From 4c08ee6790e322081f39a566b041baebd353c21d Mon Sep 17 00:00:00 2001 From: kubel Date: Mon, 26 Aug 2024 13:33:54 +0200 Subject: [PATCH 01/51] Connect when intention to use Relay --- .../connection/DefaultConnectionLifecycle.kt | 82 ++++++ .../internal/common/di/AndroidCommonDITags.kt | 2 +- .../internal/common/di/CoreJsonRpcModule.kt | 1 + .../internal/common/di/CoreNetworkModule.kt | 11 +- .../domain/relay/RelayJsonRpcInteractor.kt | 273 ++++++++++-------- .../android/pairing/client/PairingProtocol.kt | 17 +- .../pairing/engine/domain/PairingEngine.kt | 37 ++- .../android/relay/ConnectionState.kt | 4 +- .../android/relay/RelayClient.kt | 1 + .../internal/domain/RelayerInteractorTest.kt | 7 +- .../foundation/network/BaseRelayClient.kt | 6 +- .../notify/engine/NotifyEngine.kt | 5 +- .../domain/WatchSubscriptionsUseCase.kt | 23 +- .../com/walletconnect/sign/di/CallsModule.kt | 3 +- .../sign/engine/domain/SignEngine.kt | 55 ++-- .../use_case/calls/RejectSessionUseCase.kt | 4 + 16 files changed, 335 insertions(+), 196 deletions(-) create mode 100644 core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/DefaultConnectionLifecycle.kt diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/DefaultConnectionLifecycle.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/DefaultConnectionLifecycle.kt new file mode 100644 index 000000000..482d506d8 --- /dev/null +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/DefaultConnectionLifecycle.kt @@ -0,0 +1,82 @@ +@file:JvmSynthetic + +package com.walletconnect.android.internal.common.connection + +import android.app.Activity +import android.app.Application +import android.os.Bundle +import com.tinder.scarlet.Lifecycle +import com.tinder.scarlet.ShutdownReason +import com.tinder.scarlet.lifecycle.LifecycleRegistry +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import kotlinx.coroutines.SupervisorJob +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch +import java.util.concurrent.TimeUnit + +internal class DefaultConnectionLifecycle( + application: Application, + private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry() +) : Lifecycle by lifecycleRegistry { + private val job = SupervisorJob() + private var scope = CoroutineScope(job + Dispatchers.Default) + + init { + application.registerActivityLifecycleCallbacks(ActivityLifecycleCallbacks()) + } + + fun connect() { + println("kobe: ApplicationResumedLifecycle; connect()") + + lifecycleRegistry.onNext(Lifecycle.State.Started) + } + + fun disconnect() { + println("kobe: ApplicationResumedLifecycle; disconnect()") + + lifecycleRegistry.onNext(Lifecycle.State.Stopped.WithReason(ShutdownReason(1000, "App is paused"))) + } + + 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) { + println("kobe: onPaused; disconnect()") + lifecycleRegistry.onNext(Lifecycle.State.Stopped.WithReason(ShutdownReason(1000, "App is paused"))) + job = null + } + } + } + + override fun onActivityResumed(activity: Activity) { + isResumed = true + + if (job?.isActive == true) { + job?.cancel() + job = null + } + + //todo: should auto-connect on resume when subscriptions are present +// println("kobe: onResume; connect()") +// lifecycleRegistry.onNext(Lifecycle.State.Started) + } + + override fun onActivityStarted(activity: Activity) {} + + override fun onActivityDestroyed(activity: Activity) {} + + override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {} + + override fun onActivityStopped(activity: Activity) {} + + override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {} + } +} \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/AndroidCommonDITags.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/AndroidCommonDITags.kt index 2fcb45460..fdf61faf6 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/AndroidCommonDITags.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/AndroidCommonDITags.kt @@ -10,7 +10,7 @@ enum class AndroidCommonDITags { SCARLET, MSG_ADAPTER, MANUAL_CONNECTION_LIFECYCLE, - AUTOMATIC_CONNECTION_LIFECYCLE, + DEFAULT_CONNECTION_LIFECYCLE, LOGGER, CONNECTIVITY_STATE, PUSH_RETROFIT, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreJsonRpcModule.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreJsonRpcModule.kt index 15ad468fe..d58872313 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreJsonRpcModule.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreJsonRpcModule.kt @@ -27,6 +27,7 @@ fun coreJsonRpcModule() = module { jsonRpcHistory = get(), pushMessageStorage = get(), logger = get(named(AndroidCommonDITags.LOGGER)), + connectionLifecycle = get(named(AndroidCommonDITags.DEFAULT_CONNECTION_LIFECYCLE)) ) } diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreNetworkModule.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreNetworkModule.kt index ba56b0fda..1a7c7b9a1 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreNetworkModule.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreNetworkModule.kt @@ -6,12 +6,12 @@ import com.pandulapeter.beagle.logOkHttp.BeagleOkHttpLogger import com.squareup.moshi.Moshi import com.tinder.scarlet.Lifecycle import com.tinder.scarlet.Scarlet -import com.tinder.scarlet.lifecycle.android.AndroidLifecycle import com.tinder.scarlet.messageadapter.moshi.MoshiMessageAdapter import com.tinder.scarlet.retry.ExponentialBackoffStrategy import com.tinder.scarlet.websocket.okhttp.newWebSocketFactory import com.walletconnect.android.BuildConfig import com.walletconnect.android.internal.common.connection.ConnectivityState +import com.walletconnect.android.internal.common.connection.DefaultConnectionLifecycle import com.walletconnect.android.internal.common.connection.ManualConnectionLifecycle import com.walletconnect.android.internal.common.jwt.clientid.GenerateJwtStoreClientIdUseCase import com.walletconnect.android.relay.ConnectionType @@ -109,8 +109,9 @@ fun coreAndroidNetworkModule(serverUrl: String, connectionType: ConnectionType, ManualConnectionLifecycle() } - single(named(AndroidCommonDITags.AUTOMATIC_CONNECTION_LIFECYCLE)) { - AndroidLifecycle.ofApplicationForeground(androidApplication()) + single(named(AndroidCommonDITags.DEFAULT_CONNECTION_LIFECYCLE)) { + DefaultConnectionLifecycle(androidApplication()) +// AndroidLifecycle.ofApplicationForeground(androidApplication()) //todo: combine with connectivity check? } single { ExponentialBackoffStrategy(INIT_BACKOFF_MILLIS, TimeUnit.SECONDS.toMillis(MAX_BACKOFF_SEC)) } @@ -136,9 +137,9 @@ fun coreAndroidNetworkModule(serverUrl: String, connectionType: ConnectionType, } } -private fun Scope.getLifecycle(connectionType: ConnectionType) = +private fun Scope.getLifecycle(connectionType: ConnectionType): Lifecycle = if (connectionType == ConnectionType.MANUAL) { get(named(AndroidCommonDITags.MANUAL_CONNECTION_LIFECYCLE)) } else { - get(named(AndroidCommonDITags.AUTOMATIC_CONNECTION_LIFECYCLE)) + get(named(AndroidCommonDITags.DEFAULT_CONNECTION_LIFECYCLE)) } \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt index 8210cdeac..13a74b01e 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt @@ -1,12 +1,11 @@ package com.walletconnect.android.internal.common.json_rpc.domain.relay import com.walletconnect.android.internal.common.JsonRpcResponse +import com.walletconnect.android.internal.common.connection.DefaultConnectionLifecycle import com.walletconnect.android.internal.common.crypto.codec.Codec import com.walletconnect.android.internal.common.crypto.sha256 -import com.walletconnect.android.internal.common.exception.NoConnectivityException import com.walletconnect.android.internal.common.exception.NoInternetConnectionException import com.walletconnect.android.internal.common.exception.NoRelayConnectionException -import com.walletconnect.android.internal.common.exception.Uncategorized import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer import com.walletconnect.android.internal.common.json_rpc.model.toRelay import com.walletconnect.android.internal.common.json_rpc.model.toWCRequest @@ -40,6 +39,8 @@ import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asSharedFlow import kotlinx.coroutines.flow.filter +import kotlinx.coroutines.flow.filterIsInstance +import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onEach @@ -61,6 +62,7 @@ internal class RelayJsonRpcInteractor( private val jsonRpcHistory: JsonRpcHistory, private val pushMessageStorage: PushMessagesRepository, private val logger: Logger, + private val connectionLifecycle: DefaultConnectionLifecycle ) : RelayJsonRpcInteractorInterface { private val serializer: JsonRpcSerializer get() = wcKoinApp.koin.get() @@ -80,6 +82,8 @@ internal class RelayJsonRpcInteractor( manageSubscriptions() } + //TODO: create connectIfDisconnected() method + add connectivity checks for manual and automatic modes + override fun checkConnectionWorking() { if (relay.isNetworkAvailable.value != null && relay.isNetworkAvailable.value == false) { throw NoInternetConnectionException("Connection error: Please check your Internet connection") @@ -98,6 +102,27 @@ internal class RelayJsonRpcInteractor( } } + private fun connectAndCallRelay(action: () -> Unit) { + if (relay.wssConnectionState.value is WSSConnectionState.Disconnected) { + println("kobe: connectAndCallRelay: connect()") + connectionLifecycle.connect() + + scope.launch { + supervisorScope {//todo: timeout(?) + relay.wssConnectionState + .filterIsInstance() + .first { + println("kobe: connected + action") + action() + true + } + } + } + } else if (relay.wssConnectionState.value is WSSConnectionState.Connected) { + action() + } + } + override fun publishJsonRpcRequest( topic: Topic, params: IrnParams, @@ -107,36 +132,30 @@ internal class RelayJsonRpcInteractor( onSuccess: () -> Unit, onFailure: (Throwable) -> Unit, ) { - try { - checkConnectionWorking() - } catch (e: NoConnectivityException) { - return onFailure(e) - } - - val requestJson = try { - serializer.serialize(payload) ?: return onFailure(IllegalStateException("JsonRpcInteractor: Unknown result params")) - } catch (e: Exception) { - return onFailure(e) - } - - try { - if (jsonRpcHistory.setRequest(payload.id, topic, payload.method, requestJson, TransportType.RELAY)) { - val encryptedRequest = chaChaPolyCodec.encrypt(topic, requestJson, envelopeType, participants) - val encryptedRequestString = Base64.toBase64String(encryptedRequest) - - relay.publish(topic.value, encryptedRequestString, params.toRelay()) { result -> - result.fold( - onSuccess = { onSuccess() }, - onFailure = { error -> - logger.error("JsonRpcInteractor: Cannot send the request, error: $error") - onFailure(Throwable("Publish error: ${error.message}")) - } - ) + connectAndCallRelay { + try { + val requestJson = serializer.serialize(payload) ?: throw IllegalStateException("RelayJsonRpcInteractor: Unknown Request Params") + + println("kobe: Request: $requestJson") + + if (jsonRpcHistory.setRequest(payload.id, topic, payload.method, requestJson, TransportType.RELAY)) { + val encryptedRequest = chaChaPolyCodec.encrypt(topic, requestJson, envelopeType, participants) + val encryptedRequestString = Base64.toBase64String(encryptedRequest) + + relay.publish(topic.value, encryptedRequestString, params.toRelay()) { result -> + result.fold( + onSuccess = { onSuccess() }, + onFailure = { error -> + logger.error("JsonRpcInteractor: Cannot send the request, error: $error") + onFailure(Throwable("Publish error: ${error.message}")) + } + ) + } } + } catch (e: Exception) { + logger.error("JsonRpcInteractor: Cannot send the request, exception: $e") + onFailure(Throwable("Publish Request Error: $e")) } - } catch (e: Exception) { - logger.error("JsonRpcInteractor: Cannot send the request, exception: $e") - return onFailure(e) } } @@ -149,32 +168,103 @@ internal class RelayJsonRpcInteractor( participants: Participants?, envelopeType: EnvelopeType, ) { - try { - checkConnectionWorking() - } catch (e: NoConnectivityException) { - return onFailure(e) + connectAndCallRelay { + try { + val responseJson = serializer.serialize(response) ?: throw IllegalStateException("RelayJsonRpcInteractor: Unknown Response Params") + val encryptedResponse = chaChaPolyCodec.encrypt(topic, responseJson, envelopeType, participants) + val encryptedResponseString = Base64.toBase64String(encryptedResponse) + + println("kobe: Response: $responseJson") + + relay.publish(topic.value, encryptedResponseString, params.toRelay()) { result -> + result.fold( + onSuccess = { + jsonRpcHistory.updateRequestWithResponse(response.id, responseJson) + onSuccess() + }, + onFailure = { error -> + logger.error("JsonRpcInteractor: Cannot send the response, error: $error") + onFailure(Throwable("Publish error: ${error.message}")) + } + ) + } + } catch (e: Exception) { + logger.error("JsonRpcInteractor: Cannot send the response, exception: $e") + onFailure(Throwable("Publish Response Error: $e")) + } } + } - try { - val responseJson = serializer.serialize(response) ?: return onFailure(IllegalStateException("JsonRpcInteractor: Unknown result params")) - val encryptedResponse = chaChaPolyCodec.encrypt(topic, responseJson, envelopeType, participants) - val encryptedResponseString = Base64.toBase64String(encryptedResponse) - - relay.publish(topic.value, encryptedResponseString, params.toRelay()) { result -> - result.fold( - onSuccess = { - jsonRpcHistory.updateRequestWithResponse(response.id, responseJson) - onSuccess() - }, - onFailure = { error -> - logger.error("JsonRpcInteractor: Cannot send the response, error: $error") - onFailure(Throwable("Publish error: ${error.message}")) + override fun subscribe(topic: Topic, onSuccess: (Topic) -> Unit, onFailure: (Throwable) -> Unit) { + connectAndCallRelay { + try { + relay.subscribe(topic.value) { result -> + result.fold( + onSuccess = { acknowledgement -> + subscriptions[topic.value] = acknowledgement.result + println("kobe: subscribe: success") + onSuccess(topic) + }, + onFailure = { error -> + logger.error("Subscribe to topic error: $topic error: $error") + onFailure(Throwable("Subscribe error: ${error.message}")) + } + ) + } + } catch (e: Exception) { + logger.error("Subscribe to topic error: $topic error: $e") + onFailure(Throwable("Subscribe error: ${e.message}")) + } + } + } + + override fun batchSubscribe(topics: List, onSuccess: (List) -> Unit, onFailure: (Throwable) -> Unit) { + if (topics.isNotEmpty()) { + connectAndCallRelay { + try { + relay.batchSubscribe(topics) { result -> + result.fold( + onSuccess = { acknowledgement -> + subscriptions.plusAssign(topics.zip(acknowledgement.result).toMap()) + onSuccess(topics) + }, + onFailure = { error -> + logger.error("Batch subscribe to topics error: $topics error: $error") + onFailure(Throwable("Batch subscribe error: ${error.message}")) + } + ) } - ) + } catch (e: Exception) { + logger.error("Batch subscribe to topics error: $topics error: $e") + onFailure(Throwable("Batch subscribe error: ${e.message}")) + } + } + } + } + + override fun unsubscribe(topic: Topic, onSuccess: () -> Unit, onFailure: (Throwable) -> Unit) { + if (subscriptions.contains(topic.value)) { + connectAndCallRelay { + val subscriptionId = SubscriptionId(subscriptions[topic.value].toString()) + relay.unsubscribe(topic.value, subscriptionId.id) { result -> + result.fold( + onSuccess = { + scope.launch { + supervisorScope { + jsonRpcHistory.deleteRecordsByTopic(topic) + subscriptions.remove(topic.value) + pushMessageStorage.deletePushMessagesByTopic(topic.value) + onSuccess() + } + } + }, + onFailure = { error -> + logger.error("Unsubscribe to topic: $topic error: $error") + onFailure(Throwable("Unsubscribe error: ${error.message}")) + } + ) + } } - } catch (e: Exception) { - logger.error("JsonRpcInteractor: Cannot send the response, exception: $e") - return onFailure(e) } } @@ -280,82 +370,6 @@ internal class RelayJsonRpcInteractor( } } - override fun subscribe(topic: Topic, onSuccess: (Topic) -> Unit, onFailure: (Throwable) -> Unit) { - try { - checkConnectionWorking() - } catch (e: NoConnectivityException) { - return onFailure(e) - } - - relay.subscribe(topic.value) { result -> - result.fold( - onSuccess = { acknowledgement -> - subscriptions[topic.value] = acknowledgement.result - onSuccess(topic) - }, - onFailure = { error -> - logger.error("Subscribe to topic error: $topic error: $error") - onFailure(Throwable("Subscribe error: ${error.message}")) - } - ) - } - } - - override fun batchSubscribe(topics: List, onSuccess: (List) -> Unit, onFailure: (Throwable) -> Unit) { - try { - checkConnectionWorking() - } catch (e: NoConnectivityException) { - return onFailure(e) - } - - if (topics.isNotEmpty()) { - relay.batchSubscribe(topics) { result -> - result.fold( - onSuccess = { acknowledgement -> - subscriptions.plusAssign(topics.zip(acknowledgement.result).toMap()) - onSuccess(topics) - }, - onFailure = { error -> - logger.error("Batch subscribe to topics error: $topics error: $error") - onFailure(Throwable("Batch subscribe error: ${error.message}")) - } - ) - } - } - } - - override fun unsubscribe(topic: Topic, onSuccess: () -> Unit, onFailure: (Throwable) -> Unit) { - try { - checkConnectionWorking() - } catch (e: NoConnectivityException) { - return onFailure(e) - } - - if (subscriptions.contains(topic.value)) { - val subscriptionId = SubscriptionId(subscriptions[topic.value].toString()) - relay.unsubscribe(topic.value, subscriptionId.id) { result -> - result.fold( - onSuccess = { - scope.launch { - supervisorScope { - jsonRpcHistory.deleteRecordsByTopic(topic) - subscriptions.remove(topic.value) - pushMessageStorage.deletePushMessagesByTopic(topic.value) - onSuccess() - } - } - }, - onFailure = { error -> - logger.error("Unsubscribe to topic: $topic error: $error") - onFailure(Throwable("Unsubscribe error: ${error.message}")) - } - ) - } - } else { - onFailure(NoSuchElementException(Uncategorized.NoMatchingTopic("Session", topic.value).message)) - } - } - private fun manageSubscriptions() { scope.launch { relay.subscriptionRequest.map { relayRequest -> @@ -365,6 +379,9 @@ internal class RelayJsonRpcInteractor( storePushRequestsIfEnabled(relayRequest, topic) Subscription(decryptMessage(topic, relayRequest), relayRequest.message, topic, relayRequest.publishedAt, relayRequest.attestation) }.collect { subscription -> + + println("kobe: Message: ${subscription.decryptedMessage}") + if (subscription.decryptedMessage.isNotEmpty()) { try { manageSubscriptions(subscription) diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingProtocol.kt b/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingProtocol.kt index 6888983b2..cda79568c 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingProtocol.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingProtocol.kt @@ -77,22 +77,22 @@ internal class PairingProtocol(private val koinApp: KoinApplication = wcKoinApp) checkEngineInitialization() scope.launch(Dispatchers.IO) { - awaitConnection( - { +// awaitConnection( +// { try { pairingEngine.pair( uri = pair.uri, onSuccess = { onSuccess(pair) }, - onFailure = { error -> onError(Core.Model.Error(error)) } + onFailure = { error -> onError(Core.Model.Error(Throwable("Pairing error: ${error.message}"))) } ) } catch (e: Exception) { onError(Core.Model.Error(e)) } - }, - { throwable -> - logger.error(throwable) - onError(Core.Model.Error(Throwable("Pairing error: ${throwable.message}"))) - }) +// }, +// { throwable -> +// logger.error(throwable) +// onError(Core.Model.Error(Throwable("Pairing error: ${throwable.message}"))) +// }) } } @@ -159,6 +159,7 @@ internal class PairingProtocol(private val koinApp: KoinApplication = wcKoinApp) onConnection() return@withTimeout } + //todo: return an error after earlier - after tries ? } else { insertEventUseCase(Props(type = EventType.Error.NO_INTERNET_CONNECTION)) errorLambda(Throwable("No internet connection")) diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pairing/engine/domain/PairingEngine.kt b/core/android/src/main/kotlin/com/walletconnect/android/pairing/engine/domain/PairingEngine.kt index d6b3c3c51..ceabd2f00 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pairing/engine/domain/PairingEngine.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/pairing/engine/domain/PairingEngine.kt @@ -45,7 +45,6 @@ import com.walletconnect.android.pulse.model.EventType import com.walletconnect.android.pulse.model.Trace import com.walletconnect.android.pulse.model.properties.Properties import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.android.relay.WSSConnectionState import com.walletconnect.foundation.common.model.Topic import com.walletconnect.foundation.common.model.Ttl import com.walletconnect.foundation.util.Logger @@ -63,7 +62,6 @@ import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.asSharedFlow import kotlinx.coroutines.flow.filter -import kotlinx.coroutines.flow.filterIsInstance import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.map @@ -297,24 +295,37 @@ internal class PairingEngine( } private fun resubscribeToPairingTopics() { - jsonRpcInteractor.wssConnectionState - .filterIsInstance() - .onEach { - supervisorScope { - launch(Dispatchers.IO) { - sendBatchSubscribeForPairings() - } + scope.launch { + supervisorScope { + launch(Dispatchers.IO) { + sendBatchSubscribeForPairings() } + } - if (jsonRpcRequestsJob == null) { - jsonRpcRequestsJob = collectJsonRpcRequestsFlow() - } - }.launchIn(scope) + if (jsonRpcRequestsJob == null) { + jsonRpcRequestsJob = collectJsonRpcRequestsFlow() + } + } + +// jsonRpcInteractor.wssConnectionState +// .filterIsInstance() +// .onEach { +// supervisorScope { +// launch(Dispatchers.IO) { +// sendBatchSubscribeForPairings() +// } +// } +// +// if (jsonRpcRequestsJob == null) { +// jsonRpcRequestsJob = collectJsonRpcRequestsFlow() +// } +// }.launchIn(scope) } private suspend fun sendBatchSubscribeForPairings() { try { val pairingTopics = pairingRepository.getListOfPairings().filter { pairing -> pairing.isNotExpired() }.map { pairing -> pairing.topic.value } + println("kobe: re-subscribing to pairing topics: $pairingTopics") jsonRpcInteractor.batchSubscribe(pairingTopics) { error -> scope.launch { internalErrorFlow.emit(SDKError(error)) } } } catch (e: Exception) { scope.launch { internalErrorFlow.emit(SDKError(e)) } diff --git a/core/android/src/main/kotlin/com/walletconnect/android/relay/ConnectionState.kt b/core/android/src/main/kotlin/com/walletconnect/android/relay/ConnectionState.kt index 6583cd536..14d84e097 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/relay/ConnectionState.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/relay/ConnectionState.kt @@ -3,10 +3,10 @@ package com.walletconnect.android.relay sealed class WSSConnectionState { - object Connected : WSSConnectionState() + data object Connected : WSSConnectionState() sealed class Disconnected : WSSConnectionState() { data class ConnectionFailed(val throwable: Throwable) : Disconnected() data class ConnectionClosed(val message: String? = null) : Disconnected() } -} +} \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayClient.kt b/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayClient.kt index dd39a8e98..5200dc97f 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayClient.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayClient.kt @@ -36,6 +36,7 @@ class RelayClient(private val koinApp: KoinApplication = wcKoinApp) : BaseRelayC this.connectionType = connectionType logger = koinApp.koin.get(named(AndroidCommonDITags.LOGGER)) relayService = koinApp.koin.get(named(AndroidCommonDITags.RELAY_SERVICE)) + collectConnectionInitializationErrors { error -> onError(error) } monitorConnectionState() observeResults() diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/domain/RelayerInteractorTest.kt b/core/android/src/test/kotlin/com/walletconnect/android/internal/domain/RelayerInteractorTest.kt index 58eef91ea..7e917f04f 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/domain/RelayerInteractorTest.kt +++ b/core/android/src/test/kotlin/com/walletconnect/android/internal/domain/RelayerInteractorTest.kt @@ -1,6 +1,7 @@ package com.walletconnect.android.internal.domain import com.walletconnect.android.internal.common.JsonRpcResponse +import com.walletconnect.android.internal.common.connection.DefaultConnectionLifecycle import com.walletconnect.android.internal.common.crypto.codec.Codec import com.walletconnect.android.internal.common.exception.WalletConnectException import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer @@ -40,6 +41,8 @@ internal class RelayerInteractorTest { every { subscriptionRequest } returns flow { } } + private val defaultConnectionLifecycle: DefaultConnectionLifecycle = mockk() + private val jsonRpcHistory: JsonRpcHistory = mockk { every { setRequest(any(), any(), any(), any(), any()) } returns true every { updateRequestWithResponse(any(), any()) } returns mockk() @@ -70,7 +73,7 @@ internal class RelayerInteractorTest { } private val sut = - spyk(RelayJsonRpcInteractor(relay, codec, jsonRpcHistory, pushMessagesRepository, logger), recordPrivateCalls = true) { + spyk(RelayJsonRpcInteractor(relay, codec, jsonRpcHistory, pushMessagesRepository, logger, defaultConnectionLifecycle), recordPrivateCalls = true) { every { checkConnectionWorking() } answers { } } @@ -86,7 +89,7 @@ internal class RelayerInteractorTest { every { topic } returns topicVO } - val peerError: Error = mockk { + private val peerError: Error = mockk { every { message } returns "message" every { code } returns -1 } diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/network/BaseRelayClient.kt b/foundation/src/main/kotlin/com/walletconnect/foundation/network/BaseRelayClient.kt index f8289b3af..2d4c487f5 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/network/BaseRelayClient.kt +++ b/foundation/src/main/kotlin/com/walletconnect/foundation/network/BaseRelayClient.kt @@ -74,9 +74,9 @@ abstract class BaseRelayClient : RelayInterface { relayService .observeWebSocketEvent() .map { event -> - if (isLoggingEnabled) { - println("Event: $event") - } +// if (isLoggingEnabled) { + println("kobe: Event: $event") +// } event.toRelayEvent() } .shareIn(scope, SharingStarted.Lazily, REPLAY) diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/NotifyEngine.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/NotifyEngine.kt index ec22f9324..c31e85df4 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/NotifyEngine.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/NotifyEngine.kt @@ -107,8 +107,9 @@ internal class NotifyEngine( .onEach { supervisorScope { launch(Dispatchers.IO) { - resubscribeToSubscriptions() - watchSubscriptionsForEveryRegisteredAccount() +// println("kobe: Notify batch subs") +// resubscribeToSubscriptions() +// watchSubscriptionsForEveryRegisteredAccount() } } diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/WatchSubscriptionsUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/WatchSubscriptionsUseCase.kt index da68fcd12..60f982e4a 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/WatchSubscriptionsUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/WatchSubscriptionsUseCase.kt @@ -4,9 +4,7 @@ package com.walletconnect.notify.engine.domain import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.model.EnvelopeType import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Participants import com.walletconnect.android.internal.common.model.Tags import com.walletconnect.android.internal.common.model.params.CoreNotifyParams import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface @@ -35,7 +33,8 @@ internal class WatchSubscriptionsUseCase( val selfPublicKey = getSelfKeyForWatchSubscriptionUseCase(requestTopic, accountId) val responseTopic = keyManagementRepository.generateTopicFromKeyAgreement(selfPublicKey, peerPublicKey) - jsonRpcInteractor.subscribe(responseTopic) { error -> onFailure(error) } +// println("kobe: watch") +// jsonRpcInteractor.subscribe(responseTopic) { error -> onFailure(error) } val account = registeredAccountsRepository.getAccountByAccountId(accountId.value) val didJwt = fetchDidJwtInteractor.watchSubscriptionsRequest(accountId, authenticationPublicKey, account.appDomain) @@ -46,14 +45,14 @@ internal class WatchSubscriptionsUseCase( val request = NotifyRpc.NotifyWatchSubscriptions(params = watchSubscriptionsParams) val irnParams = IrnParams(Tags.NOTIFY_WATCH_SUBSCRIPTIONS, Ttl(thirtySeconds)) - jsonRpcInteractor.publishJsonRpcRequest( - topic = requestTopic, - params = irnParams, - payload = request, - envelopeType = EnvelopeType.ONE, - participants = Participants(selfPublicKey, peerPublicKey), - onSuccess = onSuccess, - onFailure = onFailure - ) +// jsonRpcInteractor.publishJsonRpcRequest( +// topic = requestTopic, +// params = irnParams, +// payload = request, +// envelopeType = EnvelopeType.ONE, +// participants = Participants(selfPublicKey, peerPublicKey), +// onSuccess = onSuccess, +// onFailure = onFailure +// ) } } diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/CallsModule.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/CallsModule.kt index 454e431f0..d6237dfec 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/CallsModule.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/CallsModule.kt @@ -136,7 +136,8 @@ internal fun callsModule() = module { verifyContextStorageRepository = get(), proposalStorageRepository = get(), jsonRpcInteractor = get(), - logger = get(named(AndroidCommonDITags.LOGGER)) + logger = get(named(AndroidCommonDITags.LOGGER)), + pairingController = get() ) } diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/domain/SignEngine.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/domain/SignEngine.kt index f117e1b05..82ea66e9c 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/domain/SignEngine.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/domain/SignEngine.kt @@ -83,7 +83,6 @@ import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asSharedFlow import kotlinx.coroutines.flow.filter -import kotlinx.coroutines.flow.filterIsInstance import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.merge @@ -216,24 +215,42 @@ internal class SignEngine( } private fun handleRelayRequestsAndResponses() { - jsonRpcInteractor.wssConnectionState - .filterIsInstance() - .onEach { - supervisorScope { - launch(Dispatchers.IO) { - resubscribeToSession() - resubscribeToPendingAuthenticateTopics() - } + scope.launch { + supervisorScope { + launch(Dispatchers.IO) { + resubscribeToSession() + resubscribeToPendingAuthenticateTopics() } + } - if (jsonRpcRequestsJob == null) { - jsonRpcRequestsJob = collectJsonRpcRequests() - } + if (jsonRpcRequestsJob == null) { + jsonRpcRequestsJob = collectJsonRpcRequests() + } - if (jsonRpcResponsesJob == null) { - jsonRpcResponsesJob = collectJsonRpcResponses() - } - }.launchIn(scope) + if (jsonRpcResponsesJob == null) { + jsonRpcResponsesJob = collectJsonRpcResponses() + } + } + + +// jsonRpcInteractor.wssConnectionState +// .filterIsInstance() +// .onEach { +// supervisorScope { +// launch(Dispatchers.IO) { +// resubscribeToSession() +// resubscribeToPendingAuthenticateTopics() +// } +// } +// +// if (jsonRpcRequestsJob == null) { +// jsonRpcRequestsJob = collectJsonRpcRequests() +// } +// +// if (jsonRpcResponsesJob == null) { +// jsonRpcResponsesJob = collectJsonRpcResponses() +// } +// }.launchIn(scope) } private fun handleLinkModeResponses() { @@ -325,13 +342,12 @@ internal class SignEngine( listOfExpiredSession .map { session -> session.topic } .onEach { sessionTopic -> - runCatching { - crypto.removeKeys(sessionTopic.value) - }.onFailure { logger.error(it) } + runCatching { crypto.removeKeys(sessionTopic.value) }.onFailure { logger.error(it) } sessionStorageRepository.deleteSession(sessionTopic) } val validSessionTopics = listOfValidSessions.map { it.topic.value } + println("kobe: re-subscribe to session topics: $validSessionTopics") jsonRpcInteractor.batchSubscribe(validSessionTopics) { error -> scope.launch { _engineEvent.emit(SDKError(error)) } } } catch (e: Exception) { scope.launch { _engineEvent.emit(SDKError(e)) } @@ -342,6 +358,7 @@ internal class SignEngine( scope.launch { try { val responseTopics = authenticateResponseTopicRepository.getResponseTopics().map { responseTopic -> responseTopic } + println("kobe: re-subscribe to pending auth topics; $responseTopics") jsonRpcInteractor.batchSubscribe(responseTopics) { error -> scope.launch { _engineEvent.emit(SDKError(error)) } } } catch (e: Exception) { scope.launch { _engineEvent.emit(SDKError(e)) } diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionUseCase.kt index 8517eb6dd..16466d5e3 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionUseCase.kt @@ -1,5 +1,6 @@ package com.walletconnect.sign.engine.use_case.calls +import com.walletconnect.android.Core import com.walletconnect.android.internal.common.model.IrnParams import com.walletconnect.android.internal.common.model.Tags import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface @@ -7,6 +8,7 @@ import com.walletconnect.android.internal.common.scope import com.walletconnect.android.internal.common.storage.verify.VerifyContextStorageRepository import com.walletconnect.android.internal.utils.CoreValidator.isExpired import com.walletconnect.android.internal.utils.fiveMinutesInSeconds +import com.walletconnect.android.pairing.handler.PairingControllerInterface import com.walletconnect.foundation.common.model.Ttl import com.walletconnect.foundation.util.Logger import com.walletconnect.sign.common.exceptions.PeerError @@ -20,6 +22,7 @@ internal class RejectSessionUseCase( private val verifyContextStorageRepository: VerifyContextStorageRepository, private val jsonRpcInteractor: RelayJsonRpcInteractorInterface, private val proposalStorageRepository: ProposalStorageRepository, + private val pairingController: PairingControllerInterface, private val logger: Logger ) : RejectSessionUseCaseInterface { @@ -42,6 +45,7 @@ internal class RejectSessionUseCase( scope.launch { proposalStorageRepository.deleteProposal(proposerPublicKey) verifyContextStorageRepository.delete(proposal.requestId) + pairingController.deleteAndUnsubscribePairing(Core.Params.Delete(proposal.pairingTopic.value)) } onSuccess() }, From 6b147a8f720c348d4f174d1bd8061ca5b03904f0 Mon Sep 17 00:00:00 2001 From: kubel Date: Thu, 29 Aug 2024 14:13:15 +0200 Subject: [PATCH 02/51] Open connection lifecycle --- .../com/walletconnect/android/CoreProtocol.kt | 2 +- .../ConditionalExponentialBackoffStrategy.kt | 24 ++++ .../common/connection/ConnectionLifecycle.kt | 8 ++ .../connection/DefaultConnectionLifecycle.kt | 30 +++-- .../connection/ManualConnectionLifecycle.kt | 9 +- .../internal/common/di/CoreJsonRpcModule.kt | 18 ++- .../internal/common/di/CoreNetworkModule.kt | 7 +- .../domain/relay/RelayJsonRpcInteractor.kt | 124 ++++++++++++------ .../type/RelayJsonRpcInteractorInterface.kt | 4 +- .../android/internal/utils/ObservableMap.kt | 19 +++ .../android/pairing/client/PairingProtocol.kt | 55 ++++---- .../pairing/engine/domain/PairingEngine.kt | 33 ++--- .../android/relay/RelayClient.kt | 15 ++- .../walletconnect/android/utils/Extensions.kt | 6 +- .../internal/domain/RelayerInteractorTest.kt | 7 +- gradle/libs.versions.toml | 16 +-- .../notify/engine/NotifyEngine.kt | 5 +- .../walletconnect/sign/client/SignProtocol.kt | 5 + .../sign/engine/domain/SignEngine.kt | 51 +++---- .../sample/wallet/Web3WalletApplication.kt | 3 +- .../sample/wallet/domain/WCDelegate.kt | 1 - .../sample/wallet/ui/Web3WalletViewModel.kt | 14 +- .../wallet/ui/routes/host/WalletSampleHost.kt | 20 +-- 23 files changed, 291 insertions(+), 185 deletions(-) create mode 100644 core/android/src/main/kotlin/com/walletconnect/android/internal/common/ConditionalExponentialBackoffStrategy.kt create mode 100644 core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/ConnectionLifecycle.kt create mode 100644 core/android/src/main/kotlin/com/walletconnect/android/internal/utils/ObservableMap.kt diff --git a/core/android/src/main/kotlin/com/walletconnect/android/CoreProtocol.kt b/core/android/src/main/kotlin/com/walletconnect/android/CoreProtocol.kt index d90923d32..cf5fddf4f 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/CoreProtocol.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/CoreProtocol.kt @@ -176,7 +176,7 @@ class CoreProtocol(private val koinApp: KoinApplication = wcKoinApp) : CoreInter module { single { Echo } }, module { single { Push } }, module { single { Verify } }, - coreJsonRpcModule(), + coreJsonRpcModule(connectionType), corePairingModule(Pairing, PairingController), keyServerModule(keyServerUrl), explorerModule(), diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/ConditionalExponentialBackoffStrategy.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/ConditionalExponentialBackoffStrategy.kt new file mode 100644 index 000000000..72a7978d9 --- /dev/null +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/ConditionalExponentialBackoffStrategy.kt @@ -0,0 +1,24 @@ +package com.walletconnect.android.internal.common + +import com.tinder.scarlet.retry.BackoffStrategy +import kotlin.math.pow + +class ConditionalExponentialBackoffStrategy( + private val initialDurationMillis: Long, + private val maxDurationMillis: Long +) : BackoffStrategy { + init { + require(initialDurationMillis > 0) { "initialDurationMillis, $initialDurationMillis, must be positive" } + require(maxDurationMillis > 0) { "maxDurationMillis, $maxDurationMillis, must be positive" } + } + + override var shouldBackoff: Boolean = false + + fun shouldBackoff(shouldBackoff: Boolean) { + println("kobe:be Sending shouldBackoff: $shouldBackoff") + this.shouldBackoff = shouldBackoff + } + + override fun backoffDurationMillisAt(retryCount: Int): Long = + maxDurationMillis.toDouble().coerceAtMost(initialDurationMillis.toDouble() * 2.0.pow(retryCount.toDouble())).toLong() +} \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/ConnectionLifecycle.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/ConnectionLifecycle.kt new file mode 100644 index 000000000..dcd3fc8d9 --- /dev/null +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/ConnectionLifecycle.kt @@ -0,0 +1,8 @@ +package com.walletconnect.android.internal.common.connection + +import kotlinx.coroutines.flow.StateFlow + +interface ConnectionLifecycle { + val onResume: StateFlow + fun reconnect() +} \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/DefaultConnectionLifecycle.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/DefaultConnectionLifecycle.kt index 482d506d8..48b80f918 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/DefaultConnectionLifecycle.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/DefaultConnectionLifecycle.kt @@ -13,37 +13,38 @@ 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 internal class DefaultConnectionLifecycle( application: Application, private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry() -) : Lifecycle by lifecycleRegistry { +) : Lifecycle by lifecycleRegistry, ConnectionLifecycle { private val job = SupervisorJob() private var scope = CoroutineScope(job + Dispatchers.Default) + private val _onResume = MutableStateFlow(null) + override val onResume: StateFlow = _onResume.asStateFlow() + init { application.registerActivityLifecycleCallbacks(ActivityLifecycleCallbacks()) } - fun connect() { - println("kobe: ApplicationResumedLifecycle; connect()") - + override fun reconnect() { + println("kobe: reconnect()") + lifecycleRegistry.onNext(Lifecycle.State.Stopped.WithReason()) lifecycleRegistry.onNext(Lifecycle.State.Started) } - fun disconnect() { - println("kobe: ApplicationResumedLifecycle; disconnect()") - - lifecycleRegistry.onNext(Lifecycle.State.Stopped.WithReason(ShutdownReason(1000, "App is paused"))) - } - private inner class ActivityLifecycleCallbacks : Application.ActivityLifecycleCallbacks { var isResumed: Boolean = false var job: Job? = null override fun onActivityPaused(activity: Activity) { + println("kobe: pause") isResumed = false job = scope.launch { @@ -52,11 +53,13 @@ internal class DefaultConnectionLifecycle( println("kobe: onPaused; disconnect()") lifecycleRegistry.onNext(Lifecycle.State.Stopped.WithReason(ShutdownReason(1000, "App is paused"))) job = null + _onResume.value = false } } } override fun onActivityResumed(activity: Activity) { + println("kobe: resume") isResumed = true if (job?.isActive == true) { @@ -64,9 +67,10 @@ internal class DefaultConnectionLifecycle( job = null } - //todo: should auto-connect on resume when subscriptions are present -// println("kobe: onResume; connect()") -// lifecycleRegistry.onNext(Lifecycle.State.Started) + + scope.launch { + _onResume.value = true + } } override fun onActivityStarted(activity: Activity) {} diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/ManualConnectionLifecycle.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/ManualConnectionLifecycle.kt index 395a04df7..2d3076761 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/ManualConnectionLifecycle.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/ManualConnectionLifecycle.kt @@ -4,10 +4,12 @@ package com.walletconnect.android.internal.common.connection import com.tinder.scarlet.Lifecycle import com.tinder.scarlet.lifecycle.LifecycleRegistry +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow internal class ManualConnectionLifecycle( private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(), -) : Lifecycle by lifecycleRegistry { +) : Lifecycle by lifecycleRegistry, ConnectionLifecycle { fun connect() { lifecycleRegistry.onNext(Lifecycle.State.Started) } @@ -16,7 +18,10 @@ internal class ManualConnectionLifecycle( lifecycleRegistry.onNext(Lifecycle.State.Stopped.WithReason()) } - fun restart() { + override val onResume: StateFlow + get() = MutableStateFlow(null) + + override fun reconnect() { lifecycleRegistry.onNext(Lifecycle.State.Stopped.WithReason()) lifecycleRegistry.onNext(Lifecycle.State.Started) } diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreJsonRpcModule.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreJsonRpcModule.kt index d58872313..c798938ba 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreJsonRpcModule.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreJsonRpcModule.kt @@ -1,6 +1,9 @@ package com.walletconnect.android.internal.common.di import com.squareup.moshi.Moshi +import com.walletconnect.android.internal.common.connection.ConnectionLifecycle +import com.walletconnect.android.internal.common.connection.DefaultConnectionLifecycle +import com.walletconnect.android.internal.common.connection.ManualConnectionLifecycle import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer import com.walletconnect.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractor import com.walletconnect.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface @@ -9,16 +12,26 @@ import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteract import com.walletconnect.android.internal.common.model.type.SerializableJsonRpc import com.walletconnect.android.pairing.model.PairingJsonRpcMethod import com.walletconnect.android.pairing.model.PairingRpc +import com.walletconnect.android.relay.ConnectionType import com.walletconnect.utils.JsonAdapterEntry import com.walletconnect.utils.addDeserializerEntry import com.walletconnect.utils.addSerializerEntry import org.koin.android.ext.koin.androidContext import org.koin.core.qualifier.named +import org.koin.core.scope.Scope import org.koin.dsl.module import kotlin.reflect.KClass + +fun Scope.getConnectionLifecycle(connectionType: ConnectionType): ConnectionLifecycle = + if (connectionType == ConnectionType.MANUAL) { + get(named(AndroidCommonDITags.MANUAL_CONNECTION_LIFECYCLE)) + } else { + get(named(AndroidCommonDITags.DEFAULT_CONNECTION_LIFECYCLE)) + } + @JvmSynthetic -fun coreJsonRpcModule() = module { +fun coreJsonRpcModule(connectionType: ConnectionType) = module { single { RelayJsonRpcInteractor( @@ -27,7 +40,8 @@ fun coreJsonRpcModule() = module { jsonRpcHistory = get(), pushMessageStorage = get(), logger = get(named(AndroidCommonDITags.LOGGER)), - connectionLifecycle = get(named(AndroidCommonDITags.DEFAULT_CONNECTION_LIFECYCLE)) + connectionLifecycle = getConnectionLifecycle(connectionType), + backoffStrategy = get() ) } diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreNetworkModule.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreNetworkModule.kt index 1a7c7b9a1..b72ff5fc5 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreNetworkModule.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreNetworkModule.kt @@ -7,9 +7,9 @@ import com.squareup.moshi.Moshi import com.tinder.scarlet.Lifecycle import com.tinder.scarlet.Scarlet import com.tinder.scarlet.messageadapter.moshi.MoshiMessageAdapter -import com.tinder.scarlet.retry.ExponentialBackoffStrategy import com.tinder.scarlet.websocket.okhttp.newWebSocketFactory import com.walletconnect.android.BuildConfig +import com.walletconnect.android.internal.common.ConditionalExponentialBackoffStrategy import com.walletconnect.android.internal.common.connection.ConnectivityState import com.walletconnect.android.internal.common.connection.DefaultConnectionLifecycle import com.walletconnect.android.internal.common.connection.ManualConnectionLifecycle @@ -111,16 +111,15 @@ fun coreAndroidNetworkModule(serverUrl: String, connectionType: ConnectionType, single(named(AndroidCommonDITags.DEFAULT_CONNECTION_LIFECYCLE)) { DefaultConnectionLifecycle(androidApplication()) -// AndroidLifecycle.ofApplicationForeground(androidApplication()) //todo: combine with connectivity check? } - single { ExponentialBackoffStrategy(INIT_BACKOFF_MILLIS, TimeUnit.SECONDS.toMillis(MAX_BACKOFF_SEC)) } + single { ConditionalExponentialBackoffStrategy(INIT_BACKOFF_MILLIS, TimeUnit.SECONDS.toMillis(MAX_BACKOFF_SEC)) } single { FlowStreamAdapter.Factory() } single(named(AndroidCommonDITags.SCARLET)) { Scarlet.Builder() - .backoffStrategy(get()) + .backoffStrategy((get())) .webSocketFactory(get(named(AndroidCommonDITags.OK_HTTP)).newWebSocketFactory(get(named(AndroidCommonDITags.RELAY_URL)))) .lifecycle(getLifecycle(connectionType)) .addMessageAdapterFactory(get(named(AndroidCommonDITags.MSG_ADAPTER))) diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt index 13a74b01e..baa03ec72 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt @@ -1,9 +1,11 @@ package com.walletconnect.android.internal.common.json_rpc.domain.relay +import com.walletconnect.android.internal.common.ConditionalExponentialBackoffStrategy import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.connection.DefaultConnectionLifecycle +import com.walletconnect.android.internal.common.connection.ConnectionLifecycle import com.walletconnect.android.internal.common.crypto.codec.Codec import com.walletconnect.android.internal.common.crypto.sha256 +import com.walletconnect.android.internal.common.exception.NoConnectivityException import com.walletconnect.android.internal.common.exception.NoInternetConnectionException import com.walletconnect.android.internal.common.exception.NoRelayConnectionException import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer @@ -27,6 +29,7 @@ import com.walletconnect.android.internal.common.scope import com.walletconnect.android.internal.common.storage.push_messages.PushMessagesRepository import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory import com.walletconnect.android.internal.common.wcKoinApp +import com.walletconnect.android.internal.utils.ObservableMap import com.walletconnect.android.relay.RelayConnectionInterface import com.walletconnect.android.relay.WSSConnectionState import com.walletconnect.foundation.common.model.SubscriptionId @@ -34,6 +37,7 @@ import com.walletconnect.foundation.common.model.Topic import com.walletconnect.foundation.network.model.Relay import com.walletconnect.foundation.util.Logger import com.walletconnect.utils.Empty +import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.StateFlow @@ -43,6 +47,7 @@ import kotlinx.coroutines.flow.filterIsInstance import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.merge import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch import kotlinx.coroutines.supervisorScope @@ -62,7 +67,8 @@ internal class RelayJsonRpcInteractor( private val jsonRpcHistory: JsonRpcHistory, private val pushMessageStorage: PushMessagesRepository, private val logger: Logger, - private val connectionLifecycle: DefaultConnectionLifecycle + private val connectionLifecycle: ConnectionLifecycle, + private val backoffStrategy: ConditionalExponentialBackoffStrategy ) : RelayJsonRpcInteractorInterface { private val serializer: JsonRpcSerializer get() = wcKoinApp.koin.get() @@ -76,50 +82,61 @@ internal class RelayJsonRpcInteractor( override val internalErrors: SharedFlow = _internalErrors.asSharedFlow() override val wssConnectionState: StateFlow get() = relay.wssConnectionState - private val subscriptions: MutableMap = mutableMapOf() + private var subscriptions = ObservableMap(mutableMapOf()) { newMap -> backoffStrategy.shouldBackoff(newMap.isNotEmpty()) } + override val onResubscribe: Flow + get() = merge( + connectionLifecycle.onResume.filter { isResumed -> isResumed != null && isResumed }, + relay.wssConnectionState.filterIsInstance(WSSConnectionState.Connected::class) + ) init { manageSubscriptions() } - //TODO: create connectIfDisconnected() method + add connectivity checks for manual and automatic modes - - override fun checkConnectionWorking() { + override fun checkNetworkConnectivity() { if (relay.isNetworkAvailable.value != null && relay.isNetworkAvailable.value == false) { throw NoInternetConnectionException("Connection error: Please check your Internet connection") } - - if (relay.wssConnectionState.value is WSSConnectionState.Disconnected) { - val message = when (relay.wssConnectionState.value) { - is WSSConnectionState.Disconnected.ConnectionClosed -> - (relay.wssConnectionState.value as WSSConnectionState.Disconnected.ConnectionClosed).message ?: "WSS connection closed" - - is WSSConnectionState.Disconnected.ConnectionFailed -> (relay.wssConnectionState.value as WSSConnectionState.Disconnected.ConnectionFailed).throwable.message - - else -> "WSS connection closed" - } - throw NoRelayConnectionException("Connection error: No Relay connection: $message") - } } - private fun connectAndCallRelay(action: () -> Unit) { + private fun connectAndCallRelay(onConnected: () -> Unit, onFailure: (Throwable) -> Unit) { if (relay.wssConnectionState.value is WSSConnectionState.Disconnected) { - println("kobe: connectAndCallRelay: connect()") - connectionLifecycle.connect() - + connectionLifecycle.reconnect() + //todo: timeout(?) + check how many times we try to re-connect scope.launch { - supervisorScope {//todo: timeout(?) + supervisorScope { relay.wssConnectionState - .filterIsInstance() - .first { - println("kobe: connected + action") - action() + .filter { state -> + when (state) { + is WSSConnectionState.Disconnected.ConnectionClosed -> state.message != null + else -> true + } + } + .first { state -> + println("kobe: interactor state: $state") + when (state) { + is WSSConnectionState.Connected -> { + println("kobe: action") + onConnected() + } + + is WSSConnectionState.Disconnected.ConnectionFailed -> { + println("kobe: error failed: ${state.throwable}") + onFailure(NoRelayConnectionException(state.throwable.message)) + } + + is WSSConnectionState.Disconnected.ConnectionClosed -> { + println("kobe: error closed: $state") + onFailure(NoRelayConnectionException(state.message)) + } + } true } } } } else if (relay.wssConnectionState.value is WSSConnectionState.Connected) { - action() + println("kobe: already connected") + onConnected() } } @@ -132,7 +149,13 @@ internal class RelayJsonRpcInteractor( onSuccess: () -> Unit, onFailure: (Throwable) -> Unit, ) { - connectAndCallRelay { + try { + checkNetworkConnectivity() + } catch (e: NoConnectivityException) { + return onFailure(e) + } + + connectAndCallRelay(onConnected = { try { val requestJson = serializer.serialize(payload) ?: throw IllegalStateException("RelayJsonRpcInteractor: Unknown Request Params") @@ -156,7 +179,7 @@ internal class RelayJsonRpcInteractor( logger.error("JsonRpcInteractor: Cannot send the request, exception: $e") onFailure(Throwable("Publish Request Error: $e")) } - } + }, onFailure = { error -> onFailure(error) }) } override fun publishJsonRpcResponse( @@ -168,7 +191,13 @@ internal class RelayJsonRpcInteractor( participants: Participants?, envelopeType: EnvelopeType, ) { - connectAndCallRelay { + try { + checkNetworkConnectivity() + } catch (e: NoConnectivityException) { + return onFailure(e) + } + + connectAndCallRelay(onConnected = { try { val responseJson = serializer.serialize(response) ?: throw IllegalStateException("RelayJsonRpcInteractor: Unknown Response Params") val encryptedResponse = chaChaPolyCodec.encrypt(topic, responseJson, envelopeType, participants) @@ -192,17 +221,22 @@ internal class RelayJsonRpcInteractor( logger.error("JsonRpcInteractor: Cannot send the response, exception: $e") onFailure(Throwable("Publish Response Error: $e")) } - } + }, onFailure = { error -> onFailure(error) }) } override fun subscribe(topic: Topic, onSuccess: (Topic) -> Unit, onFailure: (Throwable) -> Unit) { - connectAndCallRelay { + try { + checkNetworkConnectivity() + } catch (e: NoConnectivityException) { + return onFailure(e) + } + + connectAndCallRelay(onConnected = { try { relay.subscribe(topic.value) { result -> result.fold( onSuccess = { acknowledgement -> subscriptions[topic.value] = acknowledgement.result - println("kobe: subscribe: success") onSuccess(topic) }, onFailure = { error -> @@ -215,12 +249,18 @@ internal class RelayJsonRpcInteractor( logger.error("Subscribe to topic error: $topic error: $e") onFailure(Throwable("Subscribe error: ${e.message}")) } - } + }, onFailure = { error -> onFailure(error) }) } override fun batchSubscribe(topics: List, onSuccess: (List) -> Unit, onFailure: (Throwable) -> Unit) { + try { + checkNetworkConnectivity() + } catch (e: NoConnectivityException) { + return onFailure(e) + } + if (topics.isNotEmpty()) { - connectAndCallRelay { + connectAndCallRelay(onConnected = { try { relay.batchSubscribe(topics) { result -> result.fold( @@ -238,13 +278,19 @@ internal class RelayJsonRpcInteractor( logger.error("Batch subscribe to topics error: $topics error: $e") onFailure(Throwable("Batch subscribe error: ${e.message}")) } - } + }, onFailure = { error -> onFailure(error) }) } } override fun unsubscribe(topic: Topic, onSuccess: () -> Unit, onFailure: (Throwable) -> Unit) { + try { + checkNetworkConnectivity() + } catch (e: NoConnectivityException) { + return onFailure(e) + } + if (subscriptions.contains(topic.value)) { - connectAndCallRelay { + connectAndCallRelay(onConnected = { val subscriptionId = SubscriptionId(subscriptions[topic.value].toString()) relay.unsubscribe(topic.value, subscriptionId.id) { result -> result.fold( @@ -264,7 +310,7 @@ internal class RelayJsonRpcInteractor( } ) } - } + }, onFailure = { error -> onFailure(error) }) } } diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/RelayJsonRpcInteractorInterface.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/RelayJsonRpcInteractorInterface.kt index 017090b2c..7f535b97c 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/RelayJsonRpcInteractorInterface.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/RelayJsonRpcInteractorInterface.kt @@ -7,11 +7,13 @@ import com.walletconnect.android.internal.common.model.Participants import com.walletconnect.android.internal.common.model.WCRequest import com.walletconnect.android.relay.WSSConnectionState import com.walletconnect.foundation.common.model.Topic +import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.StateFlow interface RelayJsonRpcInteractorInterface : JsonRpcInteractorInterface { val wssConnectionState: StateFlow - fun checkConnectionWorking() + val onResubscribe: Flow + fun checkNetworkConnectivity() fun subscribe(topic: Topic, onSuccess: (Topic) -> Unit = {}, onFailure: (Throwable) -> Unit = {}) diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/utils/ObservableMap.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/utils/ObservableMap.kt new file mode 100644 index 000000000..c492a723c --- /dev/null +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/utils/ObservableMap.kt @@ -0,0 +1,19 @@ +package com.walletconnect.android.internal.utils + +class ObservableMap( + private val map: MutableMap = mutableMapOf(), + private val onChange: (Map) -> Unit +) : MutableMap by map { + + override fun put(key: K, value: V): V? { + return map.put(key, value).also { onChange(map) } + } + + override fun remove(key: K): V? { + return map.remove(key).also { onChange(map) } + } + + override fun putAll(from: Map) { + return map.putAll(from).also { onChange(map) } + } +} \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingProtocol.kt b/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingProtocol.kt index cda79568c..401b009e7 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingProtocol.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingProtocol.kt @@ -10,16 +10,11 @@ import com.walletconnect.android.pairing.engine.domain.PairingEngine import com.walletconnect.android.pairing.engine.model.EngineDO import com.walletconnect.android.pairing.model.mapper.toCore import com.walletconnect.android.pulse.domain.InsertTelemetryEventUseCase -import com.walletconnect.android.pulse.model.EventType -import com.walletconnect.android.pulse.model.properties.Props import com.walletconnect.android.relay.RelayConnectionInterface -import com.walletconnect.android.relay.WSSConnectionState import com.walletconnect.foundation.util.Logger import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.delay import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch -import kotlinx.coroutines.withTimeout import org.koin.core.KoinApplication internal class PairingProtocol(private val koinApp: KoinApplication = wcKoinApp) : PairingInterface { @@ -149,31 +144,31 @@ internal class PairingProtocol(private val koinApp: KoinApplication = wcKoinApp) } } - private suspend fun awaitConnection(onConnection: () -> Unit, errorLambda: (Throwable) -> Unit = {}) { - try { - withTimeout(60000) { - while (true) { - if (relayClient.isNetworkAvailable.value != null) { - if (relayClient.isNetworkAvailable.value == true) { - if (relayClient.wssConnectionState.value is WSSConnectionState.Connected) { - onConnection() - return@withTimeout - } - //todo: return an error after earlier - after tries ? - } else { - insertEventUseCase(Props(type = EventType.Error.NO_INTERNET_CONNECTION)) - errorLambda(Throwable("No internet connection")) - return@withTimeout - } - } - delay(100) - } - } - } catch (e: Exception) { - insertEventUseCase(Props(type = EventType.Error.NO_WSS_CONNECTION)) - errorLambda(Throwable("Failed to connect: ${e.message}")) - } - } +// private suspend fun awaitConnection(onConnection: () -> Unit, errorLambda: (Throwable) -> Unit = {}) { +// try { +// withTimeout(60000) { +// while (true) { +// if (relayClient.isNetworkAvailable.value != null) { +// if (relayClient.isNetworkAvailable.value == true) { +// if (relayClient.wssConnectionState.value is WSSConnectionState.Connected) { +// onConnection() +// return@withTimeout +// } +// //todo: return an error after earlier - after tries ? +// } else { +// insertEventUseCase(Props(type = EventType.Error.NO_INTERNET_CONNECTION)) +// errorLambda(Throwable("No internet connection")) +// return@withTimeout +// } +// } +// delay(100) +// } +// } +// } catch (e: Exception) { +// insertEventUseCase(Props(type = EventType.Error.NO_WSS_CONNECTION)) +// errorLambda(Throwable("Failed to connect: ${e.message}")) +// } +// } @Throws(IllegalStateException::class) private fun checkEngineInitialization() { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pairing/engine/domain/PairingEngine.kt b/core/android/src/main/kotlin/com/walletconnect/android/pairing/engine/domain/PairingEngine.kt index ceabd2f00..b987d4fcb 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pairing/engine/domain/PairingEngine.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/pairing/engine/domain/PairingEngine.kt @@ -295,31 +295,18 @@ internal class PairingEngine( } private fun resubscribeToPairingTopics() { - scope.launch { - supervisorScope { - launch(Dispatchers.IO) { - sendBatchSubscribeForPairings() + jsonRpcInteractor.onResubscribe + .onEach { + supervisorScope { + launch(Dispatchers.IO) { + sendBatchSubscribeForPairings() + } } - } - if (jsonRpcRequestsJob == null) { - jsonRpcRequestsJob = collectJsonRpcRequestsFlow() - } - } - -// jsonRpcInteractor.wssConnectionState -// .filterIsInstance() -// .onEach { -// supervisorScope { -// launch(Dispatchers.IO) { -// sendBatchSubscribeForPairings() -// } -// } -// -// if (jsonRpcRequestsJob == null) { -// jsonRpcRequestsJob = collectJsonRpcRequestsFlow() -// } -// }.launchIn(scope) + if (jsonRpcRequestsJob == null) { + jsonRpcRequestsJob = collectJsonRpcRequestsFlow() + } + }.launchIn(scope) } private suspend fun sendBatchSubscribeForPairings() { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayClient.kt b/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayClient.kt index 5200dc97f..1e7771867 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayClient.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayClient.kt @@ -14,10 +14,9 @@ import com.walletconnect.foundation.network.BaseRelayClient import com.walletconnect.foundation.network.model.Relay import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.collect +import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach -import kotlinx.coroutines.flow.takeWhile import kotlinx.coroutines.launch import kotlinx.coroutines.supervisorScope import org.koin.core.KoinApplication @@ -27,6 +26,7 @@ class RelayClient(private val koinApp: KoinApplication = wcKoinApp) : BaseRelayC private val manualConnection: ManualConnectionLifecycle by lazy { koinApp.koin.get(named(AndroidCommonDITags.MANUAL_CONNECTION_LIFECYCLE)) } private val networkState: ConnectivityState by lazy { koinApp.koin.get(named(AndroidCommonDITags.CONNECTIVITY_STATE)) } override val isNetworkAvailable: StateFlow by lazy { networkState.isAvailable } + private val _wssConnectionState: MutableStateFlow = MutableStateFlow(WSSConnectionState.Disconnected.ConnectionClosed()) override val wssConnectionState: StateFlow = _wssConnectionState private lateinit var connectionType: ConnectionType @@ -46,13 +46,13 @@ class RelayClient(private val koinApp: KoinApplication = wcKoinApp) : BaseRelayC scope.launch { supervisorScope { eventsFlow - .takeWhile { event -> + .first { event -> if (event is Relay.Model.Event.OnConnectionFailed) { onError(event.throwable.toWalletConnectException) } event !is Relay.Model.Event.OnConnectionOpened<*> - }.collect() + } } } } @@ -69,7 +69,10 @@ class RelayClient(private val koinApp: KoinApplication = wcKoinApp) : BaseRelayC _wssConnectionState.value = WSSConnectionState.Connected event is Relay.Model.Event.OnConnectionFailed && _wssConnectionState.value is WSSConnectionState.Connected -> - _wssConnectionState.value = WSSConnectionState.Disconnected.ConnectionFailed(event.throwable) + _wssConnectionState.value = WSSConnectionState.Disconnected.ConnectionFailed(event.throwable.toWalletConnectException) + + event is Relay.Model.Event.OnConnectionFailed && _wssConnectionState.value is WSSConnectionState.Disconnected.ConnectionClosed -> + _wssConnectionState.value = WSSConnectionState.Disconnected.ConnectionFailed(event.throwable.toWalletConnectException) event is Relay.Model.Event.OnConnectionClosed && _wssConnectionState.value is WSSConnectionState.Connected -> _wssConnectionState.value = WSSConnectionState.Disconnected.ConnectionClosed("Connection closed: ${event.shutdownReason.reason} ${event.shutdownReason.code}") @@ -94,7 +97,7 @@ class RelayClient(private val koinApp: KoinApplication = wcKoinApp) : BaseRelayC try { when (connectionType) { ConnectionType.AUTOMATIC -> onError(Core.Model.Error(IllegalStateException(WRONG_CONNECTION_TYPE))) - ConnectionType.MANUAL -> manualConnection.restart() + ConnectionType.MANUAL -> manualConnection.reconnect() } } catch (e: Exception) { onError(Core.Model.Error(e)) diff --git a/core/android/src/main/kotlin/com/walletconnect/android/utils/Extensions.kt b/core/android/src/main/kotlin/com/walletconnect/android/utils/Extensions.kt index 2dc2c5f9a..d87b71e43 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/utils/Extensions.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/utils/Extensions.kt @@ -41,12 +41,12 @@ internal val Throwable.toWalletConnectException: WalletConnectException UnableToConnectToWebsocketException("${this.message}. It's possible that JWT has expired. Try initializing the CoreClient again.") this.message?.contains(HttpURLConnection.HTTP_NOT_FOUND.toString()) == true -> - ProjectIdDoesNotExistException(this.message) + ProjectIdDoesNotExistException("Project ID doesn't exist: ${this.message}") this.message?.contains(HttpURLConnection.HTTP_FORBIDDEN.toString()) == true -> - InvalidProjectIdException(this.message) + InvalidProjectIdException("Invalid project ID: ${this.message}") - else -> GenericException("Error while connecting, please check your Internet connection or contact support: $this") + else -> GenericException("Error while connecting, please check your Internet connection or contact support: ${this.message}") } @get:JvmSynthetic diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/domain/RelayerInteractorTest.kt b/core/android/src/test/kotlin/com/walletconnect/android/internal/domain/RelayerInteractorTest.kt index 7e917f04f..ee273e612 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/domain/RelayerInteractorTest.kt +++ b/core/android/src/test/kotlin/com/walletconnect/android/internal/domain/RelayerInteractorTest.kt @@ -1,5 +1,6 @@ package com.walletconnect.android.internal.domain +import com.walletconnect.android.internal.common.ConditionalExponentialBackoffStrategy import com.walletconnect.android.internal.common.JsonRpcResponse import com.walletconnect.android.internal.common.connection.DefaultConnectionLifecycle import com.walletconnect.android.internal.common.crypto.codec.Codec @@ -43,6 +44,8 @@ internal class RelayerInteractorTest { private val defaultConnectionLifecycle: DefaultConnectionLifecycle = mockk() + private val backoffStrategy: ConditionalExponentialBackoffStrategy = mockk() + private val jsonRpcHistory: JsonRpcHistory = mockk { every { setRequest(any(), any(), any(), any(), any()) } returns true every { updateRequestWithResponse(any(), any()) } returns mockk() @@ -73,8 +76,8 @@ internal class RelayerInteractorTest { } private val sut = - spyk(RelayJsonRpcInteractor(relay, codec, jsonRpcHistory, pushMessagesRepository, logger, defaultConnectionLifecycle), recordPrivateCalls = true) { - every { checkConnectionWorking() } answers { } + spyk(RelayJsonRpcInteractor(relay, codec, jsonRpcHistory, pushMessagesRepository, logger, defaultConnectionLifecycle, backoffStrategy), recordPrivateCalls = true) { + every { checkNetworkConnectivity() } answers { } } private val topicVO = Topic("mockkTopic") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9b92764b1..96fccff90 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -21,7 +21,7 @@ sqlDelight = "2.0.2" dokka = "1.9.20" moshi = "1.15.1" googleService = "4.4.1" -scarlet = "1.0.1" +scarlet = "0.1.14-SNAPSHOT" #"1.0.1" koin = "3.5.6" retrofit = "2.11.0" okhttp = "4.12.0" @@ -98,13 +98,13 @@ androidx-compose-material = { module = "androidx.compose.material:material", ver coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" } coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } -scarlet = { module = "com.walletconnect.Scarlet:scarlet", version.ref = "scarlet" } -scarlet-okhttp = { module = "com.walletconnect.Scarlet:websocket-okhttp", version.ref = "scarlet" } -scarlet-coroutines = { module = "com.walletconnect.Scarlet:stream-adapter-coroutines", version.ref = "scarlet" } -scarlet-moshi = { module = "com.walletconnect.Scarlet:message-adapter-moshi", version.ref = "scarlet" } -scarlet-android = { module = "com.walletconnect.Scarlet:lifecycle-android", version.ref = "scarlet" } -scarlet-mockwebserver = { module = "com.walletconnect.Scarlet:websocket-mockwebserver", version.ref = "scarlet" } -scarlet-testUtils = { module = "com.walletconnect.Scarlet:test-utils", version.ref = "scarlet" } +scarlet = { module = "com.tinder.scarlet:scarlet", version.ref = "scarlet" } +scarlet-okhttp = { module = "com.tinder.scarlet:websocket-okhttp", version.ref = "scarlet" } +scarlet-coroutines = { module = "com.tinder.scarlet:stream-adapter-coroutines", version.ref = "scarlet" } +scarlet-moshi = { module = "com.tinder.scarlet:message-adapter-moshi", version.ref = "scarlet" } +scarlet-android = { module = "com.tinder.scarlet:lifecycle-android", version.ref = "scarlet" } +scarlet-mockwebserver = { module = "com.tinder.scarlet:websocket-mockwebserver", version.ref = "scarlet" } +scarlet-testUtils = { module = "com.tinder.scarlet:test-utils", version.ref = "scarlet" } retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" } retrofit-moshi = { module = "com.squareup.retrofit2:converter-moshi", version.ref = "retrofit" } diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/NotifyEngine.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/NotifyEngine.kt index c31e85df4..af952d5a4 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/NotifyEngine.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/NotifyEngine.kt @@ -37,7 +37,6 @@ import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow import kotlinx.coroutines.flow.filter -import kotlinx.coroutines.flow.filterIsInstance import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.merge import kotlinx.coroutines.flow.onEach @@ -101,9 +100,7 @@ internal class NotifyEngine( } suspend fun setup() { - jsonRpcInteractor.wssConnectionState - .onEach { state -> handleWSSState(state) } - .filterIsInstance() + jsonRpcInteractor.onResubscribe .onEach { supervisorScope { launch(Dispatchers.IO) { diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignProtocol.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignProtocol.kt index ca5333dcb..eee6271ca 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignProtocol.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignProtocol.kt @@ -581,6 +581,11 @@ class SignProtocol(private val koinApp: KoinApplication = wcKoinApp) : SignInter onDelegate(Sign.Model.ConnectionState(true)) } + atomicBoolean?.get() == false && connectionState is WSSConnectionState.Disconnected.ConnectionFailed -> { + atomicBoolean?.set(false) + onDelegate(Sign.Model.ConnectionState(false, Sign.Model.ConnectionState.Reason.ConnectionFailed(connectionState.throwable))) + } + else -> Unit } }.launchIn(scope) diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/domain/SignEngine.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/domain/SignEngine.kt index 82ea66e9c..834168dd9 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/domain/SignEngine.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/domain/SignEngine.kt @@ -215,42 +215,25 @@ internal class SignEngine( } private fun handleRelayRequestsAndResponses() { - scope.launch { - supervisorScope { - launch(Dispatchers.IO) { - resubscribeToSession() - resubscribeToPendingAuthenticateTopics() - } - } - - if (jsonRpcRequestsJob == null) { - jsonRpcRequestsJob = collectJsonRpcRequests() - } - - if (jsonRpcResponsesJob == null) { - jsonRpcResponsesJob = collectJsonRpcResponses() - } - } + jsonRpcInteractor.onResubscribe + .onEach { + scope.launch { + supervisorScope { + launch(Dispatchers.IO) { + resubscribeToSession() + resubscribeToPendingAuthenticateTopics() + } + } + if (jsonRpcRequestsJob == null) { + jsonRpcRequestsJob = collectJsonRpcRequests() + } -// jsonRpcInteractor.wssConnectionState -// .filterIsInstance() -// .onEach { -// supervisorScope { -// launch(Dispatchers.IO) { -// resubscribeToSession() -// resubscribeToPendingAuthenticateTopics() -// } -// } -// -// if (jsonRpcRequestsJob == null) { -// jsonRpcRequestsJob = collectJsonRpcRequests() -// } -// -// if (jsonRpcResponsesJob == null) { -// jsonRpcResponsesJob = collectJsonRpcResponses() -// } -// }.launchIn(scope) + if (jsonRpcResponsesJob == null) { + jsonRpcResponsesJob = collectJsonRpcResponses() + } + } + }.launchIn(scope) } private fun handleLinkModeResponses() { diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/Web3WalletApplication.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/Web3WalletApplication.kt index 27f84ec39..0672c98d7 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/Web3WalletApplication.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/Web3WalletApplication.kt @@ -74,13 +74,14 @@ class Web3WalletApplication : Application() { metaData = appMetaData, onError = { error -> Firebase.crashlytics.recordException(error.throwable) - println(error.throwable.stackTraceToString()) + println("kobe: core init: ${error.throwable.stackTraceToString()}") scope.launch { connectionStateFlow.emit(ConnectionState.Error(error.throwable.message ?: "")) } } ) + mixPanel = MixpanelAPI.getInstance(this, CommonBuildConfig.MIX_PANEL, true).apply { identify(CoreClient.Push.clientId) people.set("\$name", EthAccountDelegate.ethAddress) diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/WCDelegate.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/WCDelegate.kt index 2b6d3b75d..57d248966 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/WCDelegate.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/WCDelegate.kt @@ -43,7 +43,6 @@ object WCDelegate : Web3Wallet.WalletDelegate, CoreClient.CoreDelegate { } override fun onConnectionStateChange(state: Wallet.Model.ConnectionState) { - state.isAvailable scope.launch { _connectionState.emit(state) } diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletViewModel.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletViewModel.kt index 5e8b4ccb6..4687327d2 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletViewModel.kt @@ -6,6 +6,8 @@ import androidx.lifecycle.viewModelScope import com.google.firebase.crashlytics.ktx.crashlytics import com.google.firebase.ktx.Firebase import com.walletconnect.android.Core +import com.walletconnect.android.internal.common.exception.InvalidProjectIdException +import com.walletconnect.android.internal.common.exception.ProjectIdDoesNotExistException import com.walletconnect.sample.wallet.domain.ISSUER import com.walletconnect.sample.wallet.domain.WCDelegate import com.walletconnect.sample.wallet.ui.state.ConnectionState @@ -68,7 +70,17 @@ class Web3WalletViewModel : ViewModel() { val connectionState = if (it.isAvailable) { ConnectionState.Ok } else { - ConnectionState.Error("No Internet connection, please check your internet connection and try again") + val message = when (it.reason) { + is Wallet.Model.ConnectionState.Reason.ConnectionFailed -> { + if ((it.reason as Wallet.Model.ConnectionState.Reason.ConnectionFailed).throwable is ProjectIdDoesNotExistException || + (it.reason as Wallet.Model.ConnectionState.Reason.ConnectionFailed).throwable is InvalidProjectIdException + ) "Invalid Project Id" else "Connection failed" + } + + else -> "Connection closed" + } + + ConnectionState.Error(message) } connectivityStateFlow.value = connectionState }.launchIn(viewModelScope) diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/host/WalletSampleHost.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/host/WalletSampleHost.kt index d5d18566c..d564d898d 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/host/WalletSampleHost.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/host/WalletSampleHost.kt @@ -108,17 +108,17 @@ fun WalletSampleHost( ) if (connectionState is ConnectionState.Error) { - ErrorBanner() + ErrorBanner((connectionState as ConnectionState.Error).message) } else if (connectionState is ConnectionState.Ok) { RestoredConnectionBanner() - } - if (isLoader) { - Loader(initMessage = "WalletConnect is pairing...", updateMessage = "Pairing is taking longer than usual, please try again...") - } + if (isLoader) { + Loader(initMessage = "WalletConnect is pairing...", updateMessage = "Pairing is taking longer than usual, please try again...") + } - if (isRequestLoader) { - Loader(initMessage = "Awaiting a request...", updateMessage = "It is taking longer than usual..") + if (isRequestLoader) { + Loader(initMessage = "Awaiting a request...", updateMessage = "It is taking longer than usual..") + } } Timer(web3walletViewModel) @@ -185,11 +185,11 @@ private fun BoxScope.Loader(initMessage: String, updateMessage: String) { } @Composable -private fun ErrorBanner() { +private fun ErrorBanner(message: String) { var shouldShow by remember { mutableStateOf(true) } LaunchedEffect(key1 = Unit) { - delay(2000) + delay(5000) shouldShow = false } @@ -208,7 +208,7 @@ private fun ErrorBanner() { colorFilter = ColorFilter.tint(color = Color.White) ) Spacer(modifier = Modifier.width(4.dp)) - Text(text = "Network connection lost", color = Color.White) + Text(text = "Network connection lost: $message", color = Color.White) } } } From c8c53b7e1e736336c996a041215231bd67da31e1 Mon Sep 17 00:00:00 2001 From: kubel Date: Thu, 29 Aug 2024 15:52:09 +0200 Subject: [PATCH 03/51] Add init event --- .../internal/common/di/CorePairingModule.kt | 3 ++ .../common/storage/events/EventsRepository.kt | 6 ++-- .../pairing/engine/domain/PairingEngine.kt | 30 +++++++++++++----- .../android/pulse/model/EventType.kt | 4 +++ .../pulse/model/properties/Properties.kt | 2 ++ .../android/pulse/model/properties/Props.kt | 3 +- .../android/sdk/storage/data/dao/Event.sq | 9 +++--- .../src/main/sqldelight/databases/12.db | Bin 0 -> 65536 bytes .../src/main/sqldelight/migration/11.sqm | 3 ++ 9 files changed, 45 insertions(+), 15 deletions(-) create mode 100644 core/android/src/main/sqldelight/databases/12.db create mode 100644 core/android/src/main/sqldelight/migration/11.sqm diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CorePairingModule.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CorePairingModule.kt index 0c3fad1d6..70a73b8d8 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CorePairingModule.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CorePairingModule.kt @@ -15,8 +15,11 @@ fun corePairingModule(pairing: PairingInterface, pairingController: PairingContr pairingRepository = get(), jsonRpcInteractor = get(), logger = get(named(AndroidCommonDITags.LOGGER)), + insertTelemetryEventUseCase = get(), insertEventUseCase = get(), sendBatchEventUseCase = get(), + clientId = get(named(AndroidCommonDITags.CLIENT_ID)), + userAgent = get(named(AndroidCommonDITags.USER_AGENT)) ) } single { pairing } diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/events/EventsRepository.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/events/EventsRepository.kt index 3463f721f..6d824430f 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/events/EventsRepository.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/events/EventsRepository.kt @@ -38,7 +38,8 @@ class EventsRepository( this.props.properties?.trace, this.props.properties?.correlationId, this.props.properties?.clientId, - this.props.properties?.direction + this.props.properties?.direction, + this.props.properties?.userAgent ) } } @@ -85,7 +86,8 @@ class EventsRepository( trace = trace, clientId = client_id, correlationId = correlation_id, - direction = direction + direction = direction, + userAgent = user_agent ) ) ) diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pairing/engine/domain/PairingEngine.kt b/core/android/src/main/kotlin/com/walletconnect/android/pairing/engine/domain/PairingEngine.kt index b987d4fcb..c9c1ce1ed 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pairing/engine/domain/PairingEngine.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/pairing/engine/domain/PairingEngine.kt @@ -39,6 +39,7 @@ import com.walletconnect.android.pairing.model.PairingParams import com.walletconnect.android.pairing.model.PairingRpc import com.walletconnect.android.pairing.model.mapper.toCore import com.walletconnect.android.pairing.model.pairingExpiry +import com.walletconnect.android.pulse.domain.InsertEventUseCase import com.walletconnect.android.pulse.domain.InsertTelemetryEventUseCase import com.walletconnect.android.pulse.domain.SendBatchEventUseCase import com.walletconnect.android.pulse.model.EventType @@ -82,8 +83,11 @@ internal class PairingEngine( private val crypto: KeyManagementRepository, private val jsonRpcInteractor: RelayJsonRpcInteractorInterface, private val pairingRepository: PairingStorageRepositoryInterface, - private val insertEventUseCase: InsertTelemetryEventUseCase, - private val sendBatchEventUseCase: SendBatchEventUseCase + private val insertTelemetryEventUseCase: InsertTelemetryEventUseCase, + private val insertEventUseCase: InsertEventUseCase, + private val sendBatchEventUseCase: SendBatchEventUseCase, + private val clientId: String, + private val userAgent: String ) { private var jsonRpcRequestsJob: Job? = null private val setOfRegisteredMethods: MutableSet = mutableSetOf() @@ -158,7 +162,7 @@ internal class PairingEngine( val trace: MutableList = mutableListOf() trace.add(Trace.Pairing.PAIRING_STARTED).also { logger.log("Pairing started") } val walletConnectUri: WalletConnectUri = Validator.validateWCUri(uri) ?: run { - scope.launch { supervisorScope { insertEventUseCase(Props(type = EventType.Error.MALFORMED_PAIRING_URI, properties = Properties(trace = trace))) } } + scope.launch { supervisorScope { insertTelemetryEventUseCase(Props(type = EventType.Error.MALFORMED_PAIRING_URI, properties = Properties(trace = trace))) } } return onFailure(MalformedWalletConnectUri(MALFORMED_PAIRING_URI_MESSAGE)) } trace.add(Trace.Pairing.PAIRING_URI_VALIDATION_SUCCESS) @@ -167,7 +171,7 @@ internal class PairingEngine( val symmetricKey = walletConnectUri.symKey try { if (walletConnectUri.expiry?.isExpired() == true) { - scope.launch { supervisorScope { insertEventUseCase(Props(type = EventType.Error.PAIRING_URI_EXPIRED, properties = Properties(trace = trace, topic = pairingTopic.value))) } } + scope.launch { supervisorScope { insertTelemetryEventUseCase(Props(type = EventType.Error.PAIRING_URI_EXPIRED, properties = Properties(trace = trace, topic = pairingTopic.value))) } } .also { logger.error("Pairing URI expired: $pairingTopic") } return onFailure(ExpiredPairingURIException("Pairing URI expired: $pairingTopic")) } @@ -176,7 +180,7 @@ internal class PairingEngine( val localPairing = pairingRepository.getPairingOrNullByTopic(pairingTopic) trace.add(Trace.Pairing.EXISTING_PAIRING) if (!localPairing!!.isNotExpired()) { - scope.launch { supervisorScope { insertEventUseCase(Props(type = EventType.Error.PAIRING_EXPIRED, properties = Properties(trace = trace, topic = pairingTopic.value))) } } + scope.launch { supervisorScope { insertTelemetryEventUseCase(Props(type = EventType.Error.PAIRING_EXPIRED, properties = Properties(trace = trace, topic = pairingTopic.value))) } } .also { logger.error("Pairing expired: $pairingTopic") } return onFailure(ExpiredPairingException("Pairing expired: ${pairingTopic.value}")) } @@ -200,7 +204,7 @@ internal class PairingEngine( }, onFailure = { error -> scope.launch { supervisorScope { - insertEventUseCase(Props(type = EventType.Error.PAIRING_SUBSCRIPTION_FAILURE, properties = Properties(trace = trace, topic = pairingTopic.value))) + insertTelemetryEventUseCase(Props(type = EventType.Error.PAIRING_SUBSCRIPTION_FAILURE, properties = Properties(trace = trace, topic = pairingTopic.value))) } }.also { logger.error("Subscribe pairing topic error: $pairingTopic, error: $error") } onFailure(error) @@ -209,9 +213,18 @@ internal class PairingEngine( } catch (e: Exception) { logger.error("Subscribe pairing topic error: $pairingTopic, error: $e") if (e is NoRelayConnectionException) - scope.launch { supervisorScope { insertEventUseCase(Props(type = EventType.Error.NO_WSS_CONNECTION, properties = Properties(trace = trace, topic = pairingTopic.value))) } } + scope.launch { supervisorScope { insertTelemetryEventUseCase(Props(type = EventType.Error.NO_WSS_CONNECTION, properties = Properties(trace = trace, topic = pairingTopic.value))) } } if (e is NoInternetConnectionException) - scope.launch { supervisorScope { insertEventUseCase(Props(type = EventType.Error.NO_INTERNET_CONNECTION, properties = Properties(trace = trace, topic = pairingTopic.value))) } } + scope.launch { + supervisorScope { + insertTelemetryEventUseCase( + Props( + type = EventType.Error.NO_INTERNET_CONNECTION, + properties = Properties(trace = trace, topic = pairingTopic.value) + ) + ) + } + } runCatching { crypto.removeKeys(pairingTopic.value) }.onFailure { logger.error("Remove keys error: $pairingTopic, error: $it") } jsonRpcInteractor.unsubscribe(pairingTopic) onFailure(e) @@ -286,6 +299,7 @@ internal class PairingEngine( scope.launch { supervisorScope { try { + insertEventUseCase(Props(event = EventType.INIT, properties = Properties(clientId = clientId, userAgent = userAgent))) sendBatchEventUseCase() } catch (e: Exception) { logger.error("Error when sending events: $e") diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/EventType.kt b/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/EventType.kt index 41e0c9a87..1ec63f6f5 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/EventType.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/EventType.kt @@ -3,9 +3,13 @@ package com.walletconnect.android.pulse.model object EventType { @get:JvmSynthetic const val ERROR: String = "ERROR" + @get:JvmSynthetic const val SUCCESS: String = "SUCCESS" + @get:JvmSynthetic + const val INIT: String = "INIT" + @get:JvmSynthetic const val TRACK: String = "TRACE" diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/properties/Properties.kt b/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/properties/Properties.kt index 0284da3d4..fceb0c53e 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/properties/Properties.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/properties/Properties.kt @@ -27,4 +27,6 @@ data class Properties( val clientId: String? = null, @Json(name = "direction") val direction: String? = null, + @Json(name = "user_agent") + val userAgent: String? = null, ) \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/properties/Props.kt b/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/properties/Props.kt index 0bfb09d8e..d7d006144 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/properties/Props.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/properties/Props.kt @@ -2,12 +2,13 @@ package com.walletconnect.android.pulse.model.properties import com.squareup.moshi.Json import com.walletconnect.android.pulse.model.EventType +import com.walletconnect.utils.Empty data class Props( @Json(name = "event") val event: String = EventType.ERROR, @Json(name = "type") - val type: String, + val type: String = String.Empty, @Json(name = "properties") val properties: Properties? = null ) \ No newline at end of file diff --git a/core/android/src/main/sqldelight/com/walletconnect/android/sdk/storage/data/dao/Event.sq b/core/android/src/main/sqldelight/com/walletconnect/android/sdk/storage/data/dao/Event.sq index 9e573c2a4..b94f1a632 100644 --- a/core/android/src/main/sqldelight/com/walletconnect/android/sdk/storage/data/dao/Event.sq +++ b/core/android/src/main/sqldelight/com/walletconnect/android/sdk/storage/data/dao/Event.sq @@ -11,15 +11,16 @@ CREATE TABLE EventDao( trace TEXT AS List, correlation_id INTEGER, client_id TEXT, - direction TEXT + direction TEXT, + user_agent TEXT ); insertOrAbort: -INSERT OR ABORT INTO EventDao(event_id, bundle_id, timestamp, event_name, type, topic, trace, correlation_id, client_id, direction) -VALUES (?,?,?,?,?,?, ?, ?, ?, ?); +INSERT OR ABORT INTO EventDao(event_id, bundle_id, timestamp, event_name, type, topic, trace, correlation_id, client_id, direction, user_agent) +VALUES (?,?,?,?,?,?, ?, ?, ?, ?, ?); getAllEventsWithLimitAndOffset: -SELECT event_id, bundle_id, timestamp, event_name, type, topic, trace, correlation_id, client_id, direction +SELECT event_id, bundle_id, timestamp, event_name, type, topic, trace, correlation_id, client_id, direction, user_agent FROM EventDao ed LIMIT ? OFFSET ?; diff --git a/core/android/src/main/sqldelight/databases/12.db b/core/android/src/main/sqldelight/databases/12.db new file mode 100644 index 0000000000000000000000000000000000000000..21a315fd6e10f466acc10f74c675df8c407ddf52 GIT binary patch literal 65536 zcmeI&OK#gn7{GBU56O}vCqNfm7%9f^A`z0t6@upB}ZEotEe{zuj$#Nuju375b%mqP^c~J!>6_gQNCd^XR46X}uK9Zs&P>Umv&E z+V6<{=lb2<-F+Ax61YQUi%#oBM|Ahwhuzjfy*wW(Z+vyy`GY;#x5nnsa|73Q`|(-Q zTJ)^IifZHU9C<3O?LY>v-JYLTrF_$}19c`dE=1Sss~Ebz)i*t9OWkrxvEBNv+1>4k zMz#LM?UK=4FBX*3ljr`MzFwkDYZSQAzB$1(8kY%CS6U36B<#=U#R%aaK9C+VqI{49bHuBT3vvmCGxXI5Y7?y21L+UUZ}k(b)Jb+7YnYmoHGYW>2ml#Pvz z;@d_PR=X#iKm|(r)2-@UK-2P%NAs}}tm1E(q%);!2w~Z_J92_{FHOLAL=9PmoILVjk|Y?@2*GZ z+>?Q|ttZvw^XA-HlF}IIQ&xmZa+PKlUwB0+d_C#go*Jf)qe|-dsVG~|H7VzE^l;QO zeVE*E4ys&DJqt^dH5{6K<(yu%6e8R;2X60borq2lkBR&9u{{*wdF$2s*3FXf^lny; z6HBv^Y?Ur**UDjfFAk$z#FNs&=(w-!9XVduy*`(jh01uv1%cn4az+$ly~>{k_q)jHFYmtNzN&uepmB&Bf#GHg4$ zKxIdAJaT${8MciEZ!*;49|nOM=#|bI440ye>*Mc9?}B=c3(|GOS+>FJ*9tQT=n$0-N=`osV6Tdh~lc&Ya!|EU4FRF3jqWW zKmY**5I_I{1Q0*~0R(a-!2N%&(n&A~Ab28m z2q1s}0tg_000IagfIwaZc>bT4OcDnI2q1s}0tg_000IagfB*v70zCiEwxI?A1Q0*~ z0R#|0009ILKmdWf2=M$rFPS6`1Q0*~0R#|0009ILKmY**vIV&R&$gik0R#|0009IL zKmY**5I_Kdya@3B|GZ?9I1oSp0R#|0009ILKmY**5Xctb`G2+zH3%Sp00IagfB*sr zAb Date: Fri, 30 Aug 2024 15:40:08 +0200 Subject: [PATCH 04/51] Add retry connection flow --- .../ConditionalExponentialBackoffStrategy.kt | 1 - .../connection/DefaultConnectionLifecycle.kt | 5 +- .../connection/ManualConnectionLifecycle.kt | 1 + .../internal/common/di/CoreJsonRpcModule.kt | 10 +- .../domain/relay/RelayJsonRpcInteractor.kt | 242 +++++++----------- .../android/pairing/client/PairingProtocol.kt | 54 +--- .../pairing/engine/domain/PairingEngine.kt | 1 - .../android/relay/RelayClient.kt | 17 +- .../android/relay/RelayConnectionInterface.kt | 2 + .../foundation/network/BaseRelayClient.kt | 192 ++++++++++++-- .../network}/ConnectionLifecycle.kt | 2 +- gradle/libs.versions.toml | 16 +- .../notify/engine/NotifyEngine.kt | 5 +- .../domain/WatchSubscriptionsUseCase.kt | 23 +- .../walletconnect/sign/client/SignProtocol.kt | 10 +- .../sign/engine/domain/SignEngine.kt | 2 - .../dapp/ui/routes/host/DappSampleHost.kt | 39 +-- .../sample/wallet/Web3WalletApplication.kt | 2 +- 18 files changed, 330 insertions(+), 294 deletions(-) rename {core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection => foundation/src/main/kotlin/com/walletconnect/foundation/network}/ConnectionLifecycle.kt (68%) diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/ConditionalExponentialBackoffStrategy.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/ConditionalExponentialBackoffStrategy.kt index 72a7978d9..2353efb61 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/ConditionalExponentialBackoffStrategy.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/ConditionalExponentialBackoffStrategy.kt @@ -15,7 +15,6 @@ class ConditionalExponentialBackoffStrategy( override var shouldBackoff: Boolean = false fun shouldBackoff(shouldBackoff: Boolean) { - println("kobe:be Sending shouldBackoff: $shouldBackoff") this.shouldBackoff = shouldBackoff } diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/DefaultConnectionLifecycle.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/DefaultConnectionLifecycle.kt index 48b80f918..d8b4c86b6 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/DefaultConnectionLifecycle.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/DefaultConnectionLifecycle.kt @@ -8,6 +8,7 @@ import android.os.Bundle import com.tinder.scarlet.Lifecycle import com.tinder.scarlet.ShutdownReason import com.tinder.scarlet.lifecycle.LifecycleRegistry +import com.walletconnect.foundation.network.ConnectionLifecycle import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job @@ -34,7 +35,6 @@ internal class DefaultConnectionLifecycle( } override fun reconnect() { - println("kobe: reconnect()") lifecycleRegistry.onNext(Lifecycle.State.Stopped.WithReason()) lifecycleRegistry.onNext(Lifecycle.State.Started) } @@ -44,13 +44,11 @@ internal class DefaultConnectionLifecycle( var job: Job? = null override fun onActivityPaused(activity: Activity) { - println("kobe: pause") isResumed = false job = scope.launch { delay(TimeUnit.SECONDS.toMillis(30)) if (!isResumed) { - println("kobe: onPaused; disconnect()") lifecycleRegistry.onNext(Lifecycle.State.Stopped.WithReason(ShutdownReason(1000, "App is paused"))) job = null _onResume.value = false @@ -59,7 +57,6 @@ internal class DefaultConnectionLifecycle( } override fun onActivityResumed(activity: Activity) { - println("kobe: resume") isResumed = true if (job?.isActive == true) { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/ManualConnectionLifecycle.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/ManualConnectionLifecycle.kt index 2d3076761..d331c965b 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/ManualConnectionLifecycle.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/ManualConnectionLifecycle.kt @@ -4,6 +4,7 @@ package com.walletconnect.android.internal.common.connection import com.tinder.scarlet.Lifecycle import com.tinder.scarlet.lifecycle.LifecycleRegistry +import com.walletconnect.foundation.network.ConnectionLifecycle import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreJsonRpcModule.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreJsonRpcModule.kt index c798938ba..f08944b30 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreJsonRpcModule.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreJsonRpcModule.kt @@ -1,7 +1,6 @@ package com.walletconnect.android.internal.common.di import com.squareup.moshi.Moshi -import com.walletconnect.android.internal.common.connection.ConnectionLifecycle import com.walletconnect.android.internal.common.connection.DefaultConnectionLifecycle import com.walletconnect.android.internal.common.connection.ManualConnectionLifecycle import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer @@ -13,6 +12,7 @@ import com.walletconnect.android.internal.common.model.type.SerializableJsonRpc import com.walletconnect.android.pairing.model.PairingJsonRpcMethod import com.walletconnect.android.pairing.model.PairingRpc import com.walletconnect.android.relay.ConnectionType +import com.walletconnect.foundation.network.ConnectionLifecycle import com.walletconnect.utils.JsonAdapterEntry import com.walletconnect.utils.addDeserializerEntry import com.walletconnect.utils.addSerializerEntry @@ -23,13 +23,6 @@ import org.koin.dsl.module import kotlin.reflect.KClass -fun Scope.getConnectionLifecycle(connectionType: ConnectionType): ConnectionLifecycle = - if (connectionType == ConnectionType.MANUAL) { - get(named(AndroidCommonDITags.MANUAL_CONNECTION_LIFECYCLE)) - } else { - get(named(AndroidCommonDITags.DEFAULT_CONNECTION_LIFECYCLE)) - } - @JvmSynthetic fun coreJsonRpcModule(connectionType: ConnectionType) = module { @@ -40,7 +33,6 @@ fun coreJsonRpcModule(connectionType: ConnectionType) = module { jsonRpcHistory = get(), pushMessageStorage = get(), logger = get(named(AndroidCommonDITags.LOGGER)), - connectionLifecycle = getConnectionLifecycle(connectionType), backoffStrategy = get() ) } diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt index baa03ec72..52f0e8e27 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt @@ -2,12 +2,10 @@ package com.walletconnect.android.internal.common.json_rpc.domain.relay import com.walletconnect.android.internal.common.ConditionalExponentialBackoffStrategy import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.connection.ConnectionLifecycle import com.walletconnect.android.internal.common.crypto.codec.Codec import com.walletconnect.android.internal.common.crypto.sha256 import com.walletconnect.android.internal.common.exception.NoConnectivityException import com.walletconnect.android.internal.common.exception.NoInternetConnectionException -import com.walletconnect.android.internal.common.exception.NoRelayConnectionException import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer import com.walletconnect.android.internal.common.json_rpc.model.toRelay import com.walletconnect.android.internal.common.json_rpc.model.toWCRequest @@ -43,11 +41,8 @@ import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asSharedFlow import kotlinx.coroutines.flow.filter -import kotlinx.coroutines.flow.filterIsInstance -import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.map -import kotlinx.coroutines.flow.merge import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch import kotlinx.coroutines.supervisorScope @@ -67,7 +62,6 @@ internal class RelayJsonRpcInteractor( private val jsonRpcHistory: JsonRpcHistory, private val pushMessageStorage: PushMessagesRepository, private val logger: Logger, - private val connectionLifecycle: ConnectionLifecycle, private val backoffStrategy: ConditionalExponentialBackoffStrategy ) : RelayJsonRpcInteractorInterface { private val serializer: JsonRpcSerializer get() = wcKoinApp.koin.get() @@ -83,11 +77,7 @@ internal class RelayJsonRpcInteractor( override val wssConnectionState: StateFlow get() = relay.wssConnectionState private var subscriptions = ObservableMap(mutableMapOf()) { newMap -> backoffStrategy.shouldBackoff(newMap.isNotEmpty()) } - override val onResubscribe: Flow - get() = merge( - connectionLifecycle.onResume.filter { isResumed -> isResumed != null && isResumed }, - relay.wssConnectionState.filterIsInstance(WSSConnectionState.Connected::class) - ) + override val onResubscribe: Flow = relay.onResubscribe init { manageSubscriptions() @@ -99,47 +89,6 @@ internal class RelayJsonRpcInteractor( } } - private fun connectAndCallRelay(onConnected: () -> Unit, onFailure: (Throwable) -> Unit) { - if (relay.wssConnectionState.value is WSSConnectionState.Disconnected) { - connectionLifecycle.reconnect() - //todo: timeout(?) + check how many times we try to re-connect - scope.launch { - supervisorScope { - relay.wssConnectionState - .filter { state -> - when (state) { - is WSSConnectionState.Disconnected.ConnectionClosed -> state.message != null - else -> true - } - } - .first { state -> - println("kobe: interactor state: $state") - when (state) { - is WSSConnectionState.Connected -> { - println("kobe: action") - onConnected() - } - - is WSSConnectionState.Disconnected.ConnectionFailed -> { - println("kobe: error failed: ${state.throwable}") - onFailure(NoRelayConnectionException(state.throwable.message)) - } - - is WSSConnectionState.Disconnected.ConnectionClosed -> { - println("kobe: error closed: $state") - onFailure(NoRelayConnectionException(state.message)) - } - } - true - } - } - } - } else if (relay.wssConnectionState.value is WSSConnectionState.Connected) { - println("kobe: already connected") - onConnected() - } - } - override fun publishJsonRpcRequest( topic: Topic, params: IrnParams, @@ -155,31 +104,26 @@ internal class RelayJsonRpcInteractor( return onFailure(e) } - connectAndCallRelay(onConnected = { - try { - val requestJson = serializer.serialize(payload) ?: throw IllegalStateException("RelayJsonRpcInteractor: Unknown Request Params") - - println("kobe: Request: $requestJson") - - if (jsonRpcHistory.setRequest(payload.id, topic, payload.method, requestJson, TransportType.RELAY)) { - val encryptedRequest = chaChaPolyCodec.encrypt(topic, requestJson, envelopeType, participants) - val encryptedRequestString = Base64.toBase64String(encryptedRequest) + try { + val requestJson = serializer.serialize(payload) ?: throw IllegalStateException("RelayJsonRpcInteractor: Unknown Request Params") + if (jsonRpcHistory.setRequest(payload.id, topic, payload.method, requestJson, TransportType.RELAY)) { + val encryptedRequest = chaChaPolyCodec.encrypt(topic, requestJson, envelopeType, participants) + val encryptedRequestString = Base64.toBase64String(encryptedRequest) - relay.publish(topic.value, encryptedRequestString, params.toRelay()) { result -> - result.fold( - onSuccess = { onSuccess() }, - onFailure = { error -> - logger.error("JsonRpcInteractor: Cannot send the request, error: $error") - onFailure(Throwable("Publish error: ${error.message}")) - } - ) - } + relay.publish(topic.value, encryptedRequestString, params.toRelay()) { result -> + result.fold( + onSuccess = { onSuccess() }, + onFailure = { error -> + logger.error("JsonRpcInteractor: Cannot send the request, error: $error") + onFailure(Throwable("Publish error: ${error.message}")) + } + ) } - } catch (e: Exception) { - logger.error("JsonRpcInteractor: Cannot send the request, exception: $e") - onFailure(Throwable("Publish Request Error: $e")) } - }, onFailure = { error -> onFailure(error) }) + } catch (e: Exception) { + logger.error("JsonRpcInteractor: Cannot send the request, exception: $e") + onFailure(Throwable("Publish Request Error: $e")) + } } override fun publishJsonRpcResponse( @@ -197,31 +141,26 @@ internal class RelayJsonRpcInteractor( return onFailure(e) } - connectAndCallRelay(onConnected = { - try { - val responseJson = serializer.serialize(response) ?: throw IllegalStateException("RelayJsonRpcInteractor: Unknown Response Params") - val encryptedResponse = chaChaPolyCodec.encrypt(topic, responseJson, envelopeType, participants) - val encryptedResponseString = Base64.toBase64String(encryptedResponse) - - println("kobe: Response: $responseJson") - - relay.publish(topic.value, encryptedResponseString, params.toRelay()) { result -> - result.fold( - onSuccess = { - jsonRpcHistory.updateRequestWithResponse(response.id, responseJson) - onSuccess() - }, - onFailure = { error -> - logger.error("JsonRpcInteractor: Cannot send the response, error: $error") - onFailure(Throwable("Publish error: ${error.message}")) - } - ) - } - } catch (e: Exception) { - logger.error("JsonRpcInteractor: Cannot send the response, exception: $e") - onFailure(Throwable("Publish Response Error: $e")) + try { + val responseJson = serializer.serialize(response) ?: throw IllegalStateException("RelayJsonRpcInteractor: Unknown Response Params") + val encryptedResponse = chaChaPolyCodec.encrypt(topic, responseJson, envelopeType, participants) + val encryptedResponseString = Base64.toBase64String(encryptedResponse) + relay.publish(topic.value, encryptedResponseString, params.toRelay()) { result -> + result.fold( + onSuccess = { + jsonRpcHistory.updateRequestWithResponse(response.id, responseJson) + onSuccess() + }, + onFailure = { error -> + logger.error("JsonRpcInteractor: Cannot send the response, error: $error") + onFailure(Throwable("Publish error: ${error.message}")) + } + ) } - }, onFailure = { error -> onFailure(error) }) + } catch (e: Exception) { + logger.error("JsonRpcInteractor: Cannot send the response, exception: $e") + onFailure(Throwable("Publish Response Error: $e")) + } } override fun subscribe(topic: Topic, onSuccess: (Topic) -> Unit, onFailure: (Throwable) -> Unit) { @@ -231,25 +170,23 @@ internal class RelayJsonRpcInteractor( return onFailure(e) } - connectAndCallRelay(onConnected = { - try { - relay.subscribe(topic.value) { result -> - result.fold( - onSuccess = { acknowledgement -> - subscriptions[topic.value] = acknowledgement.result - onSuccess(topic) - }, - onFailure = { error -> - logger.error("Subscribe to topic error: $topic error: $error") - onFailure(Throwable("Subscribe error: ${error.message}")) - } - ) - } - } catch (e: Exception) { - logger.error("Subscribe to topic error: $topic error: $e") - onFailure(Throwable("Subscribe error: ${e.message}")) + try { + relay.subscribe(topic.value) { result -> + result.fold( + onSuccess = { acknowledgement -> + subscriptions[topic.value] = acknowledgement.result + onSuccess(topic) + }, + onFailure = { error -> + logger.error("Subscribe to topic error: $topic error: $error") + onFailure(Throwable("Subscribe error: ${error.message}")) + } + ) } - }, onFailure = { error -> onFailure(error) }) + } catch (e: Exception) { + logger.error("Subscribe to topic error: $topic error: $e") + onFailure(Throwable("Subscribe error: ${e.message}")) + } } override fun batchSubscribe(topics: List, onSuccess: (List) -> Unit, onFailure: (Throwable) -> Unit) { @@ -260,25 +197,23 @@ internal class RelayJsonRpcInteractor( } if (topics.isNotEmpty()) { - connectAndCallRelay(onConnected = { - try { - relay.batchSubscribe(topics) { result -> - result.fold( - onSuccess = { acknowledgement -> - subscriptions.plusAssign(topics.zip(acknowledgement.result).toMap()) - onSuccess(topics) - }, - onFailure = { error -> - logger.error("Batch subscribe to topics error: $topics error: $error") - onFailure(Throwable("Batch subscribe error: ${error.message}")) - } - ) - } - } catch (e: Exception) { - logger.error("Batch subscribe to topics error: $topics error: $e") - onFailure(Throwable("Batch subscribe error: ${e.message}")) + try { + relay.batchSubscribe(topics) { result -> + result.fold( + onSuccess = { acknowledgement -> + subscriptions.plusAssign(topics.zip(acknowledgement.result).toMap()) + onSuccess(topics) + }, + onFailure = { error -> + logger.error("Batch subscribe to topics error: $topics error: $error") + onFailure(Throwable("Batch subscribe error: ${error.message}")) + } + ) } - }, onFailure = { error -> onFailure(error) }) + } catch (e: Exception) { + logger.error("Batch subscribe to topics error: $topics error: $e") + onFailure(Throwable("Batch subscribe error: ${e.message}")) + } } } @@ -290,27 +225,25 @@ internal class RelayJsonRpcInteractor( } if (subscriptions.contains(topic.value)) { - connectAndCallRelay(onConnected = { - val subscriptionId = SubscriptionId(subscriptions[topic.value].toString()) - relay.unsubscribe(topic.value, subscriptionId.id) { result -> - result.fold( - onSuccess = { - scope.launch { - supervisorScope { - jsonRpcHistory.deleteRecordsByTopic(topic) - subscriptions.remove(topic.value) - pushMessageStorage.deletePushMessagesByTopic(topic.value) - onSuccess() - } + val subscriptionId = SubscriptionId(subscriptions[topic.value].toString()) + relay.unsubscribe(topic.value, subscriptionId.id) { result -> + result.fold( + onSuccess = { + scope.launch { + supervisorScope { + jsonRpcHistory.deleteRecordsByTopic(topic) + subscriptions.remove(topic.value) + pushMessageStorage.deletePushMessagesByTopic(topic.value) + onSuccess() } - }, - onFailure = { error -> - logger.error("Unsubscribe to topic: $topic error: $error") - onFailure(Throwable("Unsubscribe error: ${error.message}")) } - ) - } - }, onFailure = { error -> onFailure(error) }) + }, + onFailure = { error -> + logger.error("Unsubscribe to topic: $topic error: $error") + onFailure(Throwable("Unsubscribe error: ${error.message}")) + } + ) + } } } @@ -425,9 +358,6 @@ internal class RelayJsonRpcInteractor( storePushRequestsIfEnabled(relayRequest, topic) Subscription(decryptMessage(topic, relayRequest), relayRequest.message, topic, relayRequest.publishedAt, relayRequest.attestation) }.collect { subscription -> - - println("kobe: Message: ${subscription.decryptedMessage}") - if (subscription.decryptedMessage.isNotEmpty()) { try { manageSubscriptions(subscription) diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingProtocol.kt b/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingProtocol.kt index 401b009e7..9f53e079b 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingProtocol.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingProtocol.kt @@ -12,9 +12,7 @@ import com.walletconnect.android.pairing.model.mapper.toCore import com.walletconnect.android.pulse.domain.InsertTelemetryEventUseCase import com.walletconnect.android.relay.RelayConnectionInterface import com.walletconnect.foundation.util.Logger -import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.* -import kotlinx.coroutines.launch import org.koin.core.KoinApplication internal class PairingProtocol(private val koinApp: KoinApplication = wcKoinApp) : PairingInterface { @@ -70,24 +68,14 @@ internal class PairingProtocol(private val koinApp: KoinApplication = wcKoinApp) onError: (Core.Model.Error) -> Unit, ) { checkEngineInitialization() - - scope.launch(Dispatchers.IO) { -// awaitConnection( -// { - try { - pairingEngine.pair( - uri = pair.uri, - onSuccess = { onSuccess(pair) }, - onFailure = { error -> onError(Core.Model.Error(Throwable("Pairing error: ${error.message}"))) } - ) - } catch (e: Exception) { - onError(Core.Model.Error(e)) - } -// }, -// { throwable -> -// logger.error(throwable) -// onError(Core.Model.Error(Throwable("Pairing error: ${throwable.message}"))) -// }) + try { + pairingEngine.pair( + uri = pair.uri, + onSuccess = { onSuccess(pair) }, + onFailure = { error -> onError(Core.Model.Error(Throwable("Pairing error: ${error.message}"))) } + ) + } catch (e: Exception) { + onError(Core.Model.Error(e)) } } @@ -144,32 +132,6 @@ internal class PairingProtocol(private val koinApp: KoinApplication = wcKoinApp) } } -// private suspend fun awaitConnection(onConnection: () -> Unit, errorLambda: (Throwable) -> Unit = {}) { -// try { -// withTimeout(60000) { -// while (true) { -// if (relayClient.isNetworkAvailable.value != null) { -// if (relayClient.isNetworkAvailable.value == true) { -// if (relayClient.wssConnectionState.value is WSSConnectionState.Connected) { -// onConnection() -// return@withTimeout -// } -// //todo: return an error after earlier - after tries ? -// } else { -// insertEventUseCase(Props(type = EventType.Error.NO_INTERNET_CONNECTION)) -// errorLambda(Throwable("No internet connection")) -// return@withTimeout -// } -// } -// delay(100) -// } -// } -// } catch (e: Exception) { -// insertEventUseCase(Props(type = EventType.Error.NO_WSS_CONNECTION)) -// errorLambda(Throwable("Failed to connect: ${e.message}")) -// } -// } - @Throws(IllegalStateException::class) private fun checkEngineInitialization() { check(::pairingEngine.isInitialized) { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pairing/engine/domain/PairingEngine.kt b/core/android/src/main/kotlin/com/walletconnect/android/pairing/engine/domain/PairingEngine.kt index c9c1ce1ed..aec626150 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pairing/engine/domain/PairingEngine.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/pairing/engine/domain/PairingEngine.kt @@ -326,7 +326,6 @@ internal class PairingEngine( private suspend fun sendBatchSubscribeForPairings() { try { val pairingTopics = pairingRepository.getListOfPairings().filter { pairing -> pairing.isNotExpired() }.map { pairing -> pairing.topic.value } - println("kobe: re-subscribing to pairing topics: $pairingTopics") jsonRpcInteractor.batchSubscribe(pairingTopics) { error -> scope.launch { internalErrorFlow.emit(SDKError(error)) } } } catch (e: Exception) { scope.launch { internalErrorFlow.emit(SDKError(e)) } diff --git a/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayClient.kt b/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayClient.kt index 1e7771867..9b8909ff1 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayClient.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayClient.kt @@ -4,6 +4,7 @@ package com.walletconnect.android.relay import com.walletconnect.android.Core import com.walletconnect.android.internal.common.connection.ConnectivityState +import com.walletconnect.android.internal.common.connection.DefaultConnectionLifecycle import com.walletconnect.android.internal.common.connection.ManualConnectionLifecycle import com.walletconnect.android.internal.common.di.AndroidCommonDITags import com.walletconnect.android.internal.common.exception.WRONG_CONNECTION_TYPE @@ -12,10 +13,14 @@ import com.walletconnect.android.internal.common.wcKoinApp import com.walletconnect.android.utils.toWalletConnectException import com.walletconnect.foundation.network.BaseRelayClient import com.walletconnect.foundation.network.model.Relay +import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.filter +import kotlinx.coroutines.flow.filterIsInstance import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.merge import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch import kotlinx.coroutines.supervisorScope @@ -24,18 +29,24 @@ import org.koin.core.qualifier.named class RelayClient(private val koinApp: KoinApplication = wcKoinApp) : BaseRelayClient(), RelayConnectionInterface { private val manualConnection: ManualConnectionLifecycle by lazy { koinApp.koin.get(named(AndroidCommonDITags.MANUAL_CONNECTION_LIFECYCLE)) } + private val defaultConnection: DefaultConnectionLifecycle by lazy { koinApp.koin.get(named(AndroidCommonDITags.DEFAULT_CONNECTION_LIFECYCLE)) } private val networkState: ConnectivityState by lazy { koinApp.koin.get(named(AndroidCommonDITags.CONNECTIVITY_STATE)) } override val isNetworkAvailable: StateFlow by lazy { networkState.isAvailable } - private val _wssConnectionState: MutableStateFlow = MutableStateFlow(WSSConnectionState.Disconnected.ConnectionClosed()) override val wssConnectionState: StateFlow = _wssConnectionState private lateinit var connectionType: ConnectionType + override val onResubscribe: Flow + get() = merge( + connectionLifecycle.onResume.filter { isResumed -> isResumed != null && isResumed }, + wssConnectionState.filterIsInstance(WSSConnectionState.Connected::class) + ) @JvmSynthetic fun initialize(connectionType: ConnectionType, onError: (Throwable) -> Unit) { this.connectionType = connectionType logger = koinApp.koin.get(named(AndroidCommonDITags.LOGGER)) relayService = koinApp.koin.get(named(AndroidCommonDITags.RELAY_SERVICE)) + connectionLifecycle = if (connectionType == ConnectionType.MANUAL) manualConnection else defaultConnection collectConnectionInitializationErrors { error -> onError(error) } monitorConnectionState() @@ -71,8 +82,8 @@ class RelayClient(private val koinApp: KoinApplication = wcKoinApp) : BaseRelayC event is Relay.Model.Event.OnConnectionFailed && _wssConnectionState.value is WSSConnectionState.Connected -> _wssConnectionState.value = WSSConnectionState.Disconnected.ConnectionFailed(event.throwable.toWalletConnectException) - event is Relay.Model.Event.OnConnectionFailed && _wssConnectionState.value is WSSConnectionState.Disconnected.ConnectionClosed -> - _wssConnectionState.value = WSSConnectionState.Disconnected.ConnectionFailed(event.throwable.toWalletConnectException) +// event is Relay.Model.Event.OnConnectionFailed && _wssConnectionState.value is WSSConnectionState.Disconnected.ConnectionClosed -> +// _wssConnectionState.value = WSSConnectionState.Disconnected.ConnectionFailed(event.throwable.toWalletConnectException) event is Relay.Model.Event.OnConnectionClosed && _wssConnectionState.value is WSSConnectionState.Connected -> _wssConnectionState.value = WSSConnectionState.Disconnected.ConnectionClosed("Connection closed: ${event.shutdownReason.reason} ${event.shutdownReason.code}") diff --git a/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayConnectionInterface.kt b/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayConnectionInterface.kt index c3f13d6b9..0a6606c63 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayConnectionInterface.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayConnectionInterface.kt @@ -2,11 +2,13 @@ package com.walletconnect.android.relay import com.walletconnect.android.Core import com.walletconnect.foundation.network.RelayInterface +import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.StateFlow interface RelayConnectionInterface : RelayInterface { val wssConnectionState: StateFlow val isNetworkAvailable: StateFlow + val onResubscribe: Flow @Deprecated("This has become deprecate in favor of the onError returning Core.Model.Error", ReplaceWith("this.connect(onErrorModel)")) fun connect(onErrorModel: (Core.Model.Error) -> Unit = {}, onError: (String) -> Unit) diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/network/BaseRelayClient.kt b/foundation/src/main/kotlin/com/walletconnect/foundation/network/BaseRelayClient.kt index 2d4c487f5..6408069fd 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/network/BaseRelayClient.kt +++ b/foundation/src/main/kotlin/com/walletconnect/foundation/network/BaseRelayClient.kt @@ -1,5 +1,6 @@ package com.walletconnect.foundation.network +import com.tinder.scarlet.WebSocket import com.walletconnect.foundation.common.model.SubscriptionId import com.walletconnect.foundation.common.model.Topic import com.walletconnect.foundation.common.model.Ttl @@ -12,11 +13,13 @@ import com.walletconnect.foundation.network.model.RelayDTO import com.walletconnect.foundation.util.Logger import com.walletconnect.foundation.util.scope import com.walletconnect.util.generateClientToServerId +import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.TimeoutCancellationException import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableSharedFlow +import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.catch @@ -28,18 +31,30 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.merge import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.shareIn +import kotlinx.coroutines.flow.take import kotlinx.coroutines.job import kotlinx.coroutines.launch import kotlinx.coroutines.supervisorScope import kotlinx.coroutines.withTimeout import org.koin.core.KoinApplication +sealed class ConnectionState { + data object Open : ConnectionState() + data class Closed(val throwable: Throwable) : ConnectionState() + data object Idle : ConnectionState() +} + @OptIn(ExperimentalCoroutinesApi::class) abstract class BaseRelayClient : RelayInterface { private var foundationKoinApp: KoinApplication = KoinApplication.init() lateinit var relayService: RelayService + lateinit var connectionLifecycle: ConnectionLifecycle protected var logger: Logger private val resultState: MutableSharedFlow = MutableSharedFlow() + private var connectionState: MutableStateFlow = MutableStateFlow(ConnectionState.Idle) + private var unAckedTopics: MutableList = mutableListOf() + private var isConnecting: Boolean = false + private var retryCount: Int = 0 override var isLoggingEnabled: Boolean = false init { @@ -73,10 +88,17 @@ abstract class BaseRelayClient : RelayInterface { override val eventsFlow: SharedFlow by lazy { relayService .observeWebSocketEvent() + .onEach { event -> + if (event is WebSocket.Event.OnConnectionOpened<*>) { + connectionState.value = ConnectionState.Open + } else if (event is WebSocket.Event.OnConnectionClosed || event is WebSocket.Event.OnConnectionFailed) { + connectionState.value = ConnectionState.Closed(Throwable(getErrorMessage(event))) + } + } .map { event -> -// if (isLoggingEnabled) { - println("kobe: Event: $event") -// } + if (isLoggingEnabled) { + println("Event: $event") + } event.toRelayEvent() } .shareIn(scope, SharingStarted.Lazily, REPLAY) @@ -96,12 +118,16 @@ abstract class BaseRelayClient : RelayInterface { id: Long?, onResult: (Result) -> Unit, ) { - val (tag, ttl, prompt) = params - val publishParams = RelayDTO.Publish.Request.Params(Topic(topic), message, Ttl(ttl), tag, prompt) - val publishRequest = RelayDTO.Publish.Request(id = id ?: generateClientToServerId(), params = publishParams) - - observePublishResult(publishRequest.id, onResult) - relayService.publishRequest(publishRequest) + connectAndCallRelay( + onConnected = { + val (tag, ttl, prompt) = params + val publishParams = RelayDTO.Publish.Request.Params(Topic(topic), message, Ttl(ttl), tag, prompt) + val publishRequest = RelayDTO.Publish.Request(id = id ?: generateClientToServerId(), params = publishParams) + observePublishResult(publishRequest.id, onResult) + relayService.publishRequest(publishRequest) + }, + onFailure = { onResult(Result.failure(it)) } + ) } private fun observePublishResult(id: Long, onResult: (Result) -> Unit) { @@ -131,14 +157,17 @@ abstract class BaseRelayClient : RelayInterface { @ExperimentalCoroutinesApi override fun subscribe(topic: String, id: Long?, onResult: (Result) -> Unit) { - val subscribeRequest = RelayDTO.Subscribe.Request(id = id ?: generateClientToServerId(), params = RelayDTO.Subscribe.Request.Params(Topic(topic))) - - if (isLoggingEnabled) { - logger.log("Sending SubscribeRequest: $subscribeRequest; timestamp: ${System.currentTimeMillis()}") - } - - observeSubscribeResult(subscribeRequest.id, onResult) - relayService.subscribeRequest(subscribeRequest) + connectAndCallRelay( + onConnected = { + val subscribeRequest = RelayDTO.Subscribe.Request(id = id ?: generateClientToServerId(), params = RelayDTO.Subscribe.Request.Params(Topic(topic))) + if (isLoggingEnabled) { + logger.log("Sending SubscribeRequest: $subscribeRequest; timestamp: ${System.currentTimeMillis()}") + } + observeSubscribeResult(subscribeRequest.id, onResult) + relayService.subscribeRequest(subscribeRequest) + }, + onFailure = { onResult(Result.failure(it)) } + ) } private fun observeSubscribeResult(id: Long, onResult: (Result) -> Unit) { @@ -172,18 +201,26 @@ abstract class BaseRelayClient : RelayInterface { @ExperimentalCoroutinesApi override fun batchSubscribe(topics: List, id: Long?, onResult: (Result) -> Unit) { - val batchSubscribeRequest = RelayDTO.BatchSubscribe.Request(id = id ?: generateClientToServerId(), params = RelayDTO.BatchSubscribe.Request.Params(topics)) - - observeBatchSubscribeResult(batchSubscribeRequest.id, onResult) - relayService.batchSubscribeRequest(batchSubscribeRequest) + connectAndCallRelay( + onConnected = { + if (!unAckedTopics.containsAll(topics)) { + unAckedTopics.addAll(topics) + val batchSubscribeRequest = RelayDTO.BatchSubscribe.Request(id = id ?: generateClientToServerId(), params = RelayDTO.BatchSubscribe.Request.Params(topics)) + observeBatchSubscribeResult(batchSubscribeRequest.id, topics, onResult) + relayService.batchSubscribeRequest(batchSubscribeRequest) + } + }, + onFailure = { onResult(Result.failure(it)) } + ) } - private fun observeBatchSubscribeResult(id: Long, onResult: (Result) -> Unit) { + private fun observeBatchSubscribeResult(id: Long, topics: List, onResult: (Result) -> Unit) { scope.launch { try { withTimeout(RESULT_TIMEOUT) { resultState .filterIsInstance() + .onEach { if (unAckedTopics.isNotEmpty()) unAckedTopics.removeAll(topics) } .filter { relayResult -> relayResult.id == id } .first { batchSubscribeResult -> when (batchSubscribeResult) { @@ -210,13 +247,18 @@ abstract class BaseRelayClient : RelayInterface { id: Long?, onResult: (Result) -> Unit, ) { - val unsubscribeRequest = RelayDTO.Unsubscribe.Request( - id = id ?: generateClientToServerId(), - params = RelayDTO.Unsubscribe.Request.Params(Topic(topic), SubscriptionId(subscriptionId)) - ) + connectAndCallRelay( + onConnected = { + val unsubscribeRequest = RelayDTO.Unsubscribe.Request( + id = id ?: generateClientToServerId(), + params = RelayDTO.Unsubscribe.Request.Params(Topic(topic), SubscriptionId(subscriptionId)) + ) - observeUnsubscribeResult(unsubscribeRequest.id, onResult) - relayService.unsubscribeRequest(unsubscribeRequest) + observeUnsubscribeResult(unsubscribeRequest.id, onResult) + relayService.unsubscribeRequest(unsubscribeRequest) + }, + onFailure = { onResult(Result.failure(it)) } + ) } private fun observeUnsubscribeResult(id: Long, onResult: (Result) -> Unit) { @@ -244,6 +286,98 @@ abstract class BaseRelayClient : RelayInterface { } } + private fun connectAndCallRelay(onConnected: () -> Unit, onFailure: (Throwable) -> Unit) { + when { + shouldConnect() -> { + isConnecting = true + connectionLifecycle.reconnect() + retryCount++ + + awaitConnectionWithRetry( + onConnected = { + isConnecting = false + retryCount = 0 + onConnected() + }, + onRetry = { error -> + if (retryCount == 3) { + isConnecting = false + retryCount = 0 + onFailure(error) + } else { + connectionLifecycle.reconnect() + retryCount++ + } + }, + onTimeout = { error -> onFailure(error) } + ) + } + + isConnecting -> awaitConnection(onConnected, onFailure) + connectionState.value == ConnectionState.Open -> onConnected() + } + } + + private fun awaitConnection(onConnected: () -> Unit, onFailure: (Throwable) -> Unit) { + scope.launch { + try { + withTimeout(CONNECTION_TIMEOUT) { + connectionState + .filter { state -> state != ConnectionState.Idle } + .collect { state -> + if (state == ConnectionState.Open) { + cancelJobIfActive() + onConnected() + } + } + } + } catch (e: TimeoutCancellationException) { + onFailure(e) + cancelJobIfActive() + } catch (e: Exception) { + if (e !is CancellationException) { + onFailure(e) + } + cancelJobIfActive() + } + } + } + + private fun awaitConnectionWithRetry(onConnected: () -> Unit, onRetry: (Throwable) -> Unit, onTimeout: (Throwable) -> Unit = {}) { + scope.launch { + try { + withTimeout(CONNECTION_TIMEOUT) { + connectionState + .filter { state -> state != ConnectionState.Idle } + .take(MAX_RETRIES) + .collect { state -> + if (state == ConnectionState.Open) { + cancelJobIfActive() + onConnected() + } else { + onRetry((state as ConnectionState.Closed).throwable) + } + } + } + } catch (e: TimeoutCancellationException) { + isConnecting = false + onTimeout(e) + cancelJobIfActive() + } catch (e: Exception) { + if (e !is CancellationException) { + onRetry(e) + } + } + } + } + + private fun shouldConnect() = !isConnecting && (connectionState.value is ConnectionState.Closed || connectionState.value is ConnectionState.Idle) + private fun getErrorMessage(event: WebSocket.Event) = when (event) { + is WebSocket.Event.OnConnectionClosed -> event.shutdownReason.reason + is WebSocket.Event.OnConnectionFailed -> event.throwable.message + else -> "Unknown" + } + private fun publishSubscriptionAcknowledgement(id: Long) { val publishRequest = RelayDTO.Subscription.Result.Acknowledgement(id = id, result = true) relayService.publishSubscriptionAcknowledgement(publishRequest) @@ -258,5 +392,7 @@ abstract class BaseRelayClient : RelayInterface { private companion object { const val REPLAY: Int = 1 const val RESULT_TIMEOUT: Long = 60000 + const val CONNECTION_TIMEOUT: Long = 15000 + const val MAX_RETRIES: Int = 3 } } \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/ConnectionLifecycle.kt b/foundation/src/main/kotlin/com/walletconnect/foundation/network/ConnectionLifecycle.kt similarity index 68% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/ConnectionLifecycle.kt rename to foundation/src/main/kotlin/com/walletconnect/foundation/network/ConnectionLifecycle.kt index dcd3fc8d9..bdd927e93 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/ConnectionLifecycle.kt +++ b/foundation/src/main/kotlin/com/walletconnect/foundation/network/ConnectionLifecycle.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.connection +package com.walletconnect.foundation.network import kotlinx.coroutines.flow.StateFlow diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 96fccff90..d002a0a2d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -21,7 +21,7 @@ sqlDelight = "2.0.2" dokka = "1.9.20" moshi = "1.15.1" googleService = "4.4.1" -scarlet = "0.1.14-SNAPSHOT" #"1.0.1" +scarlet = "1.0.2" koin = "3.5.6" retrofit = "2.11.0" okhttp = "4.12.0" @@ -98,13 +98,13 @@ androidx-compose-material = { module = "androidx.compose.material:material", ver coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" } coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } -scarlet = { module = "com.tinder.scarlet:scarlet", version.ref = "scarlet" } -scarlet-okhttp = { module = "com.tinder.scarlet:websocket-okhttp", version.ref = "scarlet" } -scarlet-coroutines = { module = "com.tinder.scarlet:stream-adapter-coroutines", version.ref = "scarlet" } -scarlet-moshi = { module = "com.tinder.scarlet:message-adapter-moshi", version.ref = "scarlet" } -scarlet-android = { module = "com.tinder.scarlet:lifecycle-android", version.ref = "scarlet" } -scarlet-mockwebserver = { module = "com.tinder.scarlet:websocket-mockwebserver", version.ref = "scarlet" } -scarlet-testUtils = { module = "com.tinder.scarlet:test-utils", version.ref = "scarlet" } +scarlet = { module = "com.walletconnect.Scarlet:scarlet", version.ref = "scarlet" } +scarlet-okhttp = { module = "com.walletconnect.Scarlet:websocket-okhttp", version.ref = "scarlet" } +scarlet-coroutines = { module = "com.walletconnect.Scarlet:stream-adapter-coroutines", version.ref = "scarlet" } +scarlet-moshi = { module = "com.walletconnect.Scarlet:message-adapter-moshi", version.ref = "scarlet" } +scarlet-android = { module = "com.walletconnect.Scarlet:lifecycle-android", version.ref = "scarlet" } +scarlet-mockwebserver = { module = "com.walletconnect.Scarlet:websocket-mockwebserver", version.ref = "scarlet" } +scarlet-testUtils = { module = "com.walletconnect.Scarlet:test-utils", version.ref = "scarlet" } retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" } retrofit-moshi = { module = "com.squareup.retrofit2:converter-moshi", version.ref = "retrofit" } diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/NotifyEngine.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/NotifyEngine.kt index af952d5a4..0a0405891 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/NotifyEngine.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/NotifyEngine.kt @@ -104,9 +104,8 @@ internal class NotifyEngine( .onEach { supervisorScope { launch(Dispatchers.IO) { -// println("kobe: Notify batch subs") -// resubscribeToSubscriptions() -// watchSubscriptionsForEveryRegisteredAccount() + resubscribeToSubscriptions() + watchSubscriptionsForEveryRegisteredAccount() } } diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/WatchSubscriptionsUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/WatchSubscriptionsUseCase.kt index 60f982e4a..da68fcd12 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/WatchSubscriptionsUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/WatchSubscriptionsUseCase.kt @@ -4,7 +4,9 @@ package com.walletconnect.notify.engine.domain import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository import com.walletconnect.android.internal.common.model.AccountId +import com.walletconnect.android.internal.common.model.EnvelopeType import com.walletconnect.android.internal.common.model.IrnParams +import com.walletconnect.android.internal.common.model.Participants import com.walletconnect.android.internal.common.model.Tags import com.walletconnect.android.internal.common.model.params.CoreNotifyParams import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface @@ -33,8 +35,7 @@ internal class WatchSubscriptionsUseCase( val selfPublicKey = getSelfKeyForWatchSubscriptionUseCase(requestTopic, accountId) val responseTopic = keyManagementRepository.generateTopicFromKeyAgreement(selfPublicKey, peerPublicKey) -// println("kobe: watch") -// jsonRpcInteractor.subscribe(responseTopic) { error -> onFailure(error) } + jsonRpcInteractor.subscribe(responseTopic) { error -> onFailure(error) } val account = registeredAccountsRepository.getAccountByAccountId(accountId.value) val didJwt = fetchDidJwtInteractor.watchSubscriptionsRequest(accountId, authenticationPublicKey, account.appDomain) @@ -45,14 +46,14 @@ internal class WatchSubscriptionsUseCase( val request = NotifyRpc.NotifyWatchSubscriptions(params = watchSubscriptionsParams) val irnParams = IrnParams(Tags.NOTIFY_WATCH_SUBSCRIPTIONS, Ttl(thirtySeconds)) -// jsonRpcInteractor.publishJsonRpcRequest( -// topic = requestTopic, -// params = irnParams, -// payload = request, -// envelopeType = EnvelopeType.ONE, -// participants = Participants(selfPublicKey, peerPublicKey), -// onSuccess = onSuccess, -// onFailure = onFailure -// ) + jsonRpcInteractor.publishJsonRpcRequest( + topic = requestTopic, + params = irnParams, + payload = request, + envelopeType = EnvelopeType.ONE, + participants = Participants(selfPublicKey, peerPublicKey), + onSuccess = onSuccess, + onFailure = onFailure + ) } } diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignProtocol.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignProtocol.kt index eee6271ca..6fc5ce208 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignProtocol.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignProtocol.kt @@ -580,11 +580,11 @@ class SignProtocol(private val koinApp: KoinApplication = wcKoinApp) : SignInter atomicBoolean?.set(true) onDelegate(Sign.Model.ConnectionState(true)) } - - atomicBoolean?.get() == false && connectionState is WSSConnectionState.Disconnected.ConnectionFailed -> { - atomicBoolean?.set(false) - onDelegate(Sign.Model.ConnectionState(false, Sign.Model.ConnectionState.Reason.ConnectionFailed(connectionState.throwable))) - } +// +// atomicBoolean?.get() == false && connectionState is WSSConnectionState.Disconnected.ConnectionFailed -> { +// atomicBoolean?.set(false) +// onDelegate(Sign.Model.ConnectionState(false, Sign.Model.ConnectionState.Reason.ConnectionFailed(connectionState.throwable))) +// } else -> Unit } diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/domain/SignEngine.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/domain/SignEngine.kt index 834168dd9..bd9366ded 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/domain/SignEngine.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/domain/SignEngine.kt @@ -330,7 +330,6 @@ internal class SignEngine( } val validSessionTopics = listOfValidSessions.map { it.topic.value } - println("kobe: re-subscribe to session topics: $validSessionTopics") jsonRpcInteractor.batchSubscribe(validSessionTopics) { error -> scope.launch { _engineEvent.emit(SDKError(error)) } } } catch (e: Exception) { scope.launch { _engineEvent.emit(SDKError(e)) } @@ -341,7 +340,6 @@ internal class SignEngine( scope.launch { try { val responseTopics = authenticateResponseTopicRepository.getResponseTopics().map { responseTopic -> responseTopic } - println("kobe: re-subscribe to pending auth topics; $responseTopics") jsonRpcInteractor.batchSubscribe(responseTopics) { error -> scope.launch { _engineEvent.emit(SDKError(error)) } } } catch (e: Exception) { scope.launch { _engineEvent.emit(SDKError(e)) } diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/host/DappSampleHost.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/host/DappSampleHost.kt index 2b1074a2b..48eb12e5f 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/host/DappSampleHost.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/host/DappSampleHost.kt @@ -87,20 +87,29 @@ fun DappSampleHost() { @Composable private fun NoConnectionIndicator() { - Row( - modifier = Modifier - .fillMaxWidth() - .background(Color(0xFF3496ff)) - .padding(horizontal = 16.dp, vertical = 8.dp), - ) { - Text(text = "No internet connection", color = Color.White) - Spacer(modifier = Modifier.width(4.dp)) - Image( - imageVector = ImageVector.vectorResource(id = R.drawable.ic_offline), - contentDescription = null, - modifier = Modifier.size(24.dp), - colorFilter = ColorFilter.tint(color = Color.White) - ) + var shouldShow by remember { mutableStateOf(true) } + + LaunchedEffect(key1 = Unit) { + delay(3000) + shouldShow = false + } + + if (shouldShow) { + Row( + modifier = Modifier + .fillMaxWidth() + .background(Color(0xFF3496ff)) + .padding(horizontal = 16.dp, vertical = 8.dp), + ) { + Text(text = "No internet connection", color = Color.White) + Spacer(modifier = Modifier.width(4.dp)) + Image( + imageVector = ImageVector.vectorResource(id = R.drawable.ic_offline), + contentDescription = null, + modifier = Modifier.size(24.dp), + colorFilter = ColorFilter.tint(color = Color.White) + ) + } } } @@ -109,7 +118,7 @@ private fun RestoredConnectionIndicator() { var shouldShow by remember { mutableStateOf(true) } LaunchedEffect(key1 = Unit) { - delay(2000) + delay(3000) shouldShow = false } if (shouldShow) { diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/Web3WalletApplication.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/Web3WalletApplication.kt index 0672c98d7..97e343ea3 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/Web3WalletApplication.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/Web3WalletApplication.kt @@ -74,7 +74,7 @@ class Web3WalletApplication : Application() { metaData = appMetaData, onError = { error -> Firebase.crashlytics.recordException(error.throwable) - println("kobe: core init: ${error.throwable.stackTraceToString()}") + println("Init error: ${error.throwable.stackTraceToString()}") scope.launch { connectionStateFlow.emit(ConnectionState.Error(error.throwable.message ?: "")) } From d50bfc56afa3c44c068da1b218d8c5a33de8cf34 Mon Sep 17 00:00:00 2001 From: kubel Date: Mon, 2 Sep 2024 12:43:08 +0200 Subject: [PATCH 05/51] Handle connection retries --- .../domain/relay/RelayJsonRpcInteractor.kt | 4 +- .../android/relay/NetworkClientTimeout.kt | 2 +- .../android/relay/RelayClient.kt | 3 - .../foundation/network/BaseRelayClient.kt | 110 +++++++++--------- .../wallet/ui/routes/host/WalletSampleHost.kt | 12 +- 5 files changed, 66 insertions(+), 65 deletions(-) diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt index 52f0e8e27..f967bc602 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt @@ -76,7 +76,7 @@ internal class RelayJsonRpcInteractor( override val internalErrors: SharedFlow = _internalErrors.asSharedFlow() override val wssConnectionState: StateFlow get() = relay.wssConnectionState - private var subscriptions = ObservableMap(mutableMapOf()) { newMap -> backoffStrategy.shouldBackoff(newMap.isNotEmpty()) } + private var subscriptions = ObservableMap { newMap -> if (newMap.isEmpty()) backoffStrategy.shouldBackoff(false) } override val onResubscribe: Flow = relay.onResubscribe init { @@ -171,6 +171,7 @@ internal class RelayJsonRpcInteractor( } try { + backoffStrategy.shouldBackoff(true) relay.subscribe(topic.value) { result -> result.fold( onSuccess = { acknowledgement -> @@ -197,6 +198,7 @@ internal class RelayJsonRpcInteractor( } if (topics.isNotEmpty()) { + backoffStrategy.shouldBackoff(true) try { relay.batchSubscribe(topics) { result -> result.fold( diff --git a/core/android/src/main/kotlin/com/walletconnect/android/relay/NetworkClientTimeout.kt b/core/android/src/main/kotlin/com/walletconnect/android/relay/NetworkClientTimeout.kt index a500ff355..7ee752147 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/relay/NetworkClientTimeout.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/relay/NetworkClientTimeout.kt @@ -20,7 +20,7 @@ data class NetworkClientTimeout( companion object { - private const val MIN_TIMEOUT_LIMIT_AS_MILLIS = 10_000L + private const val MIN_TIMEOUT_LIMIT_AS_MILLIS = 15_000L private const val MAX_TIMEOUT_LIMIT_AS_MILLIS = 60_000L fun getDefaultTimeout() = NetworkClientTimeout( diff --git a/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayClient.kt b/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayClient.kt index 9b8909ff1..e9d556325 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayClient.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayClient.kt @@ -82,9 +82,6 @@ class RelayClient(private val koinApp: KoinApplication = wcKoinApp) : BaseRelayC event is Relay.Model.Event.OnConnectionFailed && _wssConnectionState.value is WSSConnectionState.Connected -> _wssConnectionState.value = WSSConnectionState.Disconnected.ConnectionFailed(event.throwable.toWalletConnectException) -// event is Relay.Model.Event.OnConnectionFailed && _wssConnectionState.value is WSSConnectionState.Disconnected.ConnectionClosed -> -// _wssConnectionState.value = WSSConnectionState.Disconnected.ConnectionFailed(event.throwable.toWalletConnectException) - event is Relay.Model.Event.OnConnectionClosed && _wssConnectionState.value is WSSConnectionState.Connected -> _wssConnectionState.value = WSSConnectionState.Disconnected.ConnectionClosed("Connection closed: ${event.shutdownReason.reason} ${event.shutdownReason.code}") } diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/network/BaseRelayClient.kt b/foundation/src/main/kotlin/com/walletconnect/foundation/network/BaseRelayClient.kt index 6408069fd..70ae5d3e0 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/network/BaseRelayClient.kt +++ b/foundation/src/main/kotlin/com/walletconnect/foundation/network/BaseRelayClient.kt @@ -27,6 +27,7 @@ import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.filterIsInstance import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.merge import kotlinx.coroutines.flow.onEach @@ -92,13 +93,11 @@ abstract class BaseRelayClient : RelayInterface { if (event is WebSocket.Event.OnConnectionOpened<*>) { connectionState.value = ConnectionState.Open } else if (event is WebSocket.Event.OnConnectionClosed || event is WebSocket.Event.OnConnectionFailed) { - connectionState.value = ConnectionState.Closed(Throwable(getErrorMessage(event))) + connectionState.value = ConnectionState.Closed(getError(event)) } } .map { event -> - if (isLoggingEnabled) { - println("Event: $event") - } + logger.log("Event: $event") event.toRelayEvent() } .shareIn(scope, SharingStarted.Lazily, REPLAY) @@ -288,47 +287,40 @@ abstract class BaseRelayClient : RelayInterface { private fun connectAndCallRelay(onConnected: () -> Unit, onFailure: (Throwable) -> Unit) { when { - shouldConnect() -> { - isConnecting = true - connectionLifecycle.reconnect() - retryCount++ - - awaitConnectionWithRetry( - onConnected = { - isConnecting = false - retryCount = 0 - onConnected() - }, - onRetry = { error -> - if (retryCount == 3) { - isConnecting = false - retryCount = 0 - onFailure(error) - } else { - connectionLifecycle.reconnect() - retryCount++ - } - }, - onTimeout = { error -> onFailure(error) } - ) - } - + shouldConnect() -> connect(onConnected, onFailure) isConnecting -> awaitConnection(onConnected, onFailure) connectionState.value == ConnectionState.Open -> onConnected() } } - private fun awaitConnection(onConnected: () -> Unit, onFailure: (Throwable) -> Unit) { + private fun shouldConnect() = !isConnecting && (connectionState.value is ConnectionState.Closed || connectionState.value is ConnectionState.Idle) + private fun connect(onConnected: () -> Unit, onFailure: (Throwable) -> Unit) { + isConnecting = true + connectionLifecycle.reconnect() + awaitConnectionWithRetry( + onConnected = { + reset() + onConnected() + }, + onFailure = { error -> + reset() + onFailure(error) + } + ) + } + + private fun awaitConnectionWithRetry(onConnected: () -> Unit, onFailure: (Throwable) -> Unit = {}) { scope.launch { try { withTimeout(CONNECTION_TIMEOUT) { connectionState .filter { state -> state != ConnectionState.Idle } - .collect { state -> - if (state == ConnectionState.Open) { - cancelJobIfActive() - onConnected() - } + .take(4) + .onEach { state -> handleRetries(state, onFailure) } + .filter { state -> state == ConnectionState.Open } + .firstOrNull { + onConnected() + true } } } catch (e: TimeoutCancellationException) { @@ -338,44 +330,49 @@ abstract class BaseRelayClient : RelayInterface { if (e !is CancellationException) { onFailure(e) } - cancelJobIfActive() } } } - private fun awaitConnectionWithRetry(onConnected: () -> Unit, onRetry: (Throwable) -> Unit, onTimeout: (Throwable) -> Unit = {}) { + private fun awaitConnection(onConnected: () -> Unit, onFailure: (Throwable) -> Unit) { scope.launch { try { withTimeout(CONNECTION_TIMEOUT) { connectionState - .filter { state -> state != ConnectionState.Idle } - .take(MAX_RETRIES) - .collect { state -> - if (state == ConnectionState.Open) { - cancelJobIfActive() - onConnected() - } else { - onRetry((state as ConnectionState.Closed).throwable) - } + .filter { state -> state is ConnectionState.Open } + .firstOrNull { + onConnected() + true } } } catch (e: TimeoutCancellationException) { - isConnecting = false - onTimeout(e) + onFailure(e) cancelJobIfActive() } catch (e: Exception) { if (e !is CancellationException) { - onRetry(e) + onFailure(e) } + cancelJobIfActive() } } } - private fun shouldConnect() = !isConnecting && (connectionState.value is ConnectionState.Closed || connectionState.value is ConnectionState.Idle) - private fun getErrorMessage(event: WebSocket.Event) = when (event) { - is WebSocket.Event.OnConnectionClosed -> event.shutdownReason.reason - is WebSocket.Event.OnConnectionFailed -> event.throwable.message - else -> "Unknown" + private fun CoroutineScope.handleRetries(state: ConnectionState, onFailure: (Throwable) -> Unit) { + if (state is ConnectionState.Closed) { + if (retryCount == MAX_RETRIES) { + onFailure(Throwable("Connectivity error, please check your Internet connection and try again")) + cancelJobIfActive() + } else { + connectionLifecycle.reconnect() + retryCount++ + } + } + } + + private fun getError(event: WebSocket.Event): Throwable = when (event) { + is WebSocket.Event.OnConnectionClosed -> Throwable(event.shutdownReason.reason) + is WebSocket.Event.OnConnectionFailed -> event.throwable + else -> Throwable("Unknown") } private fun publishSubscriptionAcknowledgement(id: Long) { @@ -389,6 +386,11 @@ abstract class BaseRelayClient : RelayInterface { } } + private fun reset() { + isConnecting = false + retryCount = 0 + } + private companion object { const val REPLAY: Int = 1 const val RESULT_TIMEOUT: Long = 60000 diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/host/WalletSampleHost.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/host/WalletSampleHost.kt index d564d898d..3962ee6e1 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/host/WalletSampleHost.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/host/WalletSampleHost.kt @@ -111,14 +111,14 @@ fun WalletSampleHost( ErrorBanner((connectionState as ConnectionState.Error).message) } else if (connectionState is ConnectionState.Ok) { RestoredConnectionBanner() + } - if (isLoader) { - Loader(initMessage = "WalletConnect is pairing...", updateMessage = "Pairing is taking longer than usual, please try again...") - } + if (isLoader) { + Loader(initMessage = "WalletConnect is pairing...", updateMessage = "Pairing is taking longer than usual, please try again...") + } - if (isRequestLoader) { - Loader(initMessage = "Awaiting a request...", updateMessage = "It is taking longer than usual..") - } + if (isRequestLoader) { + Loader(initMessage = "Awaiting a request...", updateMessage = "It is taking longer than usual..") } Timer(web3walletViewModel) From 3eb4a7c67af8461cc3e9a61c4aecda4004d4e07e Mon Sep 17 00:00:00 2001 From: kubel Date: Mon, 2 Sep 2024 12:52:38 +0200 Subject: [PATCH 06/51] Clean up --- .../android/internal/common/di/CoreJsonRpcModule.kt | 7 +------ .../kotlin/com/walletconnect/sign/client/SignProtocol.kt | 5 ----- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreJsonRpcModule.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreJsonRpcModule.kt index f08944b30..688922b84 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreJsonRpcModule.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreJsonRpcModule.kt @@ -1,8 +1,6 @@ package com.walletconnect.android.internal.common.di import com.squareup.moshi.Moshi -import com.walletconnect.android.internal.common.connection.DefaultConnectionLifecycle -import com.walletconnect.android.internal.common.connection.ManualConnectionLifecycle import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer import com.walletconnect.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractor import com.walletconnect.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface @@ -11,20 +9,17 @@ import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteract import com.walletconnect.android.internal.common.model.type.SerializableJsonRpc import com.walletconnect.android.pairing.model.PairingJsonRpcMethod import com.walletconnect.android.pairing.model.PairingRpc -import com.walletconnect.android.relay.ConnectionType -import com.walletconnect.foundation.network.ConnectionLifecycle import com.walletconnect.utils.JsonAdapterEntry import com.walletconnect.utils.addDeserializerEntry import com.walletconnect.utils.addSerializerEntry import org.koin.android.ext.koin.androidContext import org.koin.core.qualifier.named -import org.koin.core.scope.Scope import org.koin.dsl.module import kotlin.reflect.KClass @JvmSynthetic -fun coreJsonRpcModule(connectionType: ConnectionType) = module { +fun coreJsonRpcModule() = module { single { RelayJsonRpcInteractor( diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignProtocol.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignProtocol.kt index 6fc5ce208..ca5333dcb 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignProtocol.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignProtocol.kt @@ -580,11 +580,6 @@ class SignProtocol(private val koinApp: KoinApplication = wcKoinApp) : SignInter atomicBoolean?.set(true) onDelegate(Sign.Model.ConnectionState(true)) } -// -// atomicBoolean?.get() == false && connectionState is WSSConnectionState.Disconnected.ConnectionFailed -> { -// atomicBoolean?.set(false) -// onDelegate(Sign.Model.ConnectionState(false, Sign.Model.ConnectionState.Reason.ConnectionFailed(connectionState.throwable))) -// } else -> Unit } From 598e3f304bce6e7721b71614cb2e275cb72d4787 Mon Sep 17 00:00:00 2001 From: kubel Date: Tue, 3 Sep 2024 07:13:39 +0200 Subject: [PATCH 07/51] Test fixing --- .../com/walletconnect/android/CoreProtocol.kt | 2 +- .../domain/relay/RelayJsonRpcInteractor.kt | 2 +- .../android/internal/EventsRepositoryTest.kt | 14 +- .../android/internal/RelayClientTests.kt | 8 +- .../internal/domain/RelayerInteractorTest.kt | 6 +- .../foundation/network/BaseRelayClient.kt | 2 +- .../foundation/BaseRelayClientTest.kt | 463 ++++++++++-------- .../ApproveSessionAuthenticateUseCaseTest.kt | 4 +- 8 files changed, 275 insertions(+), 226 deletions(-) diff --git a/core/android/src/main/kotlin/com/walletconnect/android/CoreProtocol.kt b/core/android/src/main/kotlin/com/walletconnect/android/CoreProtocol.kt index cf5fddf4f..d90923d32 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/CoreProtocol.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/CoreProtocol.kt @@ -176,7 +176,7 @@ class CoreProtocol(private val koinApp: KoinApplication = wcKoinApp) : CoreInter module { single { Echo } }, module { single { Push } }, module { single { Verify } }, - coreJsonRpcModule(connectionType), + coreJsonRpcModule(), corePairingModule(Pairing, PairingController), keyServerModule(keyServerUrl), explorerModule(), diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt index f967bc602..eb0da508c 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt @@ -77,7 +77,7 @@ internal class RelayJsonRpcInteractor( override val wssConnectionState: StateFlow get() = relay.wssConnectionState private var subscriptions = ObservableMap { newMap -> if (newMap.isEmpty()) backoffStrategy.shouldBackoff(false) } - override val onResubscribe: Flow = relay.onResubscribe + override val onResubscribe: Flow get() = relay.onResubscribe init { manageSubscriptions() diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/EventsRepositoryTest.kt b/core/android/src/test/kotlin/com/walletconnect/android/internal/EventsRepositoryTest.kt index e84b3f985..e509ac1bd 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/EventsRepositoryTest.kt +++ b/core/android/src/test/kotlin/com/walletconnect/android/internal/EventsRepositoryTest.kt @@ -46,7 +46,7 @@ class EventsRepositoryTest { @Test fun `insertOrAbort should insert event when telemetry is enabled`() = runTest(testDispatcher) { val props = Props(event = "testEvent", type = "testType") - every { eventQueries.insertOrAbort(any(), any(), any(), any(), any(), any(), any(), any(), any(), any()) } just Runs + every { eventQueries.insertOrAbort(any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any()) } just Runs repository.insertOrAbortTelemetry(props) @@ -61,7 +61,8 @@ class EventsRepositoryTest { trace = null, correlation_id = any(), client_id = any(), - direction = any() + direction = any(), + user_agent = any() ) } } @@ -69,7 +70,7 @@ class EventsRepositoryTest { @Test fun `insertOrAbort should insert event `() = runTest(testDispatcher) { val props = Props(event = "testEvent", type = "testType") - every { eventQueries.insertOrAbort(any(), any(), any(), any(), any(), any(), any(), any(), any(), any()) } just Runs + every { eventQueries.insertOrAbort(any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any()) } just Runs repository.insertOrAbort(props) @@ -84,7 +85,8 @@ class EventsRepositoryTest { trace = null, correlation_id = any(), client_id = any(), - direction = any() + direction = any(), + user_agent = any() ) } } @@ -97,14 +99,14 @@ class EventsRepositoryTest { repository.insertOrAbortTelemetry(props) verify(exactly = 0) { - eventQueries.insertOrAbort(any(), any(), any(), any(), any(), any(), any(), any(), any(), any()) + eventQueries.insertOrAbort(any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any()) } } @Test fun `insertOrAbort should throw SQLiteException when insertion fails`() = runTest(testDispatcher) { val props = Props(event = "testEvent", type = "testType") - every { eventQueries.insertOrAbort(any(), any(), any(), any(), any(), any(), any(), any(), any(), any()) } throws SQLiteException() + every { eventQueries.insertOrAbort(any(), any(), any(), any(), any(), any(), any(), any(), any(), any(), any()) } throws SQLiteException() assertFailsWith { repository.insertOrAbortTelemetry(props) diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/RelayClientTests.kt b/core/android/src/test/kotlin/com/walletconnect/android/internal/RelayClientTests.kt index c978a77fc..a594ec549 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/RelayClientTests.kt +++ b/core/android/src/test/kotlin/com/walletconnect/android/internal/RelayClientTests.kt @@ -2,6 +2,8 @@ package com.walletconnect.android.internal import com.tinder.scarlet.WebSocket import com.walletconnect.android.internal.common.connection.ConnectivityState +import com.walletconnect.android.internal.common.connection.DefaultConnectionLifecycle +import com.walletconnect.android.internal.common.connection.ManualConnectionLifecycle import com.walletconnect.android.internal.common.di.AndroidCommonDITags import com.walletconnect.android.internal.common.scope import com.walletconnect.android.relay.ConnectionType @@ -34,6 +36,8 @@ import org.koin.dsl.module class RelayClientTests { private lateinit var relayClient: RelayClient private val mockRelayService = mockk(relaxed = true) + private val defaultConnectionLifecycleMock = mockk(relaxed = true) + private val manualConnectionLifecycleMock = mockk(relaxed = true) private val mockLogger = mockk(relaxed = true) private val mockNetworkState = mockk(relaxed = true) private val testDispatcher = StandardTestDispatcher() @@ -47,6 +51,8 @@ class RelayClientTests { single(named(AndroidCommonDITags.RELAY_SERVICE)) { mockRelayService } single(named(AndroidCommonDITags.LOGGER)) { mockLogger } single(named(AndroidCommonDITags.CONNECTIVITY_STATE)) { mockNetworkState } + single(named(AndroidCommonDITags.MANUAL_CONNECTION_LIFECYCLE)) { manualConnectionLifecycleMock } + single(named(AndroidCommonDITags.DEFAULT_CONNECTION_LIFECYCLE)) { defaultConnectionLifecycleMock } }) } @@ -73,7 +79,7 @@ class RelayClientTests { relayClient.initialize(ConnectionType.MANUAL) { error -> assertEquals( - "Error while connecting, please check your Internet connection or contact support: java.lang.Throwable: Network failure", + "Error while connecting, please check your Internet connection or contact support: Network failure", error.message ) scope.coroutineContext.cancelChildren() diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/domain/RelayerInteractorTest.kt b/core/android/src/test/kotlin/com/walletconnect/android/internal/domain/RelayerInteractorTest.kt index ee273e612..ea4a6d2db 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/domain/RelayerInteractorTest.kt +++ b/core/android/src/test/kotlin/com/walletconnect/android/internal/domain/RelayerInteractorTest.kt @@ -2,7 +2,6 @@ package com.walletconnect.android.internal.domain import com.walletconnect.android.internal.common.ConditionalExponentialBackoffStrategy import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.connection.DefaultConnectionLifecycle import com.walletconnect.android.internal.common.crypto.codec.Codec import com.walletconnect.android.internal.common.exception.WalletConnectException import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer @@ -42,8 +41,6 @@ internal class RelayerInteractorTest { every { subscriptionRequest } returns flow { } } - private val defaultConnectionLifecycle: DefaultConnectionLifecycle = mockk() - private val backoffStrategy: ConditionalExponentialBackoffStrategy = mockk() private val jsonRpcHistory: JsonRpcHistory = mockk { @@ -76,8 +73,9 @@ internal class RelayerInteractorTest { } private val sut = - spyk(RelayJsonRpcInteractor(relay, codec, jsonRpcHistory, pushMessagesRepository, logger, defaultConnectionLifecycle, backoffStrategy), recordPrivateCalls = true) { + spyk(RelayJsonRpcInteractor(relay, codec, jsonRpcHistory, pushMessagesRepository, logger, backoffStrategy), recordPrivateCalls = true) { every { checkNetworkConnectivity() } answers { } + every { relay.onResubscribe } returns flow { } } private val topicVO = Topic("mockkTopic") diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/network/BaseRelayClient.kt b/foundation/src/main/kotlin/com/walletconnect/foundation/network/BaseRelayClient.kt index 70ae5d3e0..6d73522e4 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/network/BaseRelayClient.kt +++ b/foundation/src/main/kotlin/com/walletconnect/foundation/network/BaseRelayClient.kt @@ -52,7 +52,7 @@ abstract class BaseRelayClient : RelayInterface { lateinit var connectionLifecycle: ConnectionLifecycle protected var logger: Logger private val resultState: MutableSharedFlow = MutableSharedFlow() - private var connectionState: MutableStateFlow = MutableStateFlow(ConnectionState.Idle) + internal var connectionState: MutableStateFlow = MutableStateFlow(ConnectionState.Idle) private var unAckedTopics: MutableList = mutableListOf() private var isConnecting: Boolean = false private var retryCount: Int = 0 diff --git a/foundation/src/test/kotlin/com/walletconnect/foundation/BaseRelayClientTest.kt b/foundation/src/test/kotlin/com/walletconnect/foundation/BaseRelayClientTest.kt index 9bc21c2f1..24e577221 100644 --- a/foundation/src/test/kotlin/com/walletconnect/foundation/BaseRelayClientTest.kt +++ b/foundation/src/test/kotlin/com/walletconnect/foundation/BaseRelayClientTest.kt @@ -1,19 +1,28 @@ package com.walletconnect.foundation +import com.tinder.scarlet.WebSocket import com.walletconnect.foundation.common.model.SubscriptionId import com.walletconnect.foundation.network.BaseRelayClient +import com.walletconnect.foundation.network.ConnectionLifecycle +import com.walletconnect.foundation.network.ConnectionState import com.walletconnect.foundation.network.data.service.RelayService import com.walletconnect.foundation.network.model.Relay import com.walletconnect.foundation.network.model.RelayDTO import com.walletconnect.foundation.util.Logger import com.walletconnect.foundation.util.scope +import io.mockk.Runs import io.mockk.coEvery import io.mockk.coVerify +import io.mockk.every +import io.mockk.just import io.mockk.mockk +import io.mockk.slot +import io.mockk.spyk import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.TimeoutCancellationException import kotlinx.coroutines.delay +import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.test.StandardTestDispatcher @@ -32,214 +41,248 @@ import org.junit.Test @ExperimentalCoroutinesApi class BaseRelayClientTest { - private val testDispatcher = StandardTestDispatcher() - private val testScope = TestScope(testDispatcher) - private lateinit var client: BaseRelayClient - private val relayServiceMock = mockk(relaxed = true) - private val loggerMock = mockk(relaxed = true) - - @Before - fun setup() { - Dispatchers.setMain(testDispatcher) - - client = object : BaseRelayClient() { - init { - this.relayService = relayServiceMock - this.logger = loggerMock - scope = testScope - } - } - } - - @After - fun tearDown() { - Dispatchers.resetMain() - } - - @Test - fun `test publish success`() = testScope.runTest { - val topic = "testTopic" - val message = "testMessage" - val params = Relay.Model.IrnParams(1, 60, true) - val ack = RelayDTO.Publish.Result.Acknowledgement(123L, result = true) - - coEvery { relayServiceMock.publishRequest(any()) } returns Unit - coEvery { relayServiceMock.observePublishAcknowledgement() } returns flowOf(ack) - - client.observeResults() - client.publish(topic, message, params, 123L) { result -> - result.fold( - onSuccess = { - assertEquals(123L, it.id) - }, - onFailure = { fail(it.message) } - ) - } - - coVerify { relayServiceMock.publishRequest(any()) } - } - - @Test - fun `test publish error due to time out`() = testScope.runTest { - val topic = "testTopic" - val message = "testMessage" - val params = Relay.Model.IrnParams(1, 60, true) - - coEvery { relayServiceMock.publishRequest(any()) } returns Unit - coEvery { relayServiceMock.observePublishAcknowledgement() } returns flow { delay(10000L) } - - withContext(Dispatchers.Default.limitedParallelism(1)) { - client.publish(topic, message, params) { result -> - result.fold( - onSuccess = { - fail("Should not be successful") - }, - onFailure = { - assertTrue(result.exceptionOrNull() is TimeoutCancellationException) - } - ) - } - } - - advanceUntilIdle() - - coVerify { relayServiceMock.publishRequest(any()) } - } - - @Test - fun `test subscribe success`() = testScope.runTest { - val topic = "testTopic" - val expectedId = 123L - val relayDto = RelayDTO.Subscribe.Result.Acknowledgement(id = expectedId, result = SubscriptionId("testId")) - - coEvery { relayServiceMock.subscribeRequest(any()) } returns Unit - coEvery { relayServiceMock.observeSubscribeAcknowledgement() } returns flowOf(relayDto) - - client.observeResults() - client.subscribe(topic, expectedId) { result -> - result.fold( - onSuccess = { - assertEquals(expectedId, result.getOrNull()?.id) - }, - onFailure = { fail(it.message) } - ) - } - - coVerify { relayServiceMock.subscribeRequest(any()) } - } - - @Test - fun `test subscribe failure due to timeout`() = testScope.runTest() { - val topic = "testTopic" - - coEvery { relayServiceMock.subscribeRequest(any()) } returns Unit - coEvery { relayServiceMock.observeSubscribeAcknowledgement() } returns flow { delay(10000L) } - - client.subscribe(topic) { result -> - result.fold( - onSuccess = { - fail("Should not be successful") - }, - onFailure = { - assertTrue(result.exceptionOrNull() is TimeoutCancellationException) - } - ) - } - - testScheduler.apply { advanceTimeBy(5000); runCurrent() } - - coVerify { relayServiceMock.subscribeRequest(any()) } - } - - @Test - fun `test batch subscribe success`() = testScope.runTest { - val topics = listOf("testTopic") - val expectedId = 123L - val relayDto = RelayDTO.BatchSubscribe.Result.Acknowledgement(id = expectedId, result = listOf("testId")) - - coEvery { relayServiceMock.batchSubscribeRequest(any()) } returns Unit - coEvery { relayServiceMock.observeBatchSubscribeAcknowledgement() } returns flowOf(relayDto) - - client.observeResults() - client.batchSubscribe(topics, expectedId) { result -> - result.fold( - onSuccess = { - assertEquals(expectedId, result.getOrNull()?.id) - }, - onFailure = { fail(it.message) } - ) - } - - coVerify { relayServiceMock.batchSubscribeRequest(any()) } - } - - @Test - fun `test batch subscribe failure due to timeout`() = testScope.runTest { - val topics = listOf("testTopic") - - coEvery { relayServiceMock.batchSubscribeRequest(any()) } returns Unit - coEvery { relayServiceMock.observeBatchSubscribeAcknowledgement() } returns flow { delay(10000L) } - - client.batchSubscribe(topics) { result -> - result.fold( - onSuccess = { - fail("Should not be successful") - }, - onFailure = { - assertTrue(result.exceptionOrNull() is TimeoutCancellationException) - } - ) - - } - - testScheduler.apply { advanceTimeBy(5000); runCurrent() } - - coVerify { relayServiceMock.batchSubscribeRequest(any()) } - } - - @Test - fun `test unsubscribe success`() = testScope.runTest { - val topic = "testTopic" - val expectedId = 123L - val relayDto = RelayDTO.Unsubscribe.Result.Acknowledgement(id = expectedId, result = true) - - coEvery { relayServiceMock.unsubscribeRequest(any()) } returns Unit - coEvery { relayServiceMock.observeUnsubscribeAcknowledgement() } returns flowOf(relayDto) - - client.observeResults() - client.unsubscribe(topic, "subsId", expectedId) { result -> - result.fold( - onSuccess = { - assertEquals(expectedId, result.getOrNull()?.id) - }, - onFailure = { fail(it.message) } - ) - } - - coVerify { relayServiceMock.unsubscribeRequest(any()) } - } - - @Test - fun `test unsubscribe failure`() = testScope.runTest { - val topic = "testTopic" - - coEvery { relayServiceMock.subscribeRequest(any()) } returns Unit - coEvery { relayServiceMock.observeSubscribeAcknowledgement() } returns flow { delay(10000L) } - - client.subscribe(topic) { result -> - result.fold( - onSuccess = { - fail("Should not be successful") - }, - onFailure = { - assertTrue(result.exceptionOrNull() is TimeoutCancellationException) - } - ) - } - - testScheduler.apply { advanceTimeBy(5000); runCurrent() } - - coVerify { relayServiceMock.subscribeRequest(any()) } - } - + private val testDispatcher = StandardTestDispatcher() + private val testScope = TestScope(testDispatcher) + private lateinit var client: BaseRelayClient + private val relayServiceMock = mockk(relaxed = true) + private val connectionLifecycleMock = mockk(relaxed = true) + private val loggerMock = mockk(relaxed = true) + private val mockConnectionState = MutableStateFlow(ConnectionState.Idle) + + @Before + fun setup() { + Dispatchers.setMain(testDispatcher) + + client = spyk(object : BaseRelayClient() { + init { + this.relayService = relayServiceMock + this.logger = loggerMock + scope = testScope + this.connectionLifecycle = connectionLifecycleMock + } + }, recordPrivateCalls = true) + client.connectionState = mockConnectionState + } + + @After + fun tearDown() { + Dispatchers.resetMain() + } + + @Test + fun `publish invokes relayService publishRequest successfully`() = testScope.runTest { + val id = 123L + + val topic = "testTopic" + val message = "testMessage" + val params = Relay.Model.IrnParams(1, 60, true) + val ack = RelayDTO.Publish.Result.Acknowledgement(123L, result = true) + + val publishRequestSlot = slot() + coEvery { relayServiceMock.publishRequest(capture(publishRequestSlot)) } just Runs + coEvery { relayServiceMock.observePublishAcknowledgement() } returns flowOf(ack) + every { connectionLifecycleMock.reconnect() } just Runs + coEvery { relayServiceMock.observeWebSocketEvent() } returns flowOf(WebSocket.Event.OnConnectionOpened("Open")) + + client.connectionState.value = ConnectionState.Open + client.publish(topic, message, params, id) + + coVerify { relayServiceMock.publishRequest(any()) } + assertEquals(id, publishRequestSlot.captured.id) + } + + @Test + fun `test publish success`() = testScope.runTest { + val topic = "testTopic" + val message = "testMessage" + val params = Relay.Model.IrnParams(1, 60, true) + val ack = RelayDTO.Publish.Result.Acknowledgement(123L, result = true) + + coEvery { relayServiceMock.publishRequest(any()) } returns Unit + coEvery { relayServiceMock.observePublishAcknowledgement() } returns flowOf(ack) + coEvery { relayServiceMock.observeWebSocketEvent() } returns flowOf(WebSocket.Event.OnConnectionOpened("Open")) + + client.observeResults() + client.connectionState.value = ConnectionState.Open + client.publish(topic, message, params, 123L) { result -> + result.fold( + onSuccess = { + assertEquals(123L, it.id) + }, + onFailure = { fail(it.message) } + ) + } + + coVerify { relayServiceMock.publishRequest(any()) } + } + + + @Test + fun `test publish error due to time out`() = testScope.runTest() { + val topic = "testTopic" + val message = "testMessage" + val params = Relay.Model.IrnParams(1, 60, true) + + coEvery { relayServiceMock.publishRequest(any()) } returns Unit + coEvery { relayServiceMock.observePublishAcknowledgement() } returns flow { delay(15000L) } + + withContext(Dispatchers.Default.limitedParallelism(1)) { + client.connectionState.value = ConnectionState.Open + client.publish(topic, message, params) { result -> + result.fold( + onSuccess = { + fail("Should not be successful") + }, + onFailure = { + assertTrue(result.exceptionOrNull() is TimeoutCancellationException) + } + ) + } + } + + advanceUntilIdle() + + coVerify { relayServiceMock.publishRequest(any()) } + } + + @Test + fun `test subscribe success`() = testScope.runTest { + val topic = "testTopic" + val expectedId = 123L + val relayDto = RelayDTO.Subscribe.Result.Acknowledgement(id = expectedId, result = SubscriptionId("testId")) + + coEvery { relayServiceMock.subscribeRequest(any()) } returns Unit + coEvery { relayServiceMock.observeSubscribeAcknowledgement() } returns flowOf(relayDto) + + client.observeResults() + client.connectionState.value = ConnectionState.Open + client.subscribe(topic, expectedId) { result -> + result.fold( + onSuccess = { + assertEquals(expectedId, result.getOrNull()?.id) + }, + onFailure = { fail(it.message) } + ) + } + + coVerify { relayServiceMock.subscribeRequest(any()) } + } + + @Test + fun `test subscribe failure due to timeout`() = testScope.runTest() { + val topic = "testTopic" + + coEvery { relayServiceMock.subscribeRequest(any()) } returns Unit + coEvery { relayServiceMock.observeSubscribeAcknowledgement() } returns flow { delay(10000L) } + + client.connectionState.value = ConnectionState.Open + client.subscribe(topic) { result -> + result.fold( + onSuccess = { + fail("Should not be successful") + }, + onFailure = { + assertTrue(result.exceptionOrNull() is TimeoutCancellationException) + } + ) + } + + testScheduler.apply { advanceTimeBy(5000); runCurrent() } + + coVerify { relayServiceMock.subscribeRequest(any()) } + } + + @Test + fun `test batch subscribe success`() = testScope.runTest { + val topics = listOf("testTopic") + val expectedId = 123L + val relayDto = RelayDTO.BatchSubscribe.Result.Acknowledgement(id = expectedId, result = listOf("testId")) + + coEvery { relayServiceMock.batchSubscribeRequest(any()) } returns Unit + coEvery { relayServiceMock.observeBatchSubscribeAcknowledgement() } returns flowOf(relayDto) + + client.observeResults() + client.connectionState.value = ConnectionState.Open + client.batchSubscribe(topics, expectedId) { result -> + result.fold( + onSuccess = { + assertEquals(expectedId, result.getOrNull()?.id) + }, + onFailure = { fail(it.message) } + ) + } + + coVerify { relayServiceMock.batchSubscribeRequest(any()) } + } + + @Test + fun `test batch subscribe failure due to timeout`() = testScope.runTest { + val topics = listOf("testTopic") + + coEvery { relayServiceMock.batchSubscribeRequest(any()) } returns Unit + coEvery { relayServiceMock.observeBatchSubscribeAcknowledgement() } returns flow { delay(10000L) } + + client.batchSubscribe(topics) { result -> + result.fold( + onSuccess = { + fail("Should not be successful") + }, + onFailure = { + assertTrue(result.exceptionOrNull() is TimeoutCancellationException) + } + ) + + } + + testScheduler.apply { advanceTimeBy(5000); runCurrent() } + + coVerify { relayServiceMock.batchSubscribeRequest(any()) } + } + + @Test + fun `test unsubscribe success`() = testScope.runTest { + val topic = "testTopic" + val expectedId = 123L + val relayDto = RelayDTO.Unsubscribe.Result.Acknowledgement(id = expectedId, result = true) + + coEvery { relayServiceMock.unsubscribeRequest(any()) } returns Unit + coEvery { relayServiceMock.observeUnsubscribeAcknowledgement() } returns flowOf(relayDto) + + client.observeResults() + client.connectionState.value = ConnectionState.Open + client.unsubscribe(topic, "subsId", expectedId) { result -> + result.fold( + onSuccess = { + assertEquals(expectedId, result.getOrNull()?.id) + }, + onFailure = { fail(it.message) } + ) + } + + coVerify { relayServiceMock.unsubscribeRequest(any()) } + } + + @Test + fun `test unsubscribe failure`() = testScope.runTest { + val topic = "testTopic" + + coEvery { relayServiceMock.subscribeRequest(any()) } returns Unit + coEvery { relayServiceMock.observeSubscribeAcknowledgement() } returns flow { delay(10000L) } + + client.connectionState.value = ConnectionState.Open + client.subscribe(topic) { result -> + result.fold( + onSuccess = { + fail("Should not be successful") + }, + onFailure = { + assertTrue(result.exceptionOrNull() is TimeoutCancellationException) + } + ) + } + + testScheduler.apply { advanceTimeBy(5000); runCurrent() } + + coVerify { relayServiceMock.subscribeRequest(any()) } + } } \ No newline at end of file diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCaseTest.kt index 58b18c6da..091d511f0 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCaseTest.kt @@ -168,7 +168,7 @@ class ApproveSessionAuthenticateUseCaseTest { assert(throwable is MissingSessionAuthenticateRequest) }) - coVerify { insertEventUseCase(any()) } + coVerify { insertTelemetryEventUseCase(any()) } } @Test @@ -213,7 +213,7 @@ class ApproveSessionAuthenticateUseCaseTest { assert(throwable is RequestExpiredException) }) - coVerify { insertEventUseCase(any()) } + coVerify { insertTelemetryEventUseCase(any()) } } @Test From e740b02d170cc47036d0d0855f47cd945707e0cb Mon Sep 17 00:00:00 2001 From: kubel Date: Tue, 3 Sep 2024 09:18:38 +0200 Subject: [PATCH 08/51] Init migration commit --- ReadMe.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ReadMe.md b/ReadMe.md index 48be1d964..1e474acb2 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -1,6 +1,4 @@ -![WalletConnect V2](/docs/walletconnect-banner.svg) - -# **WalletConnect - Kotlin** +# **reown - kotlin** The communications protocol for web3, WalletConnect brings the ecosystem together by enabling hundreds of wallets and apps to securely connect and interact. This repository contains Kotlin implementation of WalletConnect v2 protocols for Android applications. From cafab5b7ebed9a47b69d0017118c67c160ba2c01 Mon Sep 17 00:00:00 2001 From: kubel Date: Wed, 4 Sep 2024 10:56:04 +0200 Subject: [PATCH 09/51] Remove Chat and Auth SDKs --- .github/workflows/ci_db_migrations.yml | 1 - build.gradle.kts | 2 - buildSrc/src/main/kotlin/Versions.kt | 4 - core/bom/build.gradle.kts | 1 - product/web3wallet/build.gradle.kts | 2 - .../web3/wallet/client/ClientMapper.kt | 79 -------- .../web3/wallet/client/Web3Wallet.kt | 67 ------ protocol/auth/ReadMe.md | 47 ----- protocol/auth/build.gradle.kts | 96 --------- protocol/auth/proguard-rules.pro | 1 - protocol/auth/src/main/AndroidManifest.xml | 3 - .../com/walletconnect/auth/client/Auth.kt | 164 --------------- .../walletconnect/auth/client/AuthClient.kt | 6 - .../auth/client/AuthInterface.kt | 97 --------- .../walletconnect/auth/client/AuthProtocol.kt | 191 ------------------ .../auth/client/mapper/ClientMapper.kt | 136 ------------- .../auth/common/exceptions/Exceptions.kt | 13 -- .../auth/common/exceptions/Messages.kt | 9 - .../auth/common/exceptions/PeerError.kt | 12 -- .../auth/common/json_rpc/AuthParams.kt | 21 -- .../auth/common/json_rpc/AuthRpc.kt | 24 --- .../auth/common/model/AuthResponse.kt | 10 - .../walletconnect/auth/common/model/Events.kt | 11 - .../auth/common/model/JsonRpcHistoryEntry.kt | 12 -- .../auth/common/model/PayloadParams.kt | 34 ---- .../auth/common/model/PendingRequest.kt | 7 - .../auth/common/model/Requester.kt | 15 -- .../auth/common/model/Respond.kt | 12 -- .../auth/common/model/Response.kt | 10 - .../com/walletconnect/auth/di/CallsModule.kt | 54 ----- .../com/walletconnect/auth/di/EngineModule.kt | 39 ---- .../walletconnect/auth/di/JsonRpcModule.kt | 15 -- .../walletconnect/auth/di/RequestsModule.kt | 9 - .../walletconnect/auth/di/ResponsesModule.kt | 9 - .../auth/engine/PairingTopicToReponseMap.kt | 6 - .../auth/engine/domain/AuthEngine.kt | 143 ------------- .../auth/engine/mapper/EngineMapper.kt | 30 --- .../GetPendingJsonRpcHistoryEntriesUseCase.kt | 26 --- ...etPendingJsonRpcHistoryEntryByIdUseCase.kt | 28 --- ...endingJsonRpcHistoryEntryByTopicUseCase.kt | 24 --- .../auth/json_rpc/model/JsonRpcMapper.kt | 26 --- .../auth/json_rpc/model/JsonRpcMethod.kt | 8 - .../auth/signature/cacao/CacaoSigner.kt | 15 -- .../calls/DecryptAuthMessageUseCase.kt | 53 ----- .../use_case/calls/FormatMessageUseCase.kt | 24 --- .../calls/GetListOfVerifyContextsUseCase.kt | 13 -- .../use_case/calls/GetVerifyContextUseCase.kt | 13 -- .../calls/RespondAuthRequestUseCase.kt | 122 ----------- .../use_case/calls/SendAuthRequestUseCase.kt | 106 ---------- .../use_case/requests/OnAuthRequestUseCase.kt | 52 ----- .../responses/OnAuthRequestResponseUseCase.kt | 56 ----- .../auth/client/mapper/ClientMapperTest.kt | 85 -------- protocol/chat/ReadMe.md | 45 ----- protocol/chat/build.gradle.kts | 79 -------- protocol/chat/proguard-rules.pro | 1 - .../chat/src/debug/sqldelight/databases/1.db | Bin 57344 -> 0 bytes protocol/chat/src/main/AndroidManifest.xml | 4 - .../walletconnect/chat/cacao/CacaoSigner.kt | 6 - .../com/walletconnect/chat/client/Chat.kt | 141 ------------- .../walletconnect/chat/client/ChatClient.kt | 5 - .../chat/client/ChatInterface.kt | 33 --- .../walletconnect/chat/client/ChatProtocol.kt | 168 --------------- .../chat/client/mapper/ClientMapper.kt | 103 ---------- .../chat/common/exceptions/ChatExceptions.kt | 20 -- .../chat/common/exceptions/PeerError.kt | 11 - .../chat/common/json_rpc/ChatParams.kt | 26 --- .../chat/common/json_rpc/ChatRpc.kt | 58 ------ .../chat/common/model/Account.kt | 14 -- .../chat/common/model/ChatMessage.kt | 11 - .../chat/common/model/Contact.kt | 10 - .../walletconnect/chat/common/model/Events.kt | 13 -- .../walletconnect/chat/common/model/Invite.kt | 48 ----- .../chat/common/model/InviteMessage.kt | 10 - .../chat/common/model/InviteStatus.kt | 4 - .../chat/common/model/InviteType.kt | 4 - .../chat/common/model/JsonRpcHistoryEntry.kt | 22 -- .../walletconnect/chat/common/model/Media.kt | 8 - .../chat/common/model/MediaData.kt | 10 - .../chat/common/model/Message.kt | 15 -- .../chat/common/model/SendInvite.kt | 7 - .../chat/common/model/SendMessage.kt | 11 - .../walletconnect/chat/common/model/Thread.kt | 12 -- .../com/walletconnect/chat/di/ChatDITags.kt | 6 - .../com/walletconnect/chat/di/EngineModule.kt | 174 ---------------- .../walletconnect/chat/di/JsonRpcModule.kt | 22 -- .../walletconnect/chat/di/StorageModule.kt | 54 ----- .../chat/engine/domain/ChatEngine.kt | 166 --------------- .../chat/engine/domain/ChatValidator.kt | 12 -- .../use_case/SubscribeToChatTopicsUseCase.kt | 46 ----- .../use_case/calls/AcceptInviteUseCase.kt | 96 --------- .../use_case/calls/GetMessagesUseCase.kt | 25 --- .../calls/GetReceivedInvitesUseCase.kt | 25 --- .../use_case/calls/GetSentInvitesUseCase.kt | 25 --- .../use_case/calls/GetThreadsUseCase.kt | 26 --- .../engine/use_case/calls/GoPrivateUseCase.kt | 70 ------- .../engine/use_case/calls/GoPublicUseCase.kt | 79 -------- .../use_case/calls/LeaveThreadUseCase.kt | 43 ---- .../use_case/calls/RegisterIdentityUseCase.kt | 42 ---- .../use_case/calls/RejectInviteUseCase.kt | 63 ------ .../use_case/calls/ResolveAccountUseCase.kt | 32 --- .../use_case/calls/SendInviteUseCase.kt | 134 ------------ .../use_case/calls/SendMessageUseCase.kt | 78 ------- .../engine/use_case/calls/SendPingUseCase.kt | 82 -------- .../calls/UnregisterIdentityUseCase.kt | 47 ----- .../requests/OnInviteRequestUseCase.kt | 67 ------ .../requests/OnLeaveRequestUseCase.kt | 37 ---- .../requests/OnMessageRequestUseCase.kt | 96 --------- .../responses/OnInviteResponseUseCase.kt | 86 -------- .../responses/OnLeaveResponseUseCase.kt | 16 -- .../responses/OnMessageResponseUseCase.kt | 17 -- ...etPendingJsonRpcHistoryEntryByIdUseCase.kt | 27 --- .../chat/json_rpc/JsonRpcMethod.kt | 12 -- .../chat/jwt/ChatDidJwtClaims.kt | 106 ---------- .../EncodeChatMessageDidJwtPayloadUseCase.kt | 32 --- .../EncodeChatReceiptDidJwtPayloadUseCase.kt | 25 --- ...ncodeInviteApprovalDidJwtPayloadUseCase.kt | 26 --- ...ncodeInviteProposalDidJwtPayloadUseCase.kt | 28 --- ...deRegisterInviteKeyDidJwtPayloadUseCase.kt | 24 --- ...UnregisterInviteKeyDidJwtPayloadUseCase.kt | 24 --- .../chat/storage/AccountsStorageRepository.kt | 50 ----- .../chat/storage/ContactStorageRepository.kt | 44 ---- .../chat/storage/InvitesStorageRepository.kt | 91 --------- .../chat/storage/MessageStorageRepository.kt | 26 --- .../chat/storage/ThreadsStorageRepository.kt | 23 --- .../chat/src/main/res/xml/backup_rules.xml | 6 - .../chat/storage/data/dao/Accounts.sq | 53 ----- .../chat/storage/data/dao/Contacts.sq | 37 ---- .../chat/storage/data/dao/Invites.sq | 66 ------ .../chat/storage/data/dao/Messages.sq | 27 --- .../chat/storage/data/dao/Threads.sq | 37 ---- .../chat/src/main/sqldelight/migration/1.sqm | 32 --- .../chat/jwt/DidJwtRepositoryTest.kt | 27 --- 132 files changed, 5431 deletions(-) delete mode 100644 protocol/auth/ReadMe.md delete mode 100644 protocol/auth/build.gradle.kts delete mode 100644 protocol/auth/proguard-rules.pro delete mode 100644 protocol/auth/src/main/AndroidManifest.xml delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/client/Auth.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/client/AuthClient.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/client/AuthInterface.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/client/AuthProtocol.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/client/mapper/ClientMapper.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/common/exceptions/Exceptions.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/common/exceptions/Messages.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/common/exceptions/PeerError.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/common/json_rpc/AuthParams.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/common/json_rpc/AuthRpc.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/AuthResponse.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/Events.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/JsonRpcHistoryEntry.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/PayloadParams.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/PendingRequest.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/Requester.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/Respond.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/Response.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/di/CallsModule.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/di/EngineModule.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/di/JsonRpcModule.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/di/RequestsModule.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/di/ResponsesModule.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/engine/PairingTopicToReponseMap.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/engine/domain/AuthEngine.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/engine/mapper/EngineMapper.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/json_rpc/domain/GetPendingJsonRpcHistoryEntriesUseCase.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/json_rpc/domain/GetPendingJsonRpcHistoryEntryByIdUseCase.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/json_rpc/domain/GetPendingJsonRpcHistoryEntryByTopicUseCase.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/json_rpc/model/JsonRpcMapper.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/json_rpc/model/JsonRpcMethod.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/signature/cacao/CacaoSigner.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/calls/DecryptAuthMessageUseCase.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/calls/FormatMessageUseCase.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/calls/GetListOfVerifyContextsUseCase.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/calls/GetVerifyContextUseCase.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/calls/RespondAuthRequestUseCase.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/calls/SendAuthRequestUseCase.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/requests/OnAuthRequestUseCase.kt delete mode 100644 protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/responses/OnAuthRequestResponseUseCase.kt delete mode 100644 protocol/auth/src/test/kotlin/com/walletconnect/auth/client/mapper/ClientMapperTest.kt delete mode 100644 protocol/chat/ReadMe.md delete mode 100644 protocol/chat/build.gradle.kts delete mode 100644 protocol/chat/proguard-rules.pro delete mode 100644 protocol/chat/src/debug/sqldelight/databases/1.db delete mode 100644 protocol/chat/src/main/AndroidManifest.xml delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/cacao/CacaoSigner.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/client/Chat.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/client/ChatClient.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/client/ChatInterface.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/client/ChatProtocol.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/client/mapper/ClientMapper.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/common/exceptions/ChatExceptions.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/common/exceptions/PeerError.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/common/json_rpc/ChatParams.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/common/json_rpc/ChatRpc.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Account.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/ChatMessage.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Contact.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Events.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Invite.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/InviteMessage.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/InviteStatus.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/InviteType.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/JsonRpcHistoryEntry.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Media.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/MediaData.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Message.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/SendInvite.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/SendMessage.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Thread.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/di/ChatDITags.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/di/EngineModule.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/di/JsonRpcModule.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/di/StorageModule.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/domain/ChatEngine.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/domain/ChatValidator.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/SubscribeToChatTopicsUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/AcceptInviteUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/GetMessagesUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/GetReceivedInvitesUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/GetSentInvitesUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/GetThreadsUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/GoPrivateUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/GoPublicUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/LeaveThreadUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/RegisterIdentityUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/RejectInviteUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/ResolveAccountUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/SendInviteUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/SendMessageUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/SendPingUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/UnregisterIdentityUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/requests/OnInviteRequestUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/requests/OnLeaveRequestUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/requests/OnMessageRequestUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/responses/OnInviteResponseUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/responses/OnLeaveResponseUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/responses/OnMessageResponseUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/json_rpc/GetPendingJsonRpcHistoryEntryByIdUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/json_rpc/JsonRpcMethod.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/ChatDidJwtClaims.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/use_case/EncodeChatMessageDidJwtPayloadUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/use_case/EncodeChatReceiptDidJwtPayloadUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/use_case/EncodeInviteApprovalDidJwtPayloadUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/use_case/EncodeInviteProposalDidJwtPayloadUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/use_case/EncodeRegisterInviteKeyDidJwtPayloadUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/use_case/EncodeUnregisterInviteKeyDidJwtPayloadUseCase.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/storage/AccountsStorageRepository.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/storage/ContactStorageRepository.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/storage/InvitesStorageRepository.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/storage/MessageStorageRepository.kt delete mode 100644 protocol/chat/src/main/kotlin/com/walletconnect/chat/storage/ThreadsStorageRepository.kt delete mode 100644 protocol/chat/src/main/res/xml/backup_rules.xml delete mode 100644 protocol/chat/src/main/sqldelight/com/walletconnect/chat/storage/data/dao/Accounts.sq delete mode 100644 protocol/chat/src/main/sqldelight/com/walletconnect/chat/storage/data/dao/Contacts.sq delete mode 100644 protocol/chat/src/main/sqldelight/com/walletconnect/chat/storage/data/dao/Invites.sq delete mode 100644 protocol/chat/src/main/sqldelight/com/walletconnect/chat/storage/data/dao/Messages.sq delete mode 100644 protocol/chat/src/main/sqldelight/com/walletconnect/chat/storage/data/dao/Threads.sq delete mode 100644 protocol/chat/src/main/sqldelight/migration/1.sqm delete mode 100644 protocol/chat/src/test/kotlin/com/walletconnect/chat/jwt/DidJwtRepositoryTest.kt diff --git a/.github/workflows/ci_db_migrations.yml b/.github/workflows/ci_db_migrations.yml index 9162ebea6..23d52d1cc 100644 --- a/.github/workflows/ci_db_migrations.yml +++ b/.github/workflows/ci_db_migrations.yml @@ -23,7 +23,6 @@ jobs: conf: [ { name: Android-Core SDK, command: ":core:android:verifyDebugAndroidCoreDatabaseMigration" }, { name: Sign SDK, command: ":protocol:sign:verifyDebugSignDatabaseMigration" }, - { name: Auth SDK, command: ":protocol:auth:verifyDebugAuthDatabaseMigration" }, { name: Notify SDK, command: ":protocol:notify:verifyDebugNotifyDatabaseMigration" }, ] name: ${{ matrix.conf.name }} diff --git a/build.gradle.kts b/build.gradle.kts index ae9ae4dee..c65075b42 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -332,8 +332,6 @@ private val repoIdWithVersion = listOf( Pair(FOUNDATION, FOUNDATION_VERSION), Pair(ANDROID_CORE, CORE_VERSION), Pair(SIGN, SIGN_VERSION), - Pair(AUTH, AUTH_VERSION), - Pair(CHAT, CHAT_VERSION), Pair(NOTIFY, NOTIFY_VERSION), Pair(WEB_3_WALLET, WEB_3_WALLET_VERSION), Pair(WEB_3_MODAL, WEB_3_MODAL_VERSION), diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 6d57b44a9..9c5aa2215 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -9,8 +9,6 @@ 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 AUTH_VERSION = "1.28.9" -const val CHAT_VERSION = "1.0.0-beta36" 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" @@ -22,8 +20,6 @@ const val ANDROID_BOM = "android-bom" const val FOUNDATION = "foundation" const val ANDROID_CORE = "android-core" const val SIGN = "sign" -const val AUTH = "auth" -const val CHAT = "chat" const val NOTIFY = "notify" const val WEB_3_WALLET = "web3wallet" const val WEB_3_MODAL = "web3modal" diff --git a/core/bom/build.gradle.kts b/core/bom/build.gradle.kts index 83a69ad08..b643dfcb8 100644 --- a/core/bom/build.gradle.kts +++ b/core/bom/build.gradle.kts @@ -15,7 +15,6 @@ dependencies { api(project(":core:android")) api(project(":core:modal")) api(project(":protocol:sign")) - api(project(":protocol:auth")) api(project(":protocol:notify")) api(project(":product:walletconnectmodal")) api(project(":product:web3modal")) diff --git a/product/web3wallet/build.gradle.kts b/product/web3wallet/build.gradle.kts index 9ce9593b8..784a92487 100644 --- a/product/web3wallet/build.gradle.kts +++ b/product/web3wallet/build.gradle.kts @@ -59,9 +59,7 @@ dependencies { debugImplementation(project(":core:android")) debugImplementation(project(":protocol:sign")) - debugImplementation(project(":protocol:auth")) releaseImplementation("com.walletconnect:android-core:$CORE_VERSION") releaseImplementation("com.walletconnect:sign:$SIGN_VERSION") - releaseImplementation("com.walletconnect:auth:$AUTH_VERSION") } \ No newline at end of file diff --git a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/ClientMapper.kt b/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/ClientMapper.kt index d2a4d6d95..976b7cbab 100644 --- a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/ClientMapper.kt +++ b/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/ClientMapper.kt @@ -1,7 +1,6 @@ package com.walletconnect.web3.wallet.client import com.walletconnect.android.internal.common.signing.cacao.CacaoType -import com.walletconnect.auth.client.Auth import com.walletconnect.sign.client.Sign @JvmSynthetic @@ -43,15 +42,6 @@ internal fun Wallet.Model.JsonRpcResponse.JsonRpcResult.toSign(): Sign.Model.Jso internal fun Wallet.Model.JsonRpcResponse.JsonRpcError.toSign(): Sign.Model.JsonRpcResponse.JsonRpcError = Sign.Model.JsonRpcResponse.JsonRpcError(id, code, message) -@JvmSynthetic -internal fun Wallet.Params.AuthRequestResponse.toAuth(): Auth.Params.Respond = when (this) { - is Wallet.Params.AuthRequestResponse.Result -> Auth.Params.Respond.Result(id, signature.toAuth(), issuer) - is Wallet.Params.AuthRequestResponse.Error -> Auth.Params.Respond.Error(id, code, message) -} - -@JvmSynthetic -internal fun Wallet.Model.Cacao.Signature.toAuth(): Auth.Model.Cacao.Signature = Auth.Model.Cacao.Signature(t, s, m) - @JvmSynthetic internal fun Wallet.Model.Cacao.Signature.toSign(): Sign.Model.Cacao.Signature = Sign.Model.Cacao.Signature(t, s, m) @@ -61,23 +51,6 @@ internal fun Wallet.Model.SessionEvent.toSign(): Sign.Model.SessionEvent = Sign. @JvmSynthetic internal fun Wallet.Model.Event.toSign(): Sign.Model.Event = Sign.Model.Event(topic, name, data, chainId) -@JvmSynthetic -internal fun Wallet.Model.PayloadParams.toAuth(): Auth.Model.PayloadParams = - Auth.Model.PayloadParams( - type = type, - chainId = chainId, - domain = domain, - aud = aud, - version = version, - nonce = nonce, - iat = iat, - nbf = nbf, - exp = exp, - statement = statement, - requestId = requestId, - resources = resources, - ) - @JvmSynthetic internal fun Wallet.Model.PayloadAuthRequestParams.toSign(): Sign.Model.PayloadParams = Sign.Model.PayloadParams( @@ -120,32 +93,6 @@ internal fun List.mapToPendingSessionRequests(): List ) } -internal fun Auth.Model.PayloadParams.toWallet(): Wallet.Model.PayloadParams = - Wallet.Model.PayloadParams( - type = type, - chainId = chainId, - domain = domain, - aud = aud, - version = version, - nonce = nonce, - iat = iat, - nbf = nbf, - exp = exp, - statement = statement, - requestId = requestId, - resources = resources, - ) - -@JvmSynthetic -internal fun List.toWallet(): List = - map { request -> - Wallet.Model.PendingAuthRequest( - request.id, - request.pairingTopic, - request.payloadParams.toWallet() - ) - } - @JvmSynthetic internal fun Sign.Model.SessionProposal.toWallet(): Wallet.Model.SessionProposal = Wallet.Model.SessionProposal( @@ -196,13 +143,6 @@ internal fun Sign.Model.Validation.toWallet(): Wallet.Model.Validation = Sign.Model.Validation.UNKNOWN -> Wallet.Model.Validation.UNKNOWN } -internal fun Auth.Model.Validation.toWallet(): Wallet.Model.Validation = - when (this) { - Auth.Model.Validation.VALID -> Wallet.Model.Validation.VALID - Auth.Model.Validation.INVALID -> Wallet.Model.Validation.INVALID - Auth.Model.Validation.UNKNOWN -> Wallet.Model.Validation.UNKNOWN - } - @JvmSynthetic internal fun Sign.Model.SessionRequest.toWallet(): Wallet.Model.SessionRequest = Wallet.Model.SessionRequest( @@ -243,15 +183,6 @@ internal fun Sign.Model.ExpiredProposal.toWallet(): Wallet.Model.ExpiredProposal @JvmSynthetic internal fun Sign.Model.ExpiredRequest.toWallet(): Wallet.Model.ExpiredRequest = Wallet.Model.ExpiredRequest(topic, id) -@JvmSynthetic -internal fun Auth.Event.AuthRequest.toWallet(): Wallet.Model.AuthRequest = Wallet.Model.AuthRequest(id, pairingTopic, payloadParams.toWallet()) - -@JvmSynthetic -internal fun Auth.Event.VerifyContext.toWallet(): Wallet.Model.VerifyContext = Wallet.Model.VerifyContext(id, origin, this.validation.toWallet(), verifyUrl, isScam) - -@JvmSynthetic -internal fun Auth.Model.VerifyContext.toWallet(): Wallet.Model.VerifyContext = Wallet.Model.VerifyContext(id, origin, this.validation.toWallet(), verifyUrl, isScam) - @JvmSynthetic internal fun Wallet.Model.SessionProposal.toSign(): Sign.Model.SessionProposal = Sign.Model.SessionProposal( @@ -296,16 +227,6 @@ internal fun Sign.Model.Message.SessionRequest.toWallet(): Wallet.Model.Message. Wallet.Model.Message.SessionRequest.JSONRPCRequest(request.id, request.method, request.params) ) -@JvmSynthetic -internal fun Auth.Model.Message.AuthRequest.toWallet(): Wallet.Model.Message.AuthRequest = with(payloadParams) { - Wallet.Model.Message.AuthRequest( - id, - pairingTopic, - metadata, - Wallet.Model.Message.AuthRequest.PayloadParams(type, chainId, domain, aud, version, nonce, iat, nbf, exp, statement, requestId, resources) - ) -} - @JvmSynthetic internal fun List.toSign(): List = mutableListOf().apply { this@toSign.forEach { cacao: Wallet.Model.Cacao -> diff --git a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/Web3Wallet.kt b/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/Web3Wallet.kt index 52de508ca..056ef8275 100644 --- a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/Web3Wallet.kt +++ b/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/Web3Wallet.kt @@ -3,9 +3,6 @@ package com.walletconnect.web3.wallet.client import com.walletconnect.android.Core import com.walletconnect.android.CoreInterface import com.walletconnect.android.internal.common.scope -import com.walletconnect.auth.client.Auth -import com.walletconnect.auth.client.AuthClient -import com.walletconnect.auth.common.exceptions.AuthClientAlreadyInitializedException import com.walletconnect.sign.client.Sign import com.walletconnect.sign.client.SignClient import com.walletconnect.sign.common.exceptions.SignClientAlreadyInitializedException @@ -100,23 +97,7 @@ object Web3Wallet { } } - val authWalletDelegate = object : AuthClient.ResponderDelegate { - override fun onAuthRequest(authRequest: Auth.Event.AuthRequest, verifyContext: Auth.Event.VerifyContext) { - delegate.onAuthRequest(authRequest.toWallet(), verifyContext.toWallet()) - } - - override fun onConnectionStateChange(connectionStateChange: Auth.Event.ConnectionStateChange) { - //ignore - } - - override fun onError(error: Auth.Event.Error) { - delegate.onError(Wallet.Model.Error(error.error.throwable)) - } - } - SignClient.setWalletDelegate(signWalletDelegate) - //TODO: Remove AuthClient setting responder delegate in the future - AuthClient.setResponderDelegate(authWalletDelegate) } @Throws(IllegalStateException::class) @@ -132,14 +113,6 @@ object Web3Wallet { onError(Wallet.Model.Error(error.throwable)) } } - //TODO: Remove AuthClient initialization in the future - AuthClient.initialize(Auth.Params.Init(params.core), onSuccess = onSuccessfulInitialization) { error -> - if (error.throwable is AuthClientAlreadyInitializedException) { - onSuccessfulInitialization() - } else { - onError(Wallet.Model.Error(error.throwable)) - } - } validateInitializationCount(clientInitCounter, onSuccess, onError) } @@ -316,33 +289,6 @@ object Web3Wallet { return SignClient.formatAuthMessage(signParams) } - /** - * Caution: This function is blocking and runs on the current thread. - * It is advised that this function be called from background operation - */ - @Deprecated( - "AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.", - replaceWith = ReplaceWith("fun formatAuthMessage(formatMessage: Sign.Params.FormatMessage): String? in Web3Wallet SDK") - ) - @Throws(IllegalStateException::class) - fun formatMessage(params: Wallet.Params.FormatMessage): String? { - val authParams = Auth.Params.FormatMessage(params.payloadParams.toAuth(), params.issuer) - return AuthClient.formatMessage(authParams) - } - - @Deprecated( - "AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.", - replaceWith = ReplaceWith("fun approveSessionAuthenticated(approve: Sign.Params.ApproveSessionAuthenticate, onSuccess: (Sign.Params.ApproveSessionAuthenticate) -> Unit, onError: (Sign.Model.Error) -> Unit) or fun rejectSessionAuthenticated(reject: Sign.Params.RejectSessionAuthenticate, onSuccess: (Sign.Params.RejectSessionAuthenticate) -> Unit, onError: (Sign.Model.Error) -> Unit) in Web3Wallet SDK") - ) - @Throws(IllegalStateException::class) - fun respondAuthRequest( - params: Wallet.Params.AuthRequestResponse, - onSuccess: (Wallet.Params.AuthRequestResponse) -> Unit = {}, - onError: (Wallet.Model.Error) -> Unit, - ) { - AuthClient.respond(params.toAuth(), { onSuccess(params) }, { error -> onError(Wallet.Model.Error(error.throwable)) }) - } - /** * Caution: This function is blocking and runs on the current thread. * It is advised that this function be called from background operation @@ -396,19 +342,6 @@ object Web3Wallet { return SignClient.getSessionProposals().map(Sign.Model.SessionProposal::toWallet) } - /** - * Caution: This function is blocking and runs on the current thread. - * It is advised that this function be called from background operation - */ - @Deprecated( - "AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.", - replaceWith = ReplaceWith("fun getPendingAuthenticateRequests(): List in Web3Wallet SDK") - ) - @Throws(IllegalStateException::class) - fun getPendingAuthRequests(): List { - return AuthClient.getPendingRequest().toWallet() - } - /** * Caution: This function is blocking and runs on the current thread. * It is advised that this function be called from background operation diff --git a/protocol/auth/ReadMe.md b/protocol/auth/ReadMe.md deleted file mode 100644 index 19dfeea81..000000000 --- a/protocol/auth/ReadMe.md +++ /dev/null @@ -1,47 +0,0 @@ -# **WalletConnect Auth - Kotlin** - -Kotlin implementation of WalletConnect Auth protocol for Android applications. - -![Maven Central](https://img.shields.io/maven-central/v/com.walletconnect/auth) - -## Requirements - -* Android min SDK 23 -* Java 11 - -## Documentation and usage - -* [Installation guide](https://docs.walletconnect.com/2.0/kotlin/auth/installation) -* [Responder](https://docs.walletconnect.com/2.0/kotlin/auth/wallet-or-responder-usage) -* [Requester](https://docs.walletconnect.com/2.0/kotlin/auth/dapp-or-requester-usage) -* [Protocol specification](https://docs.walletconnect.com/2.0/specs/auth/) - -  - -## Installation - -root/build.gradle.kts: - -```gradle -allprojects { - repositories { - mavenCentral() - maven { url "https://jitpack.io" } - } -} -``` - -app/build.gradle.kts - -```gradle -implementation(platform("com.walletconnect:android-bom:{BOM version}")) -implementation("com.walletconnect:android-core") -implementation("com.walletconnect:auth") -``` - -  - -## Sample apps - -* For sample responder/wallet run `responder module` -* For sample requester/Dapp run `requester module` diff --git a/protocol/auth/build.gradle.kts b/protocol/auth/build.gradle.kts deleted file mode 100644 index 930851a96..000000000 --- a/protocol/auth/build.gradle.kts +++ /dev/null @@ -1,96 +0,0 @@ -plugins { - id("com.android.library") - id(libs.plugins.kotlin.android.get().pluginId) - alias(libs.plugins.sqlDelight) - alias(libs.plugins.google.ksp) - id("publish-module-android") - id("jacoco-report") -} - -project.apply { - extra[KEY_PUBLISH_ARTIFACT_ID] = AUTH - extra[KEY_PUBLISH_VERSION] = AUTH_VERSION - extra[KEY_SDK_NAME] = "Auth" -} - -android { - namespace = "com.walletconnect.auth" - compileSdk = COMPILE_SDK - - defaultConfig { - minSdk = MIN_SDK - - buildConfigField( - type = "String", - name = "SDK_VERSION", - value = "\"${requireNotNull(extra.get(KEY_PUBLISH_VERSION))}\"" - ) - buildConfigField( - "String", - "PROJECT_ID", - "\"${System.getenv("WC_CLOUD_PROJECT_ID") ?: ""}\"" - ) - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - isMinifyEnabled = true - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "${rootDir.path}/gradle/proguard-rules/sdk-rules.pro" - ) - } - } - compileOptions { - sourceCompatibility = jvmVersion - targetCompatibility = jvmVersion - } - - lint { - abortOnError = true - ignoreWarnings = true - warningsAsErrors = false - } - - - kotlinOptions { - jvmTarget = jvmVersion.toString() - } - - buildFeatures { - buildConfig = true - } -} - -sqldelight { - databases { - create("AuthDatabase") { - packageName.set("com.walletconnect.auth") - schemaOutputDirectory.set(file("src/main/sqldelight/databases")) - generateAsync.set(true) - verifyMigrations.set(true) - verifyDefinitions.set(true) - } - } -} - - -dependencies { - debugImplementation(project(":core:android")) - releaseImplementation("com.walletconnect:android-core:$CORE_VERSION") - - ksp(libs.moshi.ksp) - implementation(libs.bundles.sqlDelight) - api(libs.web3jCrypto) - - testImplementation(libs.bundles.androidxTest) - testImplementation(libs.robolectric) - testImplementation(libs.json) - testImplementation(libs.coroutines.test) - testImplementation(libs.bundles.scarlet.test) - testImplementation(libs.bundles.sqlDelight.test) - - androidTestUtil(libs.androidx.testOrchestrator) - androidTestImplementation(libs.bundles.androidxAndroidTest) -} \ No newline at end of file diff --git a/protocol/auth/proguard-rules.pro b/protocol/auth/proguard-rules.pro deleted file mode 100644 index 88c41390a..000000000 --- a/protocol/auth/proguard-rules.pro +++ /dev/null @@ -1 +0,0 @@ --keepnames public class com.walletconnect.auth.** { *; } \ No newline at end of file diff --git a/protocol/auth/src/main/AndroidManifest.xml b/protocol/auth/src/main/AndroidManifest.xml deleted file mode 100644 index 93d8dbc09..000000000 --- a/protocol/auth/src/main/AndroidManifest.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/client/Auth.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/client/Auth.kt deleted file mode 100644 index 7ba6301b5..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/client/Auth.kt +++ /dev/null @@ -1,164 +0,0 @@ -package com.walletconnect.auth.client - -import androidx.annotation.Keep -import com.walletconnect.android.Core -import com.walletconnect.android.CoreInterface -import com.walletconnect.android.cacao.SignatureInterface -import com.walletconnect.android.internal.common.signing.cacao.Issuer - -object Auth { - - sealed class Event { - data class AuthRequest( - val id: Long, - val pairingTopic: String, - val payloadParams: Model.PayloadParams, - ) : Event() - - data class AuthResponse(val response: Model.Response) : Event() - - data class VerifyContext( - val id: Long, - val origin: String, - val validation: Model.Validation, - val verifyUrl: String, - val isScam: Boolean? - ) : Event() - - data class ConnectionStateChange( - val state: Model.ConnectionState, - ) : Event() - - data class Error( - val error: Model.Error, - ) : Event() - } - - sealed class Model { - - data class Error(val throwable: Throwable) : Model() - - data class ConnectionState(val isAvailable: Boolean) : Model() - - enum class Validation { - VALID, INVALID, UNKNOWN - } - - data class PendingRequest( - val id: Long, - val pairingTopic: String, - val payloadParams: PayloadParams, - ) : Model() - - data class VerifyContext( - val id: Long, - val origin: String, - val validation: Validation, - val verifyUrl: String, - val isScam: Boolean? - ) : Event() - - data class PayloadParams( - val type: String, - val chainId: String, - val domain: String, - val aud: String, - val version: String, - val nonce: String, - val iat: String, - val nbf: String?, - val exp: String?, - val statement: String?, - val requestId: String?, - val resources: List?, - ) : Model() - - data class Cacao( - val header: Header, - val payload: Payload, - val signature: Signature, - ) : Model() { - @Keep - data class Signature(override val t: String, override val s: String, override val m: String? = null) : Model(), SignatureInterface - data class Header(val t: String) : Model() - data class Payload( - val iss: String, - val domain: String, - val aud: String, - val version: String, - val nonce: String, - val iat: String, - val nbf: String?, - val exp: String?, - val statement: String?, - val requestId: String?, - val resources: List?, - ) : Model() { - val address: String - get() = Issuer(iss).address - } - } - - sealed class Response : Model() { - abstract val id: Long - - data class Result(override val id: Long, val cacao: Cacao) : Response() - data class Error(override val id: Long, val code: Int, val message: String) : Response() - } - - sealed class Message { - data class AuthRequest( - val id: Long, - val pairingTopic: String, - val metadata: Core.Model.AppMetaData, - val payloadParams: PayloadParams, - ) : Message() { - data class PayloadParams( - val type: String, - val chainId: String, - val domain: String, - val aud: String, - val version: String, - val nonce: String, - val iat: String, - val nbf: String?, - val exp: String?, - val statement: String?, - val requestId: String?, - val resources: List?, - ) - } - } - } - - sealed class Params { - - data class Init(val core: CoreInterface) : Params() - - data class Request( - val topic: String, - val chainId: String, - val domain: String, - val nonce: String, - val aud: String, - val type: String?, - val nbf: String?, - val exp: String?, - val statement: String?, - val requestId: String?, - val resources: List?, - val expiry: Long? = null, - ) : Params() - - sealed class Respond : Params() { - abstract val id: Long - - data class Result(override val id: Long, val signature: Model.Cacao.Signature, val issuer: String) : Respond() - data class Error(override val id: Long, val code: Int, val message: String) : Respond() - } - - data class FormatMessage(val payloadParams: Model.PayloadParams, val issuer: String) : Params() - - data class DecryptMessage(val topic: String, val encryptedMessage: String) : Params() - } -} \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/client/AuthClient.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/client/AuthClient.kt deleted file mode 100644 index 8aa77574d..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/client/AuthClient.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.walletconnect.auth.client - -object AuthClient : AuthInterface by AuthProtocol.instance { - interface RequesterDelegate : AuthInterface.RequesterDelegate - interface ResponderDelegate : AuthInterface.ResponderDelegate -} \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/client/AuthInterface.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/client/AuthInterface.kt deleted file mode 100644 index 8e3c35505..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/client/AuthInterface.kt +++ /dev/null @@ -1,97 +0,0 @@ -package com.walletconnect.auth.client - -interface AuthInterface { - - @Deprecated("AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.") - sealed interface AuthDelegate { - @Deprecated("AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.") - fun onConnectionStateChange(connectionStateChange: Auth.Event.ConnectionStateChange) - - @Deprecated("AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.") - fun onError(error: Auth.Event.Error) - } - - @Deprecated("AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.") - interface RequesterDelegate : AuthDelegate { - @Deprecated( - "AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.", - replaceWith = ReplaceWith("fun onSessionAuthenticateResponse(sessionAuthenticateResponse: Sign.Model.SessionAuthenticateResponse)") - ) - fun onAuthResponse(authResponse: Auth.Event.AuthResponse) - } - - interface ResponderDelegate : AuthDelegate { - @Deprecated( - "AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.", - replaceWith = ReplaceWith("fun onSessionAuthenticated(sessionAuthenticate: Wallet.Model.SessionAuthenticate, verifyContext: Wallet.Model.VerifyContext)") - ) - fun onAuthRequest(authRequest: Auth.Event.AuthRequest, verifyContext: Auth.Event.VerifyContext) - } - - @Deprecated("AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.") - fun setRequesterDelegate(delegate: RequesterDelegate) - - @Deprecated("AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.") - fun setResponderDelegate(delegate: ResponderDelegate) - - @Deprecated("AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.") - fun initialize(params: Auth.Params.Init, onSuccess: () -> Unit = {}, onError: (Auth.Model.Error) -> Unit) - - @Deprecated( - "AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.", - replaceWith = ReplaceWith("fun sessionAuthenticate(authenticate: Sign.Params.Authenticate, onSuccess: (String) -> Unit, onError: (Sign.Model.Error) -> Unit)") - ) - fun request(params: Auth.Params.Request, onSuccess: () -> Unit, onError: (Auth.Model.Error) -> Unit) - - @Deprecated( - "AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.", - replaceWith = ReplaceWith("fun approveSessionAuthenticated(approve: Sign.Params.ApproveSessionAuthenticate, onSuccess: (Sign.Params.ApproveSessionAuthenticate) -> Unit, onError: (Sign.Model.Error) -> Unit)"), - ) - fun respond(params: Auth.Params.Respond, onSuccess: (Auth.Params.Respond) -> Unit = {}, onError: (Auth.Model.Error) -> Unit) - - @Deprecated( - "AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.", - replaceWith = ReplaceWith("fun decryptMessage(params: Sign.Params.DecryptMessage, onSuccess: (Sign.Model.Message) -> Unit, onError: (Sign.Model.Error) -> Unit)") - ) - fun decryptMessage(params: Auth.Params.DecryptMessage, onSuccess: (Auth.Model.Message.AuthRequest) -> Unit, onError: (Auth.Model.Error) -> Unit) - - /** - * Caution: This function is blocking and runs on the current thread. - * It is advised that this function be called from background operation - */ - @Deprecated( - "AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.", - replaceWith = ReplaceWith("fun formatAuthMessage(formatMessage: Sign.Params.FormatMessage): String?") - ) - fun formatMessage(params: Auth.Params.FormatMessage): String? - - /** - * Caution: This function is blocking and runs on the current thread. - * It is advised that this function be called from background operation - */ - @Deprecated( - "AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.", - replaceWith = ReplaceWith("fun getPendingAuthenticateRequests(): List") - ) - fun getPendingRequest(): List - - /** - * Caution: This function is blocking and runs on the current thread. - * It is advised that this function be called from background operation - */ - @Deprecated( - "AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.", - replaceWith = ReplaceWith("override fun getVerifyContext(id: Long): Sign.Model.VerifyContext?") - ) - fun getVerifyContext(id: Long): Auth.Model.VerifyContext? - - /** - * Caution: This function is blocking and runs on the current thread. - * It is advised that this function be called from background operation - */ - @Deprecated( - "AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.", - replaceWith = ReplaceWith("override fun getListOfVerifyContexts(): List") - ) - fun getListOfVerifyContexts(): List -} \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/client/AuthProtocol.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/client/AuthProtocol.kt deleted file mode 100644 index bcc9bd803..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/client/AuthProtocol.kt +++ /dev/null @@ -1,191 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.auth.client - -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.model.ConnectionState -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.auth.client.mapper.toAuth -import com.walletconnect.auth.client.mapper.toClient -import com.walletconnect.auth.client.mapper.toClientAuthContext -import com.walletconnect.auth.client.mapper.toClientAuthRequest -import com.walletconnect.auth.client.mapper.toCommon -import com.walletconnect.auth.common.model.Events -import com.walletconnect.auth.di.engineModule -import com.walletconnect.auth.di.jsonRpcModule -import com.walletconnect.auth.engine.domain.AuthEngine -import kotlinx.coroutines.flow.launchIn -import kotlinx.coroutines.flow.onEach -import kotlinx.coroutines.launch -import kotlinx.coroutines.runBlocking -import org.koin.core.KoinApplication - -internal class AuthProtocol(private val koinApp: KoinApplication = wcKoinApp) : AuthInterface { - private lateinit var authEngine: AuthEngine - - companion object { - val instance = AuthProtocol() - } - - @Deprecated("AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.") - @Throws(IllegalStateException::class) - override fun initialize(params: Auth.Params.Init, onSuccess: () -> Unit, onError: (Auth.Model.Error) -> Unit) { - if (!::authEngine.isInitialized) { - try { - koinApp.modules( - jsonRpcModule(), - engineModule(), - ) - - authEngine = koinApp.koin.get() - authEngine.setup() - onSuccess() - } catch (e: Exception) { - onError(Auth.Model.Error(e)) - } - } else { - onError(Auth.Model.Error(IllegalStateException("AuthClient already initialized"))) - } - } - - @Deprecated("AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.") - @Throws(IllegalStateException::class) - override fun setRequesterDelegate(delegate: AuthInterface.RequesterDelegate) { - checkEngineInitialization() - authEngine.engineEvent.onEach { event -> - when (event) { - is ConnectionState -> delegate.onConnectionStateChange(event.toClient()) - is SDKError -> delegate.onError(event.toClient()) - is Events.OnAuthResponse -> delegate.onAuthResponse(event.toClient()) - } - }.launchIn(scope) - } - - @Deprecated("AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.") - @Throws(IllegalStateException::class) - override fun setResponderDelegate(delegate: AuthInterface.ResponderDelegate) { - checkEngineInitialization() - authEngine.engineEvent.onEach { event -> - when (event) { - is ConnectionState -> delegate.onConnectionStateChange(event.toClient()) - is SDKError -> delegate.onError(event.toClient()) - is Events.OnAuthRequest -> delegate.onAuthRequest(event.toClientAuthRequest(), event.toClientAuthContext()) - } - }.launchIn(scope) - } - - @Deprecated( - "AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.", - replaceWith = ReplaceWith("fun sessionAuthenticate(authenticate: Sign.Params.Authenticate, onSuccess: (String) -> Unit, onError: (Sign.Model.Error) -> Unit)") - ) - @Throws(IllegalStateException::class) - override fun request(params: Auth.Params.Request, onSuccess: () -> Unit, onError: (Auth.Model.Error) -> Unit) { - checkEngineInitialization() - - scope.launch { - try { - val expiry = params.expiry?.run { Expiry(this) } - authEngine.request(params.toCommon(), expiry, params.topic, - onSuccess = onSuccess, - onFailure = { error -> onError(Auth.Model.Error(error)) } - ) - } catch (error: Exception) { - onError(Auth.Model.Error(error)) - } - } - } - - @Deprecated( - "AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.", - replaceWith = ReplaceWith("fun approveSessionAuthenticated(approve: Sign.Params.ApproveSessionAuthenticate, onSuccess: (Sign.Params.ApproveSessionAuthenticate) -> Unit, onError: (Sign.Model.Error) -> Unit)") - ) - @Throws(IllegalStateException::class) - override fun respond(params: Auth.Params.Respond, onSuccess: (Auth.Params.Respond) -> Unit, onError: (Auth.Model.Error) -> Unit) { - checkEngineInitialization() - - scope.launch { - try { - authEngine.respond(params.toCommon(), { onSuccess(params) }, { error -> onError(Auth.Model.Error(error)) }) - } catch (error: Exception) { - onError(Auth.Model.Error(error)) - } - } - } - - @Deprecated( - "AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.", - replaceWith = ReplaceWith("fun formatAuthMessage(formatMessage: Sign.Params.FormatMessage): String?") - ) - @Throws(IllegalStateException::class) - override fun formatMessage(params: Auth.Params.FormatMessage): String? { - checkEngineInitialization() - - return try { - runBlocking { authEngine.formatMessage(params.payloadParams.toCommon(), params.issuer) } - } catch (error: Exception) { - null - } - } - - @Deprecated( - "AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.", - replaceWith = ReplaceWith("fun decryptMessage(params: Sign.Params.DecryptMessage, onSuccess: (Sign.Model.Message) -> Unit, onError: (Sign.Model.Error) -> Unit)") - ) - override fun decryptMessage(params: Auth.Params.DecryptMessage, onSuccess: (Auth.Model.Message.AuthRequest) -> Unit, onError: (Auth.Model.Error) -> Unit) { - checkEngineInitialization() - - scope.launch { - try { - authEngine.decryptNotification( - topic = params.topic, - message = params.encryptedMessage, - onSuccess = { message -> (message as? Core.Model.Message.AuthRequest)?.run { onSuccess(message.toAuth()) } }, - onFailure = { error -> onError(Auth.Model.Error(error)) } - ) - } catch (error: Exception) { - onError(Auth.Model.Error(error)) - } - } - } - - @Deprecated( - "AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.", - replaceWith = ReplaceWith("fun getPendingAuthenticateRequests(): List") - ) - @Throws(IllegalStateException::class) - override fun getPendingRequest(): List { - checkEngineInitialization() - - return runBlocking { authEngine.getPendingRequests().toClient() } - } - - @Deprecated( - "AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.", - replaceWith = ReplaceWith("override fun getVerifyContext(id: Long): Sign.Model.VerifyContext?") - ) - @Throws(IllegalStateException::class) - override fun getVerifyContext(id: Long): Auth.Model.VerifyContext? { - checkEngineInitialization() - return runBlocking { authEngine.getVerifyContext(id)?.toClient() } - } - - @Deprecated( - "AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.", - replaceWith = ReplaceWith("override fun getListOfVerifyContexts(): List") - ) - @Throws(IllegalStateException::class) - override fun getListOfVerifyContexts(): List { - checkEngineInitialization() - return runBlocking { authEngine.getListOfVerifyContext().map { verifyContext -> verifyContext.toClient() } } - } - - @Throws(IllegalStateException::class) - private fun checkEngineInitialization() { - check(::authEngine.isInitialized) { - "AuthClient needs to be initialized first using the initialize function" - } - } -} \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/client/mapper/ClientMapper.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/client/mapper/ClientMapper.kt deleted file mode 100644 index 35eecced6..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/client/mapper/ClientMapper.kt +++ /dev/null @@ -1,136 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.auth.client.mapper - -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.model.ConnectionState -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.Validation -import com.walletconnect.android.internal.common.signing.cacao.Cacao -import com.walletconnect.android.internal.common.signing.cacao.CacaoType -import com.walletconnect.android.verify.model.VerifyContext -import com.walletconnect.auth.client.Auth -import com.walletconnect.auth.common.model.AuthResponse -import com.walletconnect.auth.common.model.Events -import com.walletconnect.auth.common.model.PayloadParams -import com.walletconnect.auth.common.model.PendingRequest -import com.walletconnect.auth.common.model.Respond -import java.text.SimpleDateFormat -import java.util.* - -@JvmSynthetic -internal fun Auth.Params.Respond.toCommon(): Respond = when (this) { - is Auth.Params.Respond.Result -> Respond.Result(id, signature, issuer) - is Auth.Params.Respond.Error -> Respond.Error(id, code, message) -} - -@JvmSynthetic -internal fun ConnectionState.toClient(): Auth.Event.ConnectionStateChange = - Auth.Event.ConnectionStateChange(Auth.Model.ConnectionState(this.isAvailable)) - -@JvmSynthetic -internal fun SDKError.toClient(): Auth.Event.Error = Auth.Event.Error(Auth.Model.Error(this.exception)) - -@JvmSynthetic -internal fun Events.OnAuthRequest.toClientAuthRequest(): Auth.Event.AuthRequest = Auth.Event.AuthRequest(id, pairingTopic, payloadParams.toClient()) - -@JvmSynthetic -internal fun Events.OnAuthRequest.toClientAuthContext(): Auth.Event.VerifyContext = - Auth.Event.VerifyContext(id, verifyContext.origin, verifyContext.validation.toClientValidation(), verifyContext.verifyUrl, verifyContext.isScam) - -@JvmSynthetic -internal fun Validation.toClientValidation(): Auth.Model.Validation = - when (this) { - Validation.VALID -> Auth.Model.Validation.VALID - Validation.INVALID -> Auth.Model.Validation.INVALID - Validation.UNKNOWN -> Auth.Model.Validation.UNKNOWN - } - -internal fun PayloadParams.toClient(): Auth.Model.PayloadParams = - Auth.Model.PayloadParams( - type = type, - chainId = chainId, - domain = domain, - aud = aud, - version = version, - nonce = nonce, - iat = iat, - nbf = nbf, - exp = exp, - statement = statement, - requestId = requestId, - resources = resources, - ) - -@JvmSynthetic -internal fun Events.OnAuthResponse.toClient(): Auth.Event.AuthResponse = when (val response = response) { - is AuthResponse.Error -> Auth.Event.AuthResponse(Auth.Model.Response.Error(id, response.code, response.message)) - is AuthResponse.Result -> Auth.Event.AuthResponse(Auth.Model.Response.Result(id, response.cacao.toClient())) -} - -@JvmSynthetic -internal fun Auth.Params.Request.toCommon(): PayloadParams = PayloadParams( - type = CacaoType.EIP4361.header, - chainId = chainId, - domain = domain, - aud = aud, - version = Cacao.Payload.CURRENT_VERSION, - nonce = nonce, - iat = SimpleDateFormat(Cacao.Payload.ISO_8601_PATTERN).format(Calendar.getInstance().time), - nbf = nbf, - exp = exp, - statement = statement, - requestId = requestId, - resources = resources, -) - -@JvmSynthetic -internal fun List.toClient(): List = - map { request -> - Auth.Model.PendingRequest( - request.id, - request.pairingTopic, - request.payloadParams.toClient() - ) - } - -@JvmSynthetic -internal fun Auth.Model.PayloadParams.toCommon(): PayloadParams = - PayloadParams( - type = type, - chainId = chainId, - domain = domain, - aud = aud, - version = version, - nonce = nonce, - iat = iat, - nbf = nbf, - exp = exp, - statement = statement, - requestId = requestId, - resources = resources, - ) - -@JvmSynthetic -internal fun Auth.Model.Cacao.Signature.toCommon(): Cacao.Signature = Cacao.Signature(t, s, m) - -@JvmSynthetic -internal fun Cacao.toClient(): Auth.Model.Cacao = Auth.Model.Cacao(header.toClient(), payload.toClient(), signature.toClient()) - -@JvmSynthetic -internal fun Cacao.Header.toClient(): Auth.Model.Cacao.Header = Auth.Model.Cacao.Header(t) - -@JvmSynthetic -internal fun Cacao.Payload.toClient(): Auth.Model.Cacao.Payload = - Auth.Model.Cacao.Payload(iss, domain, aud, version, nonce, iat, nbf, exp, statement, requestId, resources) - -@JvmSynthetic -internal fun Cacao.Signature.toClient(): Auth.Model.Cacao.Signature = Auth.Model.Cacao.Signature(t, s, m) - -@JvmSynthetic -internal fun VerifyContext.toClient(): Auth.Model.VerifyContext = Auth.Model.VerifyContext(id, origin, validation.toClientValidation(), verifyUrl, isScam) - -@JvmSynthetic -internal fun Core.Model.Message.AuthRequest.toAuth(): Auth.Model.Message.AuthRequest = with(payloadParams) { - Auth.Model.Message.AuthRequest(id, pairingTopic, metadata, Auth.Model.Message.AuthRequest.PayloadParams(type, chainId, domain, aud, version, nonce, iat, nbf, exp, statement, requestId, resources)) -} \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/exceptions/Exceptions.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/exceptions/Exceptions.kt deleted file mode 100644 index e78f305e7..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/exceptions/Exceptions.kt +++ /dev/null @@ -1,13 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.auth.common.exceptions - -import com.walletconnect.android.internal.common.exception.WalletConnectException - -internal object MissingAuthRequestException : WalletConnectException(MISSING_AUTH_REQUEST_MESSAGE) -internal object InvalidCacaoException : WalletConnectException(CACAO_IS_NOT_VALID_MESSAGE) -internal class InvalidParamsException(override val message: String) : WalletConnectException(message) - -class AuthClientAlreadyInitializedException : WalletConnectException(CLIENT_ALREADY_INITIALIZED) - -class InvalidAuthParamsType : WalletConnectException(INVALID_AUTH_PARAMS_TYPE) \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/exceptions/Messages.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/exceptions/Messages.kt deleted file mode 100644 index 3fd34516d..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/exceptions/Messages.kt +++ /dev/null @@ -1,9 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.auth.common.exceptions - -internal const val MISSING_AUTH_REQUEST_MESSAGE: String = "Missing Auth Request" -internal const val CACAO_IS_NOT_VALID_MESSAGE: String = "Cacao is not valid" - -internal const val CLIENT_ALREADY_INITIALIZED: String = "AuthClient already initialized" -internal const val INVALID_AUTH_PARAMS_TYPE: String = "Invalid Auth params type" diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/exceptions/PeerError.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/exceptions/PeerError.kt deleted file mode 100644 index 99fb2c132..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/exceptions/PeerError.kt +++ /dev/null @@ -1,12 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.auth.common.exceptions - -import com.walletconnect.android.internal.common.model.type.Error - -internal sealed class PeerError : Error { - object SignatureVerificationFailed : PeerError() { - override val message: String = "Signature verification failed" - override val code: Int = 11004 - } -} \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/json_rpc/AuthParams.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/json_rpc/AuthParams.kt deleted file mode 100644 index d3cc4ccfa..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/json_rpc/AuthParams.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.walletconnect.auth.common.json_rpc - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.type.ClientParams -import com.walletconnect.auth.common.model.PayloadParams -import com.walletconnect.auth.common.model.Requester - -internal sealed class AuthParams : ClientParams { - - @JsonClass(generateAdapter = true) - internal data class RequestParams( - @Json(name = "requester") - val requester: Requester, - @Json(name = "payloadParams") - val payloadParams: PayloadParams, - @Json(name = "expiry") - val expiry: Expiry? = null - ) : AuthParams() -} \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/json_rpc/AuthRpc.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/json_rpc/AuthRpc.kt deleted file mode 100644 index 0f695c595..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/json_rpc/AuthRpc.kt +++ /dev/null @@ -1,24 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.auth.common.json_rpc - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass -import com.walletconnect.android.internal.common.model.type.JsonRpcClientSync -import com.walletconnect.auth.json_rpc.model.JsonRpcMethod -import com.walletconnect.util.generateId - -internal sealed class AuthRpc : JsonRpcClientSync { - - @JsonClass(generateAdapter = true) - internal data class AuthRequest( - @Json(name = "id") - override val id: Long = generateId(), - @Json(name = "jsonrpc") - override val jsonrpc: String = "2.0", - @Json(name = "method") - override val method: String = JsonRpcMethod.WC_AUTH_REQUEST, - @Json(name = "params") - override val params: AuthParams.RequestParams - ) : AuthRpc() -} \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/AuthResponse.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/AuthResponse.kt deleted file mode 100644 index d90b3ee0a..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/AuthResponse.kt +++ /dev/null @@ -1,10 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.auth.common.model - -import com.walletconnect.android.internal.common.signing.cacao.Cacao - -internal sealed class AuthResponse { - data class Result(val cacao: Cacao) : AuthResponse() - data class Error(val code: Int, val message: String) : AuthResponse() -} \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/Events.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/Events.kt deleted file mode 100644 index 5fa467128..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/Events.kt +++ /dev/null @@ -1,11 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.auth.common.model - -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.verify.model.VerifyContext - -internal sealed class Events : EngineEvent { - data class OnAuthRequest(val id: Long, val pairingTopic: String, val payloadParams: PayloadParams, val verifyContext: VerifyContext) : Events() - data class OnAuthResponse(val id: Long, val response: AuthResponse) : Events() -} \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/JsonRpcHistoryEntry.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/JsonRpcHistoryEntry.kt deleted file mode 100644 index 96e2337ec..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/JsonRpcHistoryEntry.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.walletconnect.auth.common.model - -import com.walletconnect.auth.common.json_rpc.AuthParams -import com.walletconnect.foundation.common.model.Topic - -internal data class JsonRpcHistoryEntry( - val id: Long, - val topic: Topic, - val method: String, - val params: AuthParams.RequestParams, - val response: String? -) \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/PayloadParams.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/PayloadParams.kt deleted file mode 100644 index 30414a828..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/PayloadParams.kt +++ /dev/null @@ -1,34 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.auth.common.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -@JsonClass(generateAdapter = true) -internal data class PayloadParams( - @Json(name = "type") - val type: String, - @Json(name = "chainId") - val chainId: String, - @Json(name = "domain") - val domain: String, - @Json(name = "aud") - val aud: String, - @Json(name = "version") - val version: String, - @Json(name = "nonce") - val nonce: String, - @Json(name = "iat") - val iat: String, - @Json(name = "nbf") - val nbf: String?, - @Json(name = "exp") - val exp: String?, - @Json(name = "statement") - val statement: String?, - @Json(name = "requestId") - val requestId: String?, - @Json(name = "resources") - val resources: List?, -) \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/PendingRequest.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/PendingRequest.kt deleted file mode 100644 index 943a3f963..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/PendingRequest.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.walletconnect.auth.common.model - -internal data class PendingRequest( - val id: Long, - val pairingTopic: String, - val payloadParams: PayloadParams -) diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/Requester.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/Requester.kt deleted file mode 100644 index b4a28e791..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/Requester.kt +++ /dev/null @@ -1,15 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.auth.common.model - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass -import com.walletconnect.android.internal.common.model.AppMetaData - -@JsonClass(generateAdapter = true) -internal data class Requester( - @Json(name = "publicKey") - val publicKey: String, - @Json(name = "metadata") - val metadata: AppMetaData -) \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/Respond.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/Respond.kt deleted file mode 100644 index dc780370c..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/Respond.kt +++ /dev/null @@ -1,12 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.auth.common.model - -import com.walletconnect.auth.client.Auth - -internal sealed class Respond { - abstract val id: Long - - data class Result(override val id: Long, val signature: Auth.Model.Cacao.Signature, val iss: String) : Respond() - data class Error(override val id: Long, val code: Int, val message: String) : Respond() -} \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/Response.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/Response.kt deleted file mode 100644 index e2bc32da5..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/common/model/Response.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.walletconnect.auth.common.model - -import com.walletconnect.android.internal.common.signing.cacao.Cacao - -internal sealed class Response { - abstract val id: Long - - data class Result(override val id: Long, val cacao: Cacao) : Response() - data class Error(override val id: Long, val code: Int, val message: String) : Response() -} diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/di/CallsModule.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/di/CallsModule.kt deleted file mode 100644 index e5d2d0bdd..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/di/CallsModule.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.walletconnect.auth.di - -import com.walletconnect.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.push.notifications.DecryptMessageUseCaseInterface -import com.walletconnect.auth.use_case.calls.DecryptAuthMessageUseCase -import com.walletconnect.auth.use_case.calls.FormatMessageUseCase -import com.walletconnect.auth.use_case.calls.FormatMessageUseCaseInterface -import com.walletconnect.auth.use_case.calls.GetListOfVerifyContextsUseCase -import com.walletconnect.auth.use_case.calls.GetListOfVerifyContextsUseCaseInterface -import com.walletconnect.auth.use_case.calls.GetVerifyContextUseCase -import com.walletconnect.auth.use_case.calls.GetVerifyContextUseCaseInterface -import com.walletconnect.auth.use_case.calls.RespondAuthRequestUseCase -import com.walletconnect.auth.use_case.calls.RespondAuthRequestUseCaseInterface -import com.walletconnect.auth.use_case.calls.SendAuthRequestUseCase -import com.walletconnect.auth.use_case.calls.SendAuthRequestUseCaseInterface -import org.koin.core.qualifier.named -import org.koin.dsl.module - -@JvmSynthetic -internal fun callsModule() = module { - - single { SendAuthRequestUseCase(crypto = get(), jsonRpcInteractor = get(), selfAppMetaData = get(), logger = get(named(AndroidCommonDITags.LOGGER))) } - - single { - RespondAuthRequestUseCase( - crypto = get(), - jsonRpcInteractor = get(), - verifyContextStorageRepository = get(), - getPendingJsonRpcHistoryEntryByIdUseCase = get(), - cacaoVerifier = get(), - pairingController = get(), - logger = get(named(AndroidCommonDITags.LOGGER)) - ) - } - - single(named(AndroidCommonDITags.DECRYPT_AUTH_MESSAGE)) { - val useCase = DecryptAuthMessageUseCase( - codec = get(), - serializer = get(), - metadataRepository = get(), - pushMessageStorageRepository = get() - ) - - get>(named(AndroidCommonDITags.DECRYPT_USE_CASES))[Tags.AUTH_REQUEST.id.toString()] = useCase - useCase - } - - single { FormatMessageUseCase() } - - single { GetVerifyContextUseCase(verifyContextStorageRepository = get()) } - - single { GetListOfVerifyContextsUseCase(verifyContextStorageRepository = get()) } -} \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/di/EngineModule.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/di/EngineModule.kt deleted file mode 100644 index 5e20a36e6..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/di/EngineModule.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.walletconnect.auth.di - -import com.walletconnect.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.android.internal.common.signing.cacao.CacaoVerifier -import com.walletconnect.auth.engine.domain.AuthEngine -import com.walletconnect.auth.json_rpc.domain.GetPendingJsonRpcHistoryEntriesUseCase -import com.walletconnect.auth.json_rpc.domain.GetPendingJsonRpcHistoryEntriesUseCaseInterface -import com.walletconnect.auth.json_rpc.domain.GetPendingJsonRpcHistoryEntryByIdUseCase -import com.walletconnect.auth.json_rpc.domain.GetPendingJsonRpcHistoryEntryByTopicUseCase -import org.koin.core.qualifier.named -import org.koin.dsl.module - -@JvmSynthetic -internal fun engineModule() = module { - - includes(callsModule(), requestsModule(), responsesModule()) - - single { GetPendingJsonRpcHistoryEntriesUseCase(jsonRpcHistory = get(), serializer = get()) } - single { GetPendingJsonRpcHistoryEntryByIdUseCase(jsonRpcHistory = get(), serializer = get()) } - single { GetPendingJsonRpcHistoryEntryByTopicUseCase(jsonRpcHistory = get(), serializer = get()) } - single { CacaoVerifier(projectId = get()) } - single { - AuthEngine( - jsonRpcInteractor = get(), - verifyContextStorageRepository = get(), - getListOfVerifyContextsUseCase = get(), - getVerifyContextUseCase = get(), - formatMessageUseCase = get(), - onAuthRequestUseCase = get(), - onAuthRequestResponseUseCase = get(), - respondAuthRequestUseCase = get(), - sendAuthRequestUseCase = get(), - pairingHandler = get(), - getPendingJsonRpcHistoryEntriesUseCase = get(), - getPendingJsonRpcHistoryEntryByTopicUseCase = get(), - decryptAuthMessageUseCase = get(named(AndroidCommonDITags.DECRYPT_AUTH_MESSAGE)), - ) - } -} \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/di/JsonRpcModule.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/di/JsonRpcModule.kt deleted file mode 100644 index e0e3c8d2e..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/di/JsonRpcModule.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.walletconnect.auth.di - -import com.walletconnect.auth.common.json_rpc.AuthRpc -import com.walletconnect.auth.json_rpc.model.JsonRpcMethod -import com.walletconnect.utils.addDeserializerEntry -import com.walletconnect.utils.addSerializerEntry -import org.koin.dsl.module - -@JvmSynthetic -internal fun jsonRpcModule() = module { - - addSerializerEntry(AuthRpc.AuthRequest::class) - - addDeserializerEntry(JsonRpcMethod.WC_AUTH_REQUEST, AuthRpc.AuthRequest::class) -} \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/di/RequestsModule.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/di/RequestsModule.kt deleted file mode 100644 index 416553a13..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/di/RequestsModule.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.walletconnect.auth.di - -import com.walletconnect.auth.use_case.requests.OnAuthRequestUseCase -import org.koin.dsl.module - -@JvmSynthetic -internal fun requestsModule() = module { - single { OnAuthRequestUseCase(jsonRpcInteractor = get(), resolveAttestationIdUseCase = get(), pairingController = get()) } -} diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/di/ResponsesModule.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/di/ResponsesModule.kt deleted file mode 100644 index 5caeb9ea5..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/di/ResponsesModule.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.walletconnect.auth.di - -import com.walletconnect.auth.use_case.responses.OnAuthRequestResponseUseCase -import org.koin.dsl.module - -@JvmSynthetic -internal fun responsesModule() = module { - single { OnAuthRequestResponseUseCase(cacaoVerifier = get(), pairingHandler = get(), pairingInterface = get()) } -} \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/engine/PairingTopicToReponseMap.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/engine/PairingTopicToReponseMap.kt deleted file mode 100644 index 622ff5afb..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/engine/PairingTopicToReponseMap.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.walletconnect.auth.engine - -import com.walletconnect.foundation.common.model.Topic - -// idea: If we need responseTopic persistence throughout app terminations this is not sufficient -internal val pairingTopicToResponseTopicMap: MutableMap = mutableMapOf() \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/engine/domain/AuthEngine.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/engine/domain/AuthEngine.kt deleted file mode 100644 index 76bf06d64..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/engine/domain/AuthEngine.kt +++ /dev/null @@ -1,143 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.auth.engine.domain - -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.Validation -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.storage.verify.VerifyContextStorageRepository -import com.walletconnect.android.pairing.handler.PairingControllerInterface -import com.walletconnect.android.push.notifications.DecryptMessageUseCaseInterface -import com.walletconnect.android.relay.WSSConnectionState -import com.walletconnect.android.verify.model.VerifyContext -import com.walletconnect.auth.common.json_rpc.AuthParams -import com.walletconnect.auth.common.model.Events -import com.walletconnect.auth.engine.pairingTopicToResponseTopicMap -import com.walletconnect.auth.json_rpc.domain.GetPendingJsonRpcHistoryEntriesUseCaseInterface -import com.walletconnect.auth.json_rpc.domain.GetPendingJsonRpcHistoryEntryByTopicUseCase -import com.walletconnect.auth.json_rpc.model.JsonRpcMethod -import com.walletconnect.auth.use_case.calls.FormatMessageUseCaseInterface -import com.walletconnect.auth.use_case.calls.GetListOfVerifyContextsUseCaseInterface -import com.walletconnect.auth.use_case.calls.GetVerifyContextUseCaseInterface -import com.walletconnect.auth.use_case.calls.RespondAuthRequestUseCaseInterface -import com.walletconnect.auth.use_case.calls.SendAuthRequestUseCaseInterface -import com.walletconnect.auth.use_case.requests.OnAuthRequestUseCase -import com.walletconnect.auth.use_case.responses.OnAuthRequestResponseUseCase -import com.walletconnect.utils.Empty -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.Job -import kotlinx.coroutines.flow.MutableSharedFlow -import kotlinx.coroutines.flow.SharedFlow -import kotlinx.coroutines.flow.asSharedFlow -import kotlinx.coroutines.flow.filter -import kotlinx.coroutines.flow.filterIsInstance -import kotlinx.coroutines.flow.launchIn -import kotlinx.coroutines.flow.merge -import kotlinx.coroutines.flow.onEach -import kotlinx.coroutines.launch -import kotlinx.coroutines.supervisorScope - -internal class AuthEngine( - private val jsonRpcInteractor: RelayJsonRpcInteractorInterface, - private val verifyContextStorageRepository: VerifyContextStorageRepository, - private val getPendingJsonRpcHistoryEntriesUseCase: GetPendingJsonRpcHistoryEntriesUseCaseInterface, - private val getPendingJsonRpcHistoryEntryByTopicUseCase: GetPendingJsonRpcHistoryEntryByTopicUseCase, - private val pairingHandler: PairingControllerInterface, - private val sendAuthRequestUseCase: SendAuthRequestUseCaseInterface, - private val respondAuthRequestUseCase: RespondAuthRequestUseCaseInterface, - private val formatMessageUseCase: FormatMessageUseCaseInterface, - private val decryptAuthMessageUseCase: DecryptMessageUseCaseInterface, - private val getVerifyContextUseCase: GetVerifyContextUseCaseInterface, - private val getListOfVerifyContextsUseCase: GetListOfVerifyContextsUseCaseInterface, - private val onAuthRequestUseCase: OnAuthRequestUseCase, - private val onAuthRequestResponseUseCase: OnAuthRequestResponseUseCase, -) : SendAuthRequestUseCaseInterface by sendAuthRequestUseCase, - RespondAuthRequestUseCaseInterface by respondAuthRequestUseCase, - FormatMessageUseCaseInterface by formatMessageUseCase, - DecryptMessageUseCaseInterface by decryptAuthMessageUseCase, - GetPendingJsonRpcHistoryEntriesUseCaseInterface by getPendingJsonRpcHistoryEntriesUseCase, - GetVerifyContextUseCaseInterface by getVerifyContextUseCase, - GetListOfVerifyContextsUseCaseInterface by getListOfVerifyContextsUseCase { - private var jsonRpcRequestsJob: Job? = null - private var jsonRpcResponsesJob: Job? = null - private var internalErrorsJob: Job? = null - private var authEventsJob: Job? = null - - private val _engineEvent: MutableSharedFlow = MutableSharedFlow() - val engineEvent: SharedFlow = _engineEvent.asSharedFlow() - - init { - pairingHandler.register(JsonRpcMethod.WC_AUTH_REQUEST) - emitReceivedAuthRequest() - } - - fun setup() { - jsonRpcInteractor.wssConnectionState - .filterIsInstance() - .onEach { - supervisorScope { - launch(Dispatchers.IO) { resubscribeToPendingRequestsTopics() } - } - - if (jsonRpcRequestsJob == null) { - jsonRpcRequestsJob = collectJsonRpcRequests() - } - if (jsonRpcResponsesJob == null) { - jsonRpcResponsesJob = collectJsonRpcResponses() - } - if (internalErrorsJob == null) { - internalErrorsJob = collectInternalErrors() - } - if (authEventsJob == null) { - authEventsJob = collectAuthEvents() - } - } - .launchIn(scope) - } - - private fun collectJsonRpcRequests(): Job = - jsonRpcInteractor.clientSyncJsonRpc - .filter { request -> request.params is AuthParams.RequestParams } - .onEach { request -> onAuthRequestUseCase(request, request.params as AuthParams.RequestParams) } - .launchIn(scope) - - private fun collectJsonRpcResponses(): Job = - jsonRpcInteractor.peerResponse - .filter { response -> response.params is AuthParams } - .onEach { response -> onAuthRequestResponseUseCase(response, response.params as AuthParams.RequestParams) } - .launchIn(scope) - - private fun resubscribeToPendingRequestsTopics() { - val responseTopics = pairingTopicToResponseTopicMap.map { (_, responseTopic) -> responseTopic.value } - try { - jsonRpcInteractor.batchSubscribe(responseTopics) { error -> scope.launch { _engineEvent.emit(SDKError(error)) } } - } catch (e: Exception) { - scope.launch { _engineEvent.emit(SDKError(e)) } - } - } - - private fun emitReceivedAuthRequest() { - pairingHandler.storedPairingFlow - .onEach { (pairingTopic, trace) -> - try { - val request = getPendingJsonRpcHistoryEntryByTopicUseCase(pairingTopic) - val context = verifyContextStorageRepository.get(request.id) ?: VerifyContext(request.id, String.Empty, Validation.UNKNOWN, String.Empty, null) - scope.launch { _engineEvent.emit(Events.OnAuthRequest(request.id, request.pairingTopic, request.payloadParams, context)) } - } catch (e: Exception) { - println("No auth request for pairing topic: $e") - } - }.launchIn(scope) - } - - private fun collectAuthEvents(): Job = - merge(sendAuthRequestUseCase.events, onAuthRequestUseCase.events, onAuthRequestResponseUseCase.events) - .onEach { event -> _engineEvent.emit(event) } - .launchIn(scope) - - private fun collectInternalErrors(): Job = - merge(jsonRpcInteractor.internalErrors, pairingHandler.findWrongMethodsFlow) - .onEach { exception -> _engineEvent.emit(exception) } - .launchIn(scope) -} \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/engine/mapper/EngineMapper.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/engine/mapper/EngineMapper.kt deleted file mode 100644 index 6d4b53f42..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/engine/mapper/EngineMapper.kt +++ /dev/null @@ -1,30 +0,0 @@ -package com.walletconnect.auth.engine.mapper - -import com.walletconnect.android.internal.common.signing.cacao.Cacao -import com.walletconnect.android.internal.common.signing.cacao.Issuer -import com.walletconnect.android.internal.common.signing.cacao.toCAIP222Message -import com.walletconnect.auth.common.model.JsonRpcHistoryEntry -import com.walletconnect.auth.common.model.PayloadParams -import com.walletconnect.auth.common.model.PendingRequest - -@JvmSynthetic -internal fun PayloadParams.toCacaoPayload(iss: Issuer): Cacao.Payload = Cacao.Payload( - iss.value, - domain = domain, - aud = aud, - version = version, - nonce = nonce, - iat = iat, - nbf = nbf, - exp = exp, - statement = statement, - requestId = requestId, - resources = resources -) - -@JvmSynthetic -internal fun PayloadParams.toCAIP222Message(iss: Issuer, chainName: String = "Ethereum"): String = - this.toCacaoPayload(iss).toCAIP222Message(chainName) - -@JvmSynthetic -internal fun JsonRpcHistoryEntry.toPendingRequest(): PendingRequest = PendingRequest(id, topic.value, params.payloadParams) \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/json_rpc/domain/GetPendingJsonRpcHistoryEntriesUseCase.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/json_rpc/domain/GetPendingJsonRpcHistoryEntriesUseCase.kt deleted file mode 100644 index 9293ab443..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/json_rpc/domain/GetPendingJsonRpcHistoryEntriesUseCase.kt +++ /dev/null @@ -1,26 +0,0 @@ -package com.walletconnect.auth.json_rpc.domain - -import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer -import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory -import com.walletconnect.auth.common.json_rpc.AuthRpc -import com.walletconnect.auth.common.model.PendingRequest -import com.walletconnect.auth.engine.mapper.toPendingRequest -import com.walletconnect.auth.json_rpc.model.JsonRpcMethod -import com.walletconnect.auth.json_rpc.model.toEntry - -internal class GetPendingJsonRpcHistoryEntriesUseCase( - private val jsonRpcHistory: JsonRpcHistory, - private val serializer: JsonRpcSerializer -) : GetPendingJsonRpcHistoryEntriesUseCaseInterface { - - override suspend fun getPendingRequests(): List { - return jsonRpcHistory.getListOfPendingRecords() - .filter { record -> record.method == JsonRpcMethod.WC_AUTH_REQUEST } - .mapNotNull { record -> serializer.tryDeserialize(record.body)?.params?.toEntry(record) } - .map { jsonRpcHistoryEntry -> jsonRpcHistoryEntry.toPendingRequest() } - } -} - -internal interface GetPendingJsonRpcHistoryEntriesUseCaseInterface { - suspend fun getPendingRequests(): List -} \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/json_rpc/domain/GetPendingJsonRpcHistoryEntryByIdUseCase.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/json_rpc/domain/GetPendingJsonRpcHistoryEntryByIdUseCase.kt deleted file mode 100644 index 64eb3357f..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/json_rpc/domain/GetPendingJsonRpcHistoryEntryByIdUseCase.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.walletconnect.auth.json_rpc.domain - -import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer -import com.walletconnect.android.internal.common.json_rpc.model.JsonRpcHistoryRecord -import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory -import com.walletconnect.auth.common.json_rpc.AuthRpc -import com.walletconnect.auth.common.model.JsonRpcHistoryEntry -import com.walletconnect.auth.json_rpc.model.toEntry - -internal class GetPendingJsonRpcHistoryEntryByIdUseCase( - private val jsonRpcHistory: JsonRpcHistory, - private val serializer: JsonRpcSerializer -) { - - operator fun invoke(id: Long): JsonRpcHistoryEntry? { - val record: JsonRpcHistoryRecord? = jsonRpcHistory.getPendingRecordById(id) - var entry: JsonRpcHistoryEntry? = null - - if (record != null) { - val authRequest: AuthRpc.AuthRequest? = serializer.tryDeserialize(record.body) - if (authRequest != null) { - entry = record.toEntry(authRequest.params) - } - } - - return entry - } -} \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/json_rpc/domain/GetPendingJsonRpcHistoryEntryByTopicUseCase.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/json_rpc/domain/GetPendingJsonRpcHistoryEntryByTopicUseCase.kt deleted file mode 100644 index b189f4ed0..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/json_rpc/domain/GetPendingJsonRpcHistoryEntryByTopicUseCase.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.walletconnect.auth.json_rpc.domain - -import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer -import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory -import com.walletconnect.auth.common.json_rpc.AuthRpc -import com.walletconnect.auth.common.model.PendingRequest -import com.walletconnect.auth.engine.mapper.toPendingRequest -import com.walletconnect.auth.json_rpc.model.JsonRpcMethod -import com.walletconnect.auth.json_rpc.model.toEntry -import com.walletconnect.foundation.common.model.Topic - -internal class GetPendingJsonRpcHistoryEntryByTopicUseCase( - private val jsonRpcHistory: JsonRpcHistory, - private val serializer: JsonRpcSerializer -) { - - suspend operator fun invoke(topic: Topic): PendingRequest { - return jsonRpcHistory.getListOfPendingRecords() - .filter { record -> record.method == JsonRpcMethod.WC_AUTH_REQUEST && record.topic == topic.value } - .mapNotNull { record -> serializer.tryDeserialize(record.body)?.params?.toEntry(record) } - .map { jsonRpcHistoryEntry -> jsonRpcHistoryEntry.toPendingRequest() } - .first() - } -} \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/json_rpc/model/JsonRpcMapper.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/json_rpc/model/JsonRpcMapper.kt deleted file mode 100644 index ff2fd1e9d..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/json_rpc/model/JsonRpcMapper.kt +++ /dev/null @@ -1,26 +0,0 @@ -package com.walletconnect.auth.json_rpc.model - -import com.walletconnect.android.internal.common.json_rpc.model.JsonRpcHistoryRecord -import com.walletconnect.auth.common.json_rpc.AuthParams -import com.walletconnect.auth.common.model.JsonRpcHistoryEntry -import com.walletconnect.foundation.common.model.Topic - -@JvmSynthetic -internal fun JsonRpcHistoryRecord.toEntry(params: AuthParams.RequestParams): JsonRpcHistoryEntry = - JsonRpcHistoryEntry( - id, - Topic(topic), - method, - params, - response - ) - -@JvmSynthetic -internal fun AuthParams.RequestParams.toEntry(record: JsonRpcHistoryRecord): JsonRpcHistoryEntry = - JsonRpcHistoryEntry( - record.id, - Topic(record.topic), - record.method, - this, - record.response - ) \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/json_rpc/model/JsonRpcMethod.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/json_rpc/model/JsonRpcMethod.kt deleted file mode 100644 index c9bc67d96..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/json_rpc/model/JsonRpcMethod.kt +++ /dev/null @@ -1,8 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.auth.json_rpc.model - -internal object JsonRpcMethod { - @get:JvmSynthetic - const val WC_AUTH_REQUEST: String = "wc_authRequest" -} \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/signature/cacao/CacaoSigner.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/signature/cacao/CacaoSigner.kt deleted file mode 100644 index ab522fd05..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/signature/cacao/CacaoSigner.kt +++ /dev/null @@ -1,15 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.auth.signature.cacao - -import com.walletconnect.android.cacao.signature.ISignatureType -import com.walletconnect.android.utils.cacao.CacaoSignerInterface -import com.walletconnect.auth.client.Auth - -/// Note: Szymon - Only added to have backwards compatibility. Newer SDKs should only add CacaoSigner object below. -@Deprecated("Moved to android-core module, as other SDKs also need CACAO.", ReplaceWith("com.walletconnect.android.internal.common.cacao.signature.SignatureType")) -enum class SignatureType(override val header: String) : ISignatureType { - EIP191("eip191"), EIP1271("eip1271"); -} - -object CacaoSigner : CacaoSignerInterface \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/calls/DecryptAuthMessageUseCase.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/calls/DecryptAuthMessageUseCase.kt deleted file mode 100644 index c3a65e1d3..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/calls/DecryptAuthMessageUseCase.kt +++ /dev/null @@ -1,53 +0,0 @@ -package com.walletconnect.auth.use_case.calls - -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.crypto.codec.Codec -import com.walletconnect.android.internal.common.crypto.sha256 -import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.model.sync.ClientJsonRpc -import com.walletconnect.android.internal.common.model.type.ClientParams -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.android.internal.common.storage.push_messages.PushMessagesRepository -import com.walletconnect.android.push.notifications.DecryptMessageUseCaseInterface -import com.walletconnect.android.utils.toClient -import com.walletconnect.auth.common.exceptions.InvalidAuthParamsType -import com.walletconnect.auth.common.json_rpc.AuthParams -import com.walletconnect.foundation.common.model.Topic -import org.bouncycastle.util.encoders.Base64 - -class DecryptAuthMessageUseCase( - private val codec: Codec, - private val serializer: JsonRpcSerializer, - private val metadataRepository: MetadataStorageRepositoryInterface, - private val pushMessageStorageRepository: PushMessagesRepository -) : DecryptMessageUseCaseInterface { - override suspend fun decryptNotification(topic: String, message: String, onSuccess: (Core.Model.Message) -> Unit, onFailure: (Throwable) -> Unit) { - try { - if (!pushMessageStorageRepository.doesPushMessageExist(sha256(message.toByteArray()))) { - val decryptedMessageString = codec.decrypt(Topic(topic), Base64.decode(message)) - val clientJsonRpc: ClientJsonRpc = serializer.tryDeserialize(decryptedMessageString) ?: return onFailure(InvalidAuthParamsType()) - val params: ClientParams = serializer.deserialize(clientJsonRpc.method, decryptedMessageString) ?: return onFailure(InvalidAuthParamsType()) - val metadata: AppMetaData = metadataRepository.getByTopicAndType(Topic(topic), AppMetaDataType.PEER) ?: return onFailure(InvalidAuthParamsType()) - - if (params is AuthParams.RequestParams) { - onSuccess(params.toMessage(clientJsonRpc.id, topic, metadata)) - } else { - onFailure(InvalidAuthParamsType()) - } - } - } catch (e: Exception) { - onFailure(e) - } - } - - private fun AuthParams.RequestParams.toMessage(id: Long, topic: String, metadata: AppMetaData): Core.Model.Message.AuthRequest = with(payloadParams) { - Core.Model.Message.AuthRequest( - id, - topic, - metadata.toClient(), - Core.Model.Message.AuthRequest.PayloadParams(type, chainId, domain, aud, version, nonce, iat, nbf, exp, statement, requestId, resources) - ) - } -} \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/calls/FormatMessageUseCase.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/calls/FormatMessageUseCase.kt deleted file mode 100644 index 9064fddb0..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/calls/FormatMessageUseCase.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.walletconnect.auth.use_case.calls - -import com.walletconnect.android.internal.common.signing.cacao.Issuer -import com.walletconnect.android.internal.utils.CoreValidator -import com.walletconnect.auth.common.exceptions.InvalidParamsException -import com.walletconnect.auth.common.model.PayloadParams -import com.walletconnect.auth.engine.mapper.toCAIP222Message -import kotlinx.coroutines.supervisorScope - -internal class FormatMessageUseCase : FormatMessageUseCaseInterface { - override suspend fun formatMessage(payloadParams: PayloadParams, iss: String): String = supervisorScope { - val issuer = Issuer(iss) - if (issuer.chainId != payloadParams.chainId) throw InvalidParamsException("Issuer chainId does not match with PayloadParams") - if (!CoreValidator.isChainIdCAIP2Compliant(payloadParams.chainId)) throw InvalidParamsException("PayloadParams chainId is not CAIP-2 compliant") - if (!CoreValidator.isChainIdCAIP2Compliant(issuer.chainId)) throw InvalidParamsException("Issuer chainId is not CAIP-2 compliant") - if (!CoreValidator.isAccountIdCAIP10Compliant(issuer.accountId)) throw InvalidParamsException("Issuer address is not CAIP-10 compliant") - - return@supervisorScope payloadParams.toCAIP222Message(issuer) - } -} - -internal interface FormatMessageUseCaseInterface { - suspend fun formatMessage(payloadParams: PayloadParams, iss: String): String -} \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/calls/GetListOfVerifyContextsUseCase.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/calls/GetListOfVerifyContextsUseCase.kt deleted file mode 100644 index 2076b97a6..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/calls/GetListOfVerifyContextsUseCase.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.walletconnect.auth.use_case.calls - -import com.walletconnect.android.internal.common.storage.verify.VerifyContextStorageRepository -import com.walletconnect.android.verify.model.VerifyContext -import kotlinx.coroutines.supervisorScope - -internal class GetListOfVerifyContextsUseCase(private val verifyContextStorageRepository: VerifyContextStorageRepository) : GetListOfVerifyContextsUseCaseInterface { - override suspend fun getListOfVerifyContext(): List = supervisorScope { verifyContextStorageRepository.getAll() } -} - -internal interface GetListOfVerifyContextsUseCaseInterface { - suspend fun getListOfVerifyContext(): List -} diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/calls/GetVerifyContextUseCase.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/calls/GetVerifyContextUseCase.kt deleted file mode 100644 index f305ec7f3..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/calls/GetVerifyContextUseCase.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.walletconnect.auth.use_case.calls - -import com.walletconnect.android.internal.common.storage.verify.VerifyContextStorageRepository -import com.walletconnect.android.verify.model.VerifyContext -import kotlinx.coroutines.supervisorScope - -internal class GetVerifyContextUseCase(private val verifyContextStorageRepository: VerifyContextStorageRepository) : GetVerifyContextUseCaseInterface { - override suspend fun getVerifyContext(id: Long): VerifyContext? = supervisorScope { verifyContextStorageRepository.get(id) } -} - -internal interface GetVerifyContextUseCaseInterface { - suspend fun getVerifyContext(id: Long): VerifyContext? -} \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/calls/RespondAuthRequestUseCase.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/calls/RespondAuthRequestUseCase.kt deleted file mode 100644 index 6971da432..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/calls/RespondAuthRequestUseCase.kt +++ /dev/null @@ -1,122 +0,0 @@ -package com.walletconnect.auth.use_case.calls - -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.exception.Invalid -import com.walletconnect.android.internal.common.exception.InvalidExpiryException -import com.walletconnect.android.internal.common.model.EnvelopeType -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Participants -import com.walletconnect.android.internal.common.model.SymmetricKey -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.TransportType -import com.walletconnect.android.internal.common.model.WCRequest -import com.walletconnect.android.internal.common.model.params.CoreAuthParams -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.signing.cacao.Cacao -import com.walletconnect.android.internal.common.signing.cacao.CacaoType -import com.walletconnect.android.internal.common.signing.cacao.CacaoVerifier -import com.walletconnect.android.internal.common.signing.cacao.Issuer -import com.walletconnect.android.internal.common.storage.verify.VerifyContextStorageRepository -import com.walletconnect.android.internal.utils.CoreValidator.isExpired -import com.walletconnect.android.internal.utils.dayInSeconds -import com.walletconnect.android.pairing.handler.PairingControllerInterface -import com.walletconnect.auth.client.mapper.toCommon -import com.walletconnect.auth.common.exceptions.InvalidCacaoException -import com.walletconnect.auth.common.exceptions.MissingAuthRequestException -import com.walletconnect.auth.common.json_rpc.AuthParams -import com.walletconnect.auth.common.model.Respond -import com.walletconnect.auth.engine.mapper.toCacaoPayload -import com.walletconnect.auth.json_rpc.domain.GetPendingJsonRpcHistoryEntryByIdUseCase -import com.walletconnect.auth.json_rpc.model.JsonRpcMethod -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger -import kotlinx.coroutines.launch -import kotlinx.coroutines.supervisorScope - -internal class RespondAuthRequestUseCase( - private val jsonRpcInteractor: RelayJsonRpcInteractorInterface, - private val getPendingJsonRpcHistoryEntryByIdUseCase: GetPendingJsonRpcHistoryEntryByIdUseCase, - private val crypto: KeyManagementRepository, - private val cacaoVerifier: CacaoVerifier, - private val verifyContextStorageRepository: VerifyContextStorageRepository, - private val logger: Logger, - private val pairingController: PairingControllerInterface -) : RespondAuthRequestUseCaseInterface { - - override suspend fun respond(respond: Respond, onSuccess: () -> Unit, onFailure: (Throwable) -> Unit) = supervisorScope { - val jsonRpcHistoryEntry = getPendingJsonRpcHistoryEntryByIdUseCase(respond.id) - - if (jsonRpcHistoryEntry == null) { - logger.error(MissingAuthRequestException.message) - onFailure(MissingAuthRequestException) - return@supervisorScope - } - - val authParams: AuthParams.RequestParams = jsonRpcHistoryEntry.params - val response: JsonRpcResponse = handleResponse(respond, authParams) - - val receiverPublicKey = PublicKey(authParams.requester.publicKey) - val senderPublicKey: PublicKey = crypto.generateAndStoreX25519KeyPair() - val symmetricKey: SymmetricKey = crypto.generateSymmetricKeyFromKeyAgreement(senderPublicKey, receiverPublicKey) - val responseTopic: Topic = crypto.getTopicFromKey(receiverPublicKey) - - authParams.expiry?.let { expiry -> - if (checkExpiry(expiry, responseTopic, respond, authParams)) return@supervisorScope onFailure(InvalidExpiryException()) - } - - crypto.setKey(symmetricKey, responseTopic.value) - val irnParams = IrnParams(Tags.AUTH_REQUEST_RESPONSE, Ttl(dayInSeconds), false) - jsonRpcInteractor.publishJsonRpcResponse( - responseTopic, irnParams, response, envelopeType = EnvelopeType.ONE, participants = Participants(senderPublicKey, receiverPublicKey), - onSuccess = { - logger.log("Success Responded on topic: $responseTopic") - scope.launch { - supervisorScope { - verifyContextStorageRepository.delete(respond.id) - } - } - onSuccess() - }, - onFailure = { error -> - logger.error("Error Responded on topic: $responseTopic") - scope.launch { - supervisorScope { - verifyContextStorageRepository.delete(respond.id) - } - } - onFailure(error) - } - ) - } - - private fun checkExpiry(expiry: Expiry, responseTopic: Topic, respond: Respond, authParams: AuthParams.RequestParams): Boolean { - if (expiry.isExpired()) { - val irnParams = IrnParams(Tags.AUTH_REQUEST_RESPONSE, Ttl(dayInSeconds)) - val wcRequest = WCRequest(responseTopic, respond.id, JsonRpcMethod.WC_AUTH_REQUEST, authParams, transportType = TransportType.RELAY) - jsonRpcInteractor.respondWithError(wcRequest, Invalid.RequestExpired, irnParams) - return true - } - return false - } - - private fun handleResponse(respond: Respond, authParams: AuthParams.RequestParams) = when (respond) { - is Respond.Error -> JsonRpcResponse.JsonRpcError(respond.id, error = JsonRpcResponse.Error(respond.code, respond.message)) - is Respond.Result -> { - val issuer = Issuer(respond.iss) - val payload: Cacao.Payload = authParams.payloadParams.toCacaoPayload(issuer) - val cacao = Cacao(CacaoType.EIP4361.toHeader(), payload, respond.signature.toCommon()) - val responseParams = CoreAuthParams.ResponseParams(cacao.header, cacao.payload, cacao.signature) - if (!cacaoVerifier.verify(cacao)) throw InvalidCacaoException - JsonRpcResponse.JsonRpcResult(respond.id, result = responseParams) - } - } -} - -internal interface RespondAuthRequestUseCaseInterface { - suspend fun respond(respond: Respond, onSuccess: () -> Unit, onFailure: (Throwable) -> Unit) -} \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/calls/SendAuthRequestUseCase.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/calls/SendAuthRequestUseCase.kt deleted file mode 100644 index 0b9986e96..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/calls/SendAuthRequestUseCase.kt +++ /dev/null @@ -1,106 +0,0 @@ -package com.walletconnect.auth.use_case.calls - -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.exception.InvalidExpiryException -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.utils.CoreValidator -import com.walletconnect.android.internal.utils.dayInSeconds -import com.walletconnect.android.internal.utils.getParticipantTag -import com.walletconnect.auth.common.json_rpc.AuthParams -import com.walletconnect.auth.common.json_rpc.AuthRpc -import com.walletconnect.auth.common.model.PayloadParams -import com.walletconnect.auth.common.model.Requester -import com.walletconnect.auth.engine.pairingTopicToResponseTopicMap -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger -import kotlinx.coroutines.TimeoutCancellationException -import kotlinx.coroutines.cancel -import kotlinx.coroutines.flow.MutableSharedFlow -import kotlinx.coroutines.flow.SharedFlow -import kotlinx.coroutines.flow.asSharedFlow -import kotlinx.coroutines.flow.filter -import kotlinx.coroutines.launch -import kotlinx.coroutines.supervisorScope -import kotlinx.coroutines.withTimeout -import java.util.Date -import java.util.concurrent.TimeUnit - -internal class SendAuthRequestUseCase( - private val jsonRpcInteractor: RelayJsonRpcInteractorInterface, - private val crypto: KeyManagementRepository, - private val selfAppMetaData: AppMetaData, - private val logger: Logger -) : SendAuthRequestUseCaseInterface { - private val _events: MutableSharedFlow = MutableSharedFlow() - override val events: SharedFlow = _events.asSharedFlow() - - override suspend fun request(payloadParams: PayloadParams, expiry: Expiry?, topic: String, onSuccess: () -> Unit, onFailure: (Throwable) -> Unit) = supervisorScope { - val nowInSeconds = TimeUnit.SECONDS.convert(Date().time, TimeUnit.SECONDS) - if (!CoreValidator.isExpiryWithinBounds(expiry)) { - return@supervisorScope onFailure(InvalidExpiryException()) - } - - val responsePublicKey: PublicKey = crypto.generateAndStoreX25519KeyPair() - val responseTopic: Topic = crypto.getTopicFromKey(responsePublicKey) - val authParams: AuthParams.RequestParams = AuthParams.RequestParams(Requester(responsePublicKey.keyAsHex, selfAppMetaData), payloadParams, expiry) - val authRequest: AuthRpc.AuthRequest = AuthRpc.AuthRequest(params = authParams) - val irnParamsTtl = getIrnParamsTtl(expiry, nowInSeconds) - val irnParams = IrnParams(Tags.AUTH_REQUEST, irnParamsTtl, true) - val pairingTopic = Topic(topic) - val requestTtlInSeconds = expiry?.run { seconds - nowInSeconds } ?: dayInSeconds - crypto.setKey(responsePublicKey, responseTopic.getParticipantTag()) - - jsonRpcInteractor.publishJsonRpcRequest(pairingTopic, irnParams, authRequest, - onSuccess = { - try { - jsonRpcInteractor.subscribe(responseTopic) { error -> return@subscribe onFailure(error) } - } catch (e: Exception) { - return@publishJsonRpcRequest onFailure(e) - } - - pairingTopicToResponseTopicMap[pairingTopic] = responseTopic - onSuccess() - collectPeerResponse(requestTtlInSeconds, authRequest) - }, - onFailure = { error -> - logger.error("Failed to send a auth request: $error") - onFailure(error) - } - ) - } - - private fun getIrnParamsTtl(expiry: Expiry?, nowInSeconds: Long) = expiry?.run { - val defaultTtl = dayInSeconds - val extractedTtl = seconds - nowInSeconds - val newTtl = extractedTtl.takeIf { extractedTtl >= defaultTtl } ?: defaultTtl - Ttl(newTtl) - } ?: Ttl(dayInSeconds) - - private fun collectPeerResponse(requestTtlInSeconds: Long, authRequest: AuthRpc.AuthRequest) { - scope.launch { - try { - withTimeout(TimeUnit.SECONDS.toMillis(requestTtlInSeconds)) { - jsonRpcInteractor.peerResponse - .filter { response -> response.response.id == authRequest.id } - .collect { cancel() } - } - } catch (e: TimeoutCancellationException) { - _events.emit(SDKError(e)) - } - } - } -} - -internal interface SendAuthRequestUseCaseInterface { - val events: SharedFlow - suspend fun request(payloadParams: PayloadParams, expiry: Expiry? = null, topic: String, onSuccess: () -> Unit, onFailure: (Throwable) -> Unit) -} \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/requests/OnAuthRequestUseCase.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/requests/OnAuthRequestUseCase.kt deleted file mode 100644 index b1e076668..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/requests/OnAuthRequestUseCase.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.walletconnect.auth.use_case.requests - -import com.walletconnect.android.internal.common.exception.Invalid -import com.walletconnect.android.internal.common.exception.Uncategorized -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.WCRequest -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.utils.CoreValidator.isExpired -import com.walletconnect.android.internal.utils.dayInSeconds -import com.walletconnect.android.pairing.handler.PairingControllerInterface -import com.walletconnect.android.verify.domain.ResolveAttestationIdUseCase -import com.walletconnect.auth.common.json_rpc.AuthParams -import com.walletconnect.auth.common.model.Events -import com.walletconnect.foundation.common.model.Ttl -import kotlinx.coroutines.flow.MutableSharedFlow -import kotlinx.coroutines.flow.SharedFlow -import kotlinx.coroutines.flow.asSharedFlow -import kotlinx.coroutines.launch -import kotlinx.coroutines.supervisorScope - -internal class OnAuthRequestUseCase( - private val jsonRpcInteractor: RelayJsonRpcInteractorInterface, - private val resolveAttestationIdUseCase: ResolveAttestationIdUseCase, - private val pairingController: PairingControllerInterface, -) { - private val _events: MutableSharedFlow = MutableSharedFlow() - val events: SharedFlow = _events.asSharedFlow() - - suspend operator fun invoke(wcRequest: WCRequest, authParams: AuthParams.RequestParams) = supervisorScope { - val irnParams = IrnParams(Tags.AUTH_REQUEST_RESPONSE, Ttl(dayInSeconds)) - try { - authParams.expiry?.let { - if (it.isExpired()) { - jsonRpcInteractor.respondWithError(wcRequest, Invalid.RequestExpired, irnParams) - return@supervisorScope - } - } - - val url = authParams.requester.metadata.url - resolveAttestationIdUseCase(wcRequest, url) { verifyContext -> - scope.launch { _events.emit(Events.OnAuthRequest(wcRequest.id, wcRequest.topic.value, authParams.payloadParams, verifyContext)) } - } - } catch (e: Exception) { - jsonRpcInteractor.respondWithError(wcRequest, Uncategorized.GenericError("Cannot handle a auth request: ${e.message}, topic: ${wcRequest.topic}"), irnParams) - _events.emit(SDKError(e)) - } - } -} \ No newline at end of file diff --git a/protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/responses/OnAuthRequestResponseUseCase.kt b/protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/responses/OnAuthRequestResponseUseCase.kt deleted file mode 100644 index 456a43a24..000000000 --- a/protocol/auth/src/main/kotlin/com/walletconnect/auth/use_case/responses/OnAuthRequestResponseUseCase.kt +++ /dev/null @@ -1,56 +0,0 @@ -package com.walletconnect.auth.use_case.responses - -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.WCResponse -import com.walletconnect.android.internal.common.model.params.CoreAuthParams -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.signing.cacao.Cacao -import com.walletconnect.android.internal.common.signing.cacao.CacaoVerifier -import com.walletconnect.android.pairing.client.PairingInterface -import com.walletconnect.android.pairing.handler.PairingControllerInterface -import com.walletconnect.android.utils.toClient -import com.walletconnect.auth.common.exceptions.PeerError -import com.walletconnect.auth.common.json_rpc.AuthParams -import com.walletconnect.auth.common.model.AuthResponse -import com.walletconnect.auth.common.model.Events -import com.walletconnect.auth.engine.pairingTopicToResponseTopicMap -import kotlinx.coroutines.flow.MutableSharedFlow -import kotlinx.coroutines.flow.SharedFlow -import kotlinx.coroutines.flow.asSharedFlow -import kotlinx.coroutines.supervisorScope - -internal class OnAuthRequestResponseUseCase( - private val pairingInterface: PairingInterface, - private val pairingHandler: PairingControllerInterface, - private val cacaoVerifier: CacaoVerifier, -) { - private val _events: MutableSharedFlow = MutableSharedFlow() - val events: SharedFlow = _events.asSharedFlow() - - suspend operator fun invoke(wcResponse: WCResponse, requestParams: AuthParams.RequestParams) = supervisorScope { - try { - val pairingTopic = wcResponse.topic - if (!pairingInterface.getPairings().any { pairing -> pairing.topic == pairingTopic.value }) return@supervisorScope - pairingTopicToResponseTopicMap.remove(pairingTopic) - - when (val response = wcResponse.response) { - is JsonRpcResponse.JsonRpcError -> _events.emit(Events.OnAuthResponse(response.id, AuthResponse.Error(response.error.code, response.error.message))) - is JsonRpcResponse.JsonRpcResult -> { - pairingHandler.updateMetadata(Core.Params.UpdateMetadata(pairingTopic.value, requestParams.requester.metadata.toClient(), AppMetaDataType.PEER)) - val (header, payload, signature) = (response.result as CoreAuthParams.ResponseParams) - val cacao = Cacao(header, payload, signature) - if (cacaoVerifier.verify(cacao)) { - _events.emit(Events.OnAuthResponse(response.id, AuthResponse.Result(cacao))) - } else { - _events.emit(Events.OnAuthResponse(response.id, AuthResponse.Error(PeerError.SignatureVerificationFailed.code, PeerError.SignatureVerificationFailed.message))) - } - } - } - } catch (e: Exception) { - _events.emit(SDKError(e)) - } - } -} \ No newline at end of file diff --git a/protocol/auth/src/test/kotlin/com/walletconnect/auth/client/mapper/ClientMapperTest.kt b/protocol/auth/src/test/kotlin/com/walletconnect/auth/client/mapper/ClientMapperTest.kt deleted file mode 100644 index 82b865a48..000000000 --- a/protocol/auth/src/test/kotlin/com/walletconnect/auth/client/mapper/ClientMapperTest.kt +++ /dev/null @@ -1,85 +0,0 @@ -package com.walletconnect.auth.client.mapper - -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.signing.cacao.Cacao -import com.walletconnect.android.internal.common.signing.cacao.Cacao.Payload.Companion.ISO_8601_PATTERN -import com.walletconnect.android.internal.common.signing.cacao.Issuer -import com.walletconnect.auth.client.Auth -import com.walletconnect.auth.engine.mapper.toCacaoPayload -import junit.framework.TestCase.assertEquals -import junit.framework.TestCase.assertTrue -import org.junit.Test -import java.text.SimpleDateFormat -import java.time.Clock -import java.time.Duration -import java.time.Instant - -internal class ClientMapperTest { - private val iss = "did:pkh:eip155:1:0x15bca56b6e2728aec2532df9d436bd1600e86688" - private val dummyPairing = Core.Model.Pairing("", 0L, null, "", null, "", true, "") - - private fun Cacao.Payload.mockIatAsNbf(request: Auth.Params.Request): Cacao.Payload { - return this.copy(iat = request.nbf!!) - } - - private fun Auth.Params.Request.toCacaoPayload(iss: String): Cacao.Payload = this.toCommon().toCacaoPayload(Issuer(iss)) - - @Test - fun `Payload based on Request mapping with supplied issuer`() { - val request = Auth.Params.Request( - topic = dummyPairing.topic, - type = "eip191", - chainId = "eip155:1", - domain = "service.invalid", - aud = "https://service.invalid/login", - nonce = "32891756", - nbf = "2021-09-30T16:25:24Z", - exp = null, - statement = "I accept the ServiceOrg Terms of Service: https://service.invalid/tos", - requestId = null, - resources = listOf("ipfs://bafybeiemxf5abjwjbikoz4mc3a3dla6ual3jsgpdr4cjr3oz3evfyavhwq/", "https://example.com/my-web2-claim.json") - ) - - val payload = Cacao.Payload( - iss = iss, - domain = "service.invalid", - aud = "https://service.invalid/login", - version = "1", - nonce = "32891756", - iat = "2021-09-30T16:25:24Z", - nbf = "2021-09-30T16:25:24Z", - exp = null, - statement = "I accept the ServiceOrg Terms of Service: https://service.invalid/tos", - requestId = null, - resources = listOf("ipfs://bafybeiemxf5abjwjbikoz4mc3a3dla6ual3jsgpdr4cjr3oz3evfyavhwq/", "https://example.com/my-web2-claim.json") - ) - - assertEquals(payload, request.toCacaoPayload(iss).mockIatAsNbf(request)) - } - - @Test - fun `Payload based on Request generates issued at with current time`() { - val before = Instant.now(Clock.offset(Clock.systemDefaultZone(), Duration.ofSeconds(-2))) - - val payload = Auth.Params.Request( - topic = dummyPairing.topic, - type = "eip191", - chainId = "eip155:1", - domain = "service.invalid", - aud = "https://service.invalid/login", - nonce = "32891756", - nbf = "2021-09-30T16:25:24Z", - exp = null, - statement = "I accept the ServiceOrg Terms of Service: https://service.invalid/tos", - requestId = null, - resources = listOf("ipfs://bafybeiemxf5abjwjbikoz4mc3a3dla6ual3jsgpdr4cjr3oz3evfyavhwq/", "https://example.com/my-web2-claim.json") - ).toCacaoPayload(iss) - - val sd = SimpleDateFormat(ISO_8601_PATTERN).parse(payload.iat) - val iat = Instant.ofEpochMilli(sd!!.time) - val isAfter = Instant.now().isAfter(iat) - val isBefore = before.isBefore(iat) - assertTrue(isAfter) - assertTrue(isBefore) - } -} \ No newline at end of file diff --git a/protocol/chat/ReadMe.md b/protocol/chat/ReadMe.md deleted file mode 100644 index 332a652b9..000000000 --- a/protocol/chat/ReadMe.md +++ /dev/null @@ -1,45 +0,0 @@ -# **WalletConnect Chat - Kotlin** - -Kotlin implementation of WalletConnect v2 Chat protocol for Android applications. - -![Maven Central](https://img.shields.io/maven-central/v/com.walletconnect/chat) - -## Requirements - -* Android min SDK 23 -* Java 11 - -## Documentation and usage - -* [Installation guide](https://docs.walletconnect.com/2.0/kotlin/chat/installation) -* [Usage](https://docs.walletconnect.com/2.0/kotlin/chat/usage) -* [Protocol specification](https://docs.walletconnect.com/2.0/specs/chat/) - -  - -## Installation - -root/build.gradle.kts: - -```gradle -allprojects { - repositories { - mavenCentral() - maven { url "https://jitpack.io" } - } -} -``` - -app/build.gradle.kts - -```gradle -implementation(platform("com.walletconnect:android-bom:{BOM version}")) -implementation("com.walletconnect:android-core") -implementation("com.walletconnect:chat") -``` - -  - -## Sample apps - -* For sample app run `chat sample module` diff --git a/protocol/chat/build.gradle.kts b/protocol/chat/build.gradle.kts deleted file mode 100644 index 28565b9e8..000000000 --- a/protocol/chat/build.gradle.kts +++ /dev/null @@ -1,79 +0,0 @@ -plugins { - id(libs.plugins.android.library.get().pluginId) - id(libs.plugins.kotlin.android.get().pluginId) - alias(libs.plugins.sqlDelight) - alias(libs.plugins.google.ksp) - id("publish-module-android") - id("jacoco-report") -} - -project.apply { - extra[KEY_PUBLISH_ARTIFACT_ID] = CHAT - extra[KEY_PUBLISH_VERSION] = CHAT_VERSION - extra[KEY_SDK_NAME] = "Chat" -} - -android { - namespace = "com.walletconnect.chat" - compileSdk = COMPILE_SDK - - defaultConfig { - minSdk = MIN_SDK - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - isMinifyEnabled = true - proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "${rootDir.path}/gradle/proguard-rules/sdk-rules.pro") - } - } - lint { - abortOnError = true - ignoreWarnings = true - warningsAsErrors = false - } - - compileOptions { - sourceCompatibility = jvmVersion - targetCompatibility = jvmVersion - } - - kotlinOptions { - jvmTarget = jvmVersion.toString() - } - - testOptions.unitTests { - isIncludeAndroidResources = true - isReturnDefaultValues = true - } -} - -sqldelight { - databases { - create("ChatDatabase") { - packageName.set("com.walletconnect.chat") - schemaOutputDirectory.set(file("src/main/sqldelight/databases")) -// generateAsync.set(true) // TODO: Enable once all repository methods have been converted to suspend functions - verifyMigrations.set(true) - verifyDefinitions.set(true) - } - } -} - -dependencies { - debugImplementation(project(":core:android")) - releaseImplementation("com.walletconnect:android-core:$CORE_VERSION") - - implementation(libs.bundles.retrofit) - ksp(libs.moshi.ksp) - implementation(libs.bundles.sqlDelight) - - testImplementation(libs.bundles.androidxTest) - testImplementation(libs.robolectric) - testImplementation(libs.json) - testImplementation(libs.coroutines.test) - testImplementation(libs.bundles.scarlet.test) - testImplementation(libs.bundles.sqlDelight.test) -} \ No newline at end of file diff --git a/protocol/chat/proguard-rules.pro b/protocol/chat/proguard-rules.pro deleted file mode 100644 index 6dc836563..000000000 --- a/protocol/chat/proguard-rules.pro +++ /dev/null @@ -1 +0,0 @@ --keep public class com.walletconnect.chat.** { *; } \ No newline at end of file diff --git a/protocol/chat/src/debug/sqldelight/databases/1.db b/protocol/chat/src/debug/sqldelight/databases/1.db deleted file mode 100644 index fc7125d13b1932a407a6a7eff9a0a5aed7a39da8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 57344 zcmeI&(Qn#D9KdnYCWI15`ZOM*XeVtCi9%Y@Y42mis@x=mQZp?NljXvtu||N#W?G)A zw3YU{xBW?b-M`U4pih&?{mL9W0@DvkAg^wv+?DHABk_Q zhgP9reJ6xvS*z;3q2A^dZ?BjQwJgl6-?qAHJv#ioy7|efmOfgWk2e3TeAxJV(44@m2bs%LG7SA!GBnF- zt7|u1Te!{dk8EK|#ZFnMS1=Gx+qIwCUD4?}$Ib4kIJ8eiv*(^TZPoDDZo8s=qTaou zqq=T#k?h~OY1wN#&wKVlwP-vE`ogt;yrq5CSN=3QA73{6{qb}ZWmSj*b@a%;nEZRz zi{~~7eD`W1bz^hBs_ejzd|g)FeOxWpTH6IH7!BmF;p?IL!RV<2kM*`^e7uHP+qiC( z*J@i^g||OxU-$e{`hzfCtk3DDg?GoDQOi^fzVhz=da>5rx-IPV#Jxtk zQn@}~(@FL2D;;!t%+M@Lb77m(yT|P(eXf#9XG~`7lj+N0(02xM6a~@Mp}fkB?=rO#^6Fby7bipARAUg1*D!1M)s?gqUrnp=$HVx8 z7Xk<%fB*srAb009ILKmY**5I_I{1Q5^yJpU&V z5I_I{1Q0*~0R#|0009IL$iD#3|MTC+M2G+a2q1s}0tg_000IagfB^UZ`9C>;00IagfB*srAb - - - \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/cacao/CacaoSigner.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/cacao/CacaoSigner.kt deleted file mode 100644 index 09fbd2869..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/cacao/CacaoSigner.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.walletconnect.chat.cacao - -import com.walletconnect.android.utils.cacao.CacaoSignerInterface -import com.walletconnect.chat.client.Chat - -object CacaoSigner : CacaoSignerInterface diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/client/Chat.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/client/Chat.kt deleted file mode 100644 index d1447f951..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/client/Chat.kt +++ /dev/null @@ -1,141 +0,0 @@ -package com.walletconnect.chat.client - -import androidx.annotation.Keep -import com.walletconnect.android.CoreInterface -import com.walletconnect.android.cacao.SignatureInterface - -object Chat { - sealed interface Listeners { - fun onError(error: Model.Error) - - interface PublicKeyOnSuccess : Listeners { - fun onSuccess(publicKey: String) - } - - interface SignMessage : Listeners { - fun onSign(message: String): Model.Cacao.Signature? - } - - interface Resolve : PublicKeyOnSuccess - interface Register : PublicKeyOnSuccess, SignMessage - interface Unregister : PublicKeyOnSuccess - } - - sealed interface Type { - enum class InviteStatus : Type { PENDING, REJECTED, APPROVED } - - @JvmInline - value class AccountId(val value: String) : Type - - @JvmInline - value class InviteMessage(val value: String) : Type - - @JvmInline - value class MediaData(val value: String) : Type - - @JvmInline - value class ChatMessage(val value: String) : Type - } - - sealed class Model { - data class Error(val throwable: Throwable) : Model() - - data class ConnectionState(val isAvailable: Boolean) : Model() - - sealed interface Invite { - val id: Long - val inviterAccount: Type.AccountId - val inviteeAccount: Type.AccountId - val message: Type.InviteMessage - val inviterPublicKey: String - val status: Type.InviteStatus - - data class Received( - override val id: Long, - override val inviterAccount: Type.AccountId, - override val inviteeAccount: Type.AccountId, - override val message: Type.InviteMessage, - override val inviterPublicKey: String, - override val status: Type.InviteStatus, - ) : Invite - - data class Sent( - override val id: Long, - override val inviterAccount: Type.AccountId, - override val inviteeAccount: Type.AccountId, - override val message: Type.InviteMessage, - override val inviterPublicKey: String, - override val status: Type.InviteStatus, - ) : Invite - } - - data class Media( - val type: String, - val data: Type.MediaData, - ) : Model() - - data class Thread( - val topic: String, - val selfAccount: Type.AccountId, - val peerAccount: Type.AccountId, - ) : Model() - - data class Message( - val topic: String, - val message: Type.ChatMessage, - val authorAccount: Type.AccountId, - val timestamp: Long, - val media: Media?, - ) : Model() - - sealed class Events : Model() { - data class OnInvite(val invite: Invite.Received) : Events() - data class OnInviteAccepted(val topic: String, val invite: Invite.Sent) : Events() - data class OnInviteRejected(val invite: Invite.Sent) : Events() - data class OnMessage(val message: Message) : Events() - data class OnLeft(val topic: String) : Events() - } - - data class Cacao( - val header: Header, - val payload: Payload, - val signature: Signature, - ) : Model() { - @Keep - data class Signature(override val t: String, override val s: String, override val m: String? = null) : Model(), SignatureInterface - data class Header(val t: String) : Model() - data class Payload( - val iss: String, - val domain: String, - val aud: String, - val version: String, - val nonce: String, - val iat: String, - val nbf: String?, - val exp: String?, - val statement: String?, - val requestId: String?, - val resources: List?, - ) : Model() - } - } - - sealed class Params { - data class Init(val core: CoreInterface) : Params() - data class Resolve(val account: Type.AccountId) : Params() - data class Invite(val inviterAccount: Type.AccountId, val inviteeAccount: Type.AccountId, val message: Type.InviteMessage, val inviteePublicKey: String) : Params() - data class Accept(val inviteId: Long) : Params() - data class Reject(val inviteId: Long) : Params() - data class Message(val topic: String, val message: Type.ChatMessage, val media: Model.Media? = null) : Params() - data class Ping(val topic: String) : Params() - data class Leave(val topic: String) : Params() - data class GetReceivedInvites(val account: Type.AccountId) : Params() - data class GetSentInvites(val account: Type.AccountId) : Params() - data class GetThreads(val account: Type.AccountId) : Params() - data class GetMessages(val topic: String) : Params() - data class Register(val account: Type.AccountId, val private: Boolean = false) : Params() - data class Unregister(val account: Type.AccountId) : Params() - data class GoPrivate(val account: Type.AccountId) : Params() - data class GoPublic(val account: Type.AccountId) : Params() - } -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/client/ChatClient.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/client/ChatClient.kt deleted file mode 100644 index 09cf03136..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/client/ChatClient.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.walletconnect.chat.client - -object ChatClient: ChatInterface by ChatProtocol.instance { - interface ChatDelegate: ChatInterface.ChatDelegate -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/client/ChatInterface.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/client/ChatInterface.kt deleted file mode 100644 index 2b31a6189..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/client/ChatInterface.kt +++ /dev/null @@ -1,33 +0,0 @@ -package com.walletconnect.chat.client - -interface ChatInterface { - - interface ChatDelegate { - fun onInvite(onInvite: Chat.Model.Events.OnInvite) - fun onInviteAccepted(onInviteAccepted: Chat.Model.Events.OnInviteAccepted) - fun onInviteRejected(onInviteRejected: Chat.Model.Events.OnInviteRejected) - fun onMessage(onMessage: Chat.Model.Events.OnMessage) - fun onLeft(onLeft: Chat.Model.Events.OnLeft) - fun onConnectionStateChange(state: Chat.Model.ConnectionState) - fun onError(error: Chat.Model.Error) - } - - fun setChatDelegate(delegate: ChatDelegate) - - fun initialize(init: Chat.Params.Init, onError: (Chat.Model.Error) -> Unit) - fun register(register: Chat.Params.Register, listener: Chat.Listeners.Register) - fun unregister(unregister: Chat.Params.Unregister, listener: Chat.Listeners.Unregister) - fun resolve(resolve: Chat.Params.Resolve, listener: Chat.Listeners.Resolve) - fun goPrivate(goPrivate: Chat.Params.GoPrivate, onSuccess: () -> Unit, onError: (Chat.Model.Error) -> Unit) - fun goPublic(goPublic: Chat.Params.GoPublic, onSuccess: (String) -> Unit, onError: (Chat.Model.Error) -> Unit) - fun invite(invite: Chat.Params.Invite, onSuccess: (Long) -> Unit, onError: (Chat.Model.Error) -> Unit) - fun accept(accept: Chat.Params.Accept, onSuccess: (String) -> Unit, onError: (Chat.Model.Error) -> Unit) - fun reject(reject: Chat.Params.Reject, onSuccess: () -> Unit, onError: (Chat.Model.Error) -> Unit) - fun message(message: Chat.Params.Message, onSuccess: () -> Unit, onError: (Chat.Model.Error) -> Unit) - fun ping(ping: Chat.Params.Ping, onSuccess: (String) -> Unit, onError: (Chat.Model.Error) -> Unit) - fun leave(leave: Chat.Params.Leave, onError: (Chat.Model.Error) -> Unit) - fun getReceivedInvites(getReceivedInvites: Chat.Params.GetReceivedInvites): Map - fun getSentInvites(getSentInvites: Chat.Params.GetSentInvites): Map - fun getThreads(getThreads: Chat.Params.GetThreads): Map - fun getMessages(getMessages: Chat.Params.GetMessages): List -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/client/ChatProtocol.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/client/ChatProtocol.kt deleted file mode 100644 index 309dc2d6a..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/client/ChatProtocol.kt +++ /dev/null @@ -1,168 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.chat.client - -import com.walletconnect.android.internal.common.di.DatabaseConfig -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.model.ConnectionState -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.chat.client.mapper.toClient -import com.walletconnect.chat.client.mapper.toClientError -import com.walletconnect.chat.client.mapper.toCommon -import com.walletconnect.chat.common.model.Events -import com.walletconnect.chat.di.* -import com.walletconnect.chat.engine.domain.ChatEngine -import kotlinx.coroutines.launch -import org.koin.core.KoinApplication - -internal class ChatProtocol(private val koinApp: KoinApplication = wcKoinApp) : ChatInterface { - private lateinit var chatEngine: ChatEngine - - companion object { - val instance = ChatProtocol() - } - - @Throws(IllegalStateException::class) - override fun initialize(init: Chat.Params.Init, onError: (Chat.Model.Error) -> Unit) { - try { - koinApp.run { - modules( - jsonRpcModule(), - storageModule(koinApp.koin.get().CHAT_SDK_DB_NAME), - engineModule(), - ) - } - - chatEngine = koinApp.koin.get() - chatEngine.setup() - } catch (e: Exception) { - onError(Chat.Model.Error(e)) - } - } - - @Throws(IllegalStateException::class) - override fun setChatDelegate(delegate: ChatInterface.ChatDelegate): Unit = wrapWithEngineInitializationCheck() { - scope.launch { - chatEngine.events.collect { event -> - when (event) { - is Events.OnInvite -> delegate.onInvite(event.toClient()) - is Events.OnInviteAccepted -> delegate.onInviteAccepted(event.toClient()) - is Events.OnInviteRejected -> delegate.onInviteRejected(event.toClient()) - is Events.OnMessage -> delegate.onMessage(event.toClient()) - is Events.OnLeft -> delegate.onLeft(event.toClient()) - is ConnectionState -> delegate.onConnectionStateChange(event.toClient()) - is SDKError -> delegate.onError(event.toClientError()) - } - } - } - } - - @Throws(IllegalStateException::class) - override fun resolve(resolve: Chat.Params.Resolve, listener: Chat.Listeners.Resolve) = protocolFunction(listener::onError) { - chatEngine.resolveAccount( - AccountId(resolve.account.value), - { publicKey -> listener.onSuccess(publicKey) }, - { throwable -> listener.onError(Chat.Model.Error(throwable)) } - ) - } - - @Throws(IllegalStateException::class) - override fun goPrivate(goPrivate: Chat.Params.GoPrivate, onSuccess: () -> Unit, onError: (Chat.Model.Error) -> Unit) = protocolFunction(onError) { - chatEngine.goPrivate(goPrivate.account.toCommon(), { onSuccess() }, { error -> onError(Chat.Model.Error(error)) }) - } - - @Throws(IllegalStateException::class) - override fun goPublic(goPublic: Chat.Params.GoPublic, onSuccess: (String) -> Unit, onError: (Chat.Model.Error) -> Unit) = protocolFunction(onError) { - chatEngine.goPublic(goPublic.account.toCommon(), { inviteKey -> onSuccess(inviteKey) }, { error -> onError(Chat.Model.Error(error)) }) - } - - @Throws(IllegalStateException::class) - override fun invite(invite: Chat.Params.Invite, onSuccess: (Long) -> Unit, onError: (Chat.Model.Error) -> Unit) = protocolFunction(onError) { - scope.launch { chatEngine.invite(invite.toCommon(), { inviteId -> onSuccess(inviteId) }, { error -> onError(Chat.Model.Error(error)) }) } - } - - @Throws(IllegalStateException::class) - override fun accept(accept: Chat.Params.Accept, onSuccess: (String) -> Unit, onError: (Chat.Model.Error) -> Unit) = protocolFunction(onError) { - chatEngine.accept(accept.inviteId, { threadTopic -> onSuccess(threadTopic) }, { error -> onError(Chat.Model.Error(error)) }) - } - - @Throws(IllegalStateException::class) - override fun reject(reject: Chat.Params.Reject, onSuccess: () -> Unit, onError: (Chat.Model.Error) -> Unit) = protocolFunction(onError) { - chatEngine.reject(reject.inviteId, onSuccess) { error -> onError(Chat.Model.Error(error)) } - } - - @Throws(IllegalStateException::class) - override fun message(message: Chat.Params.Message, onSuccess: () -> Unit, onError: (Chat.Model.Error) -> Unit) = protocolFunction(onError) { - chatEngine.message(message.topic, message.toCommon(), onSuccess) { error -> onError(Chat.Model.Error(error)) } - } - - @Throws(IllegalStateException::class) - override fun ping(ping: Chat.Params.Ping, onSuccess: (String) -> Unit, onError: (Chat.Model.Error) -> Unit) = protocolFunction(onError) { - chatEngine.ping(ping.topic, onSuccess = { topic -> onSuccess(topic) }, { error -> onError(Chat.Model.Error(error)) }) - } - - @Throws(IllegalStateException::class) - override fun leave(leave: Chat.Params.Leave, onError: (Chat.Model.Error) -> Unit) = protocolFunction(onError) { - chatEngine.leave(leave.topic) { error -> onError(Chat.Model.Error(error)) } - } - - @Throws(IllegalStateException::class) - override fun getReceivedInvites(getReceivedInvites: Chat.Params.GetReceivedInvites): Map = wrapWithEngineInitializationCheck() { - chatEngine.getReceivedInvites(getReceivedInvites.account.value).mapValues { (_, invite) -> invite.toClient() } - } - - @Throws(IllegalStateException::class) - override fun getSentInvites(getSentInvites: Chat.Params.GetSentInvites): Map = wrapWithEngineInitializationCheck() { - chatEngine.getSentInvites(getSentInvites.account.value).mapValues { (_, invite) -> invite.toClient() } - } - - @Throws(IllegalStateException::class) - override fun getThreads(getThreads: Chat.Params.GetThreads): Map = wrapWithEngineInitializationCheck() { - chatEngine.getThreads(getThreads.account.value).mapValues { (_, thread) -> thread.toClient() } - } - - @Throws(IllegalStateException::class) - override fun getMessages(getMessages: Chat.Params.GetMessages): List = wrapWithEngineInitializationCheck() { - chatEngine.getMessages(getMessages.topic).map { message -> message.toClient() }.sortedBy { message -> message.timestamp } - } - - @Throws(IllegalStateException::class) - override fun register(register: Chat.Params.Register, listener: Chat.Listeners.Register) = protocolFunction(listener::onError) { - chatEngine.register( - register.account.toCommon(), - onSign = { message -> listener.onSign(message).toCommon() }, - { didKey -> listener.onSuccess(didKey) }, - { throwable -> listener.onError(Chat.Model.Error(throwable)) }, - register.private - ) - } - - @Throws(IllegalStateException::class) - override fun unregister(unregister: Chat.Params.Unregister, listener: Chat.Listeners.Unregister) = protocolFunction(listener::onError) { - chatEngine.unregister( - unregister.account.toCommon(), - { didKey -> listener.onSuccess(didKey) }, - { throwable -> listener.onError(Chat.Model.Error(throwable)) }, - ) - } - - - @Throws(IllegalStateException::class) - private fun wrapWithEngineInitializationCheck(block: () -> R): R { - check(::chatEngine.isInitialized) { - "ChatClient needs to be initialized first using the initialize function" - } - return block() - } - - private fun wrapWithRunCatching(onError: (Chat.Model.Error) -> Unit, block: () -> Unit) = runCatching(block).onFailure { error -> onError(Chat.Model.Error(error)) } - - @Throws(IllegalStateException::class) - private fun protocolFunction(onError: (Chat.Model.Error) -> Unit, block: () -> Unit) { - wrapWithEngineInitializationCheck() { - wrapWithRunCatching(onError) { block() } - } - } -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/client/mapper/ClientMapper.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/client/mapper/ClientMapper.kt deleted file mode 100644 index 4d27dd886..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/client/mapper/ClientMapper.kt +++ /dev/null @@ -1,103 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.chat.client.mapper - -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.model.ConnectionState -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.signing.cacao.Cacao -import com.walletconnect.chat.client.Chat -import com.walletconnect.chat.common.model.ChatMessage -import com.walletconnect.chat.common.model.Events -import com.walletconnect.chat.common.model.Invite -import com.walletconnect.chat.common.model.InviteMessage -import com.walletconnect.chat.common.model.InviteStatus -import com.walletconnect.chat.common.model.Media -import com.walletconnect.chat.common.model.MediaData -import com.walletconnect.chat.common.model.Message -import com.walletconnect.chat.common.model.SendInvite -import com.walletconnect.chat.common.model.SendMessage -import com.walletconnect.chat.common.model.Thread -import com.walletconnect.foundation.common.model.Topic - -@JvmSynthetic -internal fun Chat.Params.Invite.toCommon(): SendInvite = SendInvite(inviterAccount.toCommon(), inviteeAccount.toCommon(), message.toCommon(), inviteePublicKey) - -@JvmSynthetic -internal fun Chat.Params.Message.toCommon(): SendMessage = SendMessage(Topic(topic), message.toCommon(), media?.toCommon()) - -@JvmSynthetic -internal fun Chat.Model.Media.toCommon(): Media = Media(type, data.toCommon()) - -@JvmSynthetic -internal fun Events.OnInvite.toClient(): Chat.Model.Events.OnInvite = Chat.Model.Events.OnInvite(invite.toClient()) - - -@JvmSynthetic -internal fun Thread.toClient(): Chat.Model.Thread = Chat.Model.Thread(topic.value, selfAccount.toClient(), peerAccount.toClient()) - -@JvmSynthetic -internal fun InviteStatus.toClient(): Chat.Type.InviteStatus = when (this) { - InviteStatus.PENDING -> Chat.Type.InviteStatus.PENDING - InviteStatus.REJECTED -> Chat.Type.InviteStatus.REJECTED - InviteStatus.APPROVED -> Chat.Type.InviteStatus.APPROVED -} - -@JvmSynthetic -internal fun Invite.Received.toClient(): Chat.Model.Invite.Received = - Chat.Model.Invite.Received(id, inviterAccount.toClient(), inviteeAccount.toClient(), message.toClient(), inviterPublicKey.keyAsHex, status.toClient()) - -@JvmSynthetic -internal fun Invite.Sent.toClient(): Chat.Model.Invite.Sent = - Chat.Model.Invite.Sent(id, inviterAccount.toClient(), inviteeAccount.toClient(), message.toClient(), inviterPublicKey.keyAsHex, status.toClient()) - -@JvmSynthetic -internal fun AccountId.toClient(): Chat.Type.AccountId = Chat.Type.AccountId(value) - -@JvmSynthetic -internal fun ChatMessage.toClient(): Chat.Type.ChatMessage = Chat.Type.ChatMessage(value) - -@JvmSynthetic -internal fun InviteMessage.toClient(): Chat.Type.InviteMessage = Chat.Type.InviteMessage(value) - -@JvmSynthetic -internal fun MediaData.toClient(): Chat.Type.MediaData = Chat.Type.MediaData(value) - -@JvmSynthetic -internal fun Media.toClient(): Chat.Model.Media = Chat.Model.Media(type, data.toClient()) - -@JvmSynthetic -internal fun Events.OnInviteAccepted.toClient(): Chat.Model.Events.OnInviteAccepted = Chat.Model.Events.OnInviteAccepted(topic, invite.toClient()) - -@JvmSynthetic -internal fun Events.OnMessage.toClient(): Chat.Model.Events.OnMessage = Chat.Model.Events.OnMessage(message.toClient()) - -@JvmSynthetic -internal fun Events.OnLeft.toClient(): Chat.Model.Events.OnLeft = Chat.Model.Events.OnLeft(topic) - -@JvmSynthetic -internal fun Events.OnInviteRejected.toClient(): Chat.Model.Events.OnInviteRejected = Chat.Model.Events.OnInviteRejected(invite.toClient()) - -@JvmSynthetic -internal fun Message.toClient(): Chat.Model.Message = Chat.Model.Message(topic.value, message.toClient(), authorAccount.toClient(), timestamp, media?.toClient()) - -@JvmSynthetic -internal fun SDKError.toClientError(): Chat.Model.Error = Chat.Model.Error(this.exception) - -@JvmSynthetic -internal fun ConnectionState.toClient(): Chat.Model.ConnectionState = Chat.Model.ConnectionState(isAvailable) - -@JvmSynthetic -internal fun Chat.Model.Cacao.Signature?.toCommon(): Cacao.Signature? = this?.let { cacao -> Cacao.Signature(cacao.t, cacao.s, cacao.m) } - -@JvmSynthetic -internal fun Chat.Type.AccountId.toCommon(): AccountId = AccountId(value) - -@JvmSynthetic -internal fun Chat.Type.ChatMessage.toCommon(): ChatMessage = ChatMessage(value) - -@JvmSynthetic -internal fun Chat.Type.InviteMessage.toCommon(): InviteMessage = InviteMessage(value) - -@JvmSynthetic -internal fun Chat.Type.MediaData.toCommon(): MediaData = MediaData(value) \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/exceptions/ChatExceptions.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/exceptions/ChatExceptions.kt deleted file mode 100644 index 4d88f6083..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/exceptions/ChatExceptions.kt +++ /dev/null @@ -1,20 +0,0 @@ -package com.walletconnect.chat.common.exceptions - -import com.walletconnect.android.internal.common.exception.WalletConnectException -import com.walletconnect.chat.engine.domain.ChatValidator.MAX_LENGTH_CHAT_MESSAGE -import com.walletconnect.chat.engine.domain.ChatValidator.MAX_LENGTH_INVITE_MESSAGE -import com.walletconnect.chat.engine.domain.ChatValidator.MAX_LENGTH_MEDIA_DATA - -class InvalidAccountIdException(override val message: String?) : WalletConnectException(message) // todo: https://github.com/WalletConnect/WalletConnectKotlinV2/issues/768 -class InviteKeyNotFound(override val message: String?) : WalletConnectException(message) -object AccountsAlreadyHaveInviteException : WalletConnectException("Accounts already have invite") -object AccountsAlreadyHaveThreadException : WalletConnectException("Accounts already have thread") -class InviteMessageTooLongException : WalletConnectException("Invite message max length is $MAX_LENGTH_INVITE_MESSAGE") -class ChatMessageTooLongException : WalletConnectException("Chat message max length is $MAX_LENGTH_CHAT_MESSAGE") -class MediaDataTooLongException : WalletConnectException("Media data max length is $MAX_LENGTH_MEDIA_DATA") -object MissingInviteRequestException : WalletConnectException("Missing Invite Request") -class InvalidActClaims(act: String) : WalletConnectException("Invalid act claim. Must be equal to $act") -object InviteWasAlreadyRespondedTo : WalletConnectException("This invite request has already been responded to") -object InviteResponseWasAlreadyReceived : WalletConnectException("This invite response has already been received") -object ChatSyncStoresInitializationTimeoutException : WalletConnectException("Required Chat Stores initialization timeout") -object ReceivedInviteNotStored : WalletConnectException("Received Invite not stored") diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/exceptions/PeerError.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/exceptions/PeerError.kt deleted file mode 100644 index 24e56f941..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/exceptions/PeerError.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.walletconnect.chat.common.exceptions - -import com.walletconnect.android.internal.common.model.type.Error - -sealed class PeerError : Error { - - //TODO: Discuss error with team on later stage of development - data class UserRejectedInvitation(override val message: String) : PeerError() { - override val code: Int = 4001 - } -} diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/json_rpc/ChatParams.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/json_rpc/ChatParams.kt deleted file mode 100644 index 46c8ea360..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/json_rpc/ChatParams.kt +++ /dev/null @@ -1,26 +0,0 @@ -package com.walletconnect.chat.common.json_rpc - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass -import com.walletconnect.android.internal.common.model.type.ClientParams - -internal sealed class ChatParams : ClientParams { - - @JsonClass(generateAdapter = true) - internal data class InviteParams( - @Json(name = "inviteAuth") - val inviteAuth: String, - ) : ChatParams() - - @JsonClass(generateAdapter = true) - internal data class MessageParams( - @Json(name = "messageAuth") - val messageAuth: String, - ) : ChatParams() - - @Suppress("CanSealedSubClassBeObject") - internal class PingParams : ChatParams() - - @Suppress("CanSealedSubClassBeObject") - internal class LeaveParams : ChatParams() -} diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/json_rpc/ChatRpc.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/json_rpc/ChatRpc.kt deleted file mode 100644 index 57ae38eb2..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/json_rpc/ChatRpc.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.walletconnect.chat.common.json_rpc - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass -import com.walletconnect.android.internal.common.model.type.JsonRpcClientSync -import com.walletconnect.chat.json_rpc.JsonRpcMethod -import com.walletconnect.util.generateId - -internal sealed class ChatRpc : JsonRpcClientSync { - - @JsonClass(generateAdapter = true) - internal data class ChatInvite( - @Json(name = "id") - override val id: Long = generateId(), - @Json(name = "jsonrpc") - override val jsonrpc: String = "2.0", - @Json(name = "method") - override val method: String = JsonRpcMethod.WC_CHAT_INVITE, - @Json(name = "params") - override val params: ChatParams.InviteParams, - ) : ChatRpc() - - @JsonClass(generateAdapter = true) - internal data class ChatMessage( - @Json(name = "id") - override val id: Long = generateId(), - @Json(name = "jsonrpc") - override val jsonrpc: String = "2.0", - @Json(name = "method") - override val method: String = JsonRpcMethod.WC_CHAT_MESSAGE, - @Json(name = "params") - override val params: ChatParams.MessageParams, - ) : ChatRpc() - - @JsonClass(generateAdapter = true) - internal data class ChatPing( - @Json(name = "id") - override val id: Long = generateId(), - @Json(name = "jsonrpc") - override val jsonrpc: String = "2.0", - @Json(name = "method") - override val method: String = JsonRpcMethod.WC_CHAT_PING, - @Json(name = "params") - override val params: ChatParams.PingParams, - ) : ChatRpc() - - @JsonClass(generateAdapter = true) - internal data class ChatLeave( - @Json(name = "id") - override val id: Long = generateId(), - @Json(name = "jsonrpc") - override val jsonrpc: String = "2.0", - @Json(name = "method") - override val method: String = JsonRpcMethod.WC_CHAT_LEAVE, - @Json(name = "params") - override val params: ChatParams.LeaveParams, - ) : ChatRpc() -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Account.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Account.kt deleted file mode 100644 index 8201f8232..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Account.kt +++ /dev/null @@ -1,14 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.chat.common.model - -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic - -internal data class Account( - val accountId: AccountId, - val publicIdentityKey: PublicKey, - val publicInviteKey: PublicKey?, - val inviteTopic: Topic?, -) \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/ChatMessage.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/ChatMessage.kt deleted file mode 100644 index 0583d713b..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/ChatMessage.kt +++ /dev/null @@ -1,11 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.chat.common.model - -import com.walletconnect.chat.engine.domain.ChatValidator - - -@JvmInline -internal value class ChatMessage(val value: String) { - fun isValid(): Boolean = ChatValidator.isChatMessageValid(value) -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Contact.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Contact.kt deleted file mode 100644 index 4fd62863d..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Contact.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.walletconnect.chat.common.model - -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.foundation.common.model.PublicKey - -internal data class Contact( - val accountId: AccountId, - val publicKey: PublicKey, - val displayName: String -) diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Events.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Events.kt deleted file mode 100644 index 0a4d64103..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Events.kt +++ /dev/null @@ -1,13 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.chat.common.model - -import com.walletconnect.android.internal.common.model.type.EngineEvent - -internal sealed class Events : EngineEvent { - data class OnInvite(val invite: Invite.Received) : Events() - data class OnInviteAccepted(val topic: String, val invite: Invite.Sent) : Events() - data class OnInviteRejected(val invite: Invite.Sent) : Events() - data class OnMessage(val message: Message) : Events() - data class OnLeft(val topic: String) : Events() -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Invite.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Invite.kt deleted file mode 100644 index e23e93ac3..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Invite.kt +++ /dev/null @@ -1,48 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.chat.common.model - -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.model.SymmetricKey -import com.walletconnect.foundation.common.model.PrivateKey -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic - -internal sealed interface Invite { - val id: Long - val inviterAccount: AccountId - val inviteeAccount: AccountId - val message: InviteMessage - val inviterPublicKey: PublicKey - val status: InviteStatus - val acceptTopic: Topic - val symmetricKey: SymmetricKey - val inviterPrivateKey: PrivateKey? - val timestamp: Long - - data class Received( - override val id: Long, - override val inviterAccount: AccountId, - override val inviteeAccount: AccountId, - override val message: InviteMessage, - override val inviterPublicKey: PublicKey, - override val status: InviteStatus, - override val acceptTopic: Topic, - override val symmetricKey: SymmetricKey, - override val inviterPrivateKey: PrivateKey?, - override val timestamp: Long, - ) : Invite - - data class Sent( - override val id: Long, - override val inviterAccount: AccountId, - override val inviteeAccount: AccountId, - override val message: InviteMessage, - override val inviterPublicKey: PublicKey, - override val status: InviteStatus, - override val acceptTopic: Topic, - override val symmetricKey: SymmetricKey, - override val inviterPrivateKey: PrivateKey?, - override val timestamp: Long, - ) : Invite -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/InviteMessage.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/InviteMessage.kt deleted file mode 100644 index a9df0a47a..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/InviteMessage.kt +++ /dev/null @@ -1,10 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.chat.common.model - -import com.walletconnect.chat.engine.domain.ChatValidator - -@JvmInline -internal value class InviteMessage(val value: String) { - fun isValid(): Boolean = ChatValidator.isInviteMessageValid(value) -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/InviteStatus.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/InviteStatus.kt deleted file mode 100644 index a04d8102d..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/InviteStatus.kt +++ /dev/null @@ -1,4 +0,0 @@ -package com.walletconnect.chat.common.model - -// Used in Invites.sq -enum class InviteStatus { PENDING, REJECTED, APPROVED } \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/InviteType.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/InviteType.kt deleted file mode 100644 index 9a13ef3f1..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/InviteType.kt +++ /dev/null @@ -1,4 +0,0 @@ -package com.walletconnect.chat.common.model - -// Used in Invites.sq -enum class InviteType { SENT, RECEIVED } \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/JsonRpcHistoryEntry.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/JsonRpcHistoryEntry.kt deleted file mode 100644 index 5dc29af78..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/JsonRpcHistoryEntry.kt +++ /dev/null @@ -1,22 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.chat.common.model - -import com.walletconnect.chat.common.json_rpc.ChatParams -import com.walletconnect.foundation.common.model.Topic - -internal interface JsonRpcHistoryEntry { - val id: Long - val topic: Topic - val method: String - val response: String? - val params: ChatParams - - data class InviteRequest( - override val params: ChatParams.InviteParams, - override val id: Long, - override val topic: Topic, - override val method: String, - override val response: String?, - ) : JsonRpcHistoryEntry -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Media.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Media.kt deleted file mode 100644 index b648e896f..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Media.kt +++ /dev/null @@ -1,8 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.chat.common.model - -internal data class Media( - val type: String, - val data: MediaData, -) \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/MediaData.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/MediaData.kt deleted file mode 100644 index 91b810b3c..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/MediaData.kt +++ /dev/null @@ -1,10 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.chat.common.model - -import com.walletconnect.chat.engine.domain.ChatValidator - -@JvmInline -internal value class MediaData(val value: String) { - fun isValid(): Boolean = ChatValidator.isMediaDataValid(value) -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Message.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Message.kt deleted file mode 100644 index d2cac3c05..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Message.kt +++ /dev/null @@ -1,15 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.chat.common.model - -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.foundation.common.model.Topic - -internal data class Message( - val messageId: Long, - val topic: Topic, - val message: ChatMessage, - val authorAccount: AccountId, - val timestamp: Long, // We might need additional deliveryTimestamp for ordering - val media: Media?, -) \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/SendInvite.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/SendInvite.kt deleted file mode 100644 index 345181511..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/SendInvite.kt +++ /dev/null @@ -1,7 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.chat.common.model - -import com.walletconnect.android.internal.common.model.AccountId - -internal data class SendInvite(val inviterAccount: AccountId, val inviteeAccount: AccountId, val message: InviteMessage, val inviteePublicKey: String) \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/SendMessage.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/SendMessage.kt deleted file mode 100644 index baa774eb6..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/SendMessage.kt +++ /dev/null @@ -1,11 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.chat.common.model - -import com.walletconnect.foundation.common.model.Topic - -internal data class SendMessage( - val topic: Topic, - val message: ChatMessage, - val media: Media?, -) \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Thread.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Thread.kt deleted file mode 100644 index 3c9b62984..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/common/model/Thread.kt +++ /dev/null @@ -1,12 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.chat.common.model - -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.foundation.common.model.Topic - -internal data class Thread( - val topic: Topic, - val selfAccount: AccountId, - val peerAccount: AccountId, -) \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/di/ChatDITags.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/di/ChatDITags.kt deleted file mode 100644 index 355062c80..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/di/ChatDITags.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.walletconnect.chat.di - -enum class ChatDITags { - COLUMN_ADAPTER_INVITE_TYPE, - COLUMN_ADAPTER_INVITE_STATUS, -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/di/EngineModule.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/di/EngineModule.kt deleted file mode 100644 index 81e6494d1..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/di/EngineModule.kt +++ /dev/null @@ -1,174 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.chat.di - -import com.walletconnect.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.chat.engine.domain.ChatEngine -import com.walletconnect.chat.engine.use_case.SubscribeToChatTopicsUseCase -import com.walletconnect.chat.engine.use_case.calls.AcceptInviteUseCase -import com.walletconnect.chat.engine.use_case.calls.GetMessagesUseCase -import com.walletconnect.chat.engine.use_case.calls.GetReceivedInvitesUseCase -import com.walletconnect.chat.engine.use_case.calls.GetSentInvitesUseCase -import com.walletconnect.chat.engine.use_case.calls.GetThreadsUseCase -import com.walletconnect.chat.engine.use_case.calls.GoPrivateUseCase -import com.walletconnect.chat.engine.use_case.calls.GoPublicUseCase -import com.walletconnect.chat.engine.use_case.calls.LeaveThreadUseCase -import com.walletconnect.chat.engine.use_case.calls.RegisterIdentityUseCase -import com.walletconnect.chat.engine.use_case.calls.RejectInviteUseCase -import com.walletconnect.chat.engine.use_case.calls.ResolveAccountUseCase -import com.walletconnect.chat.engine.use_case.calls.SendInviteUseCase -import com.walletconnect.chat.engine.use_case.calls.SendMessageUseCase -import com.walletconnect.chat.engine.use_case.calls.SendPingUseCase -import com.walletconnect.chat.engine.use_case.calls.UnregisterIdentityUseCase -import com.walletconnect.chat.engine.use_case.requests.OnInviteRequestUseCase -import com.walletconnect.chat.engine.use_case.requests.OnLeaveRequestUseCase -import com.walletconnect.chat.engine.use_case.requests.OnMessageRequestUseCase -import com.walletconnect.chat.engine.use_case.responses.OnInviteResponseUseCase -import com.walletconnect.chat.engine.use_case.responses.OnLeaveResponseUseCase -import com.walletconnect.chat.engine.use_case.responses.OnMessageResponseUseCase -import com.walletconnect.chat.json_rpc.GetPendingJsonRpcHistoryEntryByIdUseCase -import org.koin.core.qualifier.named -import org.koin.dsl.module - -@JvmSynthetic -internal fun engineModule() = module { - single { GetPendingJsonRpcHistoryEntryByIdUseCase(get(), get()) } - - single { - AcceptInviteUseCase( - keyserverUrl = get(named(AndroidCommonDITags.KEYSERVER_URL)), - getPendingJsonRpcHistoryEntryByIdUseCase = get(), - logger = get(), - invitesRepository = get(), - keyManagementRepository = get(), - identitiesInteractor = get(), - jsonRpcInteractor = get(), - threadsRepository = get(), - ) - } - - single { - RejectInviteUseCase( - getPendingJsonRpcHistoryEntryByIdUseCase = get(), - logger = get(), - invitesRepository = get(), - keyManagementRepository = get(), - jsonRpcInteractor = get(), - ) - } - - single { - RegisterIdentityUseCase( - keyserverUrl = get(named(AndroidCommonDITags.KEYSERVER_URL)), - identitiesInteractor = get(), - accountsRepository = get(), - goPublicUseCase = get(), - ) - } - - single { - UnregisterIdentityUseCase( - keyserverUrl = get(named(AndroidCommonDITags.KEYSERVER_URL)), - identitiesInteractor = get(), - accountsRepository = get(), - keyManagementRepository = get(), - jsonRpcInteractor = get(), - ) - } - - single { - GoPublicUseCase( - keyserverUrl = get(named(AndroidCommonDITags.KEYSERVER_URL)), - identitiesInteractor = get(), - accountsRepository = get(), - keyManagementRepository = get(), - jsonRpcInteractor = get(), - registerInviteUseCase = get(), - ) - } - - single { - GoPrivateUseCase( - keyserverUrl = get(named(AndroidCommonDITags.KEYSERVER_URL)), - identitiesInteractor = get(), - accountsRepository = get(), - keyManagementRepository = get(), - jsonRpcInteractor = get(), - unregisterInviteUseCase = get(), - ) - } - - single { - SendInviteUseCase( - keyserverUrl = get(named(AndroidCommonDITags.KEYSERVER_URL)), - logger = get(), - invitesRepository = get(), - keyManagementRepository = get(), - identitiesInteractor = get(), - jsonRpcInteractor = get(), - contactRepository = get(), - threadsRepository = get() - ) - } - - single { - SendMessageUseCase( - keyserverUrl = get(named(AndroidCommonDITags.KEYSERVER_URL)), - logger = get(), - identitiesInteractor = get(), - jsonRpcInteractor = get(), - threadsRepository = get(), - messageRepository = get() - ) - } - - single { LeaveThreadUseCase(logger = get(), jsonRpcInteractor = get(), threadsRepository = get()) } - single { ResolveAccountUseCase(resolveInviteUseCase = get()) } - single { GetThreadsUseCase(get()) } - single { GetMessagesUseCase(get()) } - single { GetSentInvitesUseCase(get()) } - single { GetReceivedInvitesUseCase(get()) } - single { SendPingUseCase(logger = get(), jsonRpcInteractor = get()) } - single { OnMessageResponseUseCase(logger = get()) } - single { OnLeaveResponseUseCase(logger = get()) } - single { OnInviteRequestUseCase(logger = get(), identitiesInteractor = get(), accountsRepository = get(), invitesRepository = get(), keyManagementRepository = get(), threadsRepository = get()) } - single { OnMessageRequestUseCase(logger = get(), identitiesInteractor = get(), messageRepository = get(), keyserverUrl = get(named(AndroidCommonDITags.KEYSERVER_URL)), jsonRpcInteractor = get()) } - single { OnLeaveRequestUseCase( jsonRpcInteractor = get(), threadsRepository = get()) } - - single { - OnInviteResponseUseCase( - logger = get(), invitesRepository = get(), keyManagementRepository = get(), identitiesInteractor = get(), threadsRepository = get(), jsonRpcInteractor = get(), - ) - } - - single { SubscribeToChatTopicsUseCase(logger = get(), invitesRepository = get(), accountsRepository = get(), threadsRepository = get(), jsonRpcInteractor = get()) } - - single { - ChatEngine( - jsonRpcInteractor = get(), - pairingHandler = get(), - acceptInviteUseCase = get(), - rejectInviteUseCase = get(), - goPublicUseCase = get(), - goPrivateUseCase = get(), - registerIdentityUseCase = get(), - onInviteRequestUseCase = get(), - onMessageRequestUseCase = get(), - sendInviteUseCase = get(), - sendMessageUseCase = get(), - unregisterIdentityUseCase = get(), - resolveAccountUseCase = get(), - leaveThreadUseCase = get(), - sendPingUseCase = get(), - onInviteResponseUseCase = get(), - getThreadsUseCase = get(), - getMessagesUseCase = get(), - getReceivedInvitesUseCase = get(), - getSentInvitesUseCase = get(), - onLeaveRequestUseCase = get(), - onLeaveResponseUseCase = get(), - onMessageResponseUseCase = get(), - subscribeToChatTopicsUseCase = get(), - ) - } -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/di/JsonRpcModule.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/di/JsonRpcModule.kt deleted file mode 100644 index b8cb1991a..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/di/JsonRpcModule.kt +++ /dev/null @@ -1,22 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.chat.di - -import com.walletconnect.chat.common.json_rpc.ChatRpc -import com.walletconnect.chat.json_rpc.JsonRpcMethod -import com.walletconnect.utils.addDeserializerEntry -import com.walletconnect.utils.addSerializerEntry -import org.koin.dsl.module - -@JvmSynthetic -internal fun jsonRpcModule() = module { - addSerializerEntry(ChatRpc.ChatMessage::class) - addSerializerEntry(ChatRpc.ChatInvite::class) - addSerializerEntry(ChatRpc.ChatLeave::class) - addSerializerEntry(ChatRpc.ChatPing::class) - - addDeserializerEntry(JsonRpcMethod.WC_CHAT_MESSAGE, ChatRpc.ChatMessage::class) - addDeserializerEntry(JsonRpcMethod.WC_CHAT_INVITE, ChatRpc.ChatInvite::class) - addDeserializerEntry(JsonRpcMethod.WC_CHAT_LEAVE, ChatRpc.ChatLeave::class) - addDeserializerEntry(JsonRpcMethod.WC_CHAT_PING, ChatRpc.ChatPing::class) -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/di/StorageModule.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/di/StorageModule.kt deleted file mode 100644 index 1ac141617..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/di/StorageModule.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.walletconnect.chat.di - -import app.cash.sqldelight.ColumnAdapter -import app.cash.sqldelight.EnumColumnAdapter -import com.walletconnect.android.di.sdkBaseStorageModule -import com.walletconnect.android.internal.common.di.deleteDatabase -import com.walletconnect.chat.ChatDatabase -import com.walletconnect.chat.common.model.InviteStatus -import com.walletconnect.chat.common.model.InviteType -import com.walletconnect.chat.storage.* -import com.walletconnect.chat.storage.data.dao.Invites -import org.koin.core.qualifier.named -import org.koin.core.scope.Scope -import org.koin.dsl.module - -@JvmSynthetic -internal fun storageModule(dbName: String) = module { - @Suppress("RemoveExplicitTypeArguments") - fun Scope.createChatDB(): ChatDatabase = ChatDatabase( - driver = get(named(dbName)), - InvitesAdapter = Invites.Adapter( - statusAdapter = get>(named(ChatDITags.COLUMN_ADAPTER_INVITE_STATUS)), - typeAdapter = get>(named(ChatDITags.COLUMN_ADAPTER_INVITE_TYPE)), - ) - ) - - includes(sdkBaseStorageModule(ChatDatabase.Schema, dbName)) - - single { - try { - createChatDB().also { - it.contactsQueries.doesContactNotExists("").executeAsOneOrNull() - } - } catch (e: Exception) { - deleteDatabase(dbName) - createChatDB() - } - } - - single>(named(ChatDITags.COLUMN_ADAPTER_INVITE_STATUS)) { EnumColumnAdapter() } - single>(named(ChatDITags.COLUMN_ADAPTER_INVITE_TYPE)) { EnumColumnAdapter() } - - single { get().contactsQueries } - single { get().threadsQueries } - single { get().invitesQueries } - single { get().messagesQueries } - single { get().accountsQueries } - - single { ContactStorageRepository(get()) } - single { ThreadsStorageRepository(get()) } - single { InvitesStorageRepository(get()) } - single { MessageStorageRepository(get()) } - single { AccountsStorageRepository(get()) } -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/domain/ChatEngine.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/domain/ChatEngine.kt deleted file mode 100644 index dd770cb99..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/domain/ChatEngine.kt +++ /dev/null @@ -1,166 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.chat.engine.domain - -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.params.ChatNotifyResponseAuthParams -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.utils.thirtySeconds -import com.walletconnect.android.pairing.handler.PairingControllerInterface -import com.walletconnect.android.relay.WSSConnectionState -import com.walletconnect.chat.common.json_rpc.ChatParams -import com.walletconnect.chat.engine.use_case.SubscribeToChatTopicsUseCase -import com.walletconnect.chat.engine.use_case.calls.AcceptInviteUseCase -import com.walletconnect.chat.engine.use_case.calls.AcceptInviteUseCaseInterface -import com.walletconnect.chat.engine.use_case.calls.GetMessagesUseCase -import com.walletconnect.chat.engine.use_case.calls.GetMessagesUseCaseInterface -import com.walletconnect.chat.engine.use_case.calls.GetReceivedInvitesUseCase -import com.walletconnect.chat.engine.use_case.calls.GetReceivedInvitesUseCaseInterface -import com.walletconnect.chat.engine.use_case.calls.GetSentInvitesUseCase -import com.walletconnect.chat.engine.use_case.calls.GetSentInvitesUseCaseInterface -import com.walletconnect.chat.engine.use_case.calls.GetThreadsUseCase -import com.walletconnect.chat.engine.use_case.calls.GetThreadsUseCaseInterface -import com.walletconnect.chat.engine.use_case.calls.GoPrivateUseCase -import com.walletconnect.chat.engine.use_case.calls.GoPrivateUseCaseInterface -import com.walletconnect.chat.engine.use_case.calls.GoPublicUseCase -import com.walletconnect.chat.engine.use_case.calls.GoPublicUseCaseInterface -import com.walletconnect.chat.engine.use_case.calls.LeaveThreadUseCase -import com.walletconnect.chat.engine.use_case.calls.LeaveThreadUseCaseInterface -import com.walletconnect.chat.engine.use_case.calls.RegisterIdentityUseCase -import com.walletconnect.chat.engine.use_case.calls.RegisterIdentityUseCaseInterface -import com.walletconnect.chat.engine.use_case.calls.RejectInviteUseCase -import com.walletconnect.chat.engine.use_case.calls.RejectInviteUseCaseInterface -import com.walletconnect.chat.engine.use_case.calls.ResolveAccountUseCase -import com.walletconnect.chat.engine.use_case.calls.ResolveAccountUseCaseInterface -import com.walletconnect.chat.engine.use_case.calls.SendInviteUseCase -import com.walletconnect.chat.engine.use_case.calls.SendInviteUseCaseInterface -import com.walletconnect.chat.engine.use_case.calls.SendMessageUseCase -import com.walletconnect.chat.engine.use_case.calls.SendMessageUseCaseInterface -import com.walletconnect.chat.engine.use_case.calls.SendPingUseCase -import com.walletconnect.chat.engine.use_case.calls.SendPingUseCaseInterface -import com.walletconnect.chat.engine.use_case.calls.UnregisterIdentityUseCase -import com.walletconnect.chat.engine.use_case.calls.UnregisterIdentityUseCaseInterface -import com.walletconnect.chat.engine.use_case.requests.OnInviteRequestUseCase -import com.walletconnect.chat.engine.use_case.requests.OnLeaveRequestUseCase -import com.walletconnect.chat.engine.use_case.requests.OnMessageRequestUseCase -import com.walletconnect.chat.engine.use_case.responses.OnInviteResponseUseCase -import com.walletconnect.chat.engine.use_case.responses.OnLeaveResponseUseCase -import com.walletconnect.chat.engine.use_case.responses.OnMessageResponseUseCase -import com.walletconnect.chat.json_rpc.JsonRpcMethod -import com.walletconnect.foundation.common.model.Ttl -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.Job -import kotlinx.coroutines.coroutineScope -import kotlinx.coroutines.flow.MutableSharedFlow -import kotlinx.coroutines.flow.SharedFlow -import kotlinx.coroutines.flow.asSharedFlow -import kotlinx.coroutines.flow.filter -import kotlinx.coroutines.flow.filterIsInstance -import kotlinx.coroutines.flow.launchIn -import kotlinx.coroutines.flow.merge -import kotlinx.coroutines.flow.onEach -import kotlinx.coroutines.launch - -internal class ChatEngine( - private val jsonRpcInteractor: RelayJsonRpcInteractorInterface, - private val pairingHandler: PairingControllerInterface, - private val subscribeToChatTopicsUseCase: SubscribeToChatTopicsUseCase, - private val acceptInviteUseCase: AcceptInviteUseCase, - private val rejectInviteUseCase: RejectInviteUseCase, - private val goPublicUseCase: GoPublicUseCase, - private val goPrivateUseCase: GoPrivateUseCase, - private val registerIdentityUseCase: RegisterIdentityUseCase, - private val onInviteRequestUseCase: OnInviteRequestUseCase, - private val onMessageRequestUseCase: OnMessageRequestUseCase, - private val onLeaveRequestUseCase: OnLeaveRequestUseCase, - private val onInviteResponseUseCase: OnInviteResponseUseCase, - private val onMessageResponseUseCase: OnMessageResponseUseCase, - private val onLeaveResponseUseCase: OnLeaveResponseUseCase, - private val sendInviteUseCase: SendInviteUseCase, - private val sendMessageUseCase: SendMessageUseCase, - private val unregisterIdentityUseCase: UnregisterIdentityUseCase, - private val resolveAccountUseCase: ResolveAccountUseCase, - private val leaveThreadUseCase: LeaveThreadUseCase, - private val sendPingUseCase: SendPingUseCase, - private val getThreadsUseCase: GetThreadsUseCase, - private val getMessagesUseCase: GetMessagesUseCase, - private val getSentInvitesUseCase: GetSentInvitesUseCase, - private val getReceivedInvitesUseCase: GetReceivedInvitesUseCase, -) : AcceptInviteUseCaseInterface by acceptInviteUseCase, - RejectInviteUseCaseInterface by rejectInviteUseCase, - RegisterIdentityUseCaseInterface by registerIdentityUseCase, - GoPublicUseCaseInterface by goPublicUseCase, - GoPrivateUseCaseInterface by goPrivateUseCase, - GetThreadsUseCaseInterface by getThreadsUseCase, - GetMessagesUseCaseInterface by getMessagesUseCase, - GetSentInvitesUseCaseInterface by getSentInvitesUseCase, - GetReceivedInvitesUseCaseInterface by getReceivedInvitesUseCase, - UnregisterIdentityUseCaseInterface by unregisterIdentityUseCase, - ResolveAccountUseCaseInterface by resolveAccountUseCase, - LeaveThreadUseCaseInterface by leaveThreadUseCase, - SendPingUseCaseInterface by sendPingUseCase, - SendMessageUseCaseInterface by sendMessageUseCase, - SendInviteUseCaseInterface by sendInviteUseCase { - - private var jsonRpcRequestsJob: Job? = null - private var jsonRpcResponsesJob: Job? = null - private var internalErrorsJob: Job? = null - private var chatEventsJob: Job? = null - - private val _events: MutableSharedFlow = MutableSharedFlow() - val events: SharedFlow = _events.asSharedFlow() - - // Remove after pairing refactor - init { - pairingHandler.register( - JsonRpcMethod.WC_CHAT_INVITE, - JsonRpcMethod.WC_CHAT_MESSAGE, - JsonRpcMethod.WC_CHAT_LEAVE, - JsonRpcMethod.WC_CHAT_PING - ) - } - - fun setup() { - jsonRpcInteractor.wssConnectionState - .filterIsInstance() - .onEach { - coroutineScope { launch(Dispatchers.IO) { subscribeToChatTopicsUseCase() } } - - if (jsonRpcRequestsJob == null) jsonRpcRequestsJob = collectJsonRpcRequests() - if (jsonRpcResponsesJob == null) jsonRpcResponsesJob = collectPeerResponses() - if (internalErrorsJob == null) internalErrorsJob = collectInternalErrors() - if (chatEventsJob == null) chatEventsJob = collectChatEvents() - }.launchIn(scope) - } - - private fun collectJsonRpcRequests(): Job = jsonRpcInteractor.clientSyncJsonRpc - .filter { request -> request.params is ChatParams } - .onEach { request -> - when (val params = request.params) { - is ChatParams.InviteParams -> onInviteRequestUseCase(request, params) - is ChatParams.MessageParams -> onMessageRequestUseCase(request, params) - is ChatParams.LeaveParams -> onLeaveRequestUseCase(request) - is ChatParams.PingParams -> jsonRpcInteractor.respondWithSuccess(request, IrnParams(Tags.SESSION_PING_RESPONSE, Ttl(thirtySeconds))) - } - }.launchIn(scope) - - private fun collectPeerResponses(): Job = jsonRpcInteractor.peerResponse - .onEach { response -> - when (response.params) { - is ChatParams.InviteParams, is ChatNotifyResponseAuthParams.ResponseAuth -> onInviteResponseUseCase(response) - is ChatParams.MessageParams -> onMessageResponseUseCase(response) - is ChatParams.LeaveParams -> onLeaveResponseUseCase(response) - } - }.launchIn(scope) - - private fun collectInternalErrors(): Job = merge(jsonRpcInteractor.internalErrors, pairingHandler.findWrongMethodsFlow, subscribeToChatTopicsUseCase.errors) - .onEach { exception -> _events.emit(exception) } - .launchIn(scope) - - private fun collectChatEvents(): Job = merge(onInviteRequestUseCase.events, onMessageRequestUseCase.events, onLeaveRequestUseCase.events, onInviteResponseUseCase.events) - .onEach { event -> _events.emit(event) } - .launchIn(scope) -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/domain/ChatValidator.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/domain/ChatValidator.kt deleted file mode 100644 index 59adf1b15..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/domain/ChatValidator.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.walletconnect.chat.engine.domain - - -internal object ChatValidator { - fun isInviteMessageValid(value : String) : Boolean = value.length <= MAX_LENGTH_INVITE_MESSAGE - fun isChatMessageValid(value : String) : Boolean = value.length <= MAX_LENGTH_CHAT_MESSAGE - fun isMediaDataValid(value : String?) : Boolean = (value?.length ?: 0) <= MAX_LENGTH_MEDIA_DATA - - internal const val MAX_LENGTH_INVITE_MESSAGE = 200 - internal const val MAX_LENGTH_CHAT_MESSAGE = 1000 - internal const val MAX_LENGTH_MEDIA_DATA = 500 -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/SubscribeToChatTopicsUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/SubscribeToChatTopicsUseCase.kt deleted file mode 100644 index 0ae016c72..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/SubscribeToChatTopicsUseCase.kt +++ /dev/null @@ -1,46 +0,0 @@ -package com.walletconnect.chat.engine.use_case - -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.chat.storage.AccountsStorageRepository -import com.walletconnect.chat.storage.InvitesStorageRepository -import com.walletconnect.chat.storage.ThreadsStorageRepository -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.util.Logger -import kotlinx.coroutines.flow.MutableSharedFlow -import kotlinx.coroutines.flow.SharedFlow -import kotlinx.coroutines.flow.asSharedFlow -import kotlinx.coroutines.launch - -internal class SubscribeToChatTopicsUseCase( - private val logger: Logger, - private val invitesRepository: InvitesStorageRepository, - private val accountsRepository: AccountsStorageRepository, - private val threadsRepository: ThreadsStorageRepository, - private val jsonRpcInteractor: RelayJsonRpcInteractorInterface, -) { - private val _errors: MutableSharedFlow = MutableSharedFlow() - val errors: SharedFlow = _errors.asSharedFlow() - - suspend operator fun invoke() { - trySubscribeToInviteTopics() - trySubscribeToPendingAcceptTopics() - trySubscribeToThreadTopics() - } - - private suspend fun trySubscribeToInviteTopics() = accountsRepository.getAllInviteTopics() - .trySubscribeToTopics("invite") { error -> scope.launch { _errors.emit(SDKError(error)) } } - - private suspend fun trySubscribeToThreadTopics() = threadsRepository.getAllThreads() - .map { it.topic } - .trySubscribeToTopics("thread messages") { error -> scope.launch { _errors.emit(SDKError(error)) } } - - private suspend fun trySubscribeToPendingAcceptTopics() = invitesRepository.getAllPendingSentInvites() - .map { it.acceptTopic } - .trySubscribeToTopics(topicDescription = "invite response") { error -> scope.launch { _errors.emit(SDKError(error)) } } - - private fun List.trySubscribeToTopics(topicDescription: String, onError: (Throwable) -> Unit) = runCatching { - jsonRpcInteractor.batchSubscribe(this.map { it.value }, onFailure = { error -> onError(error) }, onSuccess = { topics -> logger.log("Listening for $topicDescription on: $topics") }) - }.onFailure { error -> onError(error) } -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/AcceptInviteUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/AcceptInviteUseCase.kt deleted file mode 100644 index 2eb603f72..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/AcceptInviteUseCase.kt +++ /dev/null @@ -1,96 +0,0 @@ -package com.walletconnect.chat.engine.use_case.calls - -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase -import com.walletconnect.android.internal.common.jwt.did.encodeDidJwt -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.params.ChatNotifyResponseAuthParams -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.utils.getInviteTag -import com.walletconnect.android.internal.utils.monthInSeconds -import com.walletconnect.android.keyserver.domain.IdentitiesInteractor -import com.walletconnect.chat.common.exceptions.InviteWasAlreadyRespondedTo -import com.walletconnect.chat.common.exceptions.MissingInviteRequestException -import com.walletconnect.chat.common.model.InviteStatus -import com.walletconnect.chat.json_rpc.GetPendingJsonRpcHistoryEntryByIdUseCase -import com.walletconnect.chat.jwt.use_case.EncodeInviteApprovalDidJwtPayloadUseCase -import com.walletconnect.chat.storage.InvitesStorageRepository -import com.walletconnect.chat.storage.ThreadsStorageRepository -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger -import kotlinx.coroutines.launch - - -internal class AcceptInviteUseCase( - private val keyserverUrl: String, - private val getPendingJsonRpcHistoryEntryByIdUseCase: GetPendingJsonRpcHistoryEntryByIdUseCase, - private val logger: Logger, - private val invitesRepository: InvitesStorageRepository, - private val keyManagementRepository: KeyManagementRepository, - private val identitiesInteractor: IdentitiesInteractor, - private val jsonRpcInteractor: RelayJsonRpcInteractorInterface, - private val threadsRepository: ThreadsStorageRepository, -) : AcceptInviteUseCaseInterface { - - override fun accept(inviteId: Long, onSuccess: (String) -> Unit, onError: (Throwable) -> Unit) { - scope.launch { - try { - val jsonRpcHistoryEntry = getPendingJsonRpcHistoryEntryByIdUseCase(inviteId) - - if (jsonRpcHistoryEntry == null) { - logger.error(MissingInviteRequestException) - return@launch onError(MissingInviteRequestException) - } - - val invite = invitesRepository.getReceivedInviteByInviteId(inviteId) - if (invite.status == InviteStatus.APPROVED || invite.status == InviteStatus.REJECTED) { - logger.error(InviteWasAlreadyRespondedTo) - return@launch onError(InviteWasAlreadyRespondedTo) - } - - val inviterPublicKey = invite.inviterPublicKey - val inviteeAccountId = invite.inviteeAccount - val inviterAccountId = invite.inviterAccount - - val inviteePublicKey = keyManagementRepository.getPublicKey(inviteeAccountId.getInviteTag()) - val symmetricKey = keyManagementRepository.generateSymmetricKeyFromKeyAgreement(inviteePublicKey, inviterPublicKey) - val acceptTopic = keyManagementRepository.getTopicFromKey(symmetricKey) - keyManagementRepository.setKey(symmetricKey, acceptTopic.value) - - val publicKey = keyManagementRepository.generateAndStoreX25519KeyPair() - val (identityPublicKey, identityPrivateKey) = identitiesInteractor.getIdentityKeyPair(inviteeAccountId) - - val didJwt = encodeDidJwt( - identityPrivateKey, - EncodeInviteApprovalDidJwtPayloadUseCase(publicKey, inviterAccountId), - EncodeDidJwtPayloadUseCase.Params(identityPublicKey, keyserverUrl) - ).getOrElse { error -> return@launch onError(error) } - - val acceptanceParams = ChatNotifyResponseAuthParams.ResponseAuth(responseAuth = didJwt.value) - val responseParams = JsonRpcResponse.JsonRpcResult(jsonRpcHistoryEntry.id, result = acceptanceParams) - val irnParams = IrnParams(Tags.CHAT_INVITE_RESPONSE, Ttl(monthInSeconds)) - jsonRpcInteractor.publishJsonRpcResponse(acceptTopic, irnParams, responseParams, {}, { error -> return@publishJsonRpcResponse onError(error) }) - - val threadSymmetricKey = keyManagementRepository.generateSymmetricKeyFromKeyAgreement(publicKey, inviterPublicKey) - val threadTopic = keyManagementRepository.getTopicFromKey(threadSymmetricKey) - keyManagementRepository.setKey(threadSymmetricKey, threadTopic.value) - - threadsRepository.insertThread(threadTopic.value, selfAccount = inviteeAccountId.value, peerAccount = inviterAccountId.value) - invitesRepository.updateStatusByInviteId(inviteId, InviteStatus.APPROVED) - - jsonRpcInteractor.subscribe(threadTopic) { error -> return@subscribe onError(error) } - onSuccess(threadTopic.value) - - } catch (error: Exception) { - onError(error) - } - } - } -} - -internal interface AcceptInviteUseCaseInterface { - fun accept(inviteId: Long, onSuccess: (String) -> Unit, onError: (Throwable) -> Unit) -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/GetMessagesUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/GetMessagesUseCase.kt deleted file mode 100644 index ad470adca..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/GetMessagesUseCase.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.walletconnect.chat.engine.use_case.calls - -import com.walletconnect.chat.common.model.Message -import com.walletconnect.chat.storage.MessageStorageRepository -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.SupervisorJob -import kotlinx.coroutines.runBlocking - - -internal class GetMessagesUseCase( - private val messageRepository: MessageStorageRepository, -) : GetMessagesUseCaseInterface { - - override fun getMessages(topic: String): List { - val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) - return runBlocking(scope.coroutineContext) { - messageRepository.getMessageByTopic(topic) - } - } -} - -internal interface GetMessagesUseCaseInterface { - fun getMessages(topic: String): List -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/GetReceivedInvitesUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/GetReceivedInvitesUseCase.kt deleted file mode 100644 index 7319079a0..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/GetReceivedInvitesUseCase.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.walletconnect.chat.engine.use_case.calls - -import com.walletconnect.chat.common.model.Invite -import com.walletconnect.chat.storage.InvitesStorageRepository -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.SupervisorJob -import kotlinx.coroutines.runBlocking - - -internal class GetReceivedInvitesUseCase( - private val invitesRepository: InvitesStorageRepository, -) : GetReceivedInvitesUseCaseInterface { - - override fun getReceivedInvites(inviteeAccountId: String): Map { - val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) - return runBlocking(scope.coroutineContext) { - invitesRepository.getReceivedInvitesForInviteeAccount(inviteeAccountId).associateBy { invite -> invite.id } - } - } -} - -internal interface GetReceivedInvitesUseCaseInterface { - fun getReceivedInvites(inviteeAccountId: String): Map -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/GetSentInvitesUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/GetSentInvitesUseCase.kt deleted file mode 100644 index daa7be536..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/GetSentInvitesUseCase.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.walletconnect.chat.engine.use_case.calls - -import com.walletconnect.chat.common.model.Invite -import com.walletconnect.chat.storage.InvitesStorageRepository -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.SupervisorJob -import kotlinx.coroutines.runBlocking - - -internal class GetSentInvitesUseCase( - private val invitesRepository: InvitesStorageRepository, -) : GetSentInvitesUseCaseInterface { - - override fun getSentInvites(inviterAccountId: String): Map { - val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) - return runBlocking(scope.coroutineContext) { - invitesRepository.getSentInvitesForInviterAccount(inviterAccountId).associateBy { invite -> invite.id } - } - } -} - -internal interface GetSentInvitesUseCaseInterface { - fun getSentInvites(inviterAccountId: String): Map -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/GetThreadsUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/GetThreadsUseCase.kt deleted file mode 100644 index 6692c1c03..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/GetThreadsUseCase.kt +++ /dev/null @@ -1,26 +0,0 @@ -package com.walletconnect.chat.engine.use_case.calls - -import com.walletconnect.chat.common.model.Thread -import com.walletconnect.chat.storage.ThreadsStorageRepository -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.SupervisorJob -import kotlinx.coroutines.runBlocking - - -internal class GetThreadsUseCase( - private val threadsRepository: ThreadsStorageRepository, -) : GetThreadsUseCaseInterface { - - override fun getThreads(accountId: String): Map { - val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) - return runBlocking(scope.coroutineContext) { - threadsRepository.getThreadsForSelfAccount(accountId).associateBy { thread -> thread.topic.value } - } - } - -} - -internal interface GetThreadsUseCaseInterface { - fun getThreads(accountId: String): Map -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/GoPrivateUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/GoPrivateUseCase.kt deleted file mode 100644 index 675b8d2dc..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/GoPrivateUseCase.kt +++ /dev/null @@ -1,70 +0,0 @@ -package com.walletconnect.chat.engine.use_case.calls - -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase -import com.walletconnect.android.internal.common.jwt.did.encodeDidJwt -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.model.MissingKeyException -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.utils.getInviteTag -import com.walletconnect.android.internal.utils.getParticipantTag -import com.walletconnect.android.keyserver.domain.IdentitiesInteractor -import com.walletconnect.android.keyserver.domain.use_case.UnregisterInviteUseCase -import com.walletconnect.chat.common.exceptions.InvalidAccountIdException -import com.walletconnect.chat.common.exceptions.InviteKeyNotFound -import com.walletconnect.chat.jwt.use_case.EncodeUnregisterInviteKeyDidJwtPayloadUseCase -import com.walletconnect.chat.storage.AccountsStorageRepository -import com.walletconnect.foundation.util.jwt.encodeX25519DidKey -import kotlinx.coroutines.launch -import kotlinx.coroutines.supervisorScope - -internal class GoPrivateUseCase( - private val keyserverUrl: String, - private val identitiesInteractor: IdentitiesInteractor, - private val accountsRepository: AccountsStorageRepository, - private val keyManagementRepository: KeyManagementRepository, - private val jsonRpcInteractor: RelayJsonRpcInteractorInterface, - private val unregisterInviteUseCase: UnregisterInviteUseCase, -) : GoPrivateUseCaseInterface { - - override fun goPrivate(accountId: AccountId, onSuccess: () -> Unit, onError: (Throwable) -> Unit) { - if (accountId.isValid()) { - try { - val invitePublicKey = keyManagementRepository.getPublicKey(accountId.getInviteTag()) - val (identityPublicKey, identityPrivateKey) = identitiesInteractor.getIdentityKeyPair(accountId) - - val didJwt = encodeDidJwt( - identityPrivateKey, - EncodeUnregisterInviteKeyDidJwtPayloadUseCase(encodeX25519DidKey(invitePublicKey.keyAsBytes), accountId), - EncodeDidJwtPayloadUseCase.Params(identityPublicKey, keyserverUrl) - ).getOrElse() { error -> return@goPrivate onError(error) } - - scope.launch { - supervisorScope { - unregisterInviteUseCase(didJwt.value).fold( - onSuccess = { - accountsRepository.removeAccountPublicInviteKey(accountId) - keyManagementRepository.removeKeys(accountId.getInviteTag()) - val inviteTopic = keyManagementRepository.getTopicFromKey(invitePublicKey) - keyManagementRepository.removeKeys(inviteTopic.getParticipantTag()) - jsonRpcInteractor.unsubscribe(inviteTopic) - onSuccess() - }, - onFailure = { error -> onError(error) } - ) - } - } - } catch (e: MissingKeyException) { - onError(InviteKeyNotFound("Unable to find stored invite key for $accountId")) - } - - } else { - onError(InvalidAccountIdException("AccountId is not CAIP-10 complaint")) - } - } -} - -internal interface GoPrivateUseCaseInterface { - fun goPrivate(accountId: AccountId, onSuccess: () -> Unit, onError: (Throwable) -> Unit) -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/GoPublicUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/GoPublicUseCase.kt deleted file mode 100644 index 3ac3ba421..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/GoPublicUseCase.kt +++ /dev/null @@ -1,79 +0,0 @@ -package com.walletconnect.chat.engine.use_case.calls - -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase -import com.walletconnect.android.internal.common.jwt.did.encodeDidJwt -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.model.MissingKeyException -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.utils.getInviteTag -import com.walletconnect.android.internal.utils.getParticipantTag -import com.walletconnect.android.keyserver.domain.IdentitiesInteractor -import com.walletconnect.android.keyserver.domain.use_case.RegisterInviteUseCase -import com.walletconnect.chat.common.exceptions.InvalidAccountIdException -import com.walletconnect.chat.jwt.use_case.EncodeRegisterInviteKeyDidJwtPayloadUseCase -import com.walletconnect.chat.storage.AccountsStorageRepository -import com.walletconnect.foundation.common.model.PrivateKey -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.util.jwt.encodeX25519DidKey -import kotlinx.coroutines.launch -import kotlinx.coroutines.supervisorScope - -internal class GoPublicUseCase( - private val keyserverUrl: String, - private val identitiesInteractor: IdentitiesInteractor, - private val accountsRepository: AccountsStorageRepository, - private val keyManagementRepository: KeyManagementRepository, - private val jsonRpcInteractor: RelayJsonRpcInteractorInterface, - private val registerInviteUseCase: RegisterInviteUseCase, -) : GoPublicUseCaseInterface { - - override fun goPublic(accountId: AccountId, onSuccess: (String) -> Unit, onError: (Throwable) -> Unit) { - fun onSuccess(invitePublicKey: PublicKey, invitePrivateKey: PrivateKey) { - scope.launch { - supervisorScope { - val inviteTopic = keyManagementRepository.getTopicFromKey(invitePublicKey) - keyManagementRepository.setKey(invitePublicKey, accountId.getInviteTag()) - keyManagementRepository.setKey(invitePublicKey, inviteTopic.getParticipantTag()) - accountsRepository.setAccountPublicInviteKey(accountId, invitePublicKey, inviteTopic) - jsonRpcInteractor.subscribe(inviteTopic) - - onSuccess(invitePublicKey.keyAsHex) - } - } - } - - if (accountId.isValid()) { - try { - val storedPublicKey = keyManagementRepository.getPublicKey(accountId.getInviteTag()) - onSuccess(storedPublicKey.keyAsHex) - } catch (e: MissingKeyException) { - val (invitePublicKey, invitePrivateKey) = keyManagementRepository.generateAndStoreX25519KeyPair().let { invitePublicKey -> keyManagementRepository.getKeyPair(invitePublicKey) } - - val (identityPublicKey, identityPrivateKey) = identitiesInteractor.getIdentityKeyPair(accountId) - - val didJwt = encodeDidJwt( - identityPrivateKey, - EncodeRegisterInviteKeyDidJwtPayloadUseCase(encodeX25519DidKey(invitePublicKey.keyAsBytes), accountId), - EncodeDidJwtPayloadUseCase.Params(identityPublicKey, keyserverUrl) - ).getOrElse() { error -> return@goPublic onError(error) } - - scope.launch { - supervisorScope { - registerInviteUseCase(didJwt.value).fold( - onSuccess = { onSuccess(invitePublicKey, invitePrivateKey) }, - onFailure = { error -> onError(error) } - ) - } - } - } - } else { - onError(InvalidAccountIdException("AccountId is not CAIP-10 complaint")) - } - } -} - -internal interface GoPublicUseCaseInterface { - fun goPublic(accountId: AccountId, onSuccess: (String) -> Unit, onError: (Throwable) -> Unit) -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/LeaveThreadUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/LeaveThreadUseCase.kt deleted file mode 100644 index e26f0199e..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/LeaveThreadUseCase.kt +++ /dev/null @@ -1,43 +0,0 @@ -package com.walletconnect.chat.engine.use_case.calls - -import com.walletconnect.android.internal.common.model.EnvelopeType -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.utils.monthInSeconds -import com.walletconnect.chat.common.json_rpc.ChatParams -import com.walletconnect.chat.common.json_rpc.ChatRpc -import com.walletconnect.chat.storage.ThreadsStorageRepository -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger -import kotlinx.coroutines.launch - - -internal class LeaveThreadUseCase( - private val logger: Logger, - private val threadsRepository: ThreadsStorageRepository, - private val jsonRpcInteractor: RelayJsonRpcInteractorInterface, -) : LeaveThreadUseCaseInterface { - override fun leave(topic: String, onError: (Throwable) -> Unit) { - val payload = ChatRpc.ChatLeave(params = ChatParams.LeaveParams()) - val irnParams = IrnParams(Tags.CHAT_LEAVE, Ttl(monthInSeconds), true) - - jsonRpcInteractor.publishJsonRpcRequest( - Topic(topic), irnParams, payload, EnvelopeType.ZERO, - onSuccess = { - // Not sure if we want to remove thread and messages if someone leaves convo. - // Maybe just forgetting thread symkey is better solution? - scope.launch { - threadsRepository.deleteThreadByTopic(topic) - jsonRpcInteractor.unsubscribe(Topic(topic)) { error -> onError(error) } - } - }, - onFailure = { throwable -> onError(throwable).also { logger.error(throwable) } }) - } -} - -internal interface LeaveThreadUseCaseInterface { - fun leave(topic: String, onError: (Throwable) -> Unit) -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/RegisterIdentityUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/RegisterIdentityUseCase.kt deleted file mode 100644 index 476007803..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/RegisterIdentityUseCase.kt +++ /dev/null @@ -1,42 +0,0 @@ -package com.walletconnect.chat.engine.use_case.calls - -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.signing.cacao.Cacao -import com.walletconnect.android.keyserver.domain.IdentitiesInteractor -import com.walletconnect.chat.storage.AccountsStorageRepository -import kotlinx.coroutines.launch -import kotlinx.coroutines.supervisorScope - -internal class RegisterIdentityUseCase( - private val keyserverUrl: String, - private val identitiesInteractor: IdentitiesInteractor, - private val accountsRepository: AccountsStorageRepository, - private val goPublicUseCase: GoPublicUseCase, -) : RegisterIdentityUseCaseInterface { - - override fun register(accountId: AccountId, onSign: (String) -> Cacao.Signature?, onSuccess: (String) -> Unit, onError: (Throwable) -> Unit, private: Boolean) { - scope.launch { - supervisorScope { -// identitiesInteractor.registerIdentity(accountId, keyserverUrl, onSign).fold( -// onFailure = { error -> onError(error) }, -// onSuccess = { identityPublicKey -> -// accountsRepository.upsertAccount(Account(accountId, identityPublicKey, null, null)) -// val didKey = encodeEd25519DidKey(identityPublicKey.keyAsBytes) -// setupSyncInChatUseCase(accountId, onSign, onError = onError, onSuccess = { -// if (!private) { -// goPublicUseCase.goPublic(accountId, onSuccess = { onSuccess(didKey) }, onError = { error -> onError(error) }) -// } else { -// onSuccess(didKey) -// } -// }) -// } -// ) - } - } - } -} - -internal interface RegisterIdentityUseCaseInterface { - fun register(accountId: AccountId, onSign: (String) -> Cacao.Signature?, onSuccess: (String) -> Unit, onError: (Throwable) -> Unit, private: Boolean) -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/RejectInviteUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/RejectInviteUseCase.kt deleted file mode 100644 index 37f926793..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/RejectInviteUseCase.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.walletconnect.chat.engine.use_case.calls - -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.MissingKeyException -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.utils.monthInSeconds -import com.walletconnect.android.internal.utils.getInviteTag -import com.walletconnect.chat.common.exceptions.InviteWasAlreadyRespondedTo -import com.walletconnect.chat.common.exceptions.MissingInviteRequestException -import com.walletconnect.chat.common.exceptions.PeerError -import com.walletconnect.chat.common.model.InviteStatus -import com.walletconnect.chat.json_rpc.GetPendingJsonRpcHistoryEntryByIdUseCase -import com.walletconnect.chat.storage.InvitesStorageRepository -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger -import kotlinx.coroutines.launch - - -internal class RejectInviteUseCase( - private val getPendingJsonRpcHistoryEntryByIdUseCase: GetPendingJsonRpcHistoryEntryByIdUseCase, - private val logger: Logger, - private val invitesRepository: InvitesStorageRepository, - private val keyManagementRepository: KeyManagementRepository, - private val jsonRpcInteractor: RelayJsonRpcInteractorInterface, -) : RejectInviteUseCaseInterface { - override fun reject(inviteId: Long, onSuccess: () -> Unit, onError: (Throwable) -> Unit) { - scope.launch { - try { - val jsonRpcHistoryEntry = getPendingJsonRpcHistoryEntryByIdUseCase(inviteId) ?: return@launch onError(MissingInviteRequestException).also { logger.error(MissingInviteRequestException) } - - val invite = invitesRepository.getReceivedInviteByInviteId(inviteId) - if (invite.status == InviteStatus.APPROVED || invite.status == InviteStatus.REJECTED) { - return@launch onError(InviteWasAlreadyRespondedTo).also { logger.error(InviteWasAlreadyRespondedTo) } - } - - val inviterPublicKey = invite.inviterPublicKey - val inviteeAccountId = invite.inviteeAccount - - val inviteePublicKey = keyManagementRepository.getPublicKey(inviteeAccountId.getInviteTag()) - val symmetricKey = keyManagementRepository.generateSymmetricKeyFromKeyAgreement(inviteePublicKey, inviterPublicKey) - val rejectTopic = keyManagementRepository.getTopicFromKey(symmetricKey) - keyManagementRepository.setKey(symmetricKey, rejectTopic.value) - - val irnParams = IrnParams(Tags.CHAT_INVITE_RESPONSE, Ttl(monthInSeconds)) - val peerError = PeerError.UserRejectedInvitation("Invitation rejected by a user") - val responseParams = JsonRpcResponse.JsonRpcError(jsonRpcHistoryEntry.id, error = JsonRpcResponse.Error(peerError.code, peerError.message)) - jsonRpcInteractor.publishJsonRpcResponse(rejectTopic, irnParams, responseParams, {}, { error -> return@publishJsonRpcResponse onError(error) }) - invitesRepository.updateStatusByInviteId(inviteId, InviteStatus.REJECTED) - onSuccess() - } catch (e: MissingKeyException) { - return@launch onError(e) - } - } - } -} - -internal interface RejectInviteUseCaseInterface { - fun reject(inviteId: Long, onSuccess: () -> Unit, onError: (Throwable) -> Unit) -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/ResolveAccountUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/ResolveAccountUseCase.kt deleted file mode 100644 index 308a7c800..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/ResolveAccountUseCase.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.walletconnect.chat.engine.use_case.calls - -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.keyserver.domain.use_case.ResolveInviteUseCase -import com.walletconnect.chat.common.exceptions.InvalidAccountIdException -import kotlinx.coroutines.launch -import kotlinx.coroutines.supervisorScope - -internal class ResolveAccountUseCase( - private val resolveInviteUseCase: ResolveInviteUseCase, -) : ResolveAccountUseCaseInterface { - - override fun resolveAccount(accountId: AccountId, onSuccess: (String) -> Unit, onError: (Throwable) -> Unit) { - if (accountId.isValid()) { - scope.launch { - supervisorScope { - resolveInviteUseCase(accountId).fold( - onSuccess = { response -> onSuccess(response.inviteKey) }, - onFailure = { error -> onError(error) } - ) - } - } - } else { - onError(InvalidAccountIdException("AccountId is not CAIP-10 complaint")) - } - } -} - -internal interface ResolveAccountUseCaseInterface { - fun resolveAccount(accountId: AccountId, onSuccess: (String) -> Unit, onError: (Throwable) -> Unit) -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/SendInviteUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/SendInviteUseCase.kt deleted file mode 100644 index 87db44197..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/SendInviteUseCase.kt +++ /dev/null @@ -1,134 +0,0 @@ -package com.walletconnect.chat.engine.use_case.calls - -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase -import com.walletconnect.android.internal.common.jwt.did.encodeDidJwt -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.model.EnvelopeType -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Participants -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.utils.monthInSeconds -import com.walletconnect.android.keyserver.domain.IdentitiesInteractor -import com.walletconnect.chat.common.exceptions.AccountsAlreadyHaveInviteException -import com.walletconnect.chat.common.exceptions.AccountsAlreadyHaveThreadException -import com.walletconnect.chat.common.exceptions.InviteMessageTooLongException -import com.walletconnect.chat.common.json_rpc.ChatParams -import com.walletconnect.chat.common.json_rpc.ChatRpc -import com.walletconnect.chat.common.model.Contact -import com.walletconnect.chat.common.model.Invite -import com.walletconnect.chat.common.model.InviteStatus -import com.walletconnect.chat.common.model.SendInvite -import com.walletconnect.chat.engine.domain.ChatValidator -import com.walletconnect.chat.jwt.use_case.EncodeInviteProposalDidJwtPayloadUseCase -import com.walletconnect.chat.storage.ContactStorageRepository -import com.walletconnect.chat.storage.InvitesStorageRepository -import com.walletconnect.chat.storage.ThreadsStorageRepository -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger -import com.walletconnect.foundation.util.jwt.decodeX25519DidKey -import com.walletconnect.util.generateId -import com.walletconnect.utils.extractTimestamp -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.SupervisorJob -import kotlinx.coroutines.launch -import kotlinx.coroutines.runBlocking -import kotlinx.coroutines.withContext - - -internal class SendInviteUseCase( - private val keyserverUrl: String, - private val logger: Logger, - private val invitesRepository: InvitesStorageRepository, - private val threadsRepository: ThreadsStorageRepository, - private val keyManagementRepository: KeyManagementRepository, - private val identitiesInteractor: IdentitiesInteractor, - private val jsonRpcInteractor: RelayJsonRpcInteractorInterface, - private val contactRepository: ContactStorageRepository, -) : SendInviteUseCaseInterface { - - override suspend fun invite(invite: SendInvite, onSuccess: (Long) -> Unit, onError: (Throwable) -> Unit) { - if (!ChatValidator.isInviteMessageValid(invite.message.value)) { - return onError(InviteMessageTooLongException()) - } - - val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) - if (withContext(scope.coroutineContext) { invitesRepository.checkIfAccountsHaveExistingInvite(invite.inviterAccount.value, invite.inviteeAccount.value) }) { - return onError(AccountsAlreadyHaveInviteException) - } - - if (runBlocking(scope.coroutineContext) { threadsRepository.checkIfSelfAccountHaveThreadWithPeerAccount(invite.inviterAccount.value, invite.inviteeAccount.value) }) { - return onError(AccountsAlreadyHaveThreadException) - } - - if (runBlocking(scope.coroutineContext) { threadsRepository.checkIfSelfAccountHaveThreadWithPeerAccount(invite.inviteeAccount.value, invite.inviterAccount.value) }) { - return onError(AccountsAlreadyHaveThreadException) - } - - val decodedInviteePublicKey = decodeX25519DidKey(invite.inviteePublicKey) - - runCatching { withContext(scope.coroutineContext) { setContact(invite.inviteeAccount, decodedInviteePublicKey) } }.getOrElse { error -> return onError(error) } - - val inviterPublicKey = runCatching { keyManagementRepository.generateAndStoreX25519KeyPair() }.getOrElse { error -> return onError(error) } - val inviterPrivateKey = keyManagementRepository.getKeyPair(inviterPublicKey).second - - try { - val symmetricKey = keyManagementRepository.generateSymmetricKeyFromKeyAgreement(inviterPublicKey, decodedInviteePublicKey) - val inviteTopic = keyManagementRepository.getTopicFromKey(decodedInviteePublicKey) - keyManagementRepository.setKeyAgreement(inviteTopic, inviterPublicKey, decodedInviteePublicKey) - - val participants = Participants(senderPublicKey = inviterPublicKey, receiverPublicKey = decodedInviteePublicKey) - val (identityPublicKey, identityPrivateKey) = identitiesInteractor.getIdentityKeyPair(invite.inviterAccount) - - val didJwt = encodeDidJwt( - identityPrivateKey, - EncodeInviteProposalDidJwtPayloadUseCase(inviterPublicKey, invite.inviteeAccount, invite.message.value), - EncodeDidJwtPayloadUseCase.Params(identityPublicKey, keyserverUrl) - ).getOrElse() { error -> return@invite onError(error) } - - - val inviteParams = ChatParams.InviteParams(inviteAuth = didJwt.value) - val inviteId = generateId() - val payload = ChatRpc.ChatInvite(id = inviteId, params = inviteParams) - val acceptTopic = keyManagementRepository.getTopicFromKey(symmetricKey) - - keyManagementRepository.setKey(symmetricKey, acceptTopic.value) - jsonRpcInteractor.subscribe(acceptTopic) { error -> return@subscribe onError(error) } - - val irnParams = IrnParams(Tags.CHAT_INVITE, Ttl(monthInSeconds), true) - jsonRpcInteractor.publishJsonRpcRequest(inviteTopic, irnParams, payload, EnvelopeType.ONE, participants, - { - val sentInvite = Invite.Sent( - inviteId, invite.inviterAccount, invite.inviteeAccount, invite.message, inviterPublicKey, - InviteStatus.PENDING, acceptTopic, symmetricKey, inviterPrivateKey, - //todo: use publishedAt from relay https://github.com/WalletConnect/WalletConnectKotlinV2/issues/872 - timestamp = inviteId.extractTimestamp() - ) - scope.launch { invitesRepository.insertInvite(sentInvite) } - onSuccess(inviteId) - }, - { throwable -> - logger.error(throwable) - jsonRpcInteractor.unsubscribe(acceptTopic) - onError(throwable) - } - ) - } catch (error: Exception) { - keyManagementRepository.removeKeys(inviterPublicKey.keyAsHex) - onError(error) - } - } - - private suspend fun setContact(accountId: AccountId, publicInviteKey: PublicKey) { - contactRepository.upsertContact(Contact(accountId, publicInviteKey, accountId.value)) - } - - -} - -internal interface SendInviteUseCaseInterface { - suspend fun invite(invite: SendInvite, onSuccess: (Long) -> Unit, onError: (Throwable) -> Unit) -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/SendMessageUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/SendMessageUseCase.kt deleted file mode 100644 index 3eadeb2f2..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/SendMessageUseCase.kt +++ /dev/null @@ -1,78 +0,0 @@ -package com.walletconnect.chat.engine.use_case.calls - -import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase -import com.walletconnect.android.internal.common.jwt.did.encodeDidJwt -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.utils.monthInSeconds -import com.walletconnect.android.keyserver.domain.IdentitiesInteractor -import com.walletconnect.chat.common.exceptions.ChatMessageTooLongException -import com.walletconnect.chat.common.exceptions.MediaDataTooLongException -import com.walletconnect.chat.common.json_rpc.ChatParams -import com.walletconnect.chat.common.json_rpc.ChatRpc -import com.walletconnect.chat.common.model.Message -import com.walletconnect.chat.common.model.SendMessage -import com.walletconnect.chat.engine.domain.ChatValidator -import com.walletconnect.chat.jwt.use_case.EncodeChatMessageDidJwtPayloadUseCase -import com.walletconnect.chat.storage.MessageStorageRepository -import com.walletconnect.chat.storage.ThreadsStorageRepository -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger -import com.walletconnect.util.generateId -import com.walletconnect.utils.extractTimestamp -import kotlinx.coroutines.launch - - -internal class SendMessageUseCase( - private val keyserverUrl: String, - private val logger: Logger, - private val threadsRepository: ThreadsStorageRepository, - private val identitiesInteractor: IdentitiesInteractor, - private val jsonRpcInteractor: RelayJsonRpcInteractorInterface, - private val messageRepository: MessageStorageRepository, -) : SendMessageUseCaseInterface { - - override fun message(topic: String, message: SendMessage, onSuccess: () -> Unit, onError: (Throwable) -> Unit) { - scope.launch { - if (!ChatValidator.isChatMessageValid(message.message.value)) { - return@launch onError(ChatMessageTooLongException()) - } else if (!ChatValidator.isMediaDataValid(message.media?.data?.value)) { - return@launch onError(MediaDataTooLongException()) - } - - val thread = threadsRepository.getThreadByTopic(topic) - val (authorAccountId, recipientAccountId) = thread.selfAccount to thread.peerAccount - val messageId = generateId() - val messageTimestampInMs = messageId.extractTimestamp() - val (identityPublicKey, identityPrivateKey) = identitiesInteractor.getIdentityKeyPair(authorAccountId) - - val didJwt = encodeDidJwt( - identityPrivateKey, - EncodeChatMessageDidJwtPayloadUseCase(message.message.value, recipientAccountId, message.media, messageTimestampInMs), - EncodeDidJwtPayloadUseCase.Params(identityPublicKey, keyserverUrl) - ) - .getOrElse() { error -> return@launch onError(error) } - - val messageParams = ChatParams.MessageParams(messageAuth = didJwt.value) - val payload = ChatRpc.ChatMessage(id = messageId, params = messageParams) - val irnParams = IrnParams(Tags.CHAT_MESSAGE, Ttl(monthInSeconds), true) - - messageRepository.insertMessage(Message(messageId, Topic(topic), message.message, authorAccountId, messageTimestampInMs, message.media)) - jsonRpcInteractor.publishJsonRpcRequest( - Topic(topic), irnParams, payload, - onSuccess = { onSuccess() }, - onFailure = { throwable -> - logger.error(throwable) - scope.launch { messageRepository.deleteMessageByMessageId(messageId) } - onError(throwable) - }) - } - } -} - -internal interface SendMessageUseCaseInterface { - fun message(topic: String, message: SendMessage, onSuccess: () -> Unit, onError: (Throwable) -> Unit) -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/SendPingUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/SendPingUseCase.kt deleted file mode 100644 index 0e1a38315..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/SendPingUseCase.kt +++ /dev/null @@ -1,82 +0,0 @@ -package com.walletconnect.chat.engine.use_case.calls - -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.utils.thirtySeconds -import com.walletconnect.chat.common.json_rpc.ChatParams -import com.walletconnect.chat.common.json_rpc.ChatRpc -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger -import kotlinx.coroutines.TimeoutCancellationException -import kotlinx.coroutines.cancel -import kotlinx.coroutines.flow.filter -import kotlinx.coroutines.launch -import kotlinx.coroutines.withTimeout - - -internal class SendPingUseCase( - private val logger: Logger, - private val jsonRpcInteractor: RelayJsonRpcInteractorInterface, -) : SendPingUseCaseInterface { - - override fun ping(topic: String, onSuccess: (String) -> Unit, onError: (Throwable) -> Unit) { - val pingPayload = ChatRpc.ChatPing(params = ChatParams.PingParams()) - val irnParams = IrnParams(Tags.CHAT_PING, Ttl(thirtySeconds)) - - jsonRpcInteractor.publishJsonRpcRequest(Topic(topic), irnParams, pingPayload, - onSuccess = { pingSuccess(pingPayload, onSuccess, topic, onError) }, - onFailure = { error -> onError(error).also { logger.error("Ping sent error: $error") } }) - } - - private fun pingSuccess( - pingPayload: ChatRpc.ChatPing, - onSuccess: (String) -> Unit, - topic: String, - onError: (Throwable) -> Unit, - ) { - logger.log("Ping sent successfully") - scope.launch { - try { - withTimeout(THIRTY_SECONDS_TIMEOUT) { - collectResponse(pingPayload.id) { result -> - cancel() - result.fold( - onSuccess = { - logger.log("Ping peer response success") - onSuccess(topic) - }, - onFailure = { error -> - logger.log("Ping peer response error: $error") - onError(error) - }) - } - } - } catch (e: TimeoutCancellationException) { - onError(e) - } - } - } - - private suspend fun collectResponse(id: Long, onResponse: (Result) -> Unit = {}) { - jsonRpcInteractor.peerResponse - .filter { response -> response.response.id == id } - .collect { response -> - when (val result = response.response) { - is JsonRpcResponse.JsonRpcResult -> onResponse(Result.success(result)) - is JsonRpcResponse.JsonRpcError -> onResponse(Result.failure(Throwable(result.errorMessage))) - } - } - } - - private companion object { - const val THIRTY_SECONDS_TIMEOUT: Long = 30000L - } -} - -internal interface SendPingUseCaseInterface { - fun ping(topic: String, onSuccess: (String) -> Unit, onError: (Throwable) -> Unit) -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/UnregisterIdentityUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/UnregisterIdentityUseCase.kt deleted file mode 100644 index ea4c59af7..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/calls/UnregisterIdentityUseCase.kt +++ /dev/null @@ -1,47 +0,0 @@ -package com.walletconnect.chat.engine.use_case.calls - -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.utils.getInviteTag -import com.walletconnect.android.internal.utils.getParticipantTag -import com.walletconnect.android.keyserver.domain.IdentitiesInteractor -import com.walletconnect.chat.storage.AccountsStorageRepository -import com.walletconnect.foundation.util.jwt.encodeEd25519DidKey -import kotlinx.coroutines.launch -import kotlinx.coroutines.supervisorScope - -internal class UnregisterIdentityUseCase( - private val keyserverUrl: String, - private val identitiesInteractor: IdentitiesInteractor, - private val accountsRepository: AccountsStorageRepository, - private val keyManagementRepository: KeyManagementRepository, - private val jsonRpcInteractor: RelayJsonRpcInteractorInterface, -) : UnregisterIdentityUseCaseInterface { - - override fun unregister(accountId: AccountId, onSuccess: (String) -> Unit, onError: (Throwable) -> Unit) { - scope.launch { - supervisorScope { - identitiesInteractor.unregisterIdentity(accountId, keyserverUrl).fold( - onFailure = { error -> onError(error) }, - onSuccess = { identityPublicKey -> - val account = accountsRepository.getAccountByAccountId(accountId) - if (account.publicInviteKey != null && account.inviteTopic != null) { - keyManagementRepository.removeKeys(accountId.getInviteTag()) - keyManagementRepository.removeKeys(account.inviteTopic.getParticipantTag()) - jsonRpcInteractor.unsubscribe(account.inviteTopic) - } - accountsRepository.deleteAccountByAccountId(accountId) - val didKey = encodeEd25519DidKey(identityPublicKey.keyAsBytes) - onSuccess(didKey) - } - ) - } - } - } -} - -internal interface UnregisterIdentityUseCaseInterface { - fun unregister(accountId: AccountId, onSuccess: (String) -> Unit, onError: (Throwable) -> Unit) -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/requests/OnInviteRequestUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/requests/OnInviteRequestUseCase.kt deleted file mode 100644 index f158d80d9..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/requests/OnInviteRequestUseCase.kt +++ /dev/null @@ -1,67 +0,0 @@ -package com.walletconnect.chat.engine.use_case.requests - -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.jwt.did.extractVerifiedDidJwtClaims -import com.walletconnect.android.internal.common.model.WCRequest -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.keyserver.domain.IdentitiesInteractor -import com.walletconnect.chat.common.exceptions.AccountsAlreadyHaveInviteException -import com.walletconnect.chat.common.exceptions.AccountsAlreadyHaveThreadException -import com.walletconnect.chat.common.exceptions.InvalidActClaims -import com.walletconnect.chat.common.json_rpc.ChatParams -import com.walletconnect.chat.common.model.Events -import com.walletconnect.chat.common.model.Invite -import com.walletconnect.chat.common.model.InviteMessage -import com.walletconnect.chat.common.model.InviteStatus -import com.walletconnect.chat.jwt.ChatDidJwtClaims -import com.walletconnect.chat.storage.AccountsStorageRepository -import com.walletconnect.chat.storage.InvitesStorageRepository -import com.walletconnect.chat.storage.ThreadsStorageRepository -import com.walletconnect.foundation.util.Logger -import com.walletconnect.foundation.util.jwt.decodeX25519DidKey -import com.walletconnect.utils.extractTimestamp -import kotlinx.coroutines.flow.MutableSharedFlow -import kotlinx.coroutines.flow.SharedFlow -import kotlinx.coroutines.flow.asSharedFlow - -internal class OnInviteRequestUseCase( - private val logger: Logger, - private val identitiesInteractor: IdentitiesInteractor, - private val accountsRepository: AccountsStorageRepository, - private val invitesRepository: InvitesStorageRepository, - private val threadsRepository: ThreadsStorageRepository, - private val keyManagementRepository: KeyManagementRepository, -) { - private val _events: MutableSharedFlow = MutableSharedFlow() - val events: SharedFlow = _events.asSharedFlow() - - suspend operator fun invoke(wcRequest: WCRequest, params: ChatParams.InviteParams) { - val claims = extractVerifiedDidJwtClaims(params.inviteAuth).getOrElse() { error -> return logger.error(error) } - if (claims.action != ChatDidJwtClaims.InviteProposal.ACT) return logger.error(InvalidActClaims(ChatDidJwtClaims.InviteProposal.ACT)) - - val inviterAccountId = identitiesInteractor.resolveIdentityDidKey(claims.issuer).getOrElse() { error -> return logger.error(error) } - - runCatching { accountsRepository.getAccountByInviteTopic(wcRequest.topic) }.fold(onSuccess = { inviteeAccount -> - if (invitesRepository.checkIfAccountsHaveExistingInvite(inviterAccountId.value, inviteeAccount.accountId.value)) { - return logger.error(AccountsAlreadyHaveInviteException) - } - - if (threadsRepository.checkIfSelfAccountHaveThreadWithPeerAccount(inviteeAccount.accountId.value, inviterAccountId.value)) { - return logger.error(AccountsAlreadyHaveThreadException) - } - - val inviteePublicKey = inviteeAccount.publicInviteKey ?: throw Throwable("Missing publicInviteKey") - val inviterPublicKey = decodeX25519DidKey(claims.inviterPublicKey) - val symmetricKey = keyManagementRepository.generateSymmetricKeyFromKeyAgreement(inviteePublicKey, inviterPublicKey) - val acceptTopic = keyManagementRepository.getTopicFromKey(symmetricKey) - val invite = Invite.Received( - wcRequest.id, inviterAccountId, inviteeAccount.accountId, InviteMessage(claims.subject), inviterPublicKey, InviteStatus.PENDING, acceptTopic, symmetricKey, inviterPrivateKey = null, - //todo: use publishedAt from relay https://github.com/WalletConnect/WalletConnectKotlinV2/issues/872 - timestamp = wcRequest.id.extractTimestamp() - ) - - invitesRepository.insertInvite(invite) - _events.emit(Events.OnInvite(invite)) - }, onFailure = { error -> logger.error(error) }) - } -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/requests/OnLeaveRequestUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/requests/OnLeaveRequestUseCase.kt deleted file mode 100644 index 61583a3e6..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/requests/OnLeaveRequestUseCase.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.walletconnect.chat.engine.use_case.requests - -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.WCRequest -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.utils.monthInSeconds -import com.walletconnect.chat.common.model.Events -import com.walletconnect.chat.storage.ThreadsStorageRepository -import com.walletconnect.foundation.common.model.Ttl -import kotlinx.coroutines.flow.MutableSharedFlow -import kotlinx.coroutines.flow.SharedFlow -import kotlinx.coroutines.flow.asSharedFlow -import kotlinx.coroutines.launch - -internal class OnLeaveRequestUseCase( - private val threadsRepository: ThreadsStorageRepository, - private val jsonRpcInteractor: RelayJsonRpcInteractorInterface, -) { - private val _events: MutableSharedFlow = MutableSharedFlow() - val events: SharedFlow = _events.asSharedFlow() - - operator fun invoke(wcRequest: WCRequest) { - // Not sure if we want to remove thread and messages if someone leaves convo. - // Maybe just forgetting thread symkey is better solution? - scope.launch { - threadsRepository.deleteThreadByTopic(wcRequest.topic.value) - } - - scope.launch { - _events.emit(Events.OnLeft(wcRequest.topic.value)) - jsonRpcInteractor.respondWithSuccess(wcRequest, IrnParams(Tags.CHAT_LEAVE_RESPONSE, Ttl(monthInSeconds))) - } - } -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/requests/OnMessageRequestUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/requests/OnMessageRequestUseCase.kt deleted file mode 100644 index 5a974b458..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/requests/OnMessageRequestUseCase.kt +++ /dev/null @@ -1,96 +0,0 @@ -package com.walletconnect.chat.engine.use_case.requests - -import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase -import com.walletconnect.android.internal.common.jwt.did.encodeDidJwt -import com.walletconnect.android.internal.common.jwt.did.extractVerifiedDidJwtClaims -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.model.EnvelopeType -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.WCRequest -import com.walletconnect.android.internal.common.model.params.CoreChatParams -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.utils.monthInSeconds -import com.walletconnect.android.keyserver.domain.IdentitiesInteractor -import com.walletconnect.chat.common.exceptions.InvalidActClaims -import com.walletconnect.chat.common.json_rpc.ChatParams -import com.walletconnect.chat.common.model.ChatMessage -import com.walletconnect.chat.common.model.Events -import com.walletconnect.chat.common.model.Message -import com.walletconnect.chat.jwt.ChatDidJwtClaims -import com.walletconnect.chat.jwt.use_case.EncodeChatReceiptDidJwtPayloadUseCase -import com.walletconnect.chat.storage.MessageStorageRepository -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger -import com.walletconnect.foundation.util.jwt.decodeDidPkh -import kotlinx.coroutines.flow.MutableSharedFlow -import kotlinx.coroutines.flow.SharedFlow -import kotlinx.coroutines.flow.asSharedFlow -import kotlinx.coroutines.launch - -internal class OnMessageRequestUseCase( - private val logger: Logger, - private val identitiesInteractor: IdentitiesInteractor, - private val messageRepository: MessageStorageRepository, - private val keyserverUrl: String, - private val jsonRpcInteractor: RelayJsonRpcInteractorInterface, -) { - private val _events: MutableSharedFlow = MutableSharedFlow() - val events: SharedFlow = _events.asSharedFlow() - - suspend operator fun invoke(wcRequest: WCRequest, params: ChatParams.MessageParams) { - val claims = extractVerifiedDidJwtClaims(params.messageAuth).getOrElse() { error -> return@invoke logger.error(error) } - if (claims.action != ChatDidJwtClaims.ChatMessage.ACT) return logger.error(InvalidActClaims(ChatDidJwtClaims.ChatMessage.ACT)) - - scope.launch { - val authorAccountId = identitiesInteractor.resolveIdentityDidKey(claims.issuer) - .getOrElse() { error -> return@launch logger.error(error) } - - val message = Message(wcRequest.id, wcRequest.topic, ChatMessage(claims.subject), authorAccountId, claims.issuedAt, claims.media) - messageRepository.insertMessage(message) - _events.emit(Events.OnMessage(message)) - - // With sync integration we need to check if I'm the author by checking if I have identity keys for the account - // If they exists it means I authored the message from other client - // If they don't exists it means someone sent me the message - val recipientAccountId = AccountId(decodeDidPkh(claims.audience)) - - if (shouldClientRespondToRequest(authorAccountId, recipientAccountId)) { - // Currently timestamps are based on claims issuedAt. Which MUST be changed to achieve proper order of messages. - // Should be changed with specs: https://github.com/WalletConnect/walletconnect-docs/pull/473. - // Change: Instead of claims.issuedAt use wcRequest.receivedAt - - val (identityPublicKey, identityPrivateKey) = identitiesInteractor.getIdentityKeyPair(recipientAccountId) - - val didJwt = encodeDidJwt( - identityPrivateKey, - EncodeChatReceiptDidJwtPayloadUseCase(claims.subject, authorAccountId), - EncodeDidJwtPayloadUseCase.Params(identityPublicKey, keyserverUrl) - ).getOrElse() { error -> return@launch logger.error(error) } - - val receiptParams = CoreChatParams.ReceiptParams(receiptAuth = didJwt.value) - val irnParams = IrnParams(Tags.CHAT_MESSAGE_RESPONSE, Ttl(monthInSeconds)) - - jsonRpcInteractor.respondWithParams(wcRequest, receiptParams, irnParams, EnvelopeType.ZERO, onFailure = { error -> logger.error(error) }) - } - } - } - - /** - * Rare case when a device has clients Ax and Bx registered and needs to handle messages between them. - * Context: When I sent a message from A1 client, it was impossible to distinct if I should respond to message with sync, - * as I received message request on A2 and Bx clients - * Client doesn't send the response only when it has author keys, if it has both author and recipient then it does send the response - */ - private fun shouldClientRespondToRequest(authorAccountId: AccountId, recipientAccountId: AccountId): Boolean { - return runCatching { identitiesInteractor.getIdentityKeyPair(authorAccountId) } - .getOrNull()?.let { - // If author account is registered check if recipient is also registered - runCatching { identitiesInteractor.getIdentityKeyPair(recipientAccountId) }.getOrNull()?.let { - true // If both author account and recipient account are registered respond to request - } ?: false // If only author account is register do not respond to request - } ?: true // If author account is not registered respond to request - } -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/responses/OnInviteResponseUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/responses/OnInviteResponseUseCase.kt deleted file mode 100644 index 894ff08a4..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/responses/OnInviteResponseUseCase.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.walletconnect.chat.engine.use_case.responses - -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.model.WCResponse -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.keyserver.domain.IdentitiesInteractor -import com.walletconnect.chat.common.model.Events -import com.walletconnect.chat.common.model.InviteStatus -import com.walletconnect.chat.storage.InvitesStorageRepository -import com.walletconnect.chat.storage.ThreadsStorageRepository -import com.walletconnect.foundation.util.Logger -import kotlinx.coroutines.flow.MutableSharedFlow -import kotlinx.coroutines.flow.SharedFlow -import kotlinx.coroutines.flow.asSharedFlow -import kotlinx.coroutines.launch - -internal class OnInviteResponseUseCase( - private val logger: Logger, - private val invitesRepository: InvitesStorageRepository, - private val keyManagementRepository: KeyManagementRepository, - private val identitiesInteractor: IdentitiesInteractor, - private val threadsRepository: ThreadsStorageRepository, - private val jsonRpcInteractor: RelayJsonRpcInteractorInterface, -) { - private val _events: MutableSharedFlow = MutableSharedFlow() - val events: SharedFlow = _events.asSharedFlow() - - suspend operator fun invoke(wcResponse: WCResponse) { - when (val response = wcResponse.response) { - is JsonRpcResponse.JsonRpcError -> onRejected(wcResponse) - is JsonRpcResponse.JsonRpcResult -> onAccepted(response, wcResponse) - } - } - - private suspend fun onRejected(wcResponse: WCResponse) { - scope.launch { - invitesRepository.updateStatusByInviteId(wcResponse.response.id, InviteStatus.REJECTED) - val sentInvite = invitesRepository.getSentInviteByInviteId(wcResponse.response.id) - _events.emit(Events.OnInviteRejected(sentInvite)) - } - } - - private suspend fun onAccepted(response: JsonRpcResponse.JsonRpcResult, wcResponse: WCResponse) { -// -// //TODO this method is called because ChatNotifyResponseAuthParams.ResponseAuth is to generic -// //TODO remove return and handle this being called when it shouldn't -// return -// -// val acceptParams = response.result as ChatNotifyResponseAuthParams.ResponseAuth -// -// // TODO -// // Discuss what state is invite in if not verified -// // invitesRepository.updateStatusByInviteId(wcResponse.response.id, InviteStatus.?????????) -// val claims = extractVerifiedDidJwtClaims(acceptParams.responseAuth).getOrElse() { error -> return@onAccepted logger.error(error) } -// if (claims.action != ChatDidJwtClaims.InviteApproval.ACT) return logger.error(InvalidActClaims(ChatDidJwtClaims.InviteApproval.ACT)) -// -// try { -// val sentInvite = invitesRepository.getSentInviteByInviteId(wcResponse.response.id) -// -// if (sentInvite.status == InviteStatus.APPROVED || sentInvite.status == InviteStatus.REJECTED) return logger.error(InviteResponseWasAlreadyReceived) -// -// val selfPubKey: PublicKey = sentInvite.inviterPublicKey -// val peerPubKey = decodeX25519DidKey(claims.subject) -// val symmetricKey = keyManagementRepository.generateSymmetricKeyFromKeyAgreement(selfPubKey, peerPubKey) -// val threadTopic = keyManagementRepository.getTopicFromKey(symmetricKey) -// keyManagementRepository.setKey(symmetricKey, threadTopic.value) -// -// val inviteeAccountId = identitiesInteractor.resolveIdentityDidKey(claims.issuer).getOrThrow().value -// val inviterAccountId = decodeDidPkh(claims.audience) -// threadsRepository.insertThread(threadTopic.value, selfAccount = inviterAccountId, peerAccount = inviteeAccountId) -// -// jsonRpcInteractor.subscribe(threadTopic) { error -> scope.launch { _events.emit(SDKError(error)) } } -// -// invitesRepository.updateStatusByInviteId(wcResponse.response.id, InviteStatus.APPROVED) -// -// _events.emit(Events.OnInviteAccepted(threadTopic.value, sentInvite)) -// } catch (e: Exception) { -// scope.launch { _events.emit(SDKError(e)) } -// return -// } - } - -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/responses/OnLeaveResponseUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/responses/OnLeaveResponseUseCase.kt deleted file mode 100644 index db6eb160b..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/responses/OnLeaveResponseUseCase.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.walletconnect.chat.engine.use_case.responses - -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.model.WCResponse -import com.walletconnect.foundation.util.Logger - -internal class OnLeaveResponseUseCase( - private val logger: Logger, -) { - operator fun invoke(wcResponse: WCResponse) { - when (val response = wcResponse.response) { - is JsonRpcResponse.JsonRpcError -> logger.log("Chat leave error response: $response") - is JsonRpcResponse.JsonRpcResult -> logger.log("Chat leave success response") - } - } -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/responses/OnMessageResponseUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/responses/OnMessageResponseUseCase.kt deleted file mode 100644 index 864a2dac4..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/engine/use_case/responses/OnMessageResponseUseCase.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.walletconnect.chat.engine.use_case.responses - -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.model.WCResponse -import com.walletconnect.foundation.util.Logger - -internal class OnMessageResponseUseCase( - private val logger: Logger, -) { - operator fun invoke(wcResponse: WCResponse) { - when (val response = wcResponse.response) { - is JsonRpcResponse.JsonRpcError -> logger.log("Message error response: $response") - is JsonRpcResponse.JsonRpcResult -> logger.log("Message success response") - //todo on result validate receipt auth and notify that message was received. Needs discussion and specs (Milestone 2) - } - } -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/json_rpc/GetPendingJsonRpcHistoryEntryByIdUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/json_rpc/GetPendingJsonRpcHistoryEntryByIdUseCase.kt deleted file mode 100644 index 3107c6707..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/json_rpc/GetPendingJsonRpcHistoryEntryByIdUseCase.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.walletconnect.chat.json_rpc - -import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer -import com.walletconnect.android.internal.common.json_rpc.model.JsonRpcHistoryRecord -import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory -import com.walletconnect.chat.common.json_rpc.ChatRpc -import com.walletconnect.chat.common.model.JsonRpcHistoryEntry -import com.walletconnect.foundation.common.model.Topic - -internal class GetPendingJsonRpcHistoryEntryByIdUseCase( - private val jsonRpcHistory: JsonRpcHistory, - private val serializer: JsonRpcSerializer, -) { - operator fun invoke(id: Long): JsonRpcHistoryEntry? { - val record: JsonRpcHistoryRecord? = jsonRpcHistory.getPendingRecordById(id) - var entry: JsonRpcHistoryEntry? = null - - if (record != null) { - val chatInvite: ChatRpc.ChatInvite? = serializer.tryDeserialize(record.body) - if (chatInvite != null) { - entry = JsonRpcHistoryEntry.InviteRequest(chatInvite.params, record.id, Topic(record.topic), record.method, record.response) - } - } - - return entry - } -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/json_rpc/JsonRpcMethod.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/json_rpc/JsonRpcMethod.kt deleted file mode 100644 index 0858f1504..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/json_rpc/JsonRpcMethod.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.walletconnect.chat.json_rpc - -internal object JsonRpcMethod { - @get:JvmSynthetic - const val WC_CHAT_INVITE: String = "wc_chatInvite" - @get:JvmSynthetic - const val WC_CHAT_MESSAGE: String = "wc_chatMessage" - @get:JvmSynthetic - const val WC_CHAT_PING: String = "wc_chatPing" - @get:JvmSynthetic - const val WC_CHAT_LEAVE: String = "wc_chatLeave" -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/ChatDidJwtClaims.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/ChatDidJwtClaims.kt deleted file mode 100644 index c72770fd8..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/ChatDidJwtClaims.kt +++ /dev/null @@ -1,106 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.chat.jwt - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass -import com.walletconnect.chat.common.model.Media -import com.walletconnect.foundation.util.jwt.JwtClaims - -internal sealed interface ChatDidJwtClaims : JwtClaims { - @JsonClass(generateAdapter = true) - data class RegisterInviteKey( - @Json(name = "iss") override val issuer: String, - @Json(name = "sub") val subject: String, - @Json(name = "aud") val audience: String, - @Json(name = "iat") val issuedAt: Long, - @Json(name = "exp") val expiration: Long, - @Json(name = "pkh") val pkh: String, - @Json(name = "act") val act: String = ACT, - ) : ChatDidJwtClaims { - companion object { - const val ACT = "register_invite" - } - } - - @JsonClass(generateAdapter = true) - data class UnregisterInviteKey( - @Json(name = "iss") override val issuer: String, - @Json(name = "sub") val subject: String, - @Json(name = "aud") val audience: String, - @Json(name = "iat") val issuedAt: Long, - @Json(name = "exp") val expiration: Long, - @Json(name = "pkh") val pkh: String, - @Json(name = "act") val act: String = ACT, - ) : ChatDidJwtClaims { - companion object { - const val ACT = "unregister_invite" - } - } - - @JsonClass(generateAdapter = true) - data class InviteProposal( - @Json(name = "iss") override val issuer: String, - @Json(name = "iat") val issuedAt: Long, - @Json(name = "exp") val expiration: Long, - @Json(name = "ksu") val keyserverUrl: String, - - @Json(name = "aud") val audience: String, // responder/invitee blockchain account (did:pkh) - @Json(name = "sub") val subject: String, // opening message included in the invite - @Json(name = "pke") val inviterPublicKey: String, // proposer/inviter public key (did:key) - @Json(name = "act") val action: String = ACT, - ) : ChatDidJwtClaims { - companion object { - const val ACT = "invite_proposal" - } - } - - @JsonClass(generateAdapter = true) - data class InviteApproval( - @Json(name = "iss") override val issuer: String, - @Json(name = "iat") val issuedAt: Long, - @Json(name = "exp") val expiration: Long, - @Json(name = "ksu") val keyserverUrl: String, - - @Json(name = "aud") val audience: String, // proposer/inviter blockchain account (did:pkh) - @Json(name = "sub") val subject: String, // public key sent by the responder/invitee - @Json(name = "act") val action: String = ACT, - ) : ChatDidJwtClaims { - companion object { - const val ACT = "invite_approval" - } - } - - @JsonClass(generateAdapter = true) - data class ChatMessage( - @Json(name = "iss") override val issuer: String, - @Json(name = "iat") val issuedAt: Long, - @Json(name = "exp") val expiration: Long, - @Json(name = "ksu") val keyserverUrl: String, - - @Json(name = "aud") val audience: String, // recipient blockchain account (did:pkh) - @Json(name = "sub") val subject: String, // message sent by the author account - @Json(name = "xma") val media: Media?, // extensible media attachment (optional) - @Json(name = "act") val action: String = ACT, - ) : ChatDidJwtClaims { - companion object { - const val ACT = "chat_message" - } - } - - @JsonClass(generateAdapter = true) - data class ChatReceipt( - @Json(name = "iss") override val issuer: String, - @Json(name = "iat") val issuedAt: Long, - @Json(name = "exp") val expiration: Long, - @Json(name = "ksu") val keyserverUrl: String, - - @Json(name = "aud") val audience: String, // sender blockchain account (did:pkh) - @Json(name = "sub") val subject: String, // hash of the message received - @Json(name = "act") val action: String = ACT, - ) : ChatDidJwtClaims { - companion object { - const val ACT = "chat_receipt" - } - } -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/use_case/EncodeChatMessageDidJwtPayloadUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/use_case/EncodeChatMessageDidJwtPayloadUseCase.kt deleted file mode 100644 index 32963ab73..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/use_case/EncodeChatMessageDidJwtPayloadUseCase.kt +++ /dev/null @@ -1,32 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.chat.jwt.use_case - -import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.chat.common.model.Media -import com.walletconnect.chat.jwt.ChatDidJwtClaims -import com.walletconnect.foundation.util.jwt.encodeDidPkh -import com.walletconnect.foundation.util.jwt.jwtIatAndExp -import java.util.concurrent.TimeUnit - -internal class EncodeChatMessageDidJwtPayloadUseCase( - private val message: String, - private val recipientAccountId: AccountId, - private val media: Media?, - private val timestampInMs: Long, -) : EncodeDidJwtPayloadUseCase { - override fun invoke(params: EncodeDidJwtPayloadUseCase.Params): ChatDidJwtClaims.ChatMessage = with(params) { - val (messageIssuedAt, messageExpiration) = jwtIatAndExp(timestampInMs = timestampInMs, timeunit = TimeUnit.MILLISECONDS, expirySourceDuration = 30, expiryTimeUnit = TimeUnit.DAYS) - - return ChatDidJwtClaims.ChatMessage( - issuer = issuer, - issuedAt = messageIssuedAt, - expiration = messageExpiration, - keyserverUrl = keyserverUrl, - subject = message, - audience = encodeDidPkh(recipientAccountId.value), - media = media - ) - } -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/use_case/EncodeChatReceiptDidJwtPayloadUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/use_case/EncodeChatReceiptDidJwtPayloadUseCase.kt deleted file mode 100644 index da6c68241..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/use_case/EncodeChatReceiptDidJwtPayloadUseCase.kt +++ /dev/null @@ -1,25 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.chat.jwt.use_case - -import com.walletconnect.android.internal.common.crypto.sha256 -import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.chat.jwt.ChatDidJwtClaims -import com.walletconnect.foundation.util.jwt.encodeDidPkh - -internal class EncodeChatReceiptDidJwtPayloadUseCase( - private val message: String, - private val senderAccountId: AccountId, -) : EncodeDidJwtPayloadUseCase { - override fun invoke(params: EncodeDidJwtPayloadUseCase.Params): ChatDidJwtClaims.ChatReceipt = with(params) { - ChatDidJwtClaims.ChatReceipt( - issuer = issuer, - issuedAt = issuedAt, - expiration = expiration, - keyserverUrl = keyserverUrl, - subject = sha256(message.toByteArray()), - audience = encodeDidPkh(senderAccountId.value), - ) - } -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/use_case/EncodeInviteApprovalDidJwtPayloadUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/use_case/EncodeInviteApprovalDidJwtPayloadUseCase.kt deleted file mode 100644 index c56e7a1c6..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/use_case/EncodeInviteApprovalDidJwtPayloadUseCase.kt +++ /dev/null @@ -1,26 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.chat.jwt.use_case - -import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.chat.jwt.ChatDidJwtClaims -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.util.jwt.encodeDidPkh -import com.walletconnect.foundation.util.jwt.encodeX25519DidKey - -internal class EncodeInviteApprovalDidJwtPayloadUseCase( - private val inviteePublicKey: PublicKey, - private val inviterAccountId: AccountId, -) : EncodeDidJwtPayloadUseCase { - override fun invoke(params: EncodeDidJwtPayloadUseCase.Params): ChatDidJwtClaims.InviteApproval = with(params) { - ChatDidJwtClaims.InviteApproval( - issuer = issuer, - issuedAt = issuedAt, - expiration = expiration, - keyserverUrl = keyserverUrl, - subject = encodeX25519DidKey(inviteePublicKey.keyAsBytes), - audience = encodeDidPkh(inviterAccountId.value), - ) - } -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/use_case/EncodeInviteProposalDidJwtPayloadUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/use_case/EncodeInviteProposalDidJwtPayloadUseCase.kt deleted file mode 100644 index 8eb7c7892..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/use_case/EncodeInviteProposalDidJwtPayloadUseCase.kt +++ /dev/null @@ -1,28 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.chat.jwt.use_case - -import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.chat.jwt.ChatDidJwtClaims -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.util.jwt.encodeDidPkh -import com.walletconnect.foundation.util.jwt.encodeX25519DidKey - -internal class EncodeInviteProposalDidJwtPayloadUseCase( - private val inviterPublicKey: PublicKey, - private val inviteeAccountId: AccountId, - private val openingMessage: String, -) : EncodeDidJwtPayloadUseCase { - override fun invoke(params: EncodeDidJwtPayloadUseCase.Params): ChatDidJwtClaims.InviteProposal = with(params) { - ChatDidJwtClaims.InviteProposal( - issuer = issuer, - issuedAt = issuedAt, - expiration = expiration, - keyserverUrl = keyserverUrl, - subject = openingMessage, - audience = encodeDidPkh(inviteeAccountId.value), - inviterPublicKey = encodeX25519DidKey(inviterPublicKey.keyAsBytes) - ) - } -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/use_case/EncodeRegisterInviteKeyDidJwtPayloadUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/use_case/EncodeRegisterInviteKeyDidJwtPayloadUseCase.kt deleted file mode 100644 index efa1b04d7..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/use_case/EncodeRegisterInviteKeyDidJwtPayloadUseCase.kt +++ /dev/null @@ -1,24 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.chat.jwt.use_case - -import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.chat.jwt.ChatDidJwtClaims -import com.walletconnect.foundation.util.jwt.encodeDidPkh - -internal class EncodeRegisterInviteKeyDidJwtPayloadUseCase( - private val invitePublicKey: String, - private val accountId: AccountId, -) : EncodeDidJwtPayloadUseCase { - override fun invoke(params: EncodeDidJwtPayloadUseCase.Params): ChatDidJwtClaims.RegisterInviteKey = with(params) { - ChatDidJwtClaims.RegisterInviteKey( - issuer = issuer, - issuedAt = issuedAt, - expiration = expiration, - audience = keyserverUrl, - subject = invitePublicKey, - pkh = encodeDidPkh(accountId.value) - ) - } -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/use_case/EncodeUnregisterInviteKeyDidJwtPayloadUseCase.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/use_case/EncodeUnregisterInviteKeyDidJwtPayloadUseCase.kt deleted file mode 100644 index ee14b05a2..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/jwt/use_case/EncodeUnregisterInviteKeyDidJwtPayloadUseCase.kt +++ /dev/null @@ -1,24 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.chat.jwt.use_case - -import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.chat.jwt.ChatDidJwtClaims -import com.walletconnect.foundation.util.jwt.encodeDidPkh - -internal class EncodeUnregisterInviteKeyDidJwtPayloadUseCase( - private val invitePublicKey: String, - private val accountId: AccountId, -) : EncodeDidJwtPayloadUseCase { - override fun invoke(params: EncodeDidJwtPayloadUseCase.Params): ChatDidJwtClaims.UnregisterInviteKey = with(params) { - ChatDidJwtClaims.UnregisterInviteKey( - issuer = issuer, - issuedAt = issuedAt, - expiration = expiration, - audience = keyserverUrl, - subject = invitePublicKey, - pkh = encodeDidPkh(accountId.value) - ) - } -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/storage/AccountsStorageRepository.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/storage/AccountsStorageRepository.kt deleted file mode 100644 index efcd9f334..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/storage/AccountsStorageRepository.kt +++ /dev/null @@ -1,50 +0,0 @@ -package com.walletconnect.chat.storage - -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.chat.common.model.Account -import com.walletconnect.chat.storage.data.dao.AccountsQueries -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic - -internal class AccountsStorageRepository(private val accounts: AccountsQueries) { - - private suspend fun doesAccountNotExists(accountId: AccountId) = accounts.doesAccountNotExists(accountId.value).executeAsOne() - - suspend fun upsertAccount(account: Account) = - if (doesAccountNotExists(account.accountId)) { - createAccount(account) - } else { - updateAccount(account) - } - - private suspend fun updateAccount(account: Account) = with(account) { - accounts.updateAccount(publicIdentityKey.keyAsHex, accountId.value) - } - - private suspend fun createAccount(account: Account) = with(account) { - accounts.insertOrAbortAccount(accountId = accountId.value, publicIdentityKey = publicIdentityKey.keyAsHex, publicInviteKey = publicInviteKey?.keyAsHex, inviteTopic = inviteTopic?.value) - } - - suspend fun getAllInviteTopics(): List = - accounts.getAllInviteTopics().executeAsList().map { dbToTopic(it) } - - suspend fun getAccountByAccountId(accountId: AccountId): Account = - accounts.getAccountByAccountId(accountId.value, ::dbToAccount).executeAsOne() - - suspend fun getAccountByInviteTopic(inviteTopic: Topic): Account = - accounts.getAccountByInviteTopic(inviteTopic.value, ::dbToAccount).executeAsOne() - - suspend fun deleteAccountByAccountId(accountId: AccountId) = - accounts.deleteAccountByAccountId(accountId.value) - - suspend fun setAccountPublicInviteKey(accountId: AccountId, publicInviteKey: PublicKey?, inviteTopic: Topic?) = - accounts.updateAccountPublicInviteKey(publicInviteKey?.keyAsHex, inviteTopic?.value, accountId.value) - - suspend fun removeAccountPublicInviteKey(accountId: AccountId) = - accounts.removeAccountPublicInviteKey(accountId.value) - - private fun dbToTopic(inviteTopic: String) = Topic(inviteTopic) - - private fun dbToAccount(accountId: String, publicIdentityKey: String, publicInviteKey: String?, inviteTopic: String?): Account = - Account(AccountId(accountId), PublicKey(publicIdentityKey), publicInviteKey?.let { PublicKey(publicInviteKey) }, inviteTopic?.let { Topic(inviteTopic) }) -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/storage/ContactStorageRepository.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/storage/ContactStorageRepository.kt deleted file mode 100644 index 5a554cba7..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/storage/ContactStorageRepository.kt +++ /dev/null @@ -1,44 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.chat.storage - -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.chat.common.model.Contact -import com.walletconnect.chat.storage.data.dao.ContactsQueries -import com.walletconnect.foundation.common.model.PublicKey - -internal class ContactStorageRepository(private val contactsQueries: ContactsQueries) { - - @JvmSynthetic - internal suspend fun doesContactNotExists(accountIdVO: AccountId): Boolean = - contactsQueries.doesContactNotExists(accountIdVO.value).executeAsOne() - - @JvmSynthetic - internal suspend fun upsertContact(contact: Contact) = with(contact) { - if (doesContactNotExists(accountId)) { - createContact(contact) - } else { - updateContact(contact) - } - } - - @JvmSynthetic - internal suspend fun createContact(contact: Contact) = contactsQueries.insertOrAbortContact( - contact.accountId.value, - contact.publicKey.keyAsHex, - contact.displayName - ) - - @JvmSynthetic - internal suspend fun getContact(accountId: AccountId): Contact = - contactsQueries.getContact(accountId.value, mapper = ::mapContactDaoToContact).executeAsOne() - - @JvmSynthetic - internal suspend fun updateContact(contact: Contact) = with(contact) { - contactsQueries.updateContactPublicKey(publicKey.keyAsHex, accountId.value) - contactsQueries.updateContactDisplayName(displayName, accountId.value) - } - - private fun mapContactDaoToContact(account_id: String, public_key: String, display_name: String): Contact = - Contact(AccountId(account_id), PublicKey(public_key), display_name) -} \ No newline at end of file diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/storage/InvitesStorageRepository.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/storage/InvitesStorageRepository.kt deleted file mode 100644 index cb12d85f0..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/storage/InvitesStorageRepository.kt +++ /dev/null @@ -1,91 +0,0 @@ -package com.walletconnect.chat.storage - -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.model.SymmetricKey -import com.walletconnect.chat.common.model.Invite -import com.walletconnect.chat.common.model.InviteMessage -import com.walletconnect.chat.common.model.InviteStatus -import com.walletconnect.chat.common.model.InviteType -import com.walletconnect.chat.storage.data.dao.InvitesQueries -import com.walletconnect.foundation.common.model.PrivateKey -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.utils.Empty - -internal class InvitesStorageRepository(private val invites: InvitesQueries) { - suspend fun insertInvite(invite: Invite) { - val type = when (invite) { - is Invite.Received -> InviteType.RECEIVED - is Invite.Sent -> InviteType.SENT - } - - if (type == InviteType.SENT && invite.inviterPrivateKey == null) throw Throwable("Invite.Sent requires invitePrivateKey to not be null") - - val inviterPrivateKey = if (type == InviteType.SENT) invite.inviterPrivateKey!!.keyAsHex else String.Empty - - with(invite) { - invites.insertOrAbortInvite( - inviteId = id, message = message.value, inviterAccount = inviterAccount.value, - inviteeAccount = inviteeAccount.value, status = InviteStatus.PENDING, type = type, acceptTopic = acceptTopic.value, - inviterPublicKey = inviterPublicKey.keyAsHex, symmetricKey = symmetricKey.keyAsHex, - inviterPrivateKey = inviterPrivateKey, timestamp = timestamp - ) - } - } - - suspend fun checkIfAccountsHaveExistingInvite(inviterAccount: String, inviteeAccount: String): Boolean = invites.checkIfAccountsHaveExistingInvite(inviterAccount, inviteeAccount).executeAsOne() - - suspend fun getAllPendingSentInvites() = invites.getAllPendingSentInvites(::dbToSentInvite).executeAsList() - - suspend fun deleteInviteByInviteId(inviteId: Long) = invites.deleteInviteByInviteId(inviteId) - - suspend fun getReceivedInviteByInviteId(inviteId: Long) = invites.getInviteByInviteId(inviteId, ::dbToReceivedInvite).executeAsOne() - - suspend fun getSentInviteByInviteId(inviteId: Long) = invites.getInviteByInviteId(inviteId, ::dbToSentInvite).executeAsOne() - - suspend fun updateStatusByInviteId(inviteId: Long, status: InviteStatus) = invites.updateInviteStatusByInviteId(status, inviteId) - - suspend fun updateStatusByAccounts(accountOne: String, accountTwo: String, status: InviteStatus) { - // When it's impossible to distinct which account is the inviter try updating two - // Very unlikely non-hostile drawback: When both accounts are register within Chat SDK and they invite each other first out of two updates will update two invites: SENT and RECEIVED - invites.updateInviteStatusByAccounts(status, accountOne, accountTwo) - invites.updateInviteStatusByAccounts(status, accountTwo, accountOne) - } - - suspend fun getSentInvitesForInviterAccount(inviterAccount: String): List = invites.getSentInvitesForInviterAccount(inviterAccount, ::dbToSentInvite).executeAsList() - - suspend fun getReceivedInvitesForInviteeAccount(inviterAccount: String): List = invites.getReceivedInvitesForInviteeAccount(inviterAccount, ::dbToReceivedInvite).executeAsList() - - private fun dbToSentInvite( - inviteId: Long, message: String, inviterAccount: String, inviteeAccount: String, - status: InviteStatus, inviterPublicKey: String, acceptTopic: String, symmetricKey: String, inviterPrivateKey: String, timestamp: Long, - ): Invite.Sent = Invite.Sent( - id = inviteId, - inviterAccount = AccountId(inviterAccount), - inviteeAccount = AccountId(inviteeAccount), - message = InviteMessage(message), - inviterPublicKey = PublicKey(inviterPublicKey), - status = status, - acceptTopic = Topic(acceptTopic), - symmetricKey = SymmetricKey(symmetricKey), - inviterPrivateKey = PrivateKey(inviterPrivateKey), - timestamp = timestamp, - ) - - private fun dbToReceivedInvite( - inviteId: Long, message: String, inviterAccount: String, inviteeAccount: String, - status: InviteStatus, inviterPublicKey: String, acceptTopic: String, symmetricKey: String, inviterPrivateKey: String, // unused but required by select query - timestamp: Long, - ): Invite.Received = Invite.Received( - id = inviteId, - inviterAccount = AccountId(inviterAccount), - inviteeAccount = AccountId(inviteeAccount), - message = InviteMessage(message), - inviterPublicKey = PublicKey(inviterPublicKey), - status = status, - acceptTopic = Topic(acceptTopic), - symmetricKey = SymmetricKey(symmetricKey), - inviterPrivateKey = null, - timestamp = timestamp, - ) -} diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/storage/MessageStorageRepository.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/storage/MessageStorageRepository.kt deleted file mode 100644 index bb768d203..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/storage/MessageStorageRepository.kt +++ /dev/null @@ -1,26 +0,0 @@ -package com.walletconnect.chat.storage - -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.chat.common.model.* -import com.walletconnect.chat.storage.data.dao.MessagesQueries -import com.walletconnect.foundation.common.model.Topic - -internal class MessageStorageRepository(private val messages: MessagesQueries) { - - suspend fun insertMessage(message: Message) = with(message) { - messages.insertOrAbortMessage( - messageId = messageId, topic = topic.value, message = message.message.value, authorAccount = authorAccount.value, - timestamp = timestamp, mediaType = media?.type, mediaData = media?.data?.value - ) - } - - suspend fun deleteMessageByMessageId(messageId: Long) = messages.deleteMessageByMessageId(messageId) - - suspend fun deleteMessagesByTopic(topic: String) = messages.deleteMessagesByTopic(topic) - - suspend fun getMessageByTopic(topic: String): List = messages.getMessagesByTopic(topic, ::dbToMessage).executeAsList() - - private fun dbToMessage(messageId: Long, topic: String, message: String, authorAccount: String, timestamp: Long, mediaType: String?, mediaData: String?) = - Message(messageId, Topic(topic), ChatMessage(message), AccountId(authorAccount), timestamp, if (mediaType != null && mediaData != null) Media(mediaType, MediaData(mediaData)) else null) - -} diff --git a/protocol/chat/src/main/kotlin/com/walletconnect/chat/storage/ThreadsStorageRepository.kt b/protocol/chat/src/main/kotlin/com/walletconnect/chat/storage/ThreadsStorageRepository.kt deleted file mode 100644 index 4cb7e30e4..000000000 --- a/protocol/chat/src/main/kotlin/com/walletconnect/chat/storage/ThreadsStorageRepository.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.walletconnect.chat.storage - -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.chat.common.model.Thread -import com.walletconnect.chat.storage.data.dao.ThreadsQueries -import com.walletconnect.foundation.common.model.Topic - -internal class ThreadsStorageRepository(private val threads: ThreadsQueries) { - suspend fun insertThread(topic: String, selfAccount: String, peerAccount: String) = threads.insertOrAbortThread(topic, selfAccount, peerAccount) - - suspend fun getThreadsForSelfAccount(account: String): List = threads.getThreadsForSelfAccount(account, ::dbToThread).executeAsList() - - suspend fun checkIfSelfAccountHaveThreadWithPeerAccount(selfAccount: String, peerAccount: String): Boolean = - threads.checkIfSelfAccountHaveThreadWithPeerAccount(selfAccount, peerAccount).executeAsOne() - - suspend fun deleteThreadByTopic(topic: String) = threads.deleteThreadByTopic(topic) - - suspend fun getThreadByTopic(topic: String): Thread = threads.getThreadByTopic(topic, ::dbToThread).executeAsOne() - - suspend fun getAllThreads(): List = threads.getAllThreads(::dbToThread).executeAsList() - - private fun dbToThread(topic: String, selfPublicKey: String, peerPublicKey: String) = Thread(Topic(topic), AccountId(selfPublicKey), AccountId(peerPublicKey)) -} \ No newline at end of file diff --git a/protocol/chat/src/main/res/xml/backup_rules.xml b/protocol/chat/src/main/res/xml/backup_rules.xml deleted file mode 100644 index e72e65165..000000000 --- a/protocol/chat/src/main/res/xml/backup_rules.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/protocol/chat/src/main/sqldelight/com/walletconnect/chat/storage/data/dao/Accounts.sq b/protocol/chat/src/main/sqldelight/com/walletconnect/chat/storage/data/dao/Accounts.sq deleted file mode 100644 index b9f81af07..000000000 --- a/protocol/chat/src/main/sqldelight/com/walletconnect/chat/storage/data/dao/Accounts.sq +++ /dev/null @@ -1,53 +0,0 @@ -CREATE TABLE Accounts ( - id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, - accountId TEXT UNIQUE NOT NULL, - publicIdentityKey TEXT NOT NULL, - publicInviteKey TEXT, - inviteTopic TEXT UNIQUE -); - -insertOrAbortAccount: -INSERT OR ABORT INTO Accounts(accountId, publicIdentityKey, publicInviteKey, inviteTopic) -VALUES (?, ?, ?, ?); - -getAccountByAccountId: -SELECT accountId, publicIdentityKey, publicInviteKey, inviteTopic -FROM Accounts -WHERE accountId = ?; - -getAccountByInviteTopic: -SELECT accountId, publicIdentityKey, publicInviteKey, inviteTopic -FROM Accounts -WHERE inviteTopic = ?; - -deleteAccountByAccountId: -DELETE FROM Accounts -WHERE accountId = ?; - -updateAccountPublicInviteKey: -UPDATE Accounts -SET publicInviteKey = ?, inviteTopic = ? -WHERE accountId = ?; - -updateAccount: -UPDATE Accounts -SET publicIdentityKey = ? -WHERE accountId = ?; - -getAllInviteTopics: -SELECT inviteTopic -FROM Accounts -WHERE inviteTopic IS NOT NULL; - -removeAccountPublicInviteKey: -UPDATE Accounts -SET publicInviteKey = NULL, inviteTopic = NULL -WHERE accountId = ?; - -doesAccountNotExists: -SELECT NOT EXISTS ( - SELECT 1 - FROM Accounts - WHERE accountId = ? - LIMIT 1 -); diff --git a/protocol/chat/src/main/sqldelight/com/walletconnect/chat/storage/data/dao/Contacts.sq b/protocol/chat/src/main/sqldelight/com/walletconnect/chat/storage/data/dao/Contacts.sq deleted file mode 100644 index 99f260e2c..000000000 --- a/protocol/chat/src/main/sqldelight/com/walletconnect/chat/storage/data/dao/Contacts.sq +++ /dev/null @@ -1,37 +0,0 @@ -CREATE TABLE Contacts( - account_id TEXT PRIMARY KEY NOT NULL, - public_key TEXT NOT NULL, - display_name TEXT NOT NULL -); - -insertOrAbortContact: -INSERT OR ABORT INTO Contacts (account_id, public_key, display_name) -VALUES (?, ?, ?); - -updateContactPublicKey: -UPDATE Contacts -SET public_key = ? -WHERE account_id = ?; - -updateContactDisplayName: -UPDATE Contacts -SET display_name = ? -WHERE account_id = ?; - -getContact: -SELECT account_id, public_key, display_name -FROM Contacts -WHERE account_id = ? -LIMIT 1; - -doesContactNotExists: -SELECT NOT EXISTS ( - SELECT 1 - FROM Contacts - WHERE account_id = ? - LIMIT 1 -); - -deleteContact: -DELETE FROM Contacts -WHERE account_id = ?; \ No newline at end of file diff --git a/protocol/chat/src/main/sqldelight/com/walletconnect/chat/storage/data/dao/Invites.sq b/protocol/chat/src/main/sqldelight/com/walletconnect/chat/storage/data/dao/Invites.sq deleted file mode 100644 index b02bf6db7..000000000 --- a/protocol/chat/src/main/sqldelight/com/walletconnect/chat/storage/data/dao/Invites.sq +++ /dev/null @@ -1,66 +0,0 @@ -import com.walletconnect.chat.common.model.InviteStatus; -import com.walletconnect.chat.common.model.InviteType; - -CREATE TABLE Invites ( - id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, - inviteId INTEGER UNIQUE NOT NULL, - message TEXT NOT NULL, - inviterAccount TEXT NOT NULL, - inviteeAccount TEXT NOT NULL, - status TEXT AS InviteStatus NOT NULL, -- PENDING, REJECTED OR APPROVED - type TEXT AS InviteType NOT NULL, -- SENT OR RECEIVED - inviterPublicKey TEXT NOT NULL, - acceptTopic TEXT NOT NULL, - symmetricKey TEXT NOT NULL, - inviterPrivateKey TEXT NOT NULL, - timestamp INTEGER NOT NULL, - UNIQUE(inviterAccount, inviteeAccount) -); - -insertOrAbortInvite: -INSERT OR ABORT INTO Invites(inviteId, message, inviterAccount, inviteeAccount, status, type, inviterPublicKey, acceptTopic, symmetricKey, inviterPrivateKey, timestamp) -VALUES (?, ?, ?, ?, ?,?, ?, ?, ?, ?,?); - -checkIfAccountsHaveExistingInvite: -SELECT EXISTS ( - SELECT 1 - FROM Invites - WHERE inviterAccount = ? AND inviteeAccount = ? - LIMIT 1 -); - -updateInviteStatusByInviteId: -UPDATE Invites -SET status = ? -WHERE inviteId = ?; - -updateInviteStatusByAccounts: -UPDATE Invites -SET status = ? -WHERE inviterAccount = ? AND inviteeAccount = ?; - -deleteInviteByInviteId: -DELETE FROM Invites -WHERE inviteId = ?; - -getInviteByInviteId: -SELECT inviteId, message, inviterAccount, inviteeAccount, status, inviterPublicKey, acceptTopic, symmetricKey, inviterPrivateKey, timestamp -FROM Invites -WHERE inviteId = ?; - -getAllPendingSentInvites: -SELECT inviteId, message, inviterAccount, inviteeAccount, status, inviterPublicKey, acceptTopic, symmetricKey, inviterPrivateKey, timestamp -FROM Invites -WHERE status = 'PENDING' AND type = 'SENT'; - --- SentInvites -getSentInvitesForInviterAccount: -SELECT inviteId, message, inviterAccount, inviteeAccount, status, inviterPublicKey, acceptTopic, symmetricKey, inviterPrivateKey, timestamp -FROM Invites -WHERE inviterAccount = ? AND type = 'SENT'; - --- ReceivedInvites -getReceivedInvitesForInviteeAccount: -SELECT inviteId, message, inviterAccount, inviteeAccount, status, inviterPublicKey, acceptTopic, symmetricKey, inviterPrivateKey, timestamp -FROM Invites -WHERE inviteeAccount = ? AND type = 'RECEIVED'; \ No newline at end of file diff --git a/protocol/chat/src/main/sqldelight/com/walletconnect/chat/storage/data/dao/Messages.sq b/protocol/chat/src/main/sqldelight/com/walletconnect/chat/storage/data/dao/Messages.sq deleted file mode 100644 index e206fea27..000000000 --- a/protocol/chat/src/main/sqldelight/com/walletconnect/chat/storage/data/dao/Messages.sq +++ /dev/null @@ -1,27 +0,0 @@ -CREATE TABLE Messages ( - id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, - messageId INTEGER UNIQUE NOT NULL, - topic TEXT NOT NULL, - message TEXT NOT NULL, - authorAccount TEXT NOT NULL, - timestamp INTEGER NOT NULL, - mediaType TEXT, - mediaData TEXT -); - -insertOrAbortMessage: -INSERT OR ABORT INTO Messages(topic, messageId, message, authorAccount,timestamp, mediaType, mediaData) -VALUES (?, ?, ?, ?, ? ,? ,?); - -getMessagesByTopic: -SELECT messageId, topic, message, authorAccount, timestamp, mediaType, mediaData -FROM Messages -WHERE topic = ?; - -deleteMessagesByTopic: -DELETE FROM Messages -WHERE topic = ?; - -deleteMessageByMessageId: -DELETE FROM Messages -WHERE messageId = ?; \ No newline at end of file diff --git a/protocol/chat/src/main/sqldelight/com/walletconnect/chat/storage/data/dao/Threads.sq b/protocol/chat/src/main/sqldelight/com/walletconnect/chat/storage/data/dao/Threads.sq deleted file mode 100644 index a68181e00..000000000 --- a/protocol/chat/src/main/sqldelight/com/walletconnect/chat/storage/data/dao/Threads.sq +++ /dev/null @@ -1,37 +0,0 @@ -CREATE TABLE Threads ( - id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, - topic TEXT UNIQUE NOT NULL, - selfAccount TEXT NOT NULL, - peerAccount TEXT NOT NULL, - UNIQUE(selfAccount, peerAccount) -); - -insertOrAbortThread: -INSERT OR ABORT INTO Threads(topic, selfAccount, peerAccount) -VALUES (?, ?, ?); - -getThreadsForSelfAccount: -SELECT topic, selfAccount, peerAccount -FROM Threads -WHERE selfAccount = ?; - -checkIfSelfAccountHaveThreadWithPeerAccount: -SELECT EXISTS ( - SELECT 1 - FROM Threads - WHERE selfAccount = ? AND peerAccount = ? - LIMIT 1 -); - -getThreadByTopic: -SELECT topic, selfAccount, peerAccount -FROM Threads -WHERE topic = ?; - -getAllThreads: -SELECT topic, selfAccount, peerAccount -FROM Threads; - -deleteThreadByTopic: -DELETE FROM Threads -WHERE topic = ?; \ No newline at end of file diff --git a/protocol/chat/src/main/sqldelight/migration/1.sqm b/protocol/chat/src/main/sqldelight/migration/1.sqm deleted file mode 100644 index 31e3fce2d..000000000 --- a/protocol/chat/src/main/sqldelight/migration/1.sqm +++ /dev/null @@ -1,32 +0,0 @@ -import com.walletconnect.chat.common.model.InviteStatus; -import com.walletconnect.chat.common.model.InviteType; - --- migration from 1.db to 2.db - -DROP TABLE IF EXISTS Invites; -DROP TABLE IF EXISTS Threads; - -CREATE TABLE Invites ( - id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, - inviteId INTEGER UNIQUE NOT NULL, - message TEXT NOT NULL, - inviterAccount TEXT NOT NULL, - inviteeAccount TEXT NOT NULL, - status TEXT AS InviteStatus NOT NULL, -- PENDING, REJECTED OR APPROVED - type TEXT AS InviteType NOT NULL, -- SENT OR RECEIVED - inviterPublicKey TEXT NOT NULL, - acceptTopic TEXT NOT NULL, - symmetricKey TEXT NOT NULL, - inviterPrivateKey TEXT NOT NULL, - timestamp INTEGER NOT NULL, - UNIQUE(inviterAccount, inviteeAccount) -); - - -CREATE TABLE Threads ( - id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, - topic TEXT UNIQUE NOT NULL, - selfAccount TEXT NOT NULL, - peerAccount TEXT NOT NULL, - UNIQUE(selfAccount, peerAccount) -); \ No newline at end of file diff --git a/protocol/chat/src/test/kotlin/com/walletconnect/chat/jwt/DidJwtRepositoryTest.kt b/protocol/chat/src/test/kotlin/com/walletconnect/chat/jwt/DidJwtRepositoryTest.kt deleted file mode 100644 index feebb56b2..000000000 --- a/protocol/chat/src/test/kotlin/com/walletconnect/chat/jwt/DidJwtRepositoryTest.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.walletconnect.chat.jwt - -import android.util.Log -import com.walletconnect.android.internal.common.jwt.did.extractVerifiedDidJwtClaims -import io.mockk.every -import io.mockk.mockkStatic -import junit.framework.TestCase.assertNotNull -import org.junit.Test - -internal class DidJwtRepositoryTest { - - init { - mockkStatic(Log::class) - every { Log.v(any(), any()) } returns 0 - every { Log.d(any(), any()) } returns 0 - every { Log.i(any(), any()) } returns 0 - every { Log.e(any(), any()) } returns 0 - } - - @Test - fun jwtDecode() { - val jwt = "eyJhbGciOiJFZERTQSIsInR5cCI6IkpXVCJ9" + - ".eyJpc3MiOiJkaWQ6a2V5Ono2TWt1VHhCUTR5aTN1Y3pUWlJUYkxKVFNLaGUzN2phUnJzdEJpUWg2SmIxZ3QzWCIsImlhdCI6MTY3NTQzMjI2NiwiZXhwIjoxNjc1NTE4NjY2LCJrc3UiOiJodHRwczovL3N0YWdpbmcua2V5cy53YWxsZXRjb25uZWN0LmNvbSIsImF1ZCI6ImRpZDpwa2g6ZWlwMTU1OjE6MHhlN2M3M2JhNjlhZGM2NTkzZDM3YmQ2ZmUwMDk5NWZiODljNTQxMjg2Iiwic3ViIjoiSGV5ISIsInBrZSI6ImRpZDprZXk6ejZMU21CQ0JLd0NaemJDd3J2RWFpdFU5TFJNMnRWOWYzWHVVN3FzTUJ4bkN6U1RrIn0.NdalJAlosJygMG4gsh0ZgKtVLvEm473E4cBRmqkvZX_M1KahHuyk59ZEB9VMnqvXjnmbfMEcMvKt-unRhNsDDw" - val t = extractVerifiedDidJwtClaims(jwt).getOrNull() - assertNotNull(t) - } -} \ No newline at end of file From 7cd42ca812f5c3213f50a061c7393aebe0a0827d Mon Sep 17 00:00:00 2001 From: kubel Date: Wed, 4 Sep 2024 11:19:05 +0200 Subject: [PATCH 10/51] ReadMes update --- ReadMe.md | 127 ++++++------- core/android/ReadMe.md | 6 +- core/modal/build.gradle.kts | 1 - product/walletconnectmodal/ReadMe.md | 6 +- product/web3modal/ReadMe.md | 14 +- product/web3wallet/ReadMe.md | 266 +-------------------------- 6 files changed, 86 insertions(+), 334 deletions(-) diff --git a/ReadMe.md b/ReadMe.md index 1e474acb2..9c8483055 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -1,78 +1,81 @@ -# **reown - kotlin** +# **reown-kotlin** -The communications protocol for web3, WalletConnect brings the ecosystem together by enabling hundreds of wallets and apps to securely connect and interact. This repository contains Kotlin implementation of -WalletConnect v2 protocols for Android applications. +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. #### ## BOM Instructions: -To help manage compatible dependencies stay in sync, we've introduced a [BOM](https://docs.gradle.org/current/userguide/platforms.html#sub:bom_import) to the Kotlin SDK. With this, you only need to update the BOM version to get the latest SDKs. Just add the BOM as a dependency and then list the SDKs you want to include into your project. + +To help manage compatible dependencies stay in sync, we've introduced a [BOM](https://docs.gradle.org/current/userguide/platforms.html#sub:bom_import) to the Kotlin SDK. With this, you only need to +update the BOM version to get the latest SDKs. Just add the BOM as a dependency and then list the SDKs you want to include into your project. ### example build.gradle.kts + ```kotlin dependencies { - implementation(platform("com.walletconnect:android-bom:{BOM version}")) - implementation("com.walletconnect:android-core") - implementation("com.walletconnect:web3wallet") + implementation(platform("com.reown:android-bom:{BOM version}")) + implementation("com.reown:android-core") + implementation("com.reown:walletkit") } ``` ## SDK Chart -| BOM | [Core SDK](core/android) | [Sign SDK](protocol/sign) | [Auth SDK](protocol/auth) | [Chat SDK](protocol/chat) | [Notify SDK](protocol/notify) | [web3wallet](product/web3wallet) | [web3modal](product/web3modal) | [WalletConnectModal](product/walletconnectmodal) | -|-----------------------------------------------------------------------------------------|--------------------------|---------------------------|---------------------------|---------------------------|:------------------------------|----------------------------------|--------------------------------|--------------------------------------------------| -| 1.35.1 | 1.35.1 | 2.35.1 | 1.28.9 | 1.0.0.beta36 | 1.3.10 | 1.35.1 | 1.6.5 | 1.5.10 | -| 1.35.0 | 1.35.0 | 2.35.0 | 1.28.8 | 1.0.0.beta35 | 1.3.9 | 1.35.0 | 1.6.4 | 1.5.9 | -| 1.34.1 | 1.34.1 | 2.34.1 | 1.28.7 | 1.0.0.beta34 | 1.3.8 | 1.34.1 | 1.6.3 | 1.5.8 | -| 1.34.0 | 1.34.0 | 2.34.0 | 1.28.6 | 1.0.0.beta33 | 1.3.7 | 1.34.0 | 1.6.2 | 1.5.7 | -| 1.33.1 | 1.33.1 | 2.33.1 | 1.28.5 | 1.0.0.beta32 | 1.3.6 | 1.33.1 | 1.6.1 | 1.5.6 | -| 1.33.0 | 1.33.0 | 2.33.0 | 1.28.4 | 1.0.0.beta31 | 1.3.5 | 1.33.0 | 1.6.0 | 1.5.5 | -| 1.32.1 | 1.32.0 | 2.32.0 | 1.28.3 | 1.0.0.beta30 | 1.3.4 | 1.32.1 | 1.5.4 | 1.5.4 | -| 1.31.3 | 1.31.2 | 2.31.2 | 1.28.2 | 1.0.0.beta30 | 1.3.2 | 1.31.2 | 1.5.2 | 1.5.2 | -| 1.31.1 | 1.31.1 | 2.31.1 | 1.28.1 | 1.0.0.beta26 | 1.3.1 | 1.31.1 | 1.5.1 | 1.5.1 | -| 1.31.0[**](https://gist.github.com/TalhaAli00/7b9e1cadf19b9dc5141cd033aa4e6172) | 1.31.0 | 2.31.0 | 1.28.0 | 1.0.0.beta25 | 1.3.0 | 1.31.0 | 1.5.0 | 1.5.0 | -| 1.30.0 | 1.30.0 | 2.30.0 | 1.27.0 | 1.0.0.beta25 | 1.2.0 | 1.30.0 | 1.4.0 | 1.4.0 | -| 1.23.0 | 1.28.0 | 2.26.0 | 1.26.0 | 1.0.0.beta25 | 1.1.0 | 1.21.0 | 1.3.0 | 1.3.0 | -| 1.22.2 | 1.27.2 | 2.25.2 | 1.25.2 | 1.0.0.beta25 | 1.0.2 | 1.20.2 | 1.2.2 | 1.2.2 | -| 1.22.1 | 1.27.0 | 2.25.0 | 1.25.0 | 1.0.0.beta23 | 1.0.0 | 1.20.0 | 1.2.1 | 1.2.0 | -| 1.22.0 | 1.27.0 | 2.25.0 | 1.25.0 | 1.0.0.beta23 | 1.0.0 | 1.20.0 | 1.2.0 | 1.2.0 | -| 1.21.1 | 1.26.0 | 2.24.0 | 1.24.0 | 1.0.0.beta23 | 1.0.0-beta04 | 1.19.0 | 1.1.1 | 1.1.1 | -| 1.21.0 | 1.26.0 | 2.24.0 | 1.24.0 | 1.0.0.beta23 | 1.0.0-beta04 | 1.19.0 | 1.1.0 | 1.1.0 | -| 1.20.0 | 1.25.0 | 2.23.0 | 1.23.0 | 1.0.0.beta22 | 1.0.0-beta03 | 1.18.0 | 1.0.0 | 1.0.0-beta02 | -| 1.19.1 | 1.24.0 | 2.22.0 | 1.22.0 | 1.0.0.beta21 | 1.0.0-beta02 | 1.17.0 | 1.0.0-beta02 | 1.0.0-beta01 | -| 1.19.0 | 1.24.0 | 2.22.0 | 1.22.0 | 1.0.0.beta21 | 1.0.0-beta02 | 1.17.0 | 1.0.0-beta01 | 1.0.0-beta01 | -| 1.18.0 | 1.23.0 | 2.21.0 | 1.21.0 | 1.0.0.beta20 | 1.0.0-beta01 | 1.16.0 | 1.0.0-alpha11 | 1.0.0-alpha07 | -| 1.17.2 | 1.22.1 | 2.20.1 | 1.20.1 | 1.0.0.beta19 | 1.0.0-alpha05 | 1.15.1 | 1.0.0-alpha10 | 1.0.0-alpha06 | -| 1.17.1 | 1.22.0 | 2.20.0 | 1.20.0 | 1.0.0.beta18 | 1.0.0-alpha04 | 1.15.0 | 1.0.0-alpha09 | 1.0.0-alpha05 | -| 1.17.0 | 1.22.0 | 2.20.0 | 1.20.0 | 1.0.0.beta18 | 1.0.0-alpha03 | 1.15.0 | 1.0.0-alpha09 | 1.0.0-alpha05 | -| 1.16.0 | 1.21.0 | 2.19.0 | 1.19.0 | 1.0.0.beta17 | 1.0.0-alpha02 | 1.14.0 | | 1.0.0-alpha04 | -| 1.15.0 | 1.20.0 | 2.18.0 | 1.18.0 | 1.0.0-beta16 | | 1.13.0 | | 1.0.0-alpha03 | -| 1.14.0 | 1.19.0 | 2.17.0 | 1.17.0 | 1.0.0-beta15 | | 1.12.0 | | 1.0.0-alpha02 | -| 1.13.1 | 1.18.0 | 2.16.0 | 1.16.0 | 1.0.0-beta14 | | 1.11.0 | | 1.0.0-alpha01 | -| 1.12.0 | 1.17.0 | 2.15.0 | 1.15.0 | 1.0.0-beta13 | | 1.10.0 | | | -| 1.11.1 | 1.16.1 | 2.14.1 | 1.14.1 | 1.0.0-beta12 | | 1.9.1 | | | -| 1.11.0 | 1.16.0 | 2.14.0 | 1.14.0 | 1.0.0-beta11 | | 1.9.0 | | | -| 1.10.0 | 1.15.0 | 2.13.0 | 1.13.0 | 1.0.0-beta10 | | 1.8.0 | | | -| 1.9.3 | 1.14.3 | 2.12.3 | 1.12.3 | 1.0.0-beta09 | | 1.7.3 | | | -| 1.9.2 | 1.14.2 | 2.12.2 | 1.12.2 | 1.0.0-beta08 | | 1.7.2 | | | -| 1.9.1 | 1.14.1 | 2.12.1 | 1.12.1 | 1.0.0-beta07 | | 1.7.1 | | | -| 1.9.0[**](https://github.com/WalletConnect/WalletConnectKotlinV2/issues/821) | 1.14.0 | 2.12.0 | 1.12.0 | 1.0.0-beta06 | | 1.7.0 | | | -| 1.8.0 | 1.13.0 | 2.11.0 | 1.11.0 | 1.0.0-beta05 | | 1.6.0 | | | -| 1.7.0 | 1.12.0 | 2.10.0 | 1.10.0 | 1.0.0-beta04 | | 1.5.0 | | | -| 1.6.1 | 1.11.1 | 2.9.1 | 1.9.1 | 1.0.0-beta03 | | 1.4.1 | | | -| 1.6.0 | 1.11.0 | 2.9.0 | 1.9.0 | 1.0.0-beta02 | | 1.4.0 | | | -| 1.5.0 | 1.10.0 | 2.8.0 | 1.8.0 | 1.0.0-beta01 | | 1.3.0 | | | -| 1.4.1 | 1.9.1 | 2.7.1 | 1.7.1 | 1.0.0-alpha09 | | 1.2.1 | | | -| 1.3.0 | 1.8.0 | 2.6.0 | 1.6.0 | 1.0.0-alpha07 | | 1.1.0 | | | -| 1.2.0 | 1.7.0 | 2.5.0 | 1.5.0 | 1.0.0-alpha06 | | 1.0.0 | | | -| 1.1.1 | 1.6.0 | 2.4.0 | 1.4.0 | 1.0.0-alpha05 | | | | | -| 1.0.1 | 1.5.0 | 2.3.1 | 1.3.0 | 1.0.0-alpha04 | | | | | -| | 1.4.0 | 2.2.0 | 1.2.0 | 1.0.0-alpha03 | | | | | -| | 1.3.0 | 2.1.0 | 1.1.0 | 1.0.0-alpha02 | | | | | -| | 1.2.0 | | | 1.0.0-alpha01 | | | | | -| | 1.1.0 | 2.0.0 | 1.0.0 | | | | | | -| | 1.0.0 | 2.0.0-rc.5 | 1.0.0-alpha01 | | | | | | - +| BOM | [Core SDK](core/android) | [Sign SDK](protocol/sign) | [Notify SDK](protocol/notify) | [WalletKit](product/web3wallet) | [AppKit](product/web3modal) | [WalletConnectModal](product/walletconnectmodal) | +|-----------------------------------------------------------------------------------------|--------------------------|---------------------------|:------------------------------|---------------------------------|-----------------------------|--------------------------------------------------| +| 1.35.1 | 1.35.1 | 2.35.1 | 1.3.10 | 1.35.1 | 1.6.5 | 1.5.10 | +| 1.35.0 | 1.35.0 | 2.35.0 | 1.3.9 | 1.35.0 | 1.6.4 | 1.5.9 | +| 1.34.1 | 1.34.1 | 2.34.1 | 1.3.8 | 1.34.1 | 1.6.3 | 1.5.8 | +| 1.34.0 | 1.34.0 | 2.34.0 | 1.3.7 | 1.34.0 | 1.6.2 | 1.5.7 | +| 1.33.1 | 1.33.1 | 2.33.1 | 1.3.6 | 1.33.1 | 1.6.1 | 1.5.6 | +| 1.33.0 | 1.33.0 | 2.33.0 | 1.3.5 | 1.33.0 | 1.6.0 | 1.5.5 | +| 1.32.1 | 1.32.0 | 2.32.0 | 1.3.4 | 1.32.1 | 1.5.4 | 1.5.4 | +| 1.31.3 | 1.31.2 | 2.31.2 | 1.3.2 | 1.31.2 | 1.5.2 | 1.5.2 | +| 1.31.1 | 1.31.1 | 2.31.1 | 1.3.1 | 1.31.1 | 1.5.1 | 1.5.1 | +| 1.31.0[**](https://gist.github.com/TalhaAli00/7b9e1cadf19b9dc5141cd033aa4e6172) | 1.31.0 | 2.31.0 | 1.3.0 | 1.31.0 | 1.5.0 | 1.5.0 | +| 1.30.0 | 1.30.0 | 2.30.0 | 1.2.0 | 1.30.0 | 1.4.0 | 1.4.0 | +| 1.23.0 | 1.28.0 | 2.26.0 | 1.1.0 | 1.21.0 | 1.3.0 | 1.3.0 | +| 1.22.2 | 1.27.2 | 2.25.2 | 1.0.2 | 1.20.2 | 1.2.2 | 1.2.2 | +| 1.22.1 | 1.27.0 | 2.25.0 | 1.0.0 | 1.20.0 | 1.2.1 | 1.2.0 | +| 1.22.0 | 1.27.0 | 2.25.0 | 1.0.0 | 1.20.0 | 1.2.0 | 1.2.0 | +| 1.21.1 | 1.26.0 | 2.24.0 | 1.0.0-beta04 | 1.19.0 | 1.1.1 | 1.1.1 | +| 1.21.0 | 1.26.0 | 2.24.0 | 1.0.0-beta04 | 1.19.0 | 1.1.0 | 1.1.0 | +| 1.20.0 | 1.25.0 | 2.23.0 | 1.0.0-beta03 | 1.18.0 | 1.0.0 | 1.0.0-beta02 | +| 1.19.1 | 1.24.0 | 2.22.0 | 1.0.0-beta02 | 1.17.0 | 1.0.0-beta02 | 1.0.0-beta01 | +| 1.19.0 | 1.24.0 | 2.22.0 | 1.0.0-beta02 | 1.17.0 | 1.0.0-beta01 | 1.0.0-beta01 | +| 1.18.0 | 1.23.0 | 2.21.0 | 1.0.0-beta01 | 1.16.0 | 1.0.0-alpha11 | 1.0.0-alpha07 | +| 1.17.2 | 1.22.1 | 2.20.1 | 1.0.0-alpha05 | 1.15.1 | 1.0.0-alpha10 | 1.0.0-alpha06 | +| 1.17.1 | 1.22.0 | 2.20.0 | 1.0.0-alpha04 | 1.15.0 | 1.0.0-alpha09 | 1.0.0-alpha05 | +| 1.17.0 | 1.22.0 | 2.20.0 | 1.0.0-alpha03 | 1.15.0 | 1.0.0-alpha09 | 1.0.0-alpha05 | +| 1.16.0 | 1.21.0 | 2.19.0 | 1.0.0-alpha02 | 1.14.0 | | 1.0.0-alpha04 | +| 1.15.0 | 1.20.0 | 2.18.0 | | 1.13.0 | | 1.0.0-alpha03 | +| 1.14.0 | 1.19.0 | 2.17.0 | | 1.12.0 | | 1.0.0-alpha02 | +| 1.13.1 | 1.18.0 | 2.16.0 | | 1.11.0 | | 1.0.0-alpha01 | +| 1.12.0 | 1.17.0 | 2.15.0 | | 1.10.0 | | | +| 1.11.1 | 1.16.1 | 2.14.1 | | 1.9.1 | | | +| 1.11.0 | 1.16.0 | 2.14.0 | | 1.9.0 | | | +| 1.10.0 | 1.15.0 | 2.13.0 | | 1.8.0 | | | +| 1.9.3 | 1.14.3 | 2.12.3 | | 1.7.3 | | | +| 1.9.2 | 1.14.2 | 2.12.2 | | 1.7.2 | | | +| 1.9.1 | 1.14.1 | 2.12.1 | | 1.7.1 | | | +| 1.9.0[**](https://github.com/WalletConnect/WalletConnectKotlinV2/issues/821) | 1.14.0 | 2.12.0 | | 1.7.0 | | | +| 1.8.0 | 1.13.0 | 2.11.0 | | 1.6.0 | | | +| 1.7.0 | 1.12.0 | 2.10.0 | | 1.5.0 | | | +| 1.6.1 | 1.11.1 | 2.9.1 | | 1.4.1 | | | +| 1.6.0 | 1.11.0 | 2.9.0 | | 1.4.0 | | | +| 1.5.0 | 1.10.0 | 2.8.0 | | 1.3.0 | | | +| 1.4.1 | 1.9.1 | 2.7.1 | | 1.2.1 | | | +| 1.3.0 | 1.8.0 | 2.6.0 | | 1.1.0 | | | +| 1.2.0 | 1.7.0 | 2.5.0 | | 1.0.0 | | | +| 1.1.1 | 1.6.0 | 2.4.0 | | | | | +| 1.0.1 | 1.5.0 | 2.3.1 | | | | | +| | 1.4.0 | 2.2.0 | | | | | +| | 1.3.0 | 2.1.0 | | | | | +| | 1.2.0 | | | | | | +| | 1.1.0 | 2.0.0 | | | | | +| | 1.0.0 | 2.0.0-rc.5 | | | | | ## License -WalletConnect v2 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. diff --git a/core/android/ReadMe.md b/core/android/ReadMe.md index df3e19a9c..34de6018c 100644 --- a/core/android/ReadMe.md +++ b/core/android/ReadMe.md @@ -1,6 +1,6 @@ -# **WalletConnect Core - Android** +# **Core - Android** -Kotlin implementation of WalletConnect Core SDK for Android applications. +Kotlin implementation of reown Core SDK for Android applications. ![Maven Central](https://img.shields.io/maven-central/v/com.walletconnect/android-core) @@ -33,7 +33,7 @@ allprojects { app/build.gradle.kts ```gradle -implementation("com.walletconnect:android-core:release_version") +implementation("com.reown:android-core:release_version") ``` ## Project ID diff --git a/core/modal/build.gradle.kts b/core/modal/build.gradle.kts index 1a5c518f8..0c9eae093 100644 --- a/core/modal/build.gradle.kts +++ b/core/modal/build.gradle.kts @@ -76,5 +76,4 @@ dependencies { api(libs.bundles.androidxNavigation) implementation(libs.qrCodeGenerator) api(libs.timber) - } \ No newline at end of file diff --git a/product/walletconnectmodal/ReadMe.md b/product/walletconnectmodal/ReadMe.md index 52c16f0f6..8de2b0437 100644 --- a/product/walletconnectmodal/ReadMe.md +++ b/product/walletconnectmodal/ReadMe.md @@ -37,8 +37,8 @@ allprojects { app/build.gradle.kts ```gradle -implementation(platform("com.walletconnect:android-bom:$BOM_VERSION")) -implementation("com.walletconnect:android-core") -implementation("com.walletconnect:walletconnect-modal") +implementation(platform("com.reown:android-bom:$BOM_VERSION")) +implementation("com.reown:android-core") +implementation("com.reown:walletconnect-modal") ``` diff --git a/product/web3modal/ReadMe.md b/product/web3modal/ReadMe.md index 99476fb60..c9ea7ad82 100644 --- a/product/web3modal/ReadMe.md +++ b/product/web3modal/ReadMe.md @@ -1,18 +1,18 @@ -# **WalletConnect Web3Modal - Kotlin** +# **AppKit - Kotlin** # Installation :::caution -**The Web3Modal SDK is currently in Alpha and is not production-ready**. +**The AppKit SDK is currently in Alpha and is not production-ready**. It's public API and associated documentation may still see significant and breaking changes. ::: -Kotlin implementation of Web3Modal for Android applications. +Kotlin implementation of AppKit for Android applications. Android Core ![Maven Central](https://img.shields.io/maven-central/v/com.walletconnect/android-core) -Web3Modal ![Maven Central](https://img.shields.io/maven-central/v/com.walletconnect/web3modal) +AppKit ![Maven Central](https://img.shields.io/maven-central/v/com.walletconnect/web3modal) ## Requirements @@ -33,8 +33,8 @@ allprojects { app/build.gradle.kts ```gradle -implementation(platform("com.walletconnect:android-bom:$BOM_VERSION")) -implementation("com.walletconnect:android-core") -implementation("com.walletconnect:web3modal") +implementation(platform("com.reown:android-bom:$BOM_VERSION")) +implementation("com.reown:android-core") +implementation("com.reown:appkit") ``` diff --git a/product/web3wallet/ReadMe.md b/product/web3wallet/ReadMe.md index ac782301f..e0116f800 100644 --- a/product/web3wallet/ReadMe.md +++ b/product/web3wallet/ReadMe.md @@ -1,6 +1,6 @@ -# **WalletConnect Web3Wallet - Kotlin** +# **WalletKit - Kotlin** -Kotlin implementation of Web3Wallet for Android applications. +Kotlin implementation of WalletKit for Android applications. ![Maven Central](https://img.shields.io/maven-central/v/com.walletconnect/web3wallet) @@ -10,8 +10,8 @@ Kotlin implementation of Web3Wallet for Android applications. * Java 11 ## Documentation and usage -* [Web3Wallet installation](https://docs.walletconnect.com/2.0/kotlin/web3wallet/installation) -* [Web3Wallet usage](https://docs.walletconnect.com/2.0/kotlin/web3wallet/wallet-usage) +* [WalletKit installation](https://docs.walletconnect.com/2.0/kotlin/web3wallet/installation) +* [WalletKit usage](https://docs.walletconnect.com/2.0/kotlin/web3wallet/wallet-usage) ## Installation @@ -29,257 +29,7 @@ allprojects { app/build.gradle.kts ```gradle -implementation(platform("com.walletconnect:android-bom:{BOM version}")) -implementation("com.walletconnect:android-core") -implementation("com.walletconnect:web3wallet") -``` - -  - -## Migration guide from SignClient and AuthClient to Web3Wallet - -Web3Wallet SDK introduces a new interface for all wallets that wraps the Sign and Auth clients internally. Only one dependency is needed to -enable new use cases for wallets. Down below you can find a migration guide for Sign and Auth clients. - -## Migration from SignClient - -### Initialization - -```kotlin -//CoreClient -CoreClient.initialize(relayServerUrl, connectionType, application, metaData) { error -> } - -//SignClient -val initParams = Sign.Params.Init(CoreClient) -SignClient.initialize(initParams) { error -> } - -//Web3Wallet -val initParams = Wallet.Params.Init(CoreClient) -Web3Wallet.initialize(initParams) { error -> } -``` - -### Pair with a Dapp - -```kotlin -//CoreClient -val pairingParams = Core.Params.Pair(pairingUri) -CoreClient.Pairing.pair(pairingParams) { error -> } - -//Web3Wallet -val pairingParams = Wallet.Params.Pair(pairingUri) -Web3Wallet.pair(pairingParams) { error -> } -``` - -### Approve a session - -```kotlin -//SignClient -val approveParams: Sign.Params.Approve = Sign.Params.Approve(proposerPublicKey, namespaces) -SignClient.approveSession(approveParams) { error -> } - -//Web3Wallet -val approveParams = Wallet.Params.SessionApprove(proposerPublicKey namespaces) -Web3Wallet.approveSession(approveProposal) { error -> } -``` - -### Reject a session - -```kotlin -//SignClient -val rejectParams = Sign.Params.Reject = Reject(proposerPublicKey, rejectionReason, rejectionCode) -SignClient.rejectSession(rejectParams) { error -> } - -//Web3Wallet -val reject = Wallet.Params.SessionReject(proposerPublicKey, reason) -Web3Wallet.rejectSession(reject) { error -> } -``` - -### Respond to a session request - -```kotlin -//SignClient -val jsonRpcResponse = Sign.Model.JsonRpcResponse.JsonRpcResult(requestId, result) -val result = Sign.Params.Response(sessionTopic, jsonRpcResponse) -SignClient.respond(result) { error -> } - -//Web3Wallet -val jsonRpcResponse = Wallet.Model.JsonRpcResponse.JsonRpcResult(requestId, result) -val response = Wallet.Params.SessionRequestResponse(sessionTopic, jsonRpcResponse) -Web3Wallet.respondSessionRequest(response) { error -> } -``` - -### Reject a session request - -```kotlin -//SignClient -val jsonRpcResponseError = Sign.Model.JsonRpcResponse.JsonRpcError(requestId, code, message) /*Session Request ID along with error code and message*/ -val result = Sign.Params.Response(sessionTopic, jsonRpcResponse) -SignClient.respond(result) { error -> } - -//Web3Wallet -val jsonRpcResponse = Wallet.Model.JsonRpcResponse.JsonRpcError(requestId, code, message) -val result = Wallet.Params.SessionRequestResponse(sessionTopic, jsonRpcResponse) -Web3Wallet.respondSessionRequest(result) { error -> } -``` - -### Update a session - -```kotlin -//SignClient -val updateParams = Sign.Params.Update(sessionTopic, namespaces) -SignClient.update(updateParams) { error -> } - -//Web3Wallet -val update = Wallet.Params.SessionUpdate(sessionTopic, namespaces) -Web3Wallet.updateSession(update) { error -> } -``` - -### Extend a session - -```kotlin -//SignClient -val extendParams = Sign.Params.Extend(sessionTopic) -WalletConnectClient.extend(exdendParams) { error -> } - -//Web3Wallet -val extend = Wallet.Params.SessionExtend(sessionTopic) -Web3Wallet.extendSession(extend) { error -> } -``` - -### Disconnect a session - -```kotlin -//SignClient -val disconnectParams = Sign.Params.Disconnect(sessionTopic, disconnectionReason, disconnectionCode) -SignClient.disconnect(disconnectParams) { error -> } - -//Web3Wallet -val disconnect = Wallet.Params.SessionDisconnect(sessionTopic) -Web3Wallet.disconnectSession(disconnect) { error -> } -``` - -### WalletDelegate - -```kotlin -//SignClient -val walletDelegate = object : SignClient.WalletDelegate { - override fun onSessionProposal(sessionProposal: Sign.Model.SessionProposal) { - // Triggered when wallet receives the session proposal sent by a Dapp - } - - override fun onSessionRequest(sessionRequest: Sign.Model.SessionRequest) { - // Triggered when a Dapp sends SessionRequest to sign a transaction or a message - } - - override fun onSessionDelete(deletedSession: Sign.Model.DeletedSession) { - // Triggered when the session is deleted by the peer - } - - override fun onSessionSettleResponse(settleSessionResponse: Sign.Model.SettledSessionResponse) { - // Triggered when wallet receives the session settlement response from Dapp - } - - override fun onSessionUpdateResponse(sessionUpdateResponse: Sign.Model.SessionUpdateResponse) { - // Triggered when wallet receives the session update response from Dapp - } - - override fun onConnectionStateChange(state: Sign.Model.ConnectionState) { - //Triggered whenever the connection state is changed - } - - override fun onError(error: Sign.Model.Error) { - // Triggered whenever there is an issue inside the SDK - } -} -SignClient.setWalletDelegate(walletDelegate) - -//Web3Wallet -val walletDelegate = object : Web3Wallet.WalletDelegate { - override fun onSessionProposal(sessionProposal: Wallet.Model.SessionProposal) { - // Triggered when wallet receives the session proposal sent by a Dapp - } - - override fun onSessionRequest(sessionRequest: Wallet.Model.SessionRequest) { - // Triggered when a Dapp sends SessionRequest to sign a transaction or a message - } - - override fun onAuthRequest(authRequest: Wallet.Model.AuthRequest) { - // Triggered when Dapp / Requester makes an authorisation request - } - - override fun onSessionDelete(sessionDelete: Wallet.Model.SessionDelete) { - // Triggered when the session is deleted by the peer - } - - override fun onSessionSettleResponse(settleSessionResponse: Wallet.Model.SettledSessionResponse) { - // Triggered when wallet receives the session settlement response from Dapp - } - - override fun onSessionUpdateResponse(sessionUpdateResponse: Wallet.Model.SessionUpdateResponse) { - // Triggered when wallet receives the session update response from Dapp - } - - override fun onConnectionStateChange(state: Wallet.Model.ConnectionState) { - //Triggered whenever the connection state is changed - } - - override fun onError(error: Wallet.Model.Error) { - // Triggered whenever there is an issue inside the SDK - } -} -Web3Wallet.setWalletDelegate(walletDelegate) -``` - -## Migration from AuthClient - -### Initialization - -```kotlin -//CoreClient -CoreClient.initialize(relayServerUrl, connectionType, application, metaData) { error -> } - -//AuthClient -val initParams = Auth.Params.Init(CoreClient) -AuthClient.initialize(init = Auth.Params.Init(core = CoreClient)) { error -> } - -//Web3Wallet -val initParams = Wallet.Params.Init(core = CoreClient) -Web3Wallet.initialize(initParams) { error -> } -``` - -### Authentication - -```kotlin -//AuthClient -val signature = CacaoSigner.sign(message, privateKey, SignatureType.EIP191) -AuthClient.respond(Auth.Params.Respond.Result(requestId, signature, issuer)) { error -> } - -//Web3Wallet -val signature = CacaoSigner.sign(message, privateKey, SignatureType.EIP191) -Web3Wallet.respondAuthRequest(Wallet.Params.AuthRequestResponse(requestId, signature, issuer)) { error -> } -``` - -### Message formatting - -```kotlin -//AuthClient -val payloadParams: Auth.Params.PayloadParams = //PayloadParams received in the onAuthRequest callback -val issuer = //MUST be the same as send with the respond methods and follows: https://github.com/w3c-ccg/did-pkh/blob/main/did-pkh-method-draft.md -val formatMessage = Auth.Params.FormatMessage(payloadParamspayloadParams, issuer) -AuthClient.formatMessage(formatMessage) - -//Web3Wallet -val payloadParams: Wallet.Model.PayloadParams = //PayloadParams received in the onAuthRequest callback -val issuer = //MUST be the same as send with the respond methods and follows: https://github.com/w3c-ccg/did-pkh/blob/main/did-pkh-method-draft.md -val formatMessage = Wallet.Params.FormatMessage(Wallet.Params.FormatMessage(payloadParams, issuer)) -Web3Wallet.formatMessage(formatMessage) -``` - -Test against: - -* Live dapp - Sign - https://react-app.walletconnect.com -* Live dapp - Auth - https://react-auth-dapp.walletconnect.com/ - -## Sample app - -* For sample wallet run `web3wallet module` +implementation(platform("com.reown:android-bom:{BOM version}")) +implementation("com.reown:android-core") +implementation("com.reown:walletkit") +``` \ No newline at end of file From 2cf8eeb6d7395498c1f2149864e1b2b6f309f331 Mon Sep 17 00:00:00 2001 From: kubel Date: Wed, 4 Sep 2024 11:46:34 +0200 Subject: [PATCH 11/51] Rename Web3Wallet to WalletKit --- buildSrc/scripts/check_modules.sh | 4 - buildSrc/src/main/kotlin/VersionBump.kt | 9 +- .../main/kotlin/release-scripts.gradle.kts | 2 - .../src/main/kotlin/version-bump.gradle.kts | 10 +- .../kotlin/com/walletconnect/android/Core.kt | 23 ----- .../common/adapter/JsonRpcResultAdapter.kt | 16 ---- .../internal/common/di/DatabaseConfig.kt | 5 +- .../android/internal/common/model/Tags.kt | 15 --- .../common/model/params/CoreAuthParams.kt | 18 ---- .../push_messages/PushMessagesRepository.kt | 2 +- ...RpcResponseJsonRpcResultJsonAdapterTest.kt | 1 - .../web3/wallet/client/Wallet.kt | 47 ++-------- .../client/{Web3Wallet.kt => WalletKit.kt} | 8 +- .../sample/wallet/Web3WalletApplication.kt | 6 +- .../wallet/domain/NotificationHandler.kt | 23 ----- .../sample/wallet/domain/WCDelegate.kt | 15 +-- .../sample/wallet/ui/Web3WalletActivity.kt | 5 +- .../sample/wallet/ui/Web3WalletEvent.kt | 7 +- .../sample/wallet/ui/Web3WalletNavGraph.kt | 4 - .../sample/wallet/ui/Web3WalletViewModel.kt | 11 +-- .../sample/wallet/ui/routes/Route.kt | 1 - .../ConnectionDetailsRoute.kt | 10 +- .../connections/ConnectionsViewModel.kt | 4 +- .../auth_request/AuthRequestRoute.kt | 91 ------------------- .../auth_request/AuthRequestStore.kt | 31 ------- .../auth_request/AuthRequestUI.kt | 10 -- .../auth_request/AuthRequestViewModel.kt | 90 ------------------ .../SessionAuthenticateViewModel.kt | 14 +-- .../SessionProposalViewModel.kt | 12 +-- .../SessionRequestViewModel.kt | 10 +- 30 files changed, 55 insertions(+), 449 deletions(-) delete mode 100644 core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/params/CoreAuthParams.kt rename product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/{Web3Wallet.kt => WalletKit.kt} (97%) delete mode 100644 sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/auth_request/AuthRequestRoute.kt delete mode 100644 sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/auth_request/AuthRequestStore.kt delete mode 100644 sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/auth_request/AuthRequestUI.kt delete mode 100644 sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/auth_request/AuthRequestViewModel.kt diff --git a/buildSrc/scripts/check_modules.sh b/buildSrc/scripts/check_modules.sh index f8597b1df..e2fd17a2f 100755 --- a/buildSrc/scripts/check_modules.sh +++ b/buildSrc/scripts/check_modules.sh @@ -33,8 +33,6 @@ check_changes "foundation" "FOUNDATION_MODULE_CHANGED" check_changes "core/android" "CORE_MODULE_CHANGED" check_changes "core/modal" "MODAL_CORE_MODULE_CHANGED" check_changes "protocol/sign" "SIGN_MODULE_CHANGED" -check_changes "protocol/auth" "AUTH_MODULE_CHANGED" -check_changes "protocol/chat" "CHAT_MODULE_CHANGED" check_changes "protocol/notify" "NOTIFY_MODULE_CHANGED" check_changes "product/web3wallet" "WEB_3_WALLET_MODULE_CHANGED" check_changes "product/walletconnectmodal" "WC_MODAL_MODULE_CHANGED" @@ -46,8 +44,6 @@ echo "FOUNDATION_MODULE_CHANGED=$FOUNDATION_MODULE_CHANGED" >> "$1" echo "CORE_MODULE_CHANGED=$CORE_MODULE_CHANGED" >> "$1" echo "MODAL_CORE_MODULE_CHANGED=$MODAL_CORE_MODULE_CHANGED" >> "$1" echo "SIGN_MODULE_CHANGED=$SIGN_MODULE_CHANGED" >> "$1" -echo "AUTH_MODULE_CHANGED=$AUTH_MODULE_CHANGED" >> "$1" -echo "CHAT_MODULE_CHANGED=$CHAT_MODULE_CHANGED" >> "$1" echo "NOTIFY_MODULE_CHANGED=$NOTIFY_MODULE_CHANGED" >> "$1" echo "WEB_3_WALLET_MODULE_CHANGED=$WEB_3_WALLET_MODULE_CHANGED" >> "$1" echo "WC_MODAL_MODULE_CHANGED=$WC_MODAL_MODULE_CHANGED" >> "$1" diff --git a/buildSrc/src/main/kotlin/VersionBump.kt b/buildSrc/src/main/kotlin/VersionBump.kt index 5f49c3cf2..5c3b95bd5 100644 --- a/buildSrc/src/main/kotlin/VersionBump.kt +++ b/buildSrc/src/main/kotlin/VersionBump.kt @@ -19,8 +19,8 @@ const val CHART_DELIMETER = "|" // note: Must match names in Version.kt enum class Version(var chartPosition: Int? = null) { - BOM(1), FOUNDATION(), CORE(2), SIGN(3), AUTH(4), CHAT(5), - NOTIFY(6), WEB_3_WALLET(7), WEB_3_MODAL(8), WC_MODAL(9), MODAL_CORE(); + BOM(1), FOUNDATION(), CORE(2), SIGN(3), + NOTIFY(4), WEB_3_WALLET(5), WEB_3_MODAL(6), WC_MODAL(7), MODAL_CORE(); val key: String = name + VERSION_SUFFIX } @@ -133,7 +133,7 @@ fun parseInput(properties: Map, inputType: InputType): Map parseManualInput(properties) } -// ./gradlew fixBump -Pmodules=FOUNDATION,CORE,SIGN,AUTH,CHAT,NOTIFY,WEB_3_WALLET,WEB_3_MODAL,WC_MODAL,MODAL_CORE +// ./gradlew fixBump -Pmodules=FOUNDATION,CORE,SIGN,NOTIFY,WEB_3_WALLET,WEB_3_MODAL,WC_MODAL,MODAL_CORE // ./gradlew releaseBump -Pmodules=FOUNDATION fun parseAutomaticInput(properties: Map): Map { val modules = properties[PROPERTY_MODULE_KEY]?.run(String::class::safeCast)?.run { this.uppercase().split(MODULE_SEPARATOR) } ?: throw Exception("No modules specified.") @@ -188,13 +188,12 @@ fun ensureModuleDependenciesWhenBumping(parsedVersions: Map): else -> { versions .run { if (this[Version.SIGN] == true) bumpSignDependantModules() else this } - .run { if (this[Version.AUTH] == true) bumpAuthDependantModules() else this } .run { if (this[Version.MODAL_CORE] == true) bumpModalCoreDependantModules() else this } } } } -// ./gradlew manualBump -PBOM=1.0.0 -PFOUNDATION=1.0.0 -PCORE=1.0.0 -PSIGN=1.0.0 -PAUTH=1.0.0 -PCHAT=1.0.0 -PNOTIFY=1.0.0 -PWEB_3_WALLET=1.0.0 -PWEB_3_MODAL=1.0.0 -PWC_MODAL=1.0.0 -PMODAL_CORE=1.0.0 +// ./gradlew manualBump -PBOM=1.0.0 -PFOUNDATION=1.0.0 -PCORE=1.0.0 -PSIGN=1.0.0 -PNOTIFY=1.0.0 -PWEB_3_WALLET=1.0.0 -PWEB_3_MODAL=1.0.0 -PWC_MODAL=1.0.0 -PMODAL_CORE=1.0.0 fun parseManualInput(properties: Map): Map { return Version.values().associate { version -> version to (properties[version.name]?.run(String::class::safeCast)?.run { true } ?: false) diff --git a/buildSrc/src/main/kotlin/release-scripts.gradle.kts b/buildSrc/src/main/kotlin/release-scripts.gradle.kts index 412226d0f..1f53fa6ee 100644 --- a/buildSrc/src/main/kotlin/release-scripts.gradle.kts +++ b/buildSrc/src/main/kotlin/release-scripts.gradle.kts @@ -35,8 +35,6 @@ fun compileListOfSDKs(): List> = mutableListOf( Triple("core", "android", "android"), Triple("core", "modal", "android"), Triple("protocol", "sign", "android"), - Triple("protocol", "auth", "android"), - Triple("protocol", "chat", "android"), Triple("protocol", "notify", "android"), Triple("product", "web3wallet", "android"), Triple("product", "web3modal", "android"), diff --git a/buildSrc/src/main/kotlin/version-bump.gradle.kts b/buildSrc/src/main/kotlin/version-bump.gradle.kts index 0cce755a5..2f3e04698 100644 --- a/buildSrc/src/main/kotlin/version-bump.gradle.kts +++ b/buildSrc/src/main/kotlin/version-bump.gradle.kts @@ -25,7 +25,7 @@ tasks { } // Example usage: - // ./gradlew manualBump -PBOM=1.0.0 -PFOUNDATION=1.0.0 -PCORE=1.0.0 -PSIGN=1.0.0 -PAUTH=1.0.0 -PCHAT=1.0.0 -PNOTIFY=1.0.0 -PWEB_3_WALLET=1.0.0 -PWEB_3_MODAL=1.0.0 -PWC_MODAL=1.0.0 -PMODAL_CORE=1.0.0 + // ./gradlew manualBump -PBOM=1.0.0 -PFOUNDATION=1.0.0 -PCORE=1.0.0 -PSIGN=1.0.0 -PNOTIFY=1.0.0 -PWEB_3_WALLET=1.0.0 -PWEB_3_MODAL=1.0.0 -PWC_MODAL=1.0.0 -PMODAL_CORE=1.0.0 // ./gradlew manualBump -PNOTIFY=2.0.0 register("manualBump") { doLast { @@ -34,9 +34,9 @@ tasks { } // Example usage: - // ./gradlew releaseBump -Pmodules=FOUNDATION,CORE,SIGN,AUTH,CHAT,NOTIFY,WEB_3_WALLET,WEB_3_MODAL,WC_MODAL,MODAL_CORE + // ./gradlew releaseBump -Pmodules=FOUNDATION,CORE,SIGN,NOTIFY,WEB_3_WALLET,WEB_3_MODAL,WC_MODAL,MODAL_CORE // ./gradlew releaseBump -Pmodules=FOUNDATION - // ./gradlew releaseBump -Pmodules=AUTH,WEB_3_MODAL + // ./gradlew releaseBump -Pmodules=WEB_3_MODAL register("releaseBump") { doLast { writeFiles(bumpVersions(properties, VersionBumpType.RELEASE, InputType.AUTOMATIC)) @@ -44,9 +44,9 @@ tasks { } // Example usage: - // ./gradlew fixBump -Pmodules=FOUNDATION,CORE,SIGN,AUTH,CHAT,NOTIFY,WEB_3_WALLET,WEB_3_MODAL,WC_MODAL,MODAL_CORE + // ./gradlew fixBump -Pmodules=FOUNDATION,CORE,SIGN,NOTIFY,WEB_3_WALLET,WEB_3_MODAL,WC_MODAL,MODAL_CORE // ./gradlew fixBump -Pmodules=FOUNDATION - // ./gradlew fixBump -Pmodules=AUTH,WEB_3_MODAL + // ./gradlew fixBump -Pmodules=WEB_3_MODAL register("fixBump") { doLast { writeFiles(bumpVersions(properties, VersionBumpType.FIX, InputType.AUTOMATIC)) diff --git a/core/android/src/main/kotlin/com/walletconnect/android/Core.kt b/core/android/src/main/kotlin/com/walletconnect/android/Core.kt index a4ad20b32..8927f8c3a 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/Core.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/Core.kt @@ -132,29 +132,6 @@ object Core { val iat: String ) : Model() } - - @Deprecated("Use SessionAuthenticate instead") - data class AuthRequest( - val id: Long, - val pairingTopic: String, - val metadata: AppMetaData, - val payloadParams: PayloadParams, - ) : Message() { - data class PayloadParams( - val type: String, - val chainId: String, - val domain: String, - val aud: String, - val version: String, - val nonce: String, - val iat: String, - val nbf: String?, - val exp: String?, - val statement: String?, - val requestId: String?, - val resources: List?, - ) - } } } diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/adapter/JsonRpcResultAdapter.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/adapter/JsonRpcResultAdapter.kt index 5a26ead00..63924e8a5 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/adapter/JsonRpcResultAdapter.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/adapter/JsonRpcResultAdapter.kt @@ -6,7 +6,6 @@ import com.squareup.moshi.* import com.squareup.moshi.internal.Util import com.walletconnect.android.internal.common.JsonRpcResponse import com.walletconnect.android.internal.common.model.params.ChatNotifyResponseAuthParams -import com.walletconnect.android.internal.common.model.params.CoreAuthParams import com.walletconnect.android.internal.common.model.params.CoreNotifyParams import com.walletconnect.android.internal.common.model.params.CoreSignParams import org.json.JSONArray @@ -26,8 +25,6 @@ internal class JsonRpcResultAdapter(val moshi: Moshi) : JsonAdapter = moshi.adapter(CoreSignParams.SessionAuthenticateApproveParams::class.java, emptySet(), "result") - private val cacaoAdapter: JsonAdapter = - moshi.adapter(CoreAuthParams.ResponseParams::class.java, emptySet(), "result") private val notifySubscribeUpdateParamsAdapter: JsonAdapter = moshi.adapter(CoreNotifyParams.UpdateParams::class.java, emptySet(), "result") private val chatNotifyResponseAuthParamsAdapter: JsonAdapter = @@ -68,11 +65,6 @@ internal class JsonRpcResultAdapter(val moshi: Moshi) : JsonAdapter { - cacaoAdapter.fromJson(reader) - } - runCatching { notifySubscribeUpdateParamsAdapter.fromJson(reader.peekJson()) }.isSuccess -> { notifySubscribeUpdateParamsAdapter.fromJson(reader) } @@ -154,14 +146,6 @@ internal class JsonRpcResultAdapter(val moshi: Moshi) : JsonAdapter { - val responseParamsString = - cacaoAdapter.toJson(value_.result) - writer.valueSink().use { - it.writeUtf8(responseParamsString) - } - } - (value_.result as? ChatNotifyResponseAuthParams.ResponseAuth) != null -> { val notifySubscribeResponseParamsString = chatNotifyResponseAuthParamsAdapter.toJson(value_.result) writer.valueSink().use { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/DatabaseConfig.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/DatabaseConfig.kt index d1071537d..213b24d12 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/DatabaseConfig.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/DatabaseConfig.kt @@ -12,13 +12,10 @@ class DatabaseConfig(private val storagePrefix: String = String.Empty) { val SIGN_SDK_DB_NAME get() = storagePrefix + "WalletConnectV2.db" - val CHAT_SDK_DB_NAME - get() = storagePrefix + "WalletConnectV2_chat.db" - val NOTIFY_SDK_DB_NAME get() = storagePrefix + "WalletConnectV2_notify.db" - val dbNames: List = listOf(ANDROID_CORE_DB_NAME, SIGN_SDK_DB_NAME, CHAT_SDK_DB_NAME, NOTIFY_SDK_DB_NAME) + val dbNames: List = listOf(ANDROID_CORE_DB_NAME, SIGN_SDK_DB_NAME, NOTIFY_SDK_DB_NAME) } fun Scope.deleteDatabase(dbName: String) { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Tags.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Tags.kt index 95b6e1690..b92bd67ee 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Tags.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Tags.kt @@ -47,21 +47,6 @@ enum class Tags(val id: Int) { SESSION_REQUEST_LINK_MODE(1125), SESSION_REQUEST_LINK_MODE_RESPONSE(1126), - CHAT_INVITE(2000), - CHAT_INVITE_RESPONSE(2001), - - CHAT_MESSAGE(2002), - CHAT_MESSAGE_RESPONSE(2003), - - CHAT_LEAVE(2004), - CHAT_LEAVE_RESPONSE(2005), - - CHAT_PING(2006), - CHAT_PING_RESPONSE(2007), - - AUTH_REQUEST(3000), - AUTH_REQUEST_RESPONSE(3001), - NOTIFY_SUBSCRIBE(4000), NOTIFY_SUBSCRIBE_RESPONSE(4001), diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/params/CoreAuthParams.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/params/CoreAuthParams.kt deleted file mode 100644 index 01c718dad..000000000 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/params/CoreAuthParams.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.walletconnect.android.internal.common.model.params - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass -import com.walletconnect.android.internal.common.model.type.ClientParams -import com.walletconnect.android.internal.common.signing.cacao.Cacao - -open class CoreAuthParams : ClientParams { - @JsonClass(generateAdapter = true) - data class ResponseParams( - @Json(name = "h") - val header: Cacao.Header, - @Json(name = "p") - val payload: Cacao.Payload, - @Json(name = "s") - val signature: Cacao.Signature, - ) : CoreAuthParams() -} \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/push_messages/PushMessagesRepository.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/push_messages/PushMessagesRepository.kt index 107733746..1add21d79 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/push_messages/PushMessagesRepository.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/push_messages/PushMessagesRepository.kt @@ -13,7 +13,7 @@ import kotlinx.coroutines.withContext class PushMessagesRepository(private val pushMessageQueries: PushMessageQueries) { - val notificationTags = listOf(Tags.SESSION_PROPOSE.id, Tags.SESSION_REQUEST.id, Tags.AUTH_REQUEST.id, Tags.NOTIFY_MESSAGE.id, Tags.SESSION_AUTHENTICATE.id) + val notificationTags = listOf(Tags.SESSION_PROPOSE.id, Tags.SESSION_REQUEST.id, Tags.NOTIFY_MESSAGE.id, Tags.SESSION_AUTHENTICATE.id) private val _arePushNotificationsEnabled: MutableStateFlow = MutableStateFlow(false) val arePushNotificationsEnabled: StateFlow = _arePushNotificationsEnabled.asStateFlow() diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/JsonRpcResponseJsonRpcResultJsonAdapterTest.kt b/core/android/src/test/kotlin/com/walletconnect/android/internal/JsonRpcResponseJsonRpcResultJsonAdapterTest.kt index f6510c357..75762bb18 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/JsonRpcResponseJsonRpcResultJsonAdapterTest.kt +++ b/core/android/src/test/kotlin/com/walletconnect/android/internal/JsonRpcResponseJsonRpcResultJsonAdapterTest.kt @@ -6,7 +6,6 @@ import com.walletconnect.android.internal.common.JsonRpcResponse import com.walletconnect.android.internal.common.adapter.JsonRpcResultAdapter import com.walletconnect.android.internal.common.model.RelayProtocolOptions import com.walletconnect.android.internal.common.model.params.ChatNotifyResponseAuthParams -import com.walletconnect.android.internal.common.model.params.CoreAuthParams import com.walletconnect.android.internal.common.model.params.CoreSignParams import com.walletconnect.android.internal.common.signing.cacao.Cacao import org.junit.Test diff --git a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/Wallet.kt b/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/Wallet.kt index 4de98c980..57277b980 100644 --- a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/Wallet.kt +++ b/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/Wallet.kt @@ -66,14 +66,15 @@ object Wallet { data class Success(val topic: String) : Ping() data class Error(val error: Throwable) : Ping() } + data class Error(val throwable: Throwable) : Model() - data class ConnectionState(val isAvailable: Boolean, val reason: Reason? = null) : Model() { - sealed class Reason : Model() { - data class ConnectionClosed(val message: String) : Reason() - data class ConnectionFailed(val throwable: Throwable) : Reason() - } - } + data class ConnectionState(val isAvailable: Boolean, val reason: Reason? = null) : Model() { + sealed class Reason : Model() { + data class ConnectionClosed(val message: String) : Reason() + data class ConnectionFailed(val throwable: Throwable) : Reason() + } + } data class ExpiredProposal(val pairingTopic: String, val proposerPublicKey: String) : Model() data class ExpiredRequest(val topic: String, val id: Long) : Model() @@ -131,12 +132,6 @@ object Wallet { ) : Model() } - data class AuthRequest( - val id: Long, - val pairingTopic: String, - val payloadParams: PayloadParams, - ) : Model() - sealed class SettledSessionResponse : Model() { data class Result(val session: Session) : SettledSessionResponse() data class Error(val errorMessage: String) : SettledSessionResponse() @@ -277,12 +272,6 @@ object Wallet { val params: String, ) : Model() - data class PendingAuthRequest( - val id: Long, - val pairingTopic: String, - val payloadParams: PayloadParams, - ) : Model() - sealed class Message : Model() { data class Simple( @@ -318,28 +307,6 @@ object Wallet { val params: String, ) : Message() } - - data class AuthRequest( - val id: Long, - val pairingTopic: String, - val metadata: Core.Model.AppMetaData, - val payloadParams: PayloadParams, - ) : Message() { - data class PayloadParams( - val type: String, - val chainId: String, - val domain: String, - val aud: String, - val version: String, - val nonce: String, - val iat: String, - val nbf: String?, - val exp: String?, - val statement: String?, - val requestId: String?, - val resources: List?, - ) - } } } } \ No newline at end of file diff --git a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/Web3Wallet.kt b/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/WalletKit.kt similarity index 97% rename from product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/Web3Wallet.kt rename to product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/WalletKit.kt index 056ef8275..134db6c57 100644 --- a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/Web3Wallet.kt +++ b/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/WalletKit.kt @@ -9,7 +9,7 @@ import com.walletconnect.sign.common.exceptions.SignClientAlreadyInitializedExce import kotlinx.coroutines.* import java.util.* -object Web3Wallet { +object WalletKit { private lateinit var coreClient: CoreInterface interface WalletDelegate { @@ -19,12 +19,6 @@ object Web3Wallet { fun onSessionDelete(sessionDelete: Wallet.Model.SessionDelete) fun onSessionExtend(session: Wallet.Model.Session) - @Deprecated( - "AuthSDK has been deprecated. Please use updated Web3Wallet and Sign SDKs instead.", - replaceWith = ReplaceWith("fun onSessionAuthenticated(sessionAuthenticate: Wallet.Model.SessionAuthenticate, verifyContext: Wallet.Model.VerifyContext)") - ) - fun onAuthRequest(authRequest: Wallet.Model.AuthRequest, verifyContext: Wallet.Model.VerifyContext) - //Responses fun onSessionSettleResponse(settleSessionResponse: Wallet.Model.SettledSessionResponse) fun onSessionUpdateResponse(sessionUpdateResponse: Wallet.Model.SessionUpdateResponse) diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/Web3WalletApplication.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/Web3WalletApplication.kt index 97e343ea3..88435914f 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/Web3WalletApplication.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/Web3WalletApplication.kt @@ -35,7 +35,7 @@ import com.walletconnect.sample.wallet.ui.state.ConnectionState import com.walletconnect.sample.wallet.ui.state.connectionStateFlow import com.walletconnect.util.hexToBytes import com.walletconnect.web3.wallet.client.Wallet -import com.walletconnect.web3.wallet.client.Web3Wallet +import com.walletconnect.web3.wallet.client.WalletKit import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob @@ -90,7 +90,7 @@ class Web3WalletApplication : Application() { logger = wcKoinApp.koin.get(named(AndroidCommonDITags.LOGGER)) logger.log("Account: ${EthAccountDelegate.account}") - Web3Wallet.initialize(Wallet.Params.Init(core = CoreClient), + WalletKit.initialize(Wallet.Params.Init(core = CoreClient), onSuccess = { logger.log("Web3Wallet initialized") }, @@ -127,7 +127,7 @@ class Web3WalletApplication : Application() { // For testing purposes only FirebaseMessaging.getInstance().token.addOnSuccessListener { token -> addFirebaseBeagleModules = { - Web3Wallet.registerDeviceToken(firebaseAccessToken = token, enableEncrypted = true, + WalletKit.registerDeviceToken(firebaseAccessToken = token, enableEncrypted = true, onSuccess = { Timber.tag(tag(this)).e("Successfully registered firebase token for Web3Wallet") }, diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/NotificationHandler.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/NotificationHandler.kt index 3b9f441ec..7f6ba65ac 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/NotificationHandler.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/NotificationHandler.kt @@ -89,16 +89,6 @@ object NotificationHandler { val url: String?, val iconUrl: String?, ) : Notification - - data class AuthRequest( - override val messageId: Int, - override val channelId: String, - override val title: String, - override val body: String, - val topic: String, - val url: String?, - val iconUrl: String?, - ) : Notification } private data class NotificationsWithMetadata(val notifications: List, val channelName: String, val iconUrl: String?) @@ -233,16 +223,6 @@ object NotificationHandler { val notification = when (message) { is Core.Model.Message.Simple -> Notification.Simple(message.hashCode(), W3W_CHANNEL_ID, message.title, message.body) is Core.Model.Message.Notify -> Notification.Decrypted(message.hashCode(), message.type, message.title, message.body, message.topic, message.url) - is Core.Model.Message.AuthRequest -> Notification.AuthRequest( - message.hashCode(), - W3W_CHANNEL_ID, - "New Authentication Request!", - "A new authentication request arrived from ${message.metadata.name}, please check your wallet", - message.pairingTopic, - message.metadata.url, - message.metadata.icons.firstOrNull() - ) - is Core.Model.Message.SessionRequest -> Notification.SessionRequest( message.hashCode(), W3W_CHANNEL_ID, @@ -253,7 +233,6 @@ object NotificationHandler { message.peerMetaData?.url, message.peerMetaData?.icons?.firstOrNull() ) - is Core.Model.Message.SessionProposal -> Notification.SessionProposal( message.hashCode(), @@ -266,7 +245,6 @@ object NotificationHandler { message.icons.firstOrNull(), message.redirect ) - is Core.Model.Message.SessionAuthenticate -> Notification.SessionAuthenticate( message.hashCode(), W3W_CHANNEL_ID, @@ -302,5 +280,4 @@ object NotificationHandler { .buildAndShowNotification(context, 5000) .launchIn(scope) } - } \ No newline at end of file diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/WCDelegate.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/WCDelegate.kt index 57d248966..2c1167f1b 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/WCDelegate.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/WCDelegate.kt @@ -4,7 +4,7 @@ import android.util.Log import com.walletconnect.android.Core import com.walletconnect.android.CoreClient import com.walletconnect.web3.wallet.client.Wallet -import com.walletconnect.web3.wallet.client.Web3Wallet +import com.walletconnect.web3.wallet.client.WalletKit import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob @@ -14,7 +14,7 @@ import kotlinx.coroutines.flow.asSharedFlow import kotlinx.coroutines.launch import org.json.JSONObject -object WCDelegate : Web3Wallet.WalletDelegate, CoreClient.CoreDelegate { +object WCDelegate : WalletKit.WalletDelegate, CoreClient.CoreDelegate { private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) private val _coreEvents: MutableSharedFlow = MutableSharedFlow() val coreEvents: SharedFlow = _coreEvents.asSharedFlow() @@ -23,7 +23,6 @@ object WCDelegate : Web3Wallet.WalletDelegate, CoreClient.CoreDelegate { val walletEvents: SharedFlow = _walletEvents.asSharedFlow() private val _connectionState: MutableSharedFlow = MutableSharedFlow(replay = 1) val connectionState: SharedFlow = _connectionState.asSharedFlow() - var authRequestEvent: Pair? = null var sessionProposalEvent: Pair? = null var sessionAuthenticateEvent: Pair? = null var sessionRequestEvent: Pair? = null @@ -31,15 +30,7 @@ object WCDelegate : Web3Wallet.WalletDelegate, CoreClient.CoreDelegate { init { CoreClient.setDelegate(this) - Web3Wallet.setWalletDelegate(this) - } - - override fun onAuthRequest(authRequest: Wallet.Model.AuthRequest, verifyContext: Wallet.Model.VerifyContext) { - authRequestEvent = Pair(authRequest, verifyContext) - - scope.launch { - _walletEvents.emit(authRequest) - } + WalletKit.setWalletDelegate(this) } override fun onConnectionStateChange(state: Wallet.Model.ConnectionState) { diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletActivity.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletActivity.kt index a808b3716..c3b3b278e 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletActivity.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletActivity.kt @@ -32,7 +32,7 @@ import com.walletconnect.sample.wallet.domain.NotifyDelegate import com.walletconnect.sample.wallet.ui.routes.Route import com.walletconnect.sample.wallet.ui.routes.composable_routes.connections.ConnectionsViewModel import com.walletconnect.sample.wallet.ui.routes.host.WalletSampleHost -import com.walletconnect.web3.wallet.client.Web3Wallet +import com.walletconnect.web3.wallet.client.WalletKit import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.flow.launchIn @@ -131,7 +131,6 @@ class Web3WalletActivity : AppCompatActivity() { } } - is AuthEvent.OnRequest -> navController.navigate(Route.AuthRequest.path) else -> Unit } } @@ -149,7 +148,7 @@ class Web3WalletActivity : AppCompatActivity() { private fun handleAppLink(intent: Intent?) { if (intent?.dataString?.contains("wc_ev") == true) { - Web3Wallet.dispatchEnvelope(intent.dataString ?: "") { + WalletKit.dispatchEnvelope(intent.dataString ?: "") { lifecycleScope.launch(Dispatchers.Main) { Toast.makeText(this@Web3WalletActivity, "Error dispatching envelope: ${it.throwable.message}", Toast.LENGTH_SHORT).show() } diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletEvent.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletEvent.kt index aaf8d9c74..f9efae1d0 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletEvent.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletEvent.kt @@ -11,9 +11,4 @@ interface SignEvent : Web3WalletEvent { object ExpiredRequest : SignEvent object Disconnect : SignEvent data class ConnectionState(val isAvailable: Boolean) : SignEvent -} - -interface AuthEvent : Web3WalletEvent { - data class OnRequest(val id: Long, val message: String) : AuthEvent -} - +} \ No newline at end of file diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletNavGraph.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletNavGraph.kt index 31105e744..9cbf559e9 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletNavGraph.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletNavGraph.kt @@ -41,7 +41,6 @@ import com.walletconnect.sample.wallet.ui.routes.composable_routes.inbox.InboxRo import com.walletconnect.sample.wallet.ui.routes.composable_routes.inbox.InboxViewModel import com.walletconnect.sample.wallet.ui.routes.composable_routes.notifications.NotificationsScreenRoute import com.walletconnect.sample.wallet.ui.routes.composable_routes.settings.SettingsRoute -import com.walletconnect.sample.wallet.ui.routes.dialog_routes.auth_request.AuthRequestRoute import com.walletconnect.sample.wallet.ui.routes.dialog_routes.paste_uri.PasteUriRoute import com.walletconnect.sample.wallet.ui.routes.dialog_routes.session_authenticate.SessionAuthenticateRoute import com.walletconnect.sample.wallet.ui.routes.dialog_routes.session_proposal.SessionProposalRoute @@ -155,9 +154,6 @@ fun Web3WalletNavGraph( dialog(Route.SessionProposal.path, dialogProperties = DialogProperties(usePlatformDefaultWidth = false)) { SessionProposalRoute(navController) } - dialog(Route.AuthRequest.path, dialogProperties = DialogProperties(usePlatformDefaultWidth = false)) { - AuthRequestRoute(navController) - } dialog(Route.SessionAuthenticate.path, dialogProperties = DialogProperties(usePlatformDefaultWidth = false)) { SessionAuthenticateRoute(navController, connectionsViewModel) } diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletViewModel.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletViewModel.kt index 4687327d2..de3ebc300 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletViewModel.kt @@ -13,7 +13,7 @@ import com.walletconnect.sample.wallet.domain.WCDelegate import com.walletconnect.sample.wallet.ui.state.ConnectionState import com.walletconnect.sample.wallet.ui.state.PairingEvent import com.walletconnect.web3.wallet.client.Wallet -import com.walletconnect.web3.wallet.client.Web3Wallet +import com.walletconnect.web3.wallet.client.WalletKit import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow @@ -115,13 +115,6 @@ class Web3WalletViewModel : ViewModel() { } } - is Wallet.Model.AuthRequest -> { - _isLoadingFlow.value = false - val message = Web3Wallet.formatMessage(Wallet.Params.FormatMessage(wcEvent.payloadParams, ISSUER)) - ?: throw Exception("Error formatting message") - AuthEvent.OnRequest(wcEvent.id, message) - } - is Wallet.Model.SessionAuthenticate -> { _isLoadingFlow.value = false SignEvent.SessionAuthenticate @@ -152,7 +145,7 @@ class Web3WalletViewModel : ViewModel() { try { val pairingParams = Wallet.Params.Pair(pairingUri.removePrefix("kotlin-web3wallet://wc?uri=")) - Web3Wallet.pair(pairingParams) { error -> + WalletKit.pair(pairingParams) { error -> Firebase.crashlytics.recordException(error.throwable) viewModelScope.launch { _isLoadingFlow.value = false diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/Route.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/Route.kt index 4a7d883f5..59fa263b1 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/Route.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/Route.kt @@ -7,7 +7,6 @@ sealed class Route(val path: String) { object Connections : Route("connections") object SessionProposal : Route("session_proposal") object SessionRequest : Route("session_request") - object AuthRequest : Route("auth_request") object SessionAuthenticate : Route("session_authenticate") object PasteUri : Route("paste_uri") object ScanUri : Route("scan_uri") diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt index 6edbf2b93..27fd1ecbc 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt @@ -64,7 +64,7 @@ import com.walletconnect.sample.wallet.ui.routes.composable_routes.connections.C import com.walletconnect.sample.wallet.ui.routes.composable_routes.connections.ConnectionUI import com.walletconnect.sample.wallet.ui.routes.composable_routes.connections.ConnectionsViewModel import com.walletconnect.web3.wallet.client.Wallet -import com.walletconnect.web3.wallet.client.Web3Wallet +import com.walletconnect.web3.wallet.client.WalletKit import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -91,7 +91,7 @@ fun ConnectionDetailsRoute(navController: NavController, connectionId: Int?, con val lastDelimiterIndex = account.indexOfLast { it == ':' } val chainId = account.dropLast(account.lastIndex - lastDelimiterIndex + 1) val event = getAllEventsByChainId(uiConnection.type.namespaces.values.first(), account).first() - Web3Wallet.emitSessionEvent( + WalletKit.emitSessionEvent( Wallet.Params.SessionEmit(uiConnection.type.topic, Wallet.Model.SessionEvent(event, "someData"), chainId), onSuccess = { isEmitLoading = false @@ -133,7 +133,7 @@ fun ConnectionDetailsRoute(navController: NavController, connectionId: Int?, con ) ).toMutableMap() val params = Wallet.Params.SessionUpdate(uiConnection.type.topic, newNamespaces) - Web3Wallet.updateSession(params, + WalletKit.updateSession(params, onSuccess = { isUpdateLoading = false connectionsViewModel.refreshConnections() @@ -169,7 +169,7 @@ fun ConnectionDetailsRoute(navController: NavController, connectionId: Int?, con is ConnectionType.Sign -> { try { isDeleteLoading = true - Web3Wallet.disconnectSession(Wallet.Params.SessionDisconnect(uiConnection.type.topic), + WalletKit.disconnectSession(Wallet.Params.SessionDisconnect(uiConnection.type.topic), onSuccess = { isDeleteLoading = false connectionsViewModel.refreshConnections() @@ -208,7 +208,7 @@ fun ConnectionDetailsRoute(navController: NavController, connectionId: Int?, con val chainId = "$namespace:$reference" val accountsToChange = connectionsViewModel.getAccountsToChange() - Web3Wallet.emitSessionEvent(Wallet.Params.SessionEmit(uiConnection.type.topic, Wallet.Model.SessionEvent("accountsChanged", accountsToChange), chainId), + WalletKit.emitSessionEvent(Wallet.Params.SessionEmit(uiConnection.type.topic, Wallet.Model.SessionEvent("accountsChanged", accountsToChange), chainId), onSuccess = { composableScope.launch(Dispatchers.Main) { Toast.makeText(context, "Switching account", Toast.LENGTH_SHORT).show() diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionsViewModel.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionsViewModel.kt index c64460d88..d338c2d61 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionsViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionsViewModel.kt @@ -8,7 +8,7 @@ import androidx.lifecycle.viewModelScope import com.walletconnect.sample.wallet.domain.ACCOUNTS_1_EIP155_ADDRESS import com.walletconnect.sample.wallet.domain.ACCOUNTS_2_EIP155_ADDRESS import com.walletconnect.sample.wallet.domain.WCDelegate -import com.walletconnect.web3.wallet.client.Web3Wallet +import com.walletconnect.web3.wallet.client.WalletKit import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow @@ -65,7 +65,7 @@ class ConnectionsViewModel : ViewModel() { private fun getLatestActiveSignSessions(): List { return try { - Web3Wallet.getListOfActiveSessions().filter { wcSession -> + WalletKit.getListOfActiveSessions().filter { wcSession -> wcSession.metaData != null }.mapIndexed { index, wcSession -> ConnectionUI( diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/auth_request/AuthRequestRoute.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/auth_request/AuthRequestRoute.kt deleted file mode 100644 index 71c097244..000000000 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/auth_request/AuthRequestRoute.kt +++ /dev/null @@ -1,91 +0,0 @@ -package com.walletconnect.sample.wallet.ui.routes.dialog_routes.auth_request - -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding -import androidx.compose.material.Text -import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.rememberCoroutineScope -import androidx.compose.runtime.setValue -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -import androidx.lifecycle.viewmodel.compose.viewModel -import androidx.navigation.NavHostController -import com.walletconnect.sample.common.ui.themedColor -import com.walletconnect.sample.wallet.ui.common.Buttons -import com.walletconnect.sample.wallet.ui.common.Content -import com.walletconnect.sample.wallet.ui.common.InnerContent -import com.walletconnect.sample.wallet.ui.common.SemiTransparentDialog -import com.walletconnect.sample.wallet.ui.common.peer.Peer -import com.walletconnect.sample.wallet.ui.common.peer.getValidationColor -import com.walletconnect.sample.wallet.ui.routes.showSnackbar -import kotlinx.coroutines.launch - -@Composable -fun AuthRequestRoute(navController: NavHostController, authRequestViewModel: AuthRequestViewModel = viewModel()) { - val authRequestUI = authRequestViewModel.authRequest ?: throw Exception("Missing auth request") - val composableScope = rememberCoroutineScope() - val allowButtonColor = getValidationColor(authRequestUI.peerContextUI.validation) - var isConfirmLoading by remember { mutableStateOf(false) } - var isCancelLoading by remember { mutableStateOf(false) } - - SemiTransparentDialog { - Spacer(modifier = Modifier.height(24.dp)) - Peer(peerUI = authRequestUI.peerUI, "would like to connect", authRequestUI.peerContextUI) - Spacer(modifier = Modifier.height(16.dp)) - Message(authRequestUI = authRequestUI) - Spacer(modifier = Modifier.height(16.dp)) - Buttons(allowButtonColor, onCancel = { - isCancelLoading = true - composableScope.launch { - try { - authRequestViewModel.reject() - navController.popBackStack() - navController.showSnackbar("Auth Request declined") - } catch (e: Throwable) { - closeAndShowError(navController, e.message) - } - } - }, onConfirm = { - isConfirmLoading = true - composableScope.launch { - try { - authRequestViewModel.approve() - navController.popBackStack() - navController.showSnackbar("Auth Request approved") - } catch (e: Exception) { - closeAndShowError(navController, e.message) - } - } - }, - isLoadingConfirm = isConfirmLoading, - isLoadingCancel = isCancelLoading - ) - Spacer(modifier = Modifier.height(16.dp)) - } -} - -private fun closeAndShowError(navController: NavHostController, message: String?) { - navController.popBackStack() - navController.showSnackbar(message ?: "Auth request error, please check your Internet connection") -} - -@Composable -fun Message(authRequestUI: AuthRequestUI) { - Content(title = "Message") { - InnerContent { - Text( - modifier = Modifier.padding(vertical = 10.dp, horizontal = 13.dp), - text = authRequestUI.message, style = TextStyle(fontWeight = FontWeight.Medium, fontSize = 13.sp, color = themedColor(darkColor = Color(0xFF9ea9a9), lightColor = Color(0xFF788686))) - ) - } - } -} - diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/auth_request/AuthRequestStore.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/auth_request/AuthRequestStore.kt deleted file mode 100644 index e66c17c36..000000000 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/auth_request/AuthRequestStore.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.walletconnect.sample.wallet.ui.routes.dialog_routes.auth_request - -import com.walletconnect.web3.wallet.client.Wallet -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.asStateFlow - -//todo: remove after implementing pending request -object AuthRequestStore { - private var _activeSessions: MutableStateFlow> = MutableStateFlow(emptyList()) - var activeSessions: StateFlow> = _activeSessions.asStateFlow() - - fun addActiveSession(authRequest: Wallet.Model.AuthRequest) { - val updatedList = _activeSessions.value.toMutableList() - updatedList.add(authRequest) - _activeSessions.value = updatedList - } - - fun removeActiveSession(authRequest: Wallet.Model.AuthRequest) { - val updatedList = _activeSessions.value.toMutableList() - updatedList.remove(authRequest) - _activeSessions.value = updatedList - } - - - fun removeActiveSession(id: Long) { - val updatedList = _activeSessions.value.toMutableList() - updatedList.removeAt(updatedList.indexOfFirst { it.id == id }) - _activeSessions.value = updatedList - } -} \ No newline at end of file diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/auth_request/AuthRequestUI.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/auth_request/AuthRequestUI.kt deleted file mode 100644 index 7eb88c914..000000000 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/auth_request/AuthRequestUI.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.walletconnect.sample.wallet.ui.routes.dialog_routes.auth_request - -import com.walletconnect.sample.wallet.ui.common.peer.PeerContextUI -import com.walletconnect.sample.wallet.ui.common.peer.PeerUI - -data class AuthRequestUI( - val peerUI: PeerUI, - val message: String, - val peerContextUI: PeerContextUI, -) \ No newline at end of file diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/auth_request/AuthRequestViewModel.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/auth_request/AuthRequestViewModel.kt deleted file mode 100644 index 4f2ff31c4..000000000 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/auth_request/AuthRequestViewModel.kt +++ /dev/null @@ -1,90 +0,0 @@ -package com.walletconnect.sample.wallet.ui.routes.dialog_routes.auth_request - -import androidx.lifecycle.ViewModel -import com.google.firebase.crashlytics.ktx.crashlytics -import com.google.firebase.ktx.Firebase -import com.walletconnect.android.utils.cacao.signHex -import com.walletconnect.sample.wallet.domain.ISSUER -import com.walletconnect.sample.wallet.domain.PRIVATE_KEY_1 -import com.walletconnect.sample.wallet.domain.WCDelegate -import com.walletconnect.sample.wallet.ui.common.peer.PeerUI -import com.walletconnect.sample.wallet.ui.common.peer.toPeerUI -import com.walletconnect.web3.wallet.client.Wallet -import com.walletconnect.web3.wallet.client.Web3Wallet -import com.walletconnect.web3.wallet.utils.CacaoSigner -import com.walletconnect.web3.wallet.utils.SignatureType -import org.web3j.utils.Numeric.toHexString -import kotlin.coroutines.resume -import kotlin.coroutines.resumeWithException -import kotlin.coroutines.suspendCoroutine - -class AuthRequestViewModel : ViewModel() { - val authRequest: AuthRequestUI? - get() = generateAuthRequestUI() - - suspend fun approve() { - return suspendCoroutine { continuation -> - if (WCDelegate.authRequestEvent != null) { - val request = requireNotNull(WCDelegate.authRequestEvent!!.first) - val message = Web3Wallet.formatMessage(Wallet.Params.FormatMessage(request.payloadParams, ISSUER)) ?: throw Exception("Error formatting message") - Web3Wallet.respondAuthRequest( - Wallet.Params.AuthRequestResponse.Result( - id = request.id, - signature = CacaoSigner.signHex(toHexString(message.toByteArray()), PRIVATE_KEY_1, SignatureType.EIP191), - issuer = ISSUER - ), - onSuccess = { - WCDelegate.authRequestEvent = null - AuthRequestStore.addActiveSession(request) - continuation.resume(Unit) - }, - onError = { error -> - Firebase.crashlytics.recordException(error.throwable) - AuthRequestStore.removeActiveSession(request) - WCDelegate.authRequestEvent = null - continuation.resumeWithException(error.throwable) - }) - } - } - } - - suspend fun reject() { - return suspendCoroutine { continuation -> - if (WCDelegate.authRequestEvent != null) { - val request = requireNotNull(WCDelegate.authRequestEvent!!.first) - //todo: Define Error Codes - Web3Wallet.respondAuthRequest( - Wallet.Params.AuthRequestResponse.Error( - request.id, 12001, "User Rejected Request" - ), - onSuccess = { - WCDelegate.authRequestEvent = null - continuation.resume(Unit) - }, - onError = { error -> - Firebase.crashlytics.recordException(error.throwable) - WCDelegate.authRequestEvent = null - continuation.resumeWithException(error.throwable) - }) - } - } - } - - private fun generateAuthRequestUI(): AuthRequestUI? { - return if (WCDelegate.authRequestEvent != null) { - val (authRequest, authContext) = WCDelegate.authRequestEvent!! - val message = Web3Wallet.formatMessage(Wallet.Params.FormatMessage(authRequest.payloadParams, ISSUER)) ?: throw Exception("Error formatting message") - - AuthRequestUI( - peerUI = PeerUI( - peerIcon = "https://raw.githubusercontent.com/WalletConnect/walletconnect-assets/master/Icon/Gradient/Icon.png", - peerName = "WalletConnect", - peerUri = "https://walletconnect.com/", - peerDescription = "The communications protocol for web3.", - ), - message = message, - peerContextUI = authContext.toPeerUI() - ) - } else null - } -} \ No newline at end of file diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt index 5ef1a7426..851b26c1a 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt @@ -13,7 +13,7 @@ import com.walletconnect.sample.wallet.ui.common.peer.PeerUI import com.walletconnect.sample.wallet.ui.common.peer.toPeerUI import com.walletconnect.util.hexToBytes import com.walletconnect.web3.wallet.client.Wallet -import com.walletconnect.web3.wallet.client.Web3Wallet +import com.walletconnect.web3.wallet.client.WalletKit import com.walletconnect.web3.wallet.utils.CacaoSigner class SessionAuthenticateViewModel : ViewModel() { @@ -26,7 +26,7 @@ class SessionAuthenticateViewModel : ViewModel() { val auths = mutableListOf() val authPayloadParams = - Web3Wallet.generateAuthPayloadParams( + WalletKit.generateAuthPayloadParams( sessionAuthenticate.payloadParams, supportedChains = listOf("eip155:1", "eip155:137", "eip155:56"), supportedMethods = listOf("personal_sign", "eth_signTypedData", "eth_signTypedData_v4", "eth_sign") @@ -35,14 +35,14 @@ class SessionAuthenticateViewModel : ViewModel() { authPayloadParams.chains .forEach { chain -> val issuer = "did:pkh:$chain:$ACCOUNTS_1_EIP155_ADDRESS" - val message = Web3Wallet.formatAuthMessage(Wallet.Params.FormatAuthMessage(authPayloadParams, issuer)) + val message = WalletKit.formatAuthMessage(Wallet.Params.FormatAuthMessage(authPayloadParams, issuer)) val signature = CacaoSigner.sign(message, EthAccountDelegate.privateKey.hexToBytes(), SignatureType.EIP191) - val auth = Web3Wallet.generateAuthObject(authPayloadParams, issuer, signature) + val auth = WalletKit.generateAuthObject(authPayloadParams, issuer, signature) auths.add(auth) } val approveProposal = Wallet.Params.ApproveSessionAuthenticate(id = sessionAuthenticate.id, auths = auths) - Web3Wallet.approveSessionAuthenticate(approveProposal, + WalletKit.approveSessionAuthenticate(approveProposal, onSuccess = { WCDelegate.sessionAuthenticateEvent = null onSuccess(sessionAuthenticate.participant.metadata?.redirect ?: "") @@ -75,7 +75,7 @@ class SessionAuthenticateViewModel : ViewModel() { reason = rejectionReason ) - Web3Wallet.rejectSessionAuthenticate(reject, + WalletKit.rejectSessionAuthenticate(reject, onSuccess = { WCDelegate.sessionAuthenticateEvent = null onSuccess(sessionAuthenticate.participant.metadata?.redirect ?: "") @@ -105,7 +105,7 @@ class SessionAuthenticateViewModel : ViewModel() { .forEach { chain -> val issuer = "did:pkh:$chain:$ACCOUNTS_1_EIP155_ADDRESS" val message = try { - Web3Wallet.formatAuthMessage(Wallet.Params.FormatAuthMessage(sessionAuthenticate.payloadParams, issuer)) + WalletKit.formatAuthMessage(Wallet.Params.FormatAuthMessage(sessionAuthenticate.payloadParams, issuer)) } catch (e: Exception) { "Invalid message, error: ${e.message}" } diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalViewModel.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalViewModel.kt index 63c3388df..cdae31eb4 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalViewModel.kt @@ -7,20 +7,20 @@ import com.walletconnect.sample.wallet.domain.WCDelegate import com.walletconnect.sample.wallet.ui.common.peer.PeerUI import com.walletconnect.sample.wallet.ui.common.peer.toPeerUI import com.walletconnect.web3.wallet.client.Wallet -import com.walletconnect.web3.wallet.client.Web3Wallet +import com.walletconnect.web3.wallet.client.WalletKit import timber.log.Timber class SessionProposalViewModel : ViewModel() { val sessionProposal: SessionProposalUI? = generateSessionProposalUI() fun approve(proposalPublicKey: String, onSuccess: (String) -> Unit = {}, onError: (Throwable) -> Unit = {}) { - val proposal = Web3Wallet.getSessionProposals().find { it.proposerPublicKey == proposalPublicKey } + val proposal = WalletKit.getSessionProposals().find { it.proposerPublicKey == proposalPublicKey } if (proposal != null) { try { Timber.d("Approving session proposal: $proposalPublicKey") - val sessionNamespaces = Web3Wallet.generateApprovedNamespaces(sessionProposal = proposal, supportedNamespaces = walletMetaData.namespaces) + val sessionNamespaces = WalletKit.generateApprovedNamespaces(sessionProposal = proposal, supportedNamespaces = walletMetaData.namespaces) val approveProposal = Wallet.Params.SessionApprove(proposerPublicKey = proposal.proposerPublicKey, namespaces = sessionNamespaces) - Web3Wallet.approveSession(approveProposal, + WalletKit.approveSession(approveProposal, onError = { error -> Firebase.crashlytics.recordException(error.throwable) WCDelegate.sessionProposalEvent = null @@ -41,7 +41,7 @@ class SessionProposalViewModel : ViewModel() { } fun reject(proposalPublicKey: String, onSuccess: (String) -> Unit = {}, onError: (Throwable) -> Unit = {}) { - val proposal = Web3Wallet.getSessionProposals().find { it.proposerPublicKey == proposalPublicKey } + val proposal = WalletKit.getSessionProposals().find { it.proposerPublicKey == proposalPublicKey } if (proposal != null) { try { val rejectionReason = "Reject Session" @@ -50,7 +50,7 @@ class SessionProposalViewModel : ViewModel() { reason = rejectionReason ) - Web3Wallet.rejectSession(reject, + WalletKit.rejectSession(reject, onSuccess = { WCDelegate.sessionProposalEvent = null onSuccess(proposal.redirect) diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt index b3f499504..082e473ce 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt @@ -15,7 +15,7 @@ import com.walletconnect.sample.wallet.ui.common.peer.PeerUI import com.walletconnect.sample.wallet.ui.common.peer.toPeerUI import com.walletconnect.util.hexToBytes import com.walletconnect.web3.wallet.client.Wallet -import com.walletconnect.web3.wallet.client.Web3Wallet +import com.walletconnect.web3.wallet.client.WalletKit import com.walletconnect.web3.wallet.utils.CacaoSigner import org.json.JSONArray import org.web3j.utils.Numeric.hexStringToByteArray @@ -41,8 +41,8 @@ class SessionRequestViewModel : ViewModel() { message = "Kotlin Wallet Error" ) ) - val redirect = Web3Wallet.getActiveSessionByTopic(sessionRequest.topic)?.redirect?.toUri() - Web3Wallet.respondSessionRequest(result, + val redirect = WalletKit.getActiveSessionByTopic(sessionRequest.topic)?.redirect?.toUri() + WalletKit.respondSessionRequest(result, onSuccess = { clearSessionRequest() onSuccess(redirect) @@ -107,8 +107,8 @@ class SessionRequestViewModel : ViewModel() { ) ) - val redirect = Web3Wallet.getActiveSessionByTopic(sessionRequest.topic)?.redirect?.toUri() - Web3Wallet.respondSessionRequest(response, + val redirect = WalletKit.getActiveSessionByTopic(sessionRequest.topic)?.redirect?.toUri() + WalletKit.respondSessionRequest(response, onSuccess = { clearSessionRequest() onSuccess(redirect) From 861bba092b9c8ba1851dde0c457f5006de0ede06 Mon Sep 17 00:00:00 2001 From: kubel Date: Wed, 4 Sep 2024 11:55:53 +0200 Subject: [PATCH 12/51] Change activity and application class names --- .../walletconnect/android/pairing/client/PairingInterface.kt | 2 +- .../walletconnect/android/pairing/client/PairingProtocol.kt | 2 +- sample/wallet/src/main/AndroidManifest.xml | 4 ++-- .../{Web3WalletApplication.kt => WalletKitApplication.kt} | 4 ++-- .../walletconnect/sample/wallet/domain/NotificationHandler.kt | 4 ++-- .../wallet/ui/{Web3WalletActivity.kt => WalletKitActivity.kt} | 4 ++-- sample/wallet/src/main/res/navigation/nav_graph.xml | 2 +- settings.gradle.kts | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) rename sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/{Web3WalletApplication.kt => WalletKitApplication.kt} (99%) rename sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/{Web3WalletActivity.kt => WalletKitActivity.kt} (97%) diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingInterface.kt b/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingInterface.kt index 2bcb08eae..e56a86deb 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingInterface.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingInterface.kt @@ -30,7 +30,7 @@ interface PairingInterface { @Deprecated(message = "Disconnect method has been deprecated. It will be removed soon. Pairing will disconnect automatically internally.") fun disconnect(disconnect: Core.Params.Disconnect, onError: (Core.Model.Error) -> Unit = {}) - @Deprecated(message = "Ping method has been deprecated. It will be removed soon. Please use Ping from Web3Wallet or Sign clients.") + @Deprecated(message = "Ping method has been deprecated. It will be removed soon. Please use Ping from WalletKit or Sign clients.") fun ping(ping: Core.Params.Ping, pairingPing: Core.Listeners.PairingPing? = null) /** diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingProtocol.kt b/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingProtocol.kt index 9f53e079b..2f8d9d938 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingProtocol.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingProtocol.kt @@ -103,7 +103,7 @@ internal class PairingProtocol(private val koinApp: KoinApplication = wcKoinApp) } } - @Deprecated(message = "Ping method has been deprecated. It will be removed soon. Please use Ping from Web3Wallet or Sign clients.") + @Deprecated(message = "Ping method has been deprecated. It will be removed soon. Please use Ping from WalletKit or Sign clients.") @Throws(IllegalStateException::class) override fun ping(ping: Core.Params.Ping, pairingPing: Core.Listeners.PairingPing?) { checkEngineInitialization() diff --git a/sample/wallet/src/main/AndroidManifest.xml b/sample/wallet/src/main/AndroidManifest.xml index f2d475781..05c488796 100644 --- a/sample/wallet/src/main/AndroidManifest.xml +++ b/sample/wallet/src/main/AndroidManifest.xml @@ -8,7 +8,7 @@ Unit = {} private lateinit var logger: Logger @@ -155,7 +155,7 @@ class Web3WalletApplication : Application() { private fun initializeBeagle() { initBeagle( - this@Web3WalletApplication, + this@WalletKitApplication, HeaderModule( title = getString(R.string.app_name), subtitle = BuildConfig.APPLICATION_ID, diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/NotificationHandler.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/NotificationHandler.kt index 7f6ba65ac..85921180d 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/NotificationHandler.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/NotificationHandler.kt @@ -20,7 +20,7 @@ import com.walletconnect.android.Core import com.walletconnect.notify.client.Notify import com.walletconnect.notify.client.NotifyClient import com.walletconnect.sample.wallet.R -import com.walletconnect.sample.wallet.ui.Web3WalletActivity +import com.walletconnect.sample.wallet.ui.WalletKitActivity import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -171,7 +171,7 @@ object NotificationHandler { } private fun buildPendingIntent(context: Context): PendingIntent { - val intent = Intent(context, Web3WalletActivity::class.java).apply { addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) } + val intent = Intent(context, WalletKitActivity::class.java).apply { addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) } return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE) } diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletActivity.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/WalletKitActivity.kt similarity index 97% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletActivity.kt rename to sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/WalletKitActivity.kt index c3b3b278e..c8edae63f 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletActivity.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/WalletKitActivity.kt @@ -41,7 +41,7 @@ import kotlinx.coroutines.launch import timber.log.Timber import java.net.URLEncoder -class Web3WalletActivity : AppCompatActivity() { +class WalletKitActivity : AppCompatActivity() { private lateinit var navController: NavHostController private val web3walletViewModel = Web3WalletViewModel() private val connectionsViewModel = ConnectionsViewModel() @@ -150,7 +150,7 @@ class Web3WalletActivity : AppCompatActivity() { if (intent?.dataString?.contains("wc_ev") == true) { WalletKit.dispatchEnvelope(intent.dataString ?: "") { lifecycleScope.launch(Dispatchers.Main) { - Toast.makeText(this@Web3WalletActivity, "Error dispatching envelope: ${it.throwable.message}", Toast.LENGTH_SHORT).show() + Toast.makeText(this@WalletKitActivity, "Error dispatching envelope: ${it.throwable.message}", Toast.LENGTH_SHORT).show() } } } else { diff --git a/sample/wallet/src/main/res/navigation/nav_graph.xml b/sample/wallet/src/main/res/navigation/nav_graph.xml index e458f9485..843e9ae5d 100644 --- a/sample/wallet/src/main/res/navigation/nav_graph.xml +++ b/sample/wallet/src/main/res/navigation/nav_graph.xml @@ -6,7 +6,7 @@ diff --git a/settings.gradle.kts b/settings.gradle.kts index 3358c9dc1..5106516c5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,4 +1,4 @@ -rootProject.name = "WalletConnect Kotlin" +rootProject.name = "reown kotlin" val excludedDirs = listOf( "undefined", From 7975bff7efe3a811a4e3dd160df61c4d9c1652f3 Mon Sep 17 00:00:00 2001 From: kubel Date: Wed, 4 Sep 2024 12:55:16 +0200 Subject: [PATCH 13/51] Rename Web3Modal to AppKit --- .../com/walletconnect/android/CoreProtocol.kt | 4 +- .../internal/common/di/AndroidCommonDITags.kt | 6 +- .../{Web3ModalModule.kt => AppKitModule.kt} | 26 ++-- .../android/internal/common/di/PulseModule.kt | 2 +- ...piRepository.kt => AppKitApiRepository.kt} | 12 +- .../{Web3ModalService.kt => AppKitService.kt} | 2 +- .../domain/usecase/EnableAnalyticsUseCase.kt | 4 +- .../usecase/GetAndroidDataUseCaseInterface.kt | 6 +- .../modal/domain/usecase/GetWalletsUseCase.kt | 6 +- .../android/pulse/domain/SendEventUseCase.kt | 2 +- .../android/pulse/model/SDKType.kt | 2 +- ...RpcResponseJsonRpcResultJsonAdapterTest.kt | 54 -------- .../android/internal/SendEventUseCaseTest.kt | 8 +- .../ui/components/qr/WalletConnectQRCode.kt | 2 +- .../wcmodal/ui/theme/ModalColors.kt | 8 +- ...ModalTopBarTest.kt => AppKitTopBarTest.kt} | 12 +- ...ootStateTest.kt => AppKitRootStateTest.kt} | 18 +-- ...Web3ModalRootTest.kt => AppKitRootTest.kt} | 28 ++-- .../modal/client/{Web3Modal.kt => AppKit.kt} | 66 ++++----- .../web3/modal/client/models/Exceptions.kt | 2 +- .../{Web3ModalDITags.kt => AppKitDITags.kt} | 2 +- .../web3/modal/di/BalanceRpcModule.kt | 4 +- .../web3/modal/di/BlockchainApiModule.kt | 4 +- .../web3/modal/di/EngineModule.kt | 4 +- .../web3/modal/di/Web3ModalModule.kt | 8 +- .../web3/modal/domain/SessionRepository.kt | 4 +- ...Web3ModalDelegate.kt => AppKitDelegate.kt} | 18 +-- .../{Web3ModalEngine.kt => AppKitEngine.kt} | 14 +- ...hainsPresets.kt => AppKitChainsPresets.kt} | 2 +- .../web3/modal/ui/{Web3Modal.kt => AppKit.kt} | 32 ++--- .../web3/modal/ui/AppKitEvents.kt | 8 ++ .../ui/{Web3ModalSheet.kt => AppKitSheet.kt} | 38 +++--- .../web3/modal/ui/AppKitState.kt | 11 ++ .../web3/modal/ui/AppKitTheme.kt | 129 ++++++++++++++++++ .../ui/{Web3ModalView.kt => AppKitView.kt} | 8 +- ...b3ModalViewModel.kt => AppKitViewModel.kt} | 24 ++-- .../web3/modal/ui/Web3ModalEvents.kt | 8 -- .../web3/modal/ui/Web3ModalState.kt | 11 -- .../web3/modal/ui/Web3ModalTheme.kt | 129 ------------------ .../modal/ui/components/ComponentDelegate.kt | 4 +- .../ui/components/button/AccountButton.kt | 32 ++--- .../{Web3ModalState.kt => AppKitState.kt} | 26 ++-- .../ui/components/button/ConnectButton.kt | 8 +- .../ui/components/button/LoadingButton.kt | 4 +- .../ui/components/button/NetworkButton.kt | 8 +- .../modal/ui/components/button/Web3Button.kt | 2 +- .../components/button/views/AccountButton.kt | 6 +- .../components/button/views/ConnectButton.kt | 6 +- .../ui/components/button/views/Web3Button.kt | 6 +- ...b3ModalComponent.kt => AppKitComponent.kt} | 38 +++--- .../{Web3ModalStates.kt => AppKitStates.kt} | 4 +- .../{Web3ModalTopBar.kt => AppKitTopBar.kt} | 14 +- .../components/internal/commons/Dividers.kt | 4 +- .../ui/components/internal/commons/Help.kt | 12 +- .../ui/components/internal/commons/Icons.kt | 60 ++++---- .../ui/components/internal/commons/Label.kt | 24 ++-- .../components/internal/commons/ListSelect.kt | 12 +- .../ui/components/internal/commons/Loading.kt | 6 +- .../ui/components/internal/commons/Wallets.kt | 22 +-- .../internal/commons/account/AccountImage.kt | 6 +- .../internal/commons/account/AccountName.kt | 4 +- .../internal/commons/button/Button.kt | 3 - .../internal/commons/button/ButtonStyle.kt | 30 ++-- .../internal/commons/entry/AccountEntry.kt | 4 +- .../internal/commons/entry/ActionEntry.kt | 4 +- .../internal/commons/entry/BaseEntry.kt | 14 +- .../internal/commons/entry/StoreEntry.kt | 18 +-- .../internal/commons/inputs/BaseTextInput.kt | 18 +-- .../internal/commons/inputs/InputCancel.kt | 10 +- .../internal/commons/inputs/SearchInput.kt | 22 +-- .../commons/network/ChainNetworkIcons.kt | 6 +- .../commons/network/ChainNetworkItem.kt | 18 +-- .../internal/commons/switch/PlatformTabRow.kt | 21 +-- .../ui/components/internal/email/InputBox.kt | 4 +- .../internal/email/code/CodeInput.kt | 20 +-- .../internal/email/input/EmailInput.kt | 8 +- .../root/{Web3ModalRoot.kt => AppKitRoot.kt} | 38 +++--- ...b3ModalRootState.kt => AppKitRootState.kt} | 8 +- .../internal/snackbar/ModalSnackBar.kt | 16 +-- .../walletconnect/WalletConnectLogo.kt | 12 +- .../web3/modal/ui/navigation/Route.kt | 2 +- .../modal/ui/navigation/account/Navigation.kt | 4 +- .../web3/modal/ui/previews/Previews.kt | 24 ++-- .../ui/routes/account/AccountViewModel.kt | 16 +-- .../ui/routes/account/account/AccountRoute.kt | 14 +- .../chain_redirect/ChainSwitchRedirect.kt | 18 +-- .../change_network/ChangeNetworkRoute.kt | 8 +- .../siwe_fallback/SIWEFallbackRoute.kt | 12 +- .../what_is_network/WhatIsNetworkRoute.kt | 8 +- .../modal/ui/routes/common/WhatIsNetwork.kt | 8 +- .../ui/routes/connect/ConnectViewModel.kt | 38 +++--- .../ui/routes/connect/ParingController.kt | 8 +- .../ui/routes/connect/WalletDataSource.kt | 18 +-- .../connect/all_wallets/AllWalletsRoute.kt | 26 ++-- .../choose_network/ChooseNetworkRoute.kt | 4 +- .../connect_wallet/ConnectWalletRoute.kt | 8 +- .../connect/get_wallet/GetAWalletRoute.kt | 4 +- .../connect/redirect/RedirectWalletScreen.kt | 40 +++--- .../routes/connect/scan_code/ScanCodeRoute.kt | 22 +-- .../connect/what_is_wallet/WhatIsWallet.kt | 8 +- .../{Web3ModalColors.kt => AppKitColors.kt} | 42 +++--- .../web3/modal/ui/theme/CustomComposition.kt | 8 +- .../web3/modal/ui/theme/Theme.kt | 14 +- .../web3/modal/ui/theme/Typography.kt | 4 +- .../web3/modal/utils/SessionUtils.kt | 10 +- .../main/res/navigation/web3modal_graph.xml | 2 +- .../ui/components/buttons/ButtonsTest.kt | 6 +- .../ui/routes/account/AccountRouteTest.kt | 14 +- .../routes/account/ChainSwitchRedirectTest.kt | 4 +- .../routes/account/ChangeNetworkRouteTest.kt | 12 +- .../web3/modal/utils/PaparazziUtilts.kt | 18 +-- sample/modal/src/main/AndroidManifest.xml | 2 +- .../modal/{ModalSampleApp.kt => AppKitApp.kt} | 18 +-- .../sample/modal/MainActivity.kt | 32 ++--- .../sample/modal/ModalSampleDelegate.kt | 6 +- .../sample/modal/compose/ComposeActivity.kt | 4 +- .../sample/modal/compose/HomeScreen.kt | 4 +- .../modal/kotlindsl/KotlinDSLActivity.kt | 4 +- .../sample/modal/ui/LabScreen.kt | 20 +-- .../sample/modal/ui/PredifinedThemes.kt | 22 +-- .../sample/modal/view/ViewActivity.kt | 4 +- .../src/main/res/layout/activity_view.xml | 2 +- sample/modal/src/main/res/values/strings.xml | 2 +- 123 files changed, 895 insertions(+), 959 deletions(-) rename core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/{Web3ModalModule.kt => AppKitModule.kt} (76%) rename core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/{Web3ModalApiRepository.kt => AppKitApiRepository.kt} (90%) rename core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/network/{Web3ModalService.kt => AppKitService.kt} (96%) rename product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/{Web3ModalTopBarTest.kt => AppKitTopBarTest.kt} (74%) rename product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/{Web3ModalRootStateTest.kt => AppKitRootStateTest.kt} (82%) rename product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/{Web3ModalRootTest.kt => AppKitRootTest.kt} (77%) rename product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/{Web3Modal.kt => AppKit.kt} (85%) rename product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/{Web3ModalDITags.kt => AppKitDITags.kt} (77%) rename product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/delegate/{Web3ModalDelegate.kt => AppKitDelegate.kt} (86%) rename product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/{Web3ModalEngine.kt => AppKitEngine.kt} (97%) rename product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/presets/{Web3ModalChainsPresets.kt => AppKitChainsPresets.kt} (99%) rename product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/{Web3Modal.kt => AppKit.kt} (65%) create mode 100644 product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitEvents.kt rename product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/{Web3ModalSheet.kt => AppKitSheet.kt} (88%) create mode 100644 product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitState.kt create mode 100644 product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitTheme.kt rename product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/{Web3ModalView.kt => AppKitView.kt} (89%) rename product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/{Web3ModalViewModel.kt => AppKitViewModel.kt} (53%) delete mode 100644 product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/Web3ModalEvents.kt delete mode 100644 product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/Web3ModalState.kt delete mode 100644 product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/Web3ModalTheme.kt rename product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/{Web3ModalState.kt => AppKitState.kt} (88%) rename product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/{Web3ModalComponent.kt => AppKitComponent.kt} (80%) rename product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/{Web3ModalStates.kt => AppKitStates.kt} (91%) rename product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/{Web3ModalTopBar.kt => AppKitTopBar.kt} (77%) rename product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/{Web3ModalRoot.kt => AppKitRoot.kt} (79%) rename product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/{Web3ModalRootState.kt => AppKitRootState.kt} (92%) rename product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/{Web3ModalColors.kt => AppKitColors.kt} (79%) rename sample/modal/src/main/kotlin/com/walletconnect/sample/modal/{ModalSampleApp.kt => AppKitApp.kt} (78%) diff --git a/core/android/src/main/kotlin/com/walletconnect/android/CoreProtocol.kt b/core/android/src/main/kotlin/com/walletconnect/android/CoreProtocol.kt index d90923d32..844ffcb73 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/CoreProtocol.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/CoreProtocol.kt @@ -14,7 +14,7 @@ import com.walletconnect.android.internal.common.di.explorerModule import com.walletconnect.android.internal.common.di.keyServerModule import com.walletconnect.android.internal.common.di.pulseModule import com.walletconnect.android.internal.common.di.pushModule -import com.walletconnect.android.internal.common.di.web3ModalModule +import com.walletconnect.android.internal.common.di.appKitModule import com.walletconnect.android.internal.common.explorer.ExplorerInterface import com.walletconnect.android.internal.common.explorer.ExplorerProtocol import com.walletconnect.android.internal.common.model.AppMetaData @@ -180,7 +180,7 @@ class CoreProtocol(private val koinApp: KoinApplication = wcKoinApp) : CoreInter corePairingModule(Pairing, PairingController), keyServerModule(keyServerUrl), explorerModule(), - web3ModalModule(), + appKitModule(), pulseModule(bundleId) ) } diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/AndroidCommonDITags.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/AndroidCommonDITags.kt index fdf61faf6..77258125f 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/AndroidCommonDITags.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/AndroidCommonDITags.kt @@ -32,9 +32,9 @@ enum class AndroidCommonDITags { COLUMN_ADAPTER_APPMETADATATYPE, COLUMN_ADAPTER_TRANSPORT_TYPE, WEB3MODAL_URL, - WEB3MODAL_INTERCEPTOR, - WEB3MODAL_OKHTTP, - WEB3MODAL_RETROFIT, + APPKIT_INTERCEPTOR, + APPKIT_OKHTTP, + APPKIT_RETROFIT, DECRYPT_SIGN_MESSAGE, DECRYPT_AUTH_MESSAGE, DECRYPT_NOTIFY_MESSAGE, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/Web3ModalModule.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/AppKitModule.kt similarity index 76% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/Web3ModalModule.kt rename to core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/AppKitModule.kt index e72bd5567..97dfd200c 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/Web3ModalModule.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/AppKitModule.kt @@ -1,8 +1,8 @@ package com.walletconnect.android.internal.common.di import com.walletconnect.android.BuildConfig -import com.walletconnect.android.internal.common.modal.Web3ModalApiRepository -import com.walletconnect.android.internal.common.modal.data.network.Web3ModalService +import com.walletconnect.android.internal.common.modal.AppKitApiRepository +import com.walletconnect.android.internal.common.modal.data.network.AppKitService import com.walletconnect.android.internal.common.modal.domain.usecase.EnableAnalyticsUseCase import com.walletconnect.android.internal.common.modal.domain.usecase.EnableAnalyticsUseCaseInterface import com.walletconnect.android.internal.common.modal.domain.usecase.GetInstalledWalletsIdsUseCase @@ -21,10 +21,10 @@ import retrofit2.Retrofit import retrofit2.converter.moshi.MoshiConverterFactory @JvmSynthetic -internal fun web3ModalModule() = module { +internal fun appKitModule() = module { single(named(AndroidCommonDITags.WEB3MODAL_URL)) { "https://api.web3modal.com/" } - single(named(AndroidCommonDITags.WEB3MODAL_INTERCEPTOR)) { + single(named(AndroidCommonDITags.APPKIT_INTERCEPTOR)) { Interceptor { chain -> val updatedRequest = chain.request().newBuilder() .addHeader("x-project-id", get().value) @@ -34,33 +34,33 @@ internal fun web3ModalModule() = module { } } - single(named(AndroidCommonDITags.WEB3MODAL_OKHTTP)) { + single(named(AndroidCommonDITags.APPKIT_OKHTTP)) { get(named(AndroidCommonDITags.OK_HTTP)) .newBuilder() - .addInterceptor(get(named(AndroidCommonDITags.WEB3MODAL_INTERCEPTOR))) + .addInterceptor(get(named(AndroidCommonDITags.APPKIT_INTERCEPTOR))) .build() } - single(named(AndroidCommonDITags.WEB3MODAL_RETROFIT)) { + single(named(AndroidCommonDITags.APPKIT_RETROFIT)) { Retrofit.Builder() .baseUrl(get(named(AndroidCommonDITags.WEB3MODAL_URL))) - .client(get(named(AndroidCommonDITags.WEB3MODAL_OKHTTP))) + .client(get(named(AndroidCommonDITags.APPKIT_OKHTTP))) .addConverterFactory(MoshiConverterFactory.create(get(named(AndroidCommonDITags.MOSHI)))) .build() } - single { get(named(AndroidCommonDITags.WEB3MODAL_RETROFIT)).create(Web3ModalService::class.java) } + single { get(named(AndroidCommonDITags.APPKIT_RETROFIT)).create(AppKitService::class.java) } single { - Web3ModalApiRepository( + AppKitApiRepository( web3ModalApiUrl = get(named(AndroidCommonDITags.WEB3MODAL_URL)), - web3ModalService = get(), + appKitService = get(), context = androidContext() ) } - single { GetInstalledWalletsIdsUseCase(web3ModalApiRepository = get()) } - single { GetWalletsUseCase(web3ModalApiRepository = get()) } + single { GetInstalledWalletsIdsUseCase(appKitApiRepository = get()) } + single { GetWalletsUseCase(appKitApiRepository = get()) } single { GetSampleWalletsUseCase(context = get()) } single { EnableAnalyticsUseCase(repository = get()) } } diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/PulseModule.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/PulseModule.kt index 0528c22a3..9c88a7fdf 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/PulseModule.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/PulseModule.kt @@ -20,7 +20,7 @@ fun pulseModule(bundleId: String) = module { single(named(AndroidCommonDITags.PULSE_RETROFIT)) { Retrofit.Builder() .baseUrl(get(named(AndroidCommonDITags.PULSE_URL))) - .client(get(named(AndroidCommonDITags.WEB3MODAL_OKHTTP))) + .client(get(named(AndroidCommonDITags.APPKIT_OKHTTP))) .addConverterFactory(MoshiConverterFactory.create(get(named(AndroidCommonDITags.MOSHI)).build())) .build() } diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/Web3ModalApiRepository.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/AppKitApiRepository.kt similarity index 90% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/Web3ModalApiRepository.kt rename to core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/AppKitApiRepository.kt index bbcf2d7aa..87820f9a9 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/Web3ModalApiRepository.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/AppKitApiRepository.kt @@ -4,25 +4,25 @@ import android.content.Context import com.walletconnect.android.internal.common.modal.data.model.Wallet import com.walletconnect.android.internal.common.modal.data.model.WalletAppData import com.walletconnect.android.internal.common.modal.data.model.WalletListing -import com.walletconnect.android.internal.common.modal.data.network.Web3ModalService +import com.walletconnect.android.internal.common.modal.data.network.AppKitService import com.walletconnect.android.internal.common.modal.data.network.model.WalletDTO import com.walletconnect.android.internal.common.modal.data.network.model.WalletDataDTO import com.walletconnect.android.utils.isWalletInstalled -internal class Web3ModalApiRepository( +internal class AppKitApiRepository( private val context: Context, private val web3ModalApiUrl: String, - private val web3ModalService: Web3ModalService + private val appKitService: AppKitService ) { suspend fun getAndroidWalletsData(sdkType: String) = runCatching { - web3ModalService.getAndroidData(sdkType = sdkType) + appKitService.getAndroidData(sdkType = sdkType) }.mapCatching { response -> response.body()!!.data.toWalletsAppData().filter { it.isInstalled } } suspend fun getAnalyticsConfig(sdkType: String = "w3m") = runCatching { - web3ModalService.getAnalyticsConfig(sdkType = sdkType) + appKitService.getAnalyticsConfig(sdkType = sdkType) }.mapCatching { response -> response.body()!!.isAnalyticsEnabled } @@ -34,7 +34,7 @@ internal class Web3ModalApiRepository( excludeIds: List? = null, includeWallets: List? = null ) = runCatching { - web3ModalService.getWallets( + appKitService.getWallets( sdkType = sdkType, page = page, search = search, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/network/Web3ModalService.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/network/AppKitService.kt similarity index 96% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/network/Web3ModalService.kt rename to core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/network/AppKitService.kt index 4a60589ad..e7b500816 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/network/Web3ModalService.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/network/AppKitService.kt @@ -8,7 +8,7 @@ import retrofit2.http.GET import retrofit2.http.Header import retrofit2.http.Query -internal interface Web3ModalService { +internal interface AppKitService { @GET("getWallets") suspend fun getWallets( @Header("x-sdk-type") sdkType: String, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/domain/usecase/EnableAnalyticsUseCase.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/domain/usecase/EnableAnalyticsUseCase.kt index 716caa09b..9745c1632 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/domain/usecase/EnableAnalyticsUseCase.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/domain/usecase/EnableAnalyticsUseCase.kt @@ -1,13 +1,13 @@ package com.walletconnect.android.internal.common.modal.domain.usecase -import com.walletconnect.android.internal.common.modal.Web3ModalApiRepository +import com.walletconnect.android.internal.common.modal.AppKitApiRepository import kotlinx.coroutines.runBlocking interface EnableAnalyticsUseCaseInterface { fun fetchAnalyticsConfig(): Boolean } -internal class EnableAnalyticsUseCase(private val repository: Web3ModalApiRepository) : EnableAnalyticsUseCaseInterface { +internal class EnableAnalyticsUseCase(private val repository: AppKitApiRepository) : EnableAnalyticsUseCaseInterface { override fun fetchAnalyticsConfig(): Boolean { return runBlocking { try { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/domain/usecase/GetAndroidDataUseCaseInterface.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/domain/usecase/GetAndroidDataUseCaseInterface.kt index 4bf11ae90..548155f81 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/domain/usecase/GetAndroidDataUseCaseInterface.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/domain/usecase/GetAndroidDataUseCaseInterface.kt @@ -1,6 +1,6 @@ package com.walletconnect.android.internal.common.modal.domain.usecase -import com.walletconnect.android.internal.common.modal.Web3ModalApiRepository +import com.walletconnect.android.internal.common.modal.AppKitApiRepository interface GetInstalledWalletsIdsUseCaseInterface { suspend operator fun invoke( @@ -9,7 +9,7 @@ interface GetInstalledWalletsIdsUseCaseInterface { } internal class GetInstalledWalletsIdsUseCase( - private val web3ModalApiRepository: Web3ModalApiRepository + private val appKitApiRepository: AppKitApiRepository ) : GetInstalledWalletsIdsUseCaseInterface { - override suspend fun invoke(sdkType: String): List = web3ModalApiRepository.getAndroidWalletsData(sdkType).map { it.map { walletAppData -> walletAppData.id } }.getOrThrow() + override suspend fun invoke(sdkType: String): List = appKitApiRepository.getAndroidWalletsData(sdkType).map { it.map { walletAppData -> walletAppData.id } }.getOrThrow() } diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/domain/usecase/GetWalletsUseCase.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/domain/usecase/GetWalletsUseCase.kt index bfb73d175..ef63705b7 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/domain/usecase/GetWalletsUseCase.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/domain/usecase/GetWalletsUseCase.kt @@ -1,6 +1,6 @@ package com.walletconnect.android.internal.common.modal.domain.usecase -import com.walletconnect.android.internal.common.modal.Web3ModalApiRepository +import com.walletconnect.android.internal.common.modal.AppKitApiRepository import com.walletconnect.android.internal.common.modal.data.model.WalletListing interface GetWalletsUseCaseInterface { @@ -14,7 +14,7 @@ interface GetWalletsUseCaseInterface { } internal class GetWalletsUseCase( - private val web3ModalApiRepository: Web3ModalApiRepository + private val appKitApiRepository: AppKitApiRepository ) : GetWalletsUseCaseInterface { override suspend fun invoke( sdkType: String, @@ -22,5 +22,5 @@ internal class GetWalletsUseCase( search: String?, excludeIds: List?, includes: List? - ): WalletListing = web3ModalApiRepository.getWallets(sdkType, page, search, excludeIds, includes).getOrThrow() + ): WalletListing = appKitApiRepository.getWallets(sdkType, page, search, excludeIds, includes).getOrThrow() } diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pulse/domain/SendEventUseCase.kt b/core/android/src/main/kotlin/com/walletconnect/android/pulse/domain/SendEventUseCase.kt index ec7aa81ee..6ba684c72 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pulse/domain/SendEventUseCase.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/pulse/domain/SendEventUseCase.kt @@ -43,5 +43,5 @@ class SendEventUseCase( } interface SendEventInterface { - fun send(props: Props, sdkType: SDKType = SDKType.WEB3MODAL, timestamp: Long? = currentTimeInSeconds, id: Long? = generateId()) + fun send(props: Props, sdkType: SDKType = SDKType.APPKIT, timestamp: Long? = currentTimeInSeconds, id: Long? = generateId()) } \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/SDKType.kt b/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/SDKType.kt index 9539e81e0..fe28f0800 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/SDKType.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/SDKType.kt @@ -1,6 +1,6 @@ package com.walletconnect.android.pulse.model enum class SDKType(val type: String) { - WEB3MODAL("w3m"), + APPKIT("appkit"), EVENTS("events_sdk") } \ No newline at end of file diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/JsonRpcResponseJsonRpcResultJsonAdapterTest.kt b/core/android/src/test/kotlin/com/walletconnect/android/internal/JsonRpcResponseJsonRpcResultJsonAdapterTest.kt index 75762bb18..3d3eb2c18 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/JsonRpcResponseJsonRpcResultJsonAdapterTest.kt +++ b/core/android/src/test/kotlin/com/walletconnect/android/internal/JsonRpcResponseJsonRpcResultJsonAdapterTest.kt @@ -59,60 +59,6 @@ internal class JsonRpcResponseJsonRpcResultJsonAdapterTest { println() } - @Test - fun `test auth params to json`() { - val moshi = Moshi.Builder().add { type, _, moshi -> - return@add if (type.getRawType().name == JsonRpcResponse.JsonRpcResult::class.jvmName) { - JsonRpcResultAdapter(moshi = moshi) - } else { - null - } - }.build() - val adapter = moshi.adapter(JsonRpcResponse.JsonRpcResult::class.java) - val authParams = CoreAuthParams.ResponseParams( - header = Cacao.Header("t"), - payload = Cacao.Payload("iss", "domain", "aud", "version", "nonce", "iat", "nbf", "exp", "statement", "id", listOf("res")), - signature = Cacao.Signature("t", "s") - ) - val jsonResult = JsonRpcResponse.JsonRpcResult( - id = 1L, - jsonrpc = "2.0", - result = authParams - ) - val result = adapter.toJson(jsonResult) - println() - println(result) - println() - } - - @Test - fun `test auth params from json`() { - val moshi = Moshi.Builder().add { type, _, moshi -> - return@add if (type.getRawType().name == JsonRpcResponse.JsonRpcResult::class.jvmName) { - JsonRpcResultAdapter(moshi = moshi) - } else { - null - } - - }.build() - - val adapter = moshi.adapter(JsonRpcResponse.JsonRpcResult::class.java) - val authParams = CoreAuthParams.ResponseParams( - header = Cacao.Header("t"), - payload = Cacao.Payload("iss", "domain", "aud", "version", "nonce", "iat", "nbf", "exp", "statement", "id", listOf("res")), - signature = Cacao.Signature("t", "s") - ) - - val authParamsJsonResult = JsonRpcResponse.JsonRpcResult(id = 11L, result = authParams) - val resultString = moshi.adapter(JsonRpcResponse.JsonRpcResult::class.java).toJson(authParamsJsonResult) - val result = adapter.fromJson(resultString) - result is JsonRpcResponse.JsonRpcResult - - println() - println(result) - println() - } - @Test fun `test chat params to json`() { val moshi = Moshi.Builder().add { type, _, moshi -> diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/SendEventUseCaseTest.kt b/core/android/src/test/kotlin/com/walletconnect/android/internal/SendEventUseCaseTest.kt index c664bd174..5b14e1ff5 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/SendEventUseCaseTest.kt +++ b/core/android/src/test/kotlin/com/walletconnect/android/internal/SendEventUseCaseTest.kt @@ -66,7 +66,7 @@ class SendEventUseCaseTest : KoinTest { wcKoinApp = app val props = Props(type = "testEvent") - val sdkType = SDKType.WEB3MODAL + val sdkType = SDKType.APPKIT val event = Event(props = props, bundleId = bundleId) coEvery { pulseService.sendEvent(body = any(), sdkType = any()) } returns Response.success(Unit) @@ -92,7 +92,7 @@ class SendEventUseCaseTest : KoinTest { wcKoinApp = app val props = Props(type = "testEvent") - val sdkType = SDKType.WEB3MODAL + val sdkType = SDKType.APPKIT val event = Event(props = props, bundleId = bundleId) coEvery { pulseService.sendEvent(any(), any()) } returns Response.error(400, "ResponseBody".toResponseBody()) @@ -118,7 +118,7 @@ class SendEventUseCaseTest : KoinTest { wcKoinApp = app val props = Props(type = "testEvent") - val sdkType = SDKType.WEB3MODAL + val sdkType = SDKType.APPKIT val event = Event(props = props, bundleId = bundleId) val exception = Exception("Test exception") @@ -145,7 +145,7 @@ class SendEventUseCaseTest : KoinTest { wcKoinApp = app2 val props = Props(type = "testEvent") - val sdkType = SDKType.WEB3MODAL + val sdkType = SDKType.APPKIT val event = Event(props = props, bundleId = bundleId) useCase.send(props, sdkType, event.timestamp, event.eventId) diff --git a/core/modal/src/main/kotlin/com/walletconnect/modal/ui/components/qr/WalletConnectQRCode.kt b/core/modal/src/main/kotlin/com/walletconnect/modal/ui/components/qr/WalletConnectQRCode.kt index d99fd5981..63e9f2dd2 100644 --- a/core/modal/src/main/kotlin/com/walletconnect/modal/ui/components/qr/WalletConnectQRCode.kt +++ b/core/modal/src/main/kotlin/com/walletconnect/modal/ui/components/qr/WalletConnectQRCode.kt @@ -73,7 +73,7 @@ private fun WalletConnectModalQRCodePreview() { @Preview @Composable -private fun Web3ModalQRCodePreview() { +private fun AppKitQRCodePreview() { ComponentPreview { WalletConnectQRCode( "Preview qr code data with wallet connect logo inside", diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/theme/ModalColors.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/theme/ModalColors.kt index f4be7078c..03dec0acc 100644 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/theme/ModalColors.kt +++ b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/theme/ModalColors.kt @@ -21,12 +21,12 @@ internal data class ModalColors( internal fun provideModalColors( composition: CustomizableComposition ): ModalColors = if (isSystemInDarkTheme()) { - defaultDarkWeb3ModalColors(composition.accentColor, composition.onAccentColor) + defaultDarkAppKitColors(composition.accentColor, composition.onAccentColor) } else { - defaultLightWeb3ModalColors(composition.accentColor, composition.onAccentColor) + defaultLightAppKitColors(composition.accentColor, composition.onAccentColor) } -private fun defaultLightWeb3ModalColors( +private fun defaultLightAppKitColors( mainColor: Color, onMainColor: Color ) = ModalColors( @@ -41,7 +41,7 @@ private fun defaultLightWeb3ModalColors( border = Color(0x32062B2B) ) -private fun defaultDarkWeb3ModalColors( +private fun defaultDarkAppKitColors( mainColor: Color, onMainColor: Color ) = ModalColors( diff --git a/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/Web3ModalTopBarTest.kt b/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitTopBarTest.kt similarity index 74% rename from product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/Web3ModalTopBarTest.kt rename to product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitTopBarTest.kt index 2eb214010..adf34fe96 100644 --- a/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/Web3ModalTopBarTest.kt +++ b/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitTopBarTest.kt @@ -8,12 +8,12 @@ import androidx.compose.ui.test.performClick import com.walletconnect.web3.modal.ui.components.internal.commons.BackArrowIcon import com.walletconnect.web3.modal.ui.components.internal.commons.ContentDescription import com.walletconnect.web3.modal.ui.components.internal.commons.TestTags -import com.walletconnect.web3.modal.ui.theme.ProvideWeb3ModalThemeComposition +import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition import org.junit.Rule import org.junit.Test import org.junit.Assert.* -class Web3ModalTopBarTest { +class AppKitTopBarTest { @get:Rule val composeTestRule = createComposeRule() @@ -21,8 +21,8 @@ class Web3ModalTopBarTest { @Test fun web3ModalTopBar_titleShouldBeShown() { composeTestRule.setContent { - ProvideWeb3ModalThemeComposition { - Web3ModalTopBar(title = "Title", startIcon = { BackArrowIcon { } }, onCloseIconClick = {}) + ProvideAppKitThemeComposition { + AppKitTopBar(title = "Title", startIcon = { BackArrowIcon { } }, onCloseIconClick = {}) } } @@ -35,8 +35,8 @@ class Web3ModalTopBarTest { var isClicked = false composeTestRule.setContent { - ProvideWeb3ModalThemeComposition { - Web3ModalTopBar(title = "Title", startIcon = { BackArrowIcon { } }, onCloseIconClick = { isClicked = true}) + ProvideAppKitThemeComposition { + AppKitTopBar(title = "Title", startIcon = { BackArrowIcon { } }, onCloseIconClick = { isClicked = true}) } } diff --git a/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/Web3ModalRootStateTest.kt b/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootStateTest.kt similarity index 82% rename from product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/Web3ModalRootStateTest.kt rename to product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootStateTest.kt index 858f618be..f7eca0222 100644 --- a/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/Web3ModalRootStateTest.kt +++ b/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootStateTest.kt @@ -11,12 +11,12 @@ import org.junit.Assert.assertEquals import org.junit.Rule import org.junit.Test -class Web3ModalRootStateTest { +class AppKitRootStateTest { @get:Rule val composeTestRule = createComposeRule() - private lateinit var state: Web3ModalRootState + private lateinit var state: AppKitRootState @Test fun web3modalRootState_currentDestination() = runTest { @@ -25,7 +25,7 @@ class Web3ModalRootStateTest { composeTestRule.setContent { val navController = rememberTestNavController() state = remember(navController) { - Web3ModalRootState( + AppKitRootState( coroutineScope = backgroundScope, navController = navController ) @@ -45,7 +45,7 @@ class Web3ModalRootStateTest { fun web3ModalRootState_canPopup_fromInitDestination() = runTest { composeTestRule.setContent { val navController = rememberTestNavController() - state = rememberWeb3ModalRootState(coroutineScope = backgroundScope, navController = navController) + state = rememberAppKitRootState(coroutineScope = backgroundScope, navController = navController) } assertEquals(false, state.canPopUp) @@ -55,7 +55,7 @@ class Web3ModalRootStateTest { fun web3ModalRootState_canPopup_fromQRCode() = runTest { composeTestRule.setContent { val navController = rememberTestNavController() - state = rememberWeb3ModalRootState(coroutineScope = backgroundScope, navController = navController) + state = rememberAppKitRootState(coroutineScope = backgroundScope, navController = navController) LaunchedEffect(Unit) { navController.setCurrentDestination(Route.QR_CODE.path) @@ -71,7 +71,7 @@ class Web3ModalRootStateTest { composeTestRule.setContent { val navController = rememberTestNavController() - state = rememberWeb3ModalRootState(coroutineScope = backgroundScope, navController = navController) + state = rememberAppKitRootState(coroutineScope = backgroundScope, navController = navController) currentDestinationPath = state.currentDestinationFlow.collectAsState(null).value?.destination?.route @@ -90,7 +90,7 @@ class Web3ModalRootStateTest { composeTestRule.setContent { val navController = rememberTestNavController() - state = rememberWeb3ModalRootState(coroutineScope = backgroundScope, navController = navController) + state = rememberAppKitRootState(coroutineScope = backgroundScope, navController = navController) title = state.title.collectAsState(initial = null).value } @@ -104,7 +104,7 @@ class Web3ModalRootStateTest { composeTestRule.setContent { val navController = rememberTestNavController() - state = rememberWeb3ModalRootState(coroutineScope = backgroundScope, navController = navController) + state = rememberAppKitRootState(coroutineScope = backgroundScope, navController = navController) title = state.title.collectAsState(initial = null).value @@ -122,7 +122,7 @@ class Web3ModalRootStateTest { composeTestRule.setContent { val navController = rememberTestNavController() - state = rememberWeb3ModalRootState(coroutineScope = backgroundScope, navController = navController) + state = rememberAppKitRootState(coroutineScope = backgroundScope, navController = navController) currentDestinationPath = state.currentDestinationFlow.collectAsState(null).value?.destination?.route diff --git a/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/Web3ModalRootTest.kt b/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootTest.kt similarity index 77% rename from product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/Web3ModalRootTest.kt rename to product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootTest.kt index 5186bebd9..77ac9e28c 100644 --- a/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/Web3ModalRootTest.kt +++ b/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootTest.kt @@ -10,11 +10,11 @@ import com.walletconnect.web3.modal.ui.components.internal.commons.ContentDescri import com.walletconnect.web3.modal.ui.components.internal.commons.TestTags import com.walletconnect.web3.modal.ui.navigation.Route import com.walletconnect.web3.modal.ui.rememberTestNavController -import com.walletconnect.web3.modal.ui.theme.ProvideWeb3ModalThemeComposition +import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition import org.junit.Rule import org.junit.Test -class Web3ModalRootTest { +class AppKitRootTest { @get:Rule val composeTestRule = createComposeRule() @@ -23,8 +23,8 @@ class Web3ModalRootTest { fun web3ModalRoot_shouldShowTitleFromEnumRoute() { composeTestRule.setContent { val controller = rememberTestNavController() - ProvideWeb3ModalThemeComposition { - Web3ModalRoot(navController = controller, closeModal = { }) { + ProvideAppKitThemeComposition { + AppKitRoot(navController = controller, closeModal = { }) { Box {} } } @@ -38,8 +38,8 @@ class Web3ModalRootTest { fun web3ModalRoot_shouldShowTitleFromNavArg() { composeTestRule.setContent { val controller = rememberTestNavController() - ProvideWeb3ModalThemeComposition { - Web3ModalRoot(navController = controller, closeModal = { }) { + ProvideAppKitThemeComposition { + AppKitRoot(navController = controller, closeModal = { }) { Box {} } } @@ -57,8 +57,8 @@ class Web3ModalRootTest { fun web3ModalRoot_shouldShowWithoutTitle() { composeTestRule.setContent { val controller = rememberTestNavController() - ProvideWeb3ModalThemeComposition { - Web3ModalRoot(navController = controller, closeModal = { }) { + ProvideAppKitThemeComposition { + AppKitRoot(navController = controller, closeModal = { }) { Box {} } } @@ -75,8 +75,8 @@ class Web3ModalRootTest { fun web3ModalRoot_QuestionMarkIcon() { composeTestRule.setContent { val controller = rememberTestNavController() - ProvideWeb3ModalThemeComposition { - Web3ModalRoot(navController = controller, closeModal = { }) { + ProvideAppKitThemeComposition { + AppKitRoot(navController = controller, closeModal = { }) { Box {} } } @@ -89,8 +89,8 @@ class Web3ModalRootTest { fun web3ModalRoot_BackIcon() { composeTestRule.setContent { val controller = rememberTestNavController() - ProvideWeb3ModalThemeComposition { - Web3ModalRoot(navController = controller, closeModal = { }) { + ProvideAppKitThemeComposition { + AppKitRoot(navController = controller, closeModal = { }) { Box {} } } @@ -103,8 +103,8 @@ class Web3ModalRootTest { fun web3ModalRoot_closeIsCalled() { composeTestRule.setContent { val controller = rememberTestNavController() - ProvideWeb3ModalThemeComposition { - Web3ModalRoot(navController = controller, closeModal = { }) { + ProvideAppKitThemeComposition { + AppKitRoot(navController = controller, closeModal = { }) { Box {} } } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/Web3Modal.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/AppKit.kt similarity index 85% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/Web3Modal.kt rename to product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/AppKit.kt index ec0c89c81..db15fab5a 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/Web3Modal.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/AppKit.kt @@ -12,21 +12,21 @@ import com.walletconnect.sign.common.exceptions.SignClientAlreadyInitializedExce import com.walletconnect.util.Empty import com.walletconnect.web3.modal.client.models.Account import com.walletconnect.web3.modal.client.models.Session -import com.walletconnect.web3.modal.client.models.Web3ModelClientAlreadyInitializedException +import com.walletconnect.web3.modal.client.models.AppKitClientAlreadyInitializedException import com.walletconnect.web3.modal.client.models.request.Request import com.walletconnect.web3.modal.client.models.request.SentRequestResult -import com.walletconnect.web3.modal.di.web3ModalModule -import com.walletconnect.web3.modal.domain.delegate.Web3ModalDelegate +import com.walletconnect.web3.modal.di.appKitModule +import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate import com.walletconnect.web3.modal.domain.model.Session.WalletConnect import com.walletconnect.web3.modal.domain.model.toModalError -import com.walletconnect.web3.modal.engine.Web3ModalEngine +import com.walletconnect.web3.modal.engine.AppKitEngine import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import org.jetbrains.annotations.ApiStatus.Experimental import org.koin.core.qualifier.named import org.koin.dsl.module -object Web3Modal { +object AppKit { internal var chains: List = listOf() @@ -36,7 +36,7 @@ object Web3Modal { internal var authPayloadParams: Modal.Model.AuthPayloadParams? = null - private lateinit var web3ModalEngine: Web3ModalEngine + private lateinit var appKitEngine: AppKitEngine interface ModalDelegate { fun onSessionApproved(approvedSession: Modal.Model.ApprovedSession) @@ -94,19 +94,19 @@ object Web3Modal { @Experimental fun register(activity: ComponentActivity) { checkEngineInitialization() - web3ModalEngine.registerCoinbaseLauncher(activity) + appKitEngine.registerCoinbaseLauncher(activity) } @Experimental fun unregister() { checkEngineInitialization() - web3ModalEngine.unregisterCoinbase() + appKitEngine.unregisterCoinbase() } @Throws(IllegalStateException::class) private fun checkEngineInitialization() { - check(::web3ModalEngine.isInitialized) { - "Web3Modal needs to be initialized first using the initialize function" + check(::appKitEngine.isInitialized) { + "AppKit needs to be initialized first using the initialize function" } } @@ -115,23 +115,23 @@ object Web3Modal { onSuccess: () -> Unit = {}, onError: (Modal.Model.Error) -> Unit, ) { - if (!::web3ModalEngine.isInitialized) { + if (!::appKitEngine.isInitialized) { runCatching { - wcKoinApp.modules(web3ModalModule()) - web3ModalEngine = wcKoinApp.koin.get() - web3ModalEngine.setup(init, onError) - web3ModalEngine.setInternalDelegate(Web3ModalDelegate) + wcKoinApp.modules(appKitModule()) + appKitEngine = wcKoinApp.koin.get() + appKitEngine.setup(init, onError) + appKitEngine.setInternalDelegate(AppKitDelegate) wcKoinApp.modules( - module { single(named(AndroidCommonDITags.ENABLE_WEB_3_MODAL_ANALYTICS)) { init.enableAnalytics ?: web3ModalEngine.fetchAnalyticsConfig() } } + module { single(named(AndroidCommonDITags.ENABLE_WEB_3_MODAL_ANALYTICS)) { init.enableAnalytics ?: appKitEngine.fetchAnalyticsConfig() } } ) } .onFailure { error -> return@onInitializedClient onError(Modal.Model.Error(error)) } .onSuccess { onSuccess() - web3ModalEngine.send(Props(event = EventType.TRACK, type = EventType.Track.MODAL_LOADED)) + appKitEngine.send(Props(event = EventType.TRACK, type = EventType.Track.MODAL_LOADED)) } } else { - onError(Modal.Model.Error(Web3ModelClientAlreadyInitializedException())) + onError(Modal.Model.Error(AppKitClientAlreadyInitializedException())) } } @@ -149,11 +149,11 @@ object Web3Modal { @Throws(IllegalStateException::class) fun setDelegate(delegate: ModalDelegate) { - Web3ModalDelegate.connectionState.onEach { connectionState -> + AppKitDelegate.connectionState.onEach { connectionState -> delegate.onConnectionStateChange(connectionState) }.launchIn(scope) - Web3ModalDelegate.wcEventModels.onEach { event -> + AppKitDelegate.wcEventModels.onEach { event -> when (event) { is Modal.Model.ApprovedSession -> delegate.onSessionApproved(event) is Modal.Model.DeletedSession.Success -> delegate.onSessionDelete(event) @@ -229,7 +229,7 @@ object Web3Modal { onError: (Modal.Model.Error) -> Unit, ) { checkEngineInitialization() - web3ModalEngine.request( + appKitEngine.request( request = Request(request.method, request.params, request.expiry), onSuccess = { onSuccess(it.sentRequestToModal()) }, onError = { onError(it.toModalError()) } @@ -242,7 +242,7 @@ object Web3Modal { onError: (Throwable) -> Unit, ) { checkEngineInitialization() - web3ModalEngine.request(request, onSuccess, onError) + appKitEngine.request(request, onSuccess, onError) } private fun SentRequestResult.sentRequestToModal() = when (this) { @@ -256,10 +256,10 @@ object Web3Modal { onError: (Throwable) -> Unit, ) { checkEngineInitialization() - web3ModalEngine.request(request, { onSuccess() }, onError) + appKitEngine.request(request, { onSuccess() }, onError) } - fun ping(sessionPing: Modal.Listeners.SessionPing? = null) = web3ModalEngine.ping(sessionPing) + fun ping(sessionPing: Modal.Listeners.SessionPing? = null) = appKitEngine.ping(sessionPing) @Deprecated( message = "This has become deprecate in favor of the parameterless disconnect function", @@ -270,12 +270,12 @@ object Web3Modal { onError: (Modal.Model.Error) -> Unit, ) { checkEngineInitialization() - val topic = when (val session = web3ModalEngine.getActiveSession()) { + val topic = when (val session = appKitEngine.getActiveSession()) { is WalletConnect -> session.topic else -> String.Empty } - web3ModalEngine.disconnect( + appKitEngine.disconnect( onSuccess = { onSuccess(Modal.Params.Disconnect(topic)) }, onError = { onError(it.toModalError()) } ) @@ -286,7 +286,7 @@ object Web3Modal { onError: (Throwable) -> Unit, ) { checkEngineInitialization() - web3ModalEngine.disconnect(onSuccess, onError) + appKitEngine.disconnect(onSuccess, onError) } /** @@ -302,7 +302,7 @@ object Web3Modal { */ @Deprecated( message = "Getting active session is replaced with getAccount()", - replaceWith = ReplaceWith("com.walletconnect.web3.modal.client.Web3Modal.getAccount()"), + replaceWith = ReplaceWith("com.walletconnect.web3.modal.client.AppKit.getAccount()"), level = DeprecationLevel.WARNING ) internal fun getActiveSessionByTopic(topic: String) = SignClient.getActiveSessionByTopic(topic)?.toModal() @@ -313,12 +313,12 @@ object Web3Modal { */ @Deprecated( message = "Getting active session is replaced with getAccount()", - replaceWith = ReplaceWith("com.walletconnect.web3.modal.client.Web3Modal.getAccount()"), + replaceWith = ReplaceWith("com.walletconnect.web3.modal.client.AppKit.getAccount()"), level = DeprecationLevel.WARNING ) fun getActiveSession(): Modal.Model.Session? { checkEngineInitialization() - return (web3ModalEngine.getActiveSession() as? WalletConnect)?.topic?.let { SignClient.getActiveSessionByTopic(it)?.toModal() } + return (appKitEngine.getActiveSession() as? WalletConnect)?.topic?.let { SignClient.getActiveSessionByTopic(it)?.toModal() } } /** @@ -327,7 +327,7 @@ object Web3Modal { */ fun getAccount(): Account? { checkEngineInitialization() - return web3ModalEngine.getAccount() + return appKitEngine.getAccount() } /** @@ -336,7 +336,7 @@ object Web3Modal { */ fun getSession(): Session? { checkEngineInitialization() - return web3ModalEngine.getSession() + return appKitEngine.getSession() } /** @@ -345,6 +345,6 @@ object Web3Modal { */ fun getConnectorType(): Modal.ConnectorType? { checkEngineInitialization() - return web3ModalEngine.getConnectorType() + return appKitEngine.getConnectorType() } } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Exceptions.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Exceptions.kt index b6eb6d753..e9ecf76ed 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Exceptions.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Exceptions.kt @@ -2,5 +2,5 @@ package com.walletconnect.web3.modal.client.models import com.walletconnect.android.internal.common.exception.WalletConnectException -class Web3ModelClientAlreadyInitializedException : WalletConnectException("Web3Modal already initialized") +class AppKitClientAlreadyInitializedException : WalletConnectException("AppKit already initialized") class CoinbaseClientAlreadyInitializedException : WalletConnectException("Coinbase already initialized") \ No newline at end of file diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/Web3ModalDITags.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/AppKitDITags.kt similarity index 77% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/Web3ModalDITags.kt rename to product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/AppKitDITags.kt index 24db155f5..56c1ce33f 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/Web3ModalDITags.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/AppKitDITags.kt @@ -1,6 +1,6 @@ package com.walletconnect.web3.modal.di -internal enum class Web3ModalDITags { +internal enum class AppKitDITags { BALANCE_RPC_RETROFIT, BLOCKCHAIN_RETROFIT, MOSHI, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BalanceRpcModule.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BalanceRpcModule.kt index b1f9195d4..683b42659 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BalanceRpcModule.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BalanceRpcModule.kt @@ -11,7 +11,7 @@ import retrofit2.converter.moshi.MoshiConverterFactory internal fun balanceRpcModule() = module { - single(named(Web3ModalDITags.BALANCE_RPC_RETROFIT)) { + single(named(AppKitDITags.BALANCE_RPC_RETROFIT)) { Retrofit.Builder() // Passing url to google to passing retrofit verification. The correct url to chain RPC is provided on the BalanceService::class .baseUrl("https://google.com/") @@ -20,7 +20,7 @@ internal fun balanceRpcModule() = module { .build() } - single { get(named(Web3ModalDITags.BALANCE_RPC_RETROFIT)).create(BalanceService::class.java) } + single { get(named(AppKitDITags.BALANCE_RPC_RETROFIT)).create(BalanceService::class.java) } single { BalanceRpcRepository(balanceService = get(), logger = get()) } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BlockchainApiModule.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BlockchainApiModule.kt index db5d93659..c22179080 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BlockchainApiModule.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BlockchainApiModule.kt @@ -11,7 +11,7 @@ import retrofit2.converter.moshi.MoshiConverterFactory internal fun blockchainApiModule() = module { - single(named(Web3ModalDITags.BLOCKCHAIN_RETROFIT)) { + single(named(AppKitDITags.BLOCKCHAIN_RETROFIT)) { Retrofit.Builder() .baseUrl("https://rpc.walletconnect.org/v1/") .client(get(named(AndroidCommonDITags.OK_HTTP))) @@ -20,7 +20,7 @@ internal fun blockchainApiModule() = module { } single { - get(named(Web3ModalDITags.BLOCKCHAIN_RETROFIT)).create(BlockchainService::class.java) + get(named(AppKitDITags.BLOCKCHAIN_RETROFIT)).create(BlockchainService::class.java) } single { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/EngineModule.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/EngineModule.kt index ef25b9103..cc6ff9acb 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/EngineModule.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/EngineModule.kt @@ -3,7 +3,7 @@ package com.walletconnect.web3.modal.di import android.content.Context import com.walletconnect.android.internal.common.di.AndroidCommonDITags import com.walletconnect.web3.modal.domain.usecase.ConnectionEventRepository -import com.walletconnect.web3.modal.engine.Web3ModalEngine +import com.walletconnect.web3.modal.engine.AppKitEngine import com.walletconnect.web3.modal.engine.coinbase.CoinbaseClient import org.koin.android.ext.koin.androidContext import org.koin.core.qualifier.named @@ -16,7 +16,7 @@ internal fun engineModule() = module { } single { - Web3ModalEngine( + AppKitEngine( getSessionUseCase = get(), getSelectedChainUseCase = get(), deleteSessionDataUseCase = get(), diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/Web3ModalModule.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/Web3ModalModule.kt index 6b9dabf19..f3ad1b638 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/Web3ModalModule.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/Web3ModalModule.kt @@ -25,7 +25,7 @@ import org.koin.dsl.module private val Context.sessionDataStore: DataStore by preferencesDataStore(name = "session_store") -internal fun web3ModalModule() = module { +internal fun appKitModule() = module { single { RecentWalletsRepository(sharedPreferences = get()) } @@ -38,14 +38,14 @@ internal fun web3ModalModule() = module { .withSubtype(Session.Coinbase::class.java, "coinbase") } - single(named(Web3ModalDITags.MOSHI)) { + single(named(AppKitDITags.MOSHI)) { get(named(AndroidCommonDITags.MOSHI)) .add(get>()) .build() } - single(named(Web3ModalDITags.SESSION_DATA_STORE)) { androidContext().sessionDataStore } - single { SessionRepository(sessionStore = get(named(Web3ModalDITags.SESSION_DATA_STORE)), moshi = get(named(Web3ModalDITags.MOSHI))) } + single(named(AppKitDITags.SESSION_DATA_STORE)) { androidContext().sessionDataStore } + single { SessionRepository(sessionStore = get(named(AppKitDITags.SESSION_DATA_STORE)), moshi = get(named(AppKitDITags.MOSHI))) } single { GetSessionUseCase(repository = get()) } single { SaveSessionUseCase(repository = get()) } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/SessionRepository.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/SessionRepository.kt index c2054f649..824dbdbcb 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/SessionRepository.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/SessionRepository.kt @@ -5,7 +5,7 @@ import androidx.datastore.preferences.core.Preferences import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.stringPreferencesKey import com.squareup.moshi.Moshi -import com.walletconnect.web3.modal.client.Web3Modal +import com.walletconnect.web3.modal.client.AppKit import com.walletconnect.web3.modal.domain.model.Session import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.first @@ -41,7 +41,7 @@ internal class SessionRepository( is Session.WalletConnect -> session.copy(chain = chain) null -> null } - Web3Modal.selectedChain = Web3Modal.chains.find { it.id == chain } + AppKit.selectedChain = AppKit.chains.find { it.id == chain } store[SESSION] = adapter.toJson(updatedSession) } } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/delegate/Web3ModalDelegate.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/delegate/AppKitDelegate.kt similarity index 86% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/delegate/Web3ModalDelegate.kt rename to product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/delegate/AppKitDelegate.kt index 6be3977b9..a50cc0535 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/delegate/Web3ModalDelegate.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/delegate/AppKitDelegate.kt @@ -2,7 +2,7 @@ package com.walletconnect.web3.modal.domain.delegate import com.walletconnect.android.internal.common.wcKoinApp import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.Web3Modal +import com.walletconnect.web3.modal.client.AppKit import com.walletconnect.web3.modal.domain.model.Session import com.walletconnect.web3.modal.domain.usecase.DeleteSessionDataUseCase import com.walletconnect.web3.modal.domain.usecase.SaveChainSelectionUseCase @@ -19,7 +19,7 @@ import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow import kotlinx.coroutines.launch -internal object Web3ModalDelegate : Web3Modal.ModalDelegate { +internal object AppKitDelegate : AppKit.ModalDelegate { private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) private val _wcEventModels: MutableSharedFlow = MutableSharedFlow() val wcEventModels: SharedFlow = _wcEventModels.asSharedFlow() @@ -40,7 +40,7 @@ internal object Web3ModalDelegate : Web3Modal.ModalDelegate { override fun onSessionApproved(approvedSession: Modal.Model.ApprovedSession) { scope.launch { - val chain = Web3Modal.chains.getSelectedChain(Web3Modal.selectedChain?.id) + val chain = AppKit.chains.getSelectedChain(AppKit.selectedChain?.id) saveSessionUseCase(approvedSession.toSession(chain)) _wcEventModels.emit(approvedSession) } @@ -49,7 +49,7 @@ internal object Web3ModalDelegate : Web3Modal.ModalDelegate { override fun onSessionAuthenticateResponse(sessionAuthenticateResponse: Modal.Model.SessionAuthenticateResponse) { scope.launch { if (sessionAuthenticateResponse is Modal.Model.SessionAuthenticateResponse.Result) { - val chain = Web3Modal.chains.getSelectedChain(Web3Modal.selectedChain?.id) + val chain = AppKit.chains.getSelectedChain(AppKit.selectedChain?.id) saveSessionUseCase( Session.WalletConnect( chain = chain.id, @@ -77,7 +77,7 @@ internal object Web3ModalDelegate : Web3Modal.ModalDelegate { override fun onSessionUpdate(updatedSession: Modal.Model.UpdatedSession) { scope.launch { - val chain = Web3Modal.chains.getSelectedChain(Web3Modal.selectedChain?.id) + val chain = AppKit.chains.getSelectedChain(AppKit.selectedChain?.id) saveSessionUseCase(updatedSession.toSession(chain)) _wcEventModels.emit(updatedSession) } @@ -102,12 +102,12 @@ internal object Web3ModalDelegate : Web3Modal.ModalDelegate { when (sessionEvent.name) { EthUtils.accountsChanged -> { val (_, chainReference, _) = sessionEvent.data.split(":") - Web3Modal.chains.find { it.chainReference == chainReference }?.let { chain -> saveChainSelectionUseCase(chain.id) } + AppKit.chains.find { it.chainReference == chainReference }?.let { chain -> saveChainSelectionUseCase(chain.id) } } EthUtils.chainChanged -> { val (chainReference, _) = sessionEvent.data.split(".") - Web3Modal.chains.find { it.chainReference == chainReference }?.let { chain -> saveChainSelectionUseCase(chain.id) } + AppKit.chains.find { it.chainReference == chainReference }?.let { chain -> saveChainSelectionUseCase(chain.id) } } } } catch (throwable: Throwable) { @@ -122,13 +122,13 @@ internal object Web3ModalDelegate : Web3Modal.ModalDelegate { EthUtils.accountsChanged -> { //todo: Can we take chainReference from the event? val (_, chainReference, _) = event.data.split(":") - Web3Modal.chains.find { it.chainReference == chainReference }?.let { chain -> saveChainSelectionUseCase(chain.id) } + AppKit.chains.find { it.chainReference == chainReference }?.let { chain -> saveChainSelectionUseCase(chain.id) } } EthUtils.chainChanged -> { //todo: Can we take chainReference from the event? val (chainReference, _) = event.data.split(".") - Web3Modal.chains.find { it.chainReference == chainReference }?.let { chain -> saveChainSelectionUseCase(chain.id) } + AppKit.chains.find { it.chainReference == chainReference }?.let { chain -> saveChainSelectionUseCase(chain.id) } } } } catch (throwable: Throwable) { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/Web3ModalEngine.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/AppKitEngine.kt similarity index 97% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/Web3ModalEngine.kt rename to product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/AppKitEngine.kt index 45364bc90..40b0e1c36 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/Web3ModalEngine.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/AppKitEngine.kt @@ -17,7 +17,7 @@ import com.walletconnect.sign.client.Sign import com.walletconnect.sign.client.SignClient import com.walletconnect.util.Empty import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.Web3Modal +import com.walletconnect.web3.modal.client.AppKit import com.walletconnect.web3.modal.client.models.Account import com.walletconnect.web3.modal.client.models.CoinbaseClientAlreadyInitializedException import com.walletconnect.web3.modal.client.models.request.Request @@ -27,7 +27,7 @@ import com.walletconnect.web3.modal.client.toCoinbaseSession import com.walletconnect.web3.modal.client.toModal import com.walletconnect.web3.modal.client.toSession import com.walletconnect.web3.modal.client.toSign -import com.walletconnect.web3.modal.domain.delegate.Web3ModalDelegate +import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate import com.walletconnect.web3.modal.domain.model.InvalidSessionException import com.walletconnect.web3.modal.domain.model.Session import com.walletconnect.web3.modal.domain.usecase.ConnectionEventRepository @@ -44,7 +44,7 @@ import com.walletconnect.web3.modal.utils.toConnectorType import com.walletconnect.web3.modal.utils.toSession import kotlinx.coroutines.launch -internal class Web3ModalEngine( +internal class AppKitEngine( private val getSessionUseCase: GetSessionUseCase, private val getSelectedChainUseCase: GetSelectedChainUseCase, private val saveSessionUseCase: SaveSessionUseCase, @@ -111,9 +111,9 @@ internal class Web3ModalEngine( coinbaseClient.connect( onSuccess = { scope.launch { - val chain = Web3Modal.chains.getSelectedChain(Web3Modal.selectedChain?.id) + val chain = AppKit.chains.getSelectedChain(AppKit.selectedChain?.id) saveSessionUseCase(it.toSession(chain)) - Web3ModalDelegate.emit(it) + AppKitDelegate.emit(it) onSuccess() } @@ -134,7 +134,7 @@ internal class Web3ModalEngine( fun getConnectorType() = getSessionUseCase()?.toConnectorType() - internal fun getSelectedChainOrFirst() = getSelectedChain() ?: Web3Modal.chains.first() + internal fun getSelectedChainOrFirst() = getSelectedChain() ?: AppKit.chains.first() fun formatSIWEMessage(authParams: Modal.Model.AuthPayloadParams, issuer: String): String { return SignClient.formatAuthMessage(authParams.toSign(issuer)) @@ -236,7 +236,7 @@ internal class Web3ModalEngine( } @Throws(IllegalStateException::class) - fun setInternalDelegate(delegate: Web3ModalDelegate) { + fun setInternalDelegate(delegate: AppKitDelegate) { val signDelegate = object : SignClient.DappDelegate { override fun onSessionApproved(approvedSession: Sign.Model.ApprovedSession) { try { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/presets/Web3ModalChainsPresets.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/presets/AppKitChainsPresets.kt similarity index 99% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/presets/Web3ModalChainsPresets.kt rename to product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/presets/AppKitChainsPresets.kt index cf21ffa44..8a0f04aac 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/presets/Web3ModalChainsPresets.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/presets/AppKitChainsPresets.kt @@ -3,7 +3,7 @@ package com.walletconnect.web3.modal.presets import com.walletconnect.web3.modal.client.Modal import com.walletconnect.web3.modal.utils.EthUtils -object Web3ModalChainsPresets { +object AppKitChainsPresets { val ethToken = Modal.Model.Token(name = "Ether", symbol = "ETH", decimal = 18) val ethChains: Map = mapOf( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/Web3Modal.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKit.kt similarity index 65% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/Web3Modal.kt rename to product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKit.kt index 4ed334e6d..f4b817daf 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/Web3Modal.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKit.kt @@ -14,19 +14,19 @@ import androidx.navigation.navArgument import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi import com.google.accompanist.navigation.material.bottomSheet import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.Web3ModalComponent +import com.walletconnect.web3.modal.ui.components.internal.AppKitComponent import com.walletconnect.web3.modal.ui.navigation.Route internal const val CHOOSE_NETWORK_KEY = "chooseNetwork" private const val CHOOSE_NETWORK_ARG = "{chooseNetwork}" -private val web3ModalPath = Route.WEB3MODAL.path + "/" + CHOOSE_NETWORK_ARG +private val appKitPath = Route.APPKIT.path + "/" + CHOOSE_NETWORK_ARG -fun NavGraphBuilder.web3Modal() { - dialog(web3ModalPath) { argument(CHOOSE_NETWORK_KEY) { type = NavType.BoolType } } +fun NavGraphBuilder.appKit() { + dialog(appKitPath) { argument(CHOOSE_NETWORK_KEY) { type = NavType.BoolType } } } @SuppressLint("RestrictedApi") -fun NavController.openWeb3Modal( +fun NavController.openAppKit( shouldOpenChooseNetwork: Boolean = false, onError: (Throwable) -> Unit = {} ) { @@ -34,39 +34,39 @@ fun NavController.openWeb3Modal( findDestination(R.id.web3ModalGraph) != null -> { navigate(R.id.web3ModalGraph, args = Bundle().apply { putBoolean(CHOOSE_NETWORK_KEY, shouldOpenChooseNetwork) - }, navOptions = buildWeb3ModalNavOptions()) + }, navOptions = buildAppKitNavOptions()) } - findDestination(web3ModalPath) != null -> { + findDestination(appKitPath) != null -> { navigate( - route = Route.WEB3MODAL.path + "/$shouldOpenChooseNetwork", - navOptions = buildWeb3ModalNavOptions() + route = Route.APPKIT.path + "/$shouldOpenChooseNetwork", + navOptions = buildAppKitNavOptions() ) } - else -> onError(IllegalStateException("Invalid web3Modal path")) + else -> onError(IllegalStateException("Invalid AppKit path")) } } -fun NavGraphBuilder.web3ModalGraph(navController: NavController) { +fun NavGraphBuilder.appKitGraph(navController: NavController) { bottomSheet( - route = web3ModalPath, + route = appKitPath, arguments = listOf(navArgument(CHOOSE_NETWORK_KEY) { type = NavType.BoolType }) ) { val shouldOpenChooseNetwork = it.arguments?.getBoolean(CHOOSE_NETWORK_KEY) ?: false - Web3Modal( + AppKit( navController = navController, shouldOpenChooseNetwork = shouldOpenChooseNetwork ) } } -private fun buildWeb3ModalNavOptions() = NavOptions.Builder().setLaunchSingleTop(true).build() +private fun buildAppKitNavOptions() = NavOptions.Builder().setLaunchSingleTop(true).build() @Composable -internal fun Web3Modal( +internal fun AppKit( navController: NavController, shouldOpenChooseNetwork: Boolean ) { - Web3ModalComponent( + AppKitComponent( closeModal = navController::popBackStack, shouldOpenChooseNetwork = shouldOpenChooseNetwork ) diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitEvents.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitEvents.kt new file mode 100644 index 000000000..f6a7d277a --- /dev/null +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitEvents.kt @@ -0,0 +1,8 @@ +package com.walletconnect.web3.modal.ui + +sealed class AppKitEvents { + object SessionApproved: AppKitEvents() + object SessionRejected: AppKitEvents() + object NoAction: AppKitEvents() + object InvalidState: AppKitEvents() +} \ No newline at end of file diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/Web3ModalSheet.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitSheet.kt similarity index 88% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/Web3ModalSheet.kt rename to product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitSheet.kt index 19d0335f5..94c2f7b2e 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/Web3ModalSheet.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitSheet.kt @@ -30,10 +30,10 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.walletconnect.modal.utils.theme.toComposeColor import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.Web3ModalComponent +import com.walletconnect.web3.modal.ui.components.internal.AppKitComponent import com.walletconnect.web3.modal.ui.theme.ColorPalette -class Web3ModalSheet : BottomSheetDialogFragment() { +class AppKitSheet : BottomSheetDialogFragment() { override fun onCreate(savedInstanceState: Bundle?) { requireContext().setTheme(R.style.Web3ModalTheme_DialogTheme) @@ -53,36 +53,36 @@ class Web3ModalSheet : BottomSheetDialogFragment() { return ComposeView(requireContext()).apply { setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed) setContent { - Web3ModalTheme( + AppKitTheme( mode = mode, lightColors = colors.getLightModeColors(), darkColors = colors.getDarkModeColors() ) { - Web3ModalComposeView(shouldOpenChooseNetwork) + AppKitComposeView(shouldOpenChooseNetwork) } } } } @Composable - private fun Web3ModalComposeView( + private fun AppKitComposeView( shouldOpenChooseNetwork: Boolean ) { val navController = rememberAnimatedNavController() dialog?.setupDialog(navController) Surface(shape = RoundedCornerShape(topStart = 36.dp, topEnd = 36.dp)) { - Web3ModalComponent( + AppKitComponent( modifier = Modifier.nestedScroll(rememberNestedScrollInteropConnection()), navController = navController, shouldOpenChooseNetwork = shouldOpenChooseNetwork, - closeModal = { this@Web3ModalSheet.dismiss() }) + closeModal = { this@AppKitSheet.dismiss() }) } } private fun Dialog.setupDialog(navController: NavHostController) { (this as? ComponentDialog)?.onBackPressedDispatcher?.addCallback( - this@Web3ModalSheet, onBackPressedCallback(navController) + this@AppKitSheet, onBackPressedCallback(navController) ) findViewById(com.google.android.material.R.id.design_bottom_sheet)?.let { val behavior = BottomSheetBehavior.from(it) @@ -100,10 +100,10 @@ class Web3ModalSheet : BottomSheetDialogFragment() { } @Composable -internal fun Map.getLightModeColors(): Web3ModalTheme.Colors { - val defaultColors = Web3ModalTheme.provideLightWeb3ModalColors() +internal fun Map.getLightModeColors(): AppKitTheme.Colors { + val defaultColors = AppKitTheme.provideLightAppKitColors() val (foreground, background) = provideColorPallets(defaultColors) - return Web3ModalTheme.provideLightWeb3ModalColors( + return AppKitTheme.provideLightAppKitColors( accent100 = get(R.attr.modalAccent100) ?: defaultColors.accent100, accent90 = get(R.attr.modalAccent90) ?: defaultColors.accent90, accent80 = get(R.attr.modalAccent80) ?: defaultColors.accent80, @@ -116,10 +116,10 @@ internal fun Map.getLightModeColors(): Web3ModalTheme.Colors { } @Composable -internal fun Map.getDarkModeColors(): Web3ModalTheme.Colors { - val defaultColors = Web3ModalTheme.provideDarkWeb3ModalColor() +internal fun Map.getDarkModeColors(): AppKitTheme.Colors { + val defaultColors = AppKitTheme.provideDarkAppKitColor() val (foreground, background) = provideColorPallets(defaultColors) - return Web3ModalTheme.provideDarkWeb3ModalColor( + return AppKitTheme.provideDarkAppKitColor( accent100 = get(R.attr.modalAccent100) ?: defaultColors.accent100, accent90 = get(R.attr.modalAccent90) ?: defaultColors.accent90, accent80 = get(R.attr.modalAccent80) ?: defaultColors.accent80, @@ -131,7 +131,7 @@ internal fun Map.getDarkModeColors(): Web3ModalTheme.Colors { ) } -private fun Map.provideColorPallets(defaultColors: Web3ModalTheme.Colors): Pair { +private fun Map.provideColorPallets(defaultColors: AppKitTheme.Colors): Pair { val foreground = ColorPalette( color100 = this[R.attr.modalForeground100] ?: defaultColors.foreground.color100, color125 = this[R.attr.modalForeground125] ?: defaultColors.foreground.color125, @@ -157,10 +157,10 @@ private fun Map.provideColorPallets(defaultColors: Web3ModalTheme.C return (foreground to background) } -private fun Int.toThemeMode(): Web3ModalTheme.Mode = when (this) { - 1 -> Web3ModalTheme.Mode.DARK - 2 -> Web3ModalTheme.Mode.LIGHT - else -> Web3ModalTheme.Mode.AUTO +private fun Int.toThemeMode(): AppKitTheme.Mode = when (this) { + 1 -> AppKitTheme.Mode.DARK + 2 -> AppKitTheme.Mode.LIGHT + else -> AppKitTheme.Mode.AUTO } private val themeColorsAttributesMap = mapOf( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitState.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitState.kt new file mode 100644 index 000000000..e33f78a7e --- /dev/null +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitState.kt @@ -0,0 +1,11 @@ +package com.walletconnect.web3.modal.ui + +internal sealed class AppKitState { + object Connect : AppKitState() + + object Loading : AppKitState() + + data class Error(val error: Throwable) : AppKitState() + + object AccountState : AppKitState() +} \ No newline at end of file diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitTheme.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitTheme.kt new file mode 100644 index 000000000..efc87ac86 --- /dev/null +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitTheme.kt @@ -0,0 +1,129 @@ +package com.walletconnect.web3.modal.ui + +import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.ui.graphics.Color +import com.walletconnect.web3.modal.ui.theme.ColorPalette +import com.walletconnect.web3.modal.ui.theme.CustomComposition +import com.walletconnect.web3.modal.ui.theme.LocalCustomComposition +import com.walletconnect.web3.modal.ui.theme.defaultDarkAppKitColors +import com.walletconnect.web3.modal.ui.theme.defaultLightAppKitColors + +@Composable +fun AppKitTheme( + mode: AppKitTheme.Mode = AppKitTheme.Mode.AUTO, + lightColors: AppKitTheme.Colors = AppKitTheme.provideLightAppKitColors(), + darkColors: AppKitTheme.Colors = AppKitTheme.provideDarkAppKitColor(), + content: @Composable () -> Unit +) { + val customComposition = CustomComposition( + mode = mode, + lightColors = lightColors, + darkColors = darkColors, + ) + CompositionLocalProvider( + LocalCustomComposition provides customComposition + ) { + content() + } +} + +object AppKitTheme { + + fun provideLightAppKitColors( + accent100: Color = defaultLightAppKitColors.accent100, + accent90: Color = defaultLightAppKitColors.accent90, + accent80: Color = defaultLightAppKitColors.accent80, + foreground: ColorPalette = defaultLightAppKitColors.foreground, + background: ColorPalette = defaultLightAppKitColors.background, + overlay: Color = defaultLightAppKitColors.grayGlass, + success: Color = defaultLightAppKitColors.success, + error: Color = defaultLightAppKitColors.error + ): Colors = CustomAppKitColor(accent100, accent90, accent80, foreground, background, overlay, success, error) + + fun provideDarkAppKitColor( + accent100: Color = defaultDarkAppKitColors.accent100, + accent90: Color = defaultDarkAppKitColors.accent90, + accent80: Color = defaultDarkAppKitColors.accent80, + foreground: ColorPalette = defaultDarkAppKitColors.foreground, + background: ColorPalette = defaultDarkAppKitColors.background, + overlay: Color = defaultDarkAppKitColors.grayGlass, + success: Color = defaultDarkAppKitColors.success, + error: Color = defaultDarkAppKitColors.error + ): Colors = CustomAppKitColor(accent100, accent90, accent80, foreground, background, overlay, success, error) + + fun provideForegroundLightColorPalette( + color100: Color = defaultLightAppKitColors.foreground.color100, + color125: Color = defaultLightAppKitColors.foreground.color125, + color150: Color = defaultLightAppKitColors.foreground.color150, + color175: Color = defaultLightAppKitColors.foreground.color175, + color200: Color = defaultLightAppKitColors.foreground.color200, + color225: Color = defaultLightAppKitColors.foreground.color225, + color250: Color = defaultLightAppKitColors.foreground.color250, + color275: Color = defaultLightAppKitColors.foreground.color275, + color300: Color = defaultLightAppKitColors.foreground.color300, + ) = ColorPalette(color100, color125, color150, color175, color200, color225, color250, color275, color300) + + fun provideForegroundDarkColorPalette( + color100: Color = defaultDarkAppKitColors.foreground.color100, + color125: Color = defaultDarkAppKitColors.foreground.color125, + color150: Color = defaultDarkAppKitColors.foreground.color150, + color175: Color = defaultDarkAppKitColors.foreground.color175, + color200: Color = defaultDarkAppKitColors.foreground.color200, + color225: Color = defaultDarkAppKitColors.foreground.color225, + color250: Color = defaultDarkAppKitColors.foreground.color250, + color275: Color = defaultDarkAppKitColors.foreground.color275, + color300: Color = defaultDarkAppKitColors.foreground.color300, + ) = ColorPalette(color100, color125, color150, color175, color200, color225, color250, color275, color300) + + fun provideBackgroundLightColorPalette( + color100: Color = defaultLightAppKitColors.background.color100, + color125: Color = defaultLightAppKitColors.background.color125, + color150: Color = defaultLightAppKitColors.background.color150, + color175: Color = defaultLightAppKitColors.background.color175, + color200: Color = defaultLightAppKitColors.background.color200, + color225: Color = defaultLightAppKitColors.background.color225, + color250: Color = defaultLightAppKitColors.background.color250, + color275: Color = defaultLightAppKitColors.background.color275, + color300: Color = defaultLightAppKitColors.background.color300, + ) = ColorPalette(color100, color125, color150, color175, color200, color225, color250, color275, color300) + + fun provideBackgroundDarkColorPalette( + color100: Color = defaultDarkAppKitColors.background.color100, + color125: Color = defaultDarkAppKitColors.background.color125, + color150: Color = defaultDarkAppKitColors.background.color150, + color175: Color = defaultDarkAppKitColors.background.color175, + color200: Color = defaultDarkAppKitColors.background.color200, + color225: Color = defaultDarkAppKitColors.background.color225, + color250: Color = defaultDarkAppKitColors.background.color250, + color275: Color = defaultDarkAppKitColors.background.color275, + color300: Color = defaultDarkAppKitColors.background.color300, + ) = ColorPalette(color100, color125, color150, color175, color200, color225, color250, color275, color300) + + + enum class Mode { + LIGHT, DARK, AUTO + } + + interface Colors { + val accent100: Color + val accent90: Color + val accent80: Color + val foreground: ColorPalette + val background: ColorPalette + val grayGlass: Color + val success: Color + val error: Color + } +} + +private class CustomAppKitColor( + override val accent100: Color, + override val accent90: Color, + override val accent80: Color, + override val foreground: ColorPalette, + override val background: ColorPalette, + override val grayGlass: Color, + override val success: Color, + override val error: Color +) : AppKitTheme.Colors diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/Web3ModalView.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitView.kt similarity index 89% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/Web3ModalView.kt rename to product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitView.kt index 2afd387e4..b3cb175a8 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/Web3ModalView.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitView.kt @@ -7,9 +7,9 @@ import android.widget.FrameLayout import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ViewCompositionStrategy import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.Web3ModalComponent +import com.walletconnect.web3.modal.ui.components.internal.AppKitComponent -class Web3ModalView @JvmOverloads constructor( +class AppKitView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 @@ -38,12 +38,12 @@ class Web3ModalView @JvmOverloads constructor( .apply { setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed) setContent { - Web3ModalTheme( + AppKitTheme( mode = mode, lightColors = colors.getLightModeColors(), darkColors = colors.getDarkModeColors() ) { - Web3ModalComponent( + AppKitComponent( shouldOpenChooseNetwork = shouldOpenNetwork, closeModal = closeModal ) diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/Web3ModalViewModel.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitViewModel.kt similarity index 53% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/Web3ModalViewModel.kt rename to product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitViewModel.kt index 08a9f47aa..5333aad46 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/Web3ModalViewModel.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitViewModel.kt @@ -3,29 +3,29 @@ package com.walletconnect.web3.modal.ui import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.web3.modal.client.Web3Modal -import com.walletconnect.web3.modal.engine.Web3ModalEngine +import com.walletconnect.web3.modal.client.AppKit +import com.walletconnect.web3.modal.engine.AppKitEngine import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch -internal class Web3ModalViewModel : ViewModel() { +internal class AppKitViewModel : ViewModel() { - private val web3ModalEngine: Web3ModalEngine = wcKoinApp.koin.get() - private val _modalState: MutableStateFlow = MutableStateFlow(Web3ModalState.Loading) - val shouldDisconnect get() = web3ModalEngine.shouldDisconnect + private val appKitEngine: AppKitEngine = wcKoinApp.koin.get() + private val _modalState: MutableStateFlow = MutableStateFlow(AppKitState.Loading) + val shouldDisconnect get() = appKitEngine.shouldDisconnect - val modalState: StateFlow + val modalState: StateFlow get() = _modalState.asStateFlow() init { - require(Web3Modal.chains.isNotEmpty()) { "Be sure to set the Chains using Web3Modal.setChains" } + require(AppKit.chains.isNotEmpty()) { "Be sure to set the Chains using AppKit.setChains" } initModalState() } fun disconnect() { - web3ModalEngine.disconnect( + appKitEngine.disconnect( onSuccess = { println("Disconnected successfully") }, onError = { println("Disconnect error: $it") } ) @@ -33,17 +33,17 @@ internal class Web3ModalViewModel : ViewModel() { internal fun initModalState() { viewModelScope.launch { - web3ModalEngine.getActiveSession()?.let { _ -> + appKitEngine.getActiveSession()?.let { _ -> createAccountModalState() } ?: createConnectModalState() } } private fun createAccountModalState() { - _modalState.value = Web3ModalState.AccountState + _modalState.value = AppKitState.AccountState } private fun createConnectModalState() { - _modalState.value = Web3ModalState.Connect + _modalState.value = AppKitState.Connect } } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/Web3ModalEvents.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/Web3ModalEvents.kt deleted file mode 100644 index 6acfeeaf8..000000000 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/Web3ModalEvents.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.walletconnect.web3.modal.ui - -sealed class Web3ModalEvents { - object SessionApproved: Web3ModalEvents() - object SessionRejected: Web3ModalEvents() - object NoAction: Web3ModalEvents() - object InvalidState: Web3ModalEvents() -} \ No newline at end of file diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/Web3ModalState.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/Web3ModalState.kt deleted file mode 100644 index ee9a54330..000000000 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/Web3ModalState.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.walletconnect.web3.modal.ui - -internal sealed class Web3ModalState { - object Connect : Web3ModalState() - - object Loading : Web3ModalState() - - data class Error(val error: Throwable) : Web3ModalState() - - object AccountState : Web3ModalState() -} \ No newline at end of file diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/Web3ModalTheme.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/Web3ModalTheme.kt deleted file mode 100644 index f1dd8a62f..000000000 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/Web3ModalTheme.kt +++ /dev/null @@ -1,129 +0,0 @@ -package com.walletconnect.web3.modal.ui - -import androidx.compose.runtime.Composable -import androidx.compose.runtime.CompositionLocalProvider -import androidx.compose.ui.graphics.Color -import com.walletconnect.web3.modal.ui.theme.ColorPalette -import com.walletconnect.web3.modal.ui.theme.CustomComposition -import com.walletconnect.web3.modal.ui.theme.LocalCustomComposition -import com.walletconnect.web3.modal.ui.theme.defaultDarkWeb3ModalColors -import com.walletconnect.web3.modal.ui.theme.defaultLightWeb3ModalColors - -@Composable -fun Web3ModalTheme( - mode: Web3ModalTheme.Mode = Web3ModalTheme.Mode.AUTO, - lightColors: Web3ModalTheme.Colors = Web3ModalTheme.provideLightWeb3ModalColors(), - darkColors: Web3ModalTheme.Colors = Web3ModalTheme.provideDarkWeb3ModalColor(), - content: @Composable () -> Unit -) { - val customComposition = CustomComposition( - mode = mode, - lightColors = lightColors, - darkColors = darkColors, - ) - CompositionLocalProvider( - LocalCustomComposition provides customComposition - ) { - content() - } -} - -object Web3ModalTheme { - - fun provideLightWeb3ModalColors( - accent100: Color = defaultLightWeb3ModalColors.accent100, - accent90: Color = defaultLightWeb3ModalColors.accent90, - accent80: Color = defaultLightWeb3ModalColors.accent80, - foreground: ColorPalette = defaultLightWeb3ModalColors.foreground, - background: ColorPalette = defaultLightWeb3ModalColors.background, - overlay: Color = defaultLightWeb3ModalColors.grayGlass, - success: Color = defaultLightWeb3ModalColors.success, - error: Color = defaultLightWeb3ModalColors.error - ): Colors = CustomWeb3ModalColor(accent100, accent90, accent80, foreground, background, overlay, success, error) - - fun provideDarkWeb3ModalColor( - accent100: Color = defaultDarkWeb3ModalColors.accent100, - accent90: Color = defaultDarkWeb3ModalColors.accent90, - accent80: Color = defaultDarkWeb3ModalColors.accent80, - foreground: ColorPalette = defaultDarkWeb3ModalColors.foreground, - background: ColorPalette = defaultDarkWeb3ModalColors.background, - overlay: Color = defaultDarkWeb3ModalColors.grayGlass, - success: Color = defaultDarkWeb3ModalColors.success, - error: Color = defaultDarkWeb3ModalColors.error - ): Colors = CustomWeb3ModalColor(accent100, accent90, accent80, foreground, background, overlay, success, error) - - fun provideForegroundLightColorPalette( - color100: Color = defaultLightWeb3ModalColors.foreground.color100, - color125: Color = defaultLightWeb3ModalColors.foreground.color125, - color150: Color = defaultLightWeb3ModalColors.foreground.color150, - color175: Color = defaultLightWeb3ModalColors.foreground.color175, - color200: Color = defaultLightWeb3ModalColors.foreground.color200, - color225: Color = defaultLightWeb3ModalColors.foreground.color225, - color250: Color = defaultLightWeb3ModalColors.foreground.color250, - color275: Color = defaultLightWeb3ModalColors.foreground.color275, - color300: Color = defaultLightWeb3ModalColors.foreground.color300, - ) = ColorPalette(color100, color125, color150, color175, color200, color225, color250, color275, color300) - - fun provideForegroundDarkColorPalette( - color100: Color = defaultDarkWeb3ModalColors.foreground.color100, - color125: Color = defaultDarkWeb3ModalColors.foreground.color125, - color150: Color = defaultDarkWeb3ModalColors.foreground.color150, - color175: Color = defaultDarkWeb3ModalColors.foreground.color175, - color200: Color = defaultDarkWeb3ModalColors.foreground.color200, - color225: Color = defaultDarkWeb3ModalColors.foreground.color225, - color250: Color = defaultDarkWeb3ModalColors.foreground.color250, - color275: Color = defaultDarkWeb3ModalColors.foreground.color275, - color300: Color = defaultDarkWeb3ModalColors.foreground.color300, - ) = ColorPalette(color100, color125, color150, color175, color200, color225, color250, color275, color300) - - fun provideBackgroundLightColorPalette( - color100: Color = defaultLightWeb3ModalColors.background.color100, - color125: Color = defaultLightWeb3ModalColors.background.color125, - color150: Color = defaultLightWeb3ModalColors.background.color150, - color175: Color = defaultLightWeb3ModalColors.background.color175, - color200: Color = defaultLightWeb3ModalColors.background.color200, - color225: Color = defaultLightWeb3ModalColors.background.color225, - color250: Color = defaultLightWeb3ModalColors.background.color250, - color275: Color = defaultLightWeb3ModalColors.background.color275, - color300: Color = defaultLightWeb3ModalColors.background.color300, - ) = ColorPalette(color100, color125, color150, color175, color200, color225, color250, color275, color300) - - fun provideBackgroundDarkColorPalette( - color100: Color = defaultDarkWeb3ModalColors.background.color100, - color125: Color = defaultDarkWeb3ModalColors.background.color125, - color150: Color = defaultDarkWeb3ModalColors.background.color150, - color175: Color = defaultDarkWeb3ModalColors.background.color175, - color200: Color = defaultDarkWeb3ModalColors.background.color200, - color225: Color = defaultDarkWeb3ModalColors.background.color225, - color250: Color = defaultDarkWeb3ModalColors.background.color250, - color275: Color = defaultDarkWeb3ModalColors.background.color275, - color300: Color = defaultDarkWeb3ModalColors.background.color300, - ) = ColorPalette(color100, color125, color150, color175, color200, color225, color250, color275, color300) - - - enum class Mode { - LIGHT, DARK, AUTO - } - - interface Colors { - val accent100: Color - val accent90: Color - val accent80: Color - val foreground: ColorPalette - val background: ColorPalette - val grayGlass: Color - val success: Color - val error: Color - } -} - -private class CustomWeb3ModalColor( - override val accent100: Color, - override val accent90: Color, - override val accent80: Color, - override val foreground: ColorPalette, - override val background: ColorPalette, - override val grayGlass: Color, - override val success: Color, - override val error: Color -) : Web3ModalTheme.Colors diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/ComponentDelegate.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/ComponentDelegate.kt index 84afaebb3..f1cbc8e38 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/ComponentDelegate.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/ComponentDelegate.kt @@ -1,6 +1,6 @@ package com.walletconnect.web3.modal.ui.components -import com.walletconnect.web3.modal.client.Web3Modal +import com.walletconnect.web3.modal.client.AppKit import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.onEach @@ -15,7 +15,7 @@ internal object ComponentDelegate { var isModalOpen: Boolean = false - fun setDelegate(delegate: Web3Modal.ComponentDelegate) { + fun setDelegate(delegate: AppKit.ComponentDelegate) { modalComponentEvent.onEach { event -> when (event) { ComponentEvent.ModalHiddenEvent -> delegate.onModalHidden() diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AccountButton.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AccountButton.kt index ef4ad0f17..285e9ed9c 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AccountButton.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AccountButton.kt @@ -35,8 +35,8 @@ import com.walletconnect.web3.modal.ui.components.internal.commons.network.Circl import com.walletconnect.web3.modal.ui.previews.ComponentPreview import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.ProvideWeb3ModalThemeComposition -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition +import com.walletconnect.web3.modal.ui.theme.AppKitTheme import com.walletconnect.web3.modal.utils.getImageData import com.walletconnect.web3.modal.utils.toVisibleAddress @@ -61,7 +61,7 @@ internal sealed class AccountButtonState { @Composable fun AccountButton( - state: Web3ModalState, + state: AppKitState, accountButtonType: AccountButtonType = AccountButtonType.NORMAL ) { val accountState by when (accountButtonType) { @@ -70,7 +70,7 @@ fun AccountButton( } AccountButtonState( state = accountState, - onClick = state::openWeb3Modal + onClick = state::openAppKit ) } @@ -100,19 +100,19 @@ private fun AccountButtonMixed( onClick: () -> Unit, isEnabled: Boolean = true ) { - ProvideWeb3ModalThemeComposition { + ProvideAppKitThemeComposition { val backgroundColor: Color val borderColor: Color val textColor: Color if (isEnabled) { - backgroundColor = Web3ModalTheme.colors.grayGlass02 - borderColor = Web3ModalTheme.colors.grayGlass05 - textColor = Web3ModalTheme.colors.foreground.color100 + backgroundColor = AppKitTheme.colors.grayGlass02 + borderColor = AppKitTheme.colors.grayGlass05 + textColor = AppKitTheme.colors.foreground.color100 } else { - backgroundColor = Web3ModalTheme.colors.grayGlass15 - borderColor = Web3ModalTheme.colors.grayGlass05 - textColor = Web3ModalTheme.colors.grayGlass15 + backgroundColor = AppKitTheme.colors.grayGlass15 + borderColor = AppKitTheme.colors.grayGlass05 + textColor = AppKitTheme.colors.grayGlass15 } TransparentSurface(shape = RoundedCornerShape(100)) { @@ -130,14 +130,14 @@ private fun AccountButtonMixed( ) { CircleNetworkImage(data = chainImage.getImageData(), size = 24.dp, isEnabled = isEnabled) HorizontalSpacer(width = 4.dp) - Text(text = chainData, style = Web3ModalTheme.typo.paragraph600.copy(color = textColor)) + Text(text = chainData, style = AppKitTheme.typo.paragraph600.copy(color = textColor)) HorizontalSpacer(width = 8.dp) ImageButton( text = address.toVisibleAddress(), image = { Box( modifier = Modifier .size(22.dp) - .border(width = 2.dp, color = Web3ModalTheme.colors.grayGlass05, shape = CircleShape) + .border(width = 2.dp, color = AppKitTheme.colors.grayGlass05, shape = CircleShape) .padding(2.dp) .background(brush = Brush.linearGradient(generateAvatarColors(address)), shape = CircleShape) ) @@ -160,13 +160,13 @@ private fun AccountButtonNormal( onClick: () -> Unit, isEnabled: Boolean = true ) { - ProvideWeb3ModalThemeComposition { + ProvideAppKitThemeComposition { ImageButton( text = address.toVisibleAddress(), image = { Box( modifier = Modifier .size(22.dp) - .border(width = 2.dp, color = Web3ModalTheme.colors.grayGlass05, shape = CircleShape) + .border(width = 2.dp, color = AppKitTheme.colors.grayGlass05, shape = CircleShape) .padding(2.dp) .background(brush = Brush.linearGradient(generateAvatarColors(address)), shape = CircleShape) ) @@ -183,7 +183,7 @@ private fun AccountButtonNormal( @Composable private fun UnavailableSession() { - ProvideWeb3ModalThemeComposition { + ProvideAppKitThemeComposition { TextButton(text = "Session Unavailable", style = ButtonStyle.ACCOUNT, size = ButtonSize.M, isEnabled = false, onClick = {}) } } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/Web3ModalState.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AppKitState.kt similarity index 88% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/Web3ModalState.kt rename to product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AppKitState.kt index ed5f71a36..e70f3fbe3 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/Web3ModalState.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AppKitState.kt @@ -11,16 +11,16 @@ import com.walletconnect.android.pulse.model.properties.Properties import com.walletconnect.android.pulse.model.properties.Props import com.walletconnect.foundation.util.Logger import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.Web3Modal +import com.walletconnect.web3.modal.client.AppKit import com.walletconnect.web3.modal.domain.model.Session import com.walletconnect.web3.modal.domain.usecase.GetEthBalanceUseCase import com.walletconnect.web3.modal.domain.usecase.GetSessionUseCase import com.walletconnect.web3.modal.domain.usecase.ObserveSelectedChainUseCase import com.walletconnect.web3.modal.domain.usecase.ObserveSessionUseCase -import com.walletconnect.web3.modal.engine.Web3ModalEngine +import com.walletconnect.web3.modal.engine.AppKitEngine import com.walletconnect.web3.modal.ui.components.ComponentDelegate import com.walletconnect.web3.modal.ui.components.ComponentEvent -import com.walletconnect.web3.modal.ui.openWeb3Modal +import com.walletconnect.web3.modal.ui.openAppKit import com.walletconnect.web3.modal.utils.getChainNetworkImageUrl import com.walletconnect.web3.modal.utils.getChains import com.walletconnect.web3.modal.utils.getSelectedChain @@ -32,16 +32,16 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn @Composable -fun rememberWeb3ModalState( +fun rememberAppKitState( coroutineScope: CoroutineScope = rememberCoroutineScope(), navController: NavController -): Web3ModalState { +): AppKitState { return remember(navController) { - Web3ModalState(coroutineScope, navController) + AppKitState(coroutineScope, navController) } } -class Web3ModalState( +class AppKitState( coroutineScope: CoroutineScope, private val navController: NavController ) { @@ -50,7 +50,7 @@ class Web3ModalState( private val observeSessionTopicUseCase: ObserveSessionUseCase = wcKoinApp.koin.get() private val getSessionUseCase: GetSessionUseCase = wcKoinApp.koin.get() private val getEthBalanceUseCase: GetEthBalanceUseCase = wcKoinApp.koin.get() - private val web3ModalEngine: Web3ModalEngine = wcKoinApp.koin.get() + private val appKitEngine: AppKitEngine = wcKoinApp.koin.get() private val sendEventUseCase: SendEventInterface = wcKoinApp.koin.get() private val sessionTopicFlow = observeSessionTopicUseCase() @@ -63,11 +63,11 @@ class Web3ModalState( val isConnected = sessionTopicFlow .map { it != null && getSessionUseCase() != null } - .map { Web3Modal.getAccount() != null } + .map { AppKit.getAccount() != null } .stateIn(coroutineScope, started = SharingStarted.Lazily, initialValue = false) internal val selectedChain = observeSelectedChainUseCase().map { savedChainId -> - Web3Modal.chains.find { it.id == savedChainId } + AppKit.chains.find { it.id == savedChainId } } internal val accountNormalButtonState = sessionTopicFlow.combine(selectedChain) { session, chain -> session to chain } @@ -79,7 +79,7 @@ class Web3ModalState( .stateIn(coroutineScope, started = SharingStarted.Lazily, initialValue = AccountButtonState.Loading) private fun Flow>.mapOrAccountState(accountButtonType: AccountButtonType) = - map { web3ModalEngine.getActiveSession()?.mapToAccountButtonState(accountButtonType) ?: AccountButtonState.Invalid } + map { appKitEngine.getActiveSession()?.mapToAccountButtonState(accountButtonType) ?: AccountButtonState.Invalid } private fun sendModalCloseOrOpenEvents(event: ComponentEvent) { when { @@ -113,12 +113,12 @@ class Web3ModalState( private suspend fun getBalance(selectedChain: Modal.Model.Chain, address: String) = selectedChain.rpcUrl?.let { url -> getEthBalanceUseCase(selectedChain.token, url, address)?.valueWithSymbol } - internal fun openWeb3Modal(shouldOpenChooseNetwork: Boolean = false, isActiveNetwork: Boolean = false) { + internal fun openAppKit(shouldOpenChooseNetwork: Boolean = false, isActiveNetwork: Boolean = false) { if (shouldOpenChooseNetwork && isActiveNetwork) { sendEventUseCase.send(Props(EventType.TRACK, EventType.Track.CLICK_NETWORKS)) } - navController.openWeb3Modal( + navController.openAppKit( shouldOpenChooseNetwork = shouldOpenChooseNetwork, onError = { logger.error(it) } ) diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/ConnectButton.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/ConnectButton.kt index 5e13f1a2c..06db57c80 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/ConnectButton.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/ConnectButton.kt @@ -11,7 +11,7 @@ import com.walletconnect.web3.modal.ui.components.internal.commons.button.ImageB import com.walletconnect.web3.modal.ui.components.internal.commons.button.TextButton import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.ProvideWeb3ModalThemeComposition +import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition enum class ConnectButtonSize { NORMAL, SMALL @@ -19,7 +19,7 @@ enum class ConnectButtonSize { @Composable fun ConnectButton( - state: Web3ModalState, + state: AppKitState, buttonSize: ConnectButtonSize = ConnectButtonSize.NORMAL ) { val isLoading: Boolean by state.isOpen.collectAsState(initial = false) @@ -30,7 +30,7 @@ fun ConnectButton( isLoading = isLoading, isEnabled = !isConnected ) { - state.openWeb3Modal() + state.openAppKit() } } @@ -41,7 +41,7 @@ internal fun ConnectButton( isEnabled: Boolean = true, onClick: () -> Unit, ) { - ProvideWeb3ModalThemeComposition { + ProvideAppKitThemeComposition { val buttonSize = when (size) { ConnectButtonSize.NORMAL -> ButtonSize.M ConnectButtonSize.SMALL -> ButtonSize.S diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/LoadingButton.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/LoadingButton.kt index 607a26f37..763d52214 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/LoadingButton.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/LoadingButton.kt @@ -12,11 +12,11 @@ import com.walletconnect.web3.modal.ui.components.internal.commons.button.Button import com.walletconnect.web3.modal.ui.components.internal.commons.button.StyledButton import com.walletconnect.web3.modal.ui.previews.ComponentPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.ProvideWeb3ModalThemeComposition +import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition @Composable internal fun LoadingButton() { - ProvideWeb3ModalThemeComposition { + ProvideAppKitThemeComposition { StyledButton(style = ButtonStyle.ACCOUNT, size = ButtonSize.M, onClick = {}) { Box( modifier = Modifier.width(100.dp), contentAlignment = Alignment.Center diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/NetworkButton.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/NetworkButton.kt index 538b777cc..1b5ccd875 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/NetworkButton.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/NetworkButton.kt @@ -9,12 +9,12 @@ import com.walletconnect.web3.modal.ui.components.internal.commons.button.Button import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonStyle import com.walletconnect.web3.modal.ui.components.internal.commons.button.ImageButton import com.walletconnect.web3.modal.ui.components.internal.commons.network.CircleNetworkImage -import com.walletconnect.web3.modal.ui.theme.ProvideWeb3ModalThemeComposition +import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition import com.walletconnect.web3.modal.utils.getImageData @Composable fun NetworkButton( - state: Web3ModalState + state: AppKitState ) { val selectedChain by state.selectedChain.collectAsState(initial = null) val image: @Composable () -> Unit = selectedChain?.let { chain -> @@ -26,7 +26,7 @@ fun NetworkButton( text = selectedChain?.chainName ?: "Select Network", image = image, isEnabled = true, - onClick = { state.openWeb3Modal(true, selectedChain != null) } + onClick = { state.openAppKit(true, selectedChain != null) } ) } @@ -37,7 +37,7 @@ internal fun NetworkButton( onClick: () -> Unit, isEnabled: Boolean = true ) { - ProvideWeb3ModalThemeComposition { + ProvideAppKitThemeComposition { ImageButton( text = text, image = { image() }, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/Web3Button.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/Web3Button.kt index 34c1f27ff..6edcfd859 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/Web3Button.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/Web3Button.kt @@ -7,7 +7,7 @@ import androidx.compose.runtime.getValue @Composable fun Web3Button( - state: Web3ModalState, + state: AppKitState, accountButtonType: AccountButtonType = AccountButtonType.NORMAL, connectButtonSize: ConnectButtonSize = ConnectButtonSize.NORMAL ) { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/AccountButton.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/AccountButton.kt index 65fb44038..08b632a9b 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/AccountButton.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/AccountButton.kt @@ -9,7 +9,7 @@ import androidx.compose.ui.platform.ViewCompositionStrategy import androidx.navigation.findNavController import com.walletconnect.web3.modal.R import com.walletconnect.web3.modal.ui.components.button.AccountButton -import com.walletconnect.web3.modal.ui.components.button.rememberWeb3ModalState +import com.walletconnect.web3.modal.ui.components.button.rememberAppKitState import com.walletconnect.web3.modal.utils.toAccountButtonType class AccountButton @JvmOverloads constructor( @@ -27,9 +27,9 @@ class AccountButton @JvmOverloads constructor( .apply { setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed) setContent { - val web3ModalState = rememberWeb3ModalState(navController = findNavController()) + val appKitState = rememberAppKitState(navController = findNavController()) AccountButton( - state = web3ModalState, + state = appKitState, accountButtonType = accountButtonType ) } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/ConnectButton.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/ConnectButton.kt index eb00689ef..6d219bfe0 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/ConnectButton.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/ConnectButton.kt @@ -9,7 +9,7 @@ import androidx.compose.ui.platform.ViewCompositionStrategy import androidx.navigation.findNavController import com.walletconnect.web3.modal.R import com.walletconnect.web3.modal.ui.components.button.ConnectButton -import com.walletconnect.web3.modal.ui.components.button.rememberWeb3ModalState +import com.walletconnect.web3.modal.ui.components.button.rememberAppKitState import com.walletconnect.web3.modal.utils.toConnectButtonSize class ConnectButton @JvmOverloads constructor( @@ -27,8 +27,8 @@ class ConnectButton @JvmOverloads constructor( .apply { setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed) setContent { - val web3ModalState = rememberWeb3ModalState(navController = findNavController()) - ConnectButton(state = web3ModalState, buttonSize = connectButtonSize) + val appKitState = rememberAppKitState(navController = findNavController()) + ConnectButton(state = appKitState, buttonSize = connectButtonSize) } } } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/Web3Button.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/Web3Button.kt index 734c7b306..8d16b4e71 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/Web3Button.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/Web3Button.kt @@ -9,7 +9,7 @@ import androidx.compose.ui.platform.ViewCompositionStrategy import androidx.navigation.findNavController import com.walletconnect.web3.modal.R import com.walletconnect.web3.modal.ui.components.button.Web3Button -import com.walletconnect.web3.modal.ui.components.button.rememberWeb3ModalState +import com.walletconnect.web3.modal.ui.components.button.rememberAppKitState import com.walletconnect.web3.modal.utils.toAccountButtonType import com.walletconnect.web3.modal.utils.toConnectButtonSize @@ -29,9 +29,9 @@ class Web3Button @JvmOverloads constructor( .apply { setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed) setContent { - val web3ModalState = rememberWeb3ModalState(navController = findNavController()) + val appKitState = rememberAppKitState(navController = findNavController()) Web3Button( - state = web3ModalState, + state = appKitState, accountButtonType = accountButtonType, connectButtonSize = connectButtonSize ) diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/Web3ModalComponent.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitComponent.kt similarity index 80% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/Web3ModalComponent.kt rename to product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitComponent.kt index 5b2bcdd4b..81f69c60b 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/Web3ModalComponent.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitComponent.kt @@ -21,11 +21,11 @@ import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavHostController import com.google.accompanist.navigation.animation.rememberAnimatedNavController import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.Web3Modal -import com.walletconnect.web3.modal.domain.delegate.Web3ModalDelegate -import com.walletconnect.web3.modal.ui.Web3ModalState -import com.walletconnect.web3.modal.ui.Web3ModalViewModel -import com.walletconnect.web3.modal.ui.components.internal.root.Web3ModalRoot +import com.walletconnect.web3.modal.client.AppKit +import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate +import com.walletconnect.web3.modal.ui.AppKitState +import com.walletconnect.web3.modal.ui.AppKitViewModel +import com.walletconnect.web3.modal.ui.components.internal.root.AppKitRoot import com.walletconnect.web3.modal.ui.navigation.Route import com.walletconnect.web3.modal.ui.routes.account.AccountNavGraph import com.walletconnect.web3.modal.ui.routes.connect.ConnectionNavGraph @@ -36,11 +36,11 @@ import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch @Composable -fun Web3ModalComponent( +fun AppKitComponent( shouldOpenChooseNetwork: Boolean, closeModal: () -> Unit ) { - Web3ModalComponent( + AppKitComponent( navController = rememberAnimatedNavController(), shouldOpenChooseNetwork = shouldOpenChooseNetwork, closeModal = closeModal @@ -49,24 +49,24 @@ fun Web3ModalComponent( @SuppressLint("RestrictedApi") @Composable -internal fun Web3ModalComponent( +internal fun AppKitComponent( modifier: Modifier = Modifier, navController: NavHostController = rememberAnimatedNavController(), shouldOpenChooseNetwork: Boolean, closeModal: () -> Unit ) { - val web3ModalViewModel: Web3ModalViewModel = viewModel() - val state by web3ModalViewModel.modalState.collectAsState() + val appKitViewModel: AppKitViewModel = viewModel() + val state by appKitViewModel.modalState.collectAsState() val coroutineScope = rememberCoroutineScope() LaunchedEffect(Unit) { - Web3ModalDelegate + AppKitDelegate .wcEventModels .onEach { event -> when (event) { is Modal.Model.SIWEAuthenticateResponse.Result, is Modal.Model.SessionAuthenticateResponse.Result -> closeModal() is Modal.Model.ApprovedSession -> { - if (Web3Modal.authPayloadParams != null) { + if (AppKit.authPayloadParams != null) { navController.navigate(Route.SIWE_FALLBACK.path) } else { closeModal() @@ -84,15 +84,15 @@ internal fun Web3ModalComponent( onEvent = { _, event -> coroutineScope.launch { event.toComponentEvent(onClosed = { - if (navController.currentDestination?.route == Route.SIWE_FALLBACK.path && web3ModalViewModel.shouldDisconnect) { - web3ModalViewModel.disconnect() + if (navController.currentDestination?.route == Route.SIWE_FALLBACK.path && appKitViewModel.shouldDisconnect) { + appKitViewModel.disconnect() } }) } } ) - Web3ModalRoot( + AppKitRoot( modifier = modifier, navController = navController, closeModal = closeModal @@ -107,20 +107,20 @@ internal fun Web3ModalComponent( label = "Root Animated content" ) { state -> when (state) { - is Web3ModalState.Connect -> ConnectionNavGraph( + is AppKitState.Connect -> ConnectionNavGraph( navController = navController, closeModal = closeModal, shouldOpenChooseNetwork = shouldOpenChooseNetwork ) - is Web3ModalState.AccountState -> AccountNavGraph( + is AppKitState.AccountState -> AccountNavGraph( navController = navController, closeModal = closeModal, shouldOpenChangeNetwork = shouldOpenChooseNetwork ) - Web3ModalState.Loading -> LoadingModalState() - is Web3ModalState.Error -> ErrorModalState(retry = web3ModalViewModel::initModalState) + AppKitState.Loading -> LoadingModalState() + is AppKitState.Error -> ErrorModalState(retry = appKitViewModel::initModalState) } } } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/Web3ModalStates.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitStates.kt similarity index 91% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/Web3ModalStates.kt rename to product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitStates.kt index 5195ee3ff..15bed94e7 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/Web3ModalStates.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitStates.kt @@ -15,7 +15,7 @@ import com.walletconnect.web3.modal.ui.components.internal.commons.LoadingSpinne import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonSize import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonStyle import com.walletconnect.web3.modal.ui.components.internal.commons.button.TryAgainButton -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme @Composable internal fun LoadingModalState() { @@ -38,7 +38,7 @@ internal fun ErrorModalState(retry: () -> Unit) { verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally ) { - Text(text = "Something went wrong", style = Web3ModalTheme.typo.paragraph400) + Text(text = "Something went wrong", style = AppKitTheme.typo.paragraph400) VerticalSpacer(height = 10.dp) TryAgainButton( size = ButtonSize.M, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/Web3ModalTopBar.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitTopBar.kt similarity index 77% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/Web3ModalTopBar.kt rename to product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitTopBar.kt index dec5a462a..0392e78be 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/Web3ModalTopBar.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitTopBar.kt @@ -9,7 +9,7 @@ import androidx.compose.ui.platform.testTag import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme import com.walletconnect.web3.modal.ui.components.internal.commons.BackArrowIcon import com.walletconnect.web3.modal.ui.components.internal.commons.CloseIcon import com.walletconnect.web3.modal.ui.components.internal.commons.QuestionMarkIcon @@ -17,7 +17,7 @@ import com.walletconnect.web3.modal.ui.components.internal.commons.TestTags import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview @Composable -internal fun Web3ModalTopBar( +internal fun AppKitTopBar( title: String, startIcon: @Composable () -> Unit, onCloseIconClick: () -> Unit @@ -34,8 +34,8 @@ internal fun Web3ModalTopBar( } Text( text = title, - style = Web3ModalTheme.typo.paragraph600.copy( - color = Web3ModalTheme.colors.foreground.color100, + style = AppKitTheme.typo.paragraph600.copy( + color = AppKitTheme.colors.foreground.color100, textAlign = TextAlign.Center ), modifier = Modifier.weight(1f).testTag(TestTags.TITLE) @@ -46,9 +46,9 @@ internal fun Web3ModalTopBar( @Composable @UiModePreview -private fun PreviewWeb3ModalTopBar() { +private fun PreviewAppKitTopBar() { MultipleComponentsPreview( - { Web3ModalTopBar(title = "WalletConnect", startIcon = { BackArrowIcon {} }, {}) }, - { Web3ModalTopBar(title = "WalletConnect", startIcon = { QuestionMarkIcon() }, {}) } + { AppKitTopBar(title = "WalletConnect", startIcon = { BackArrowIcon {} }, {}) }, + { AppKitTopBar(title = "WalletConnect", startIcon = { QuestionMarkIcon() }, {}) } ) } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Dividers.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Dividers.kt index dd33922fe..6b84dc2d1 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Dividers.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Dividers.kt @@ -3,9 +3,9 @@ package com.walletconnect.web3.modal.ui.components.internal.commons import androidx.compose.material.Divider import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme @Composable internal fun FullWidthDivider(modifier: Modifier = Modifier) { - Divider(color = Web3ModalTheme.colors.grayGlass05, modifier = modifier) + Divider(color = AppKitTheme.colors.grayGlass05, modifier = modifier) } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Help.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Help.kt index 92aa02525..0b81a32c7 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Help.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Help.kt @@ -22,7 +22,7 @@ import androidx.compose.ui.unit.dp import com.walletconnect.web3.modal.R import com.walletconnect.web3.modal.ui.previews.ComponentPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme @Composable internal fun HelpSection( @@ -48,13 +48,13 @@ internal fun HelpSection( Spacer(modifier = Modifier.height(20.dp)) Text( text = title, - style = Web3ModalTheme.typo.paragraph400, + style = AppKitTheme.typo.paragraph400, textAlign = TextAlign.Center, ) Spacer(modifier = Modifier.height(8.dp)) Text( text = body, - style = Web3ModalTheme.typo.small400.copy(Web3ModalTheme.colors.foreground.color200), + style = AppKitTheme.typo.small400.copy(AppKitTheme.colors.foreground.color200), textAlign = TextAlign.Center, ) } @@ -68,7 +68,7 @@ internal fun NetworkBottomSection( VerticalSpacer(height = 12.dp) Text( text = "Your connected wallet may not support some of the networks available for this dApp", - style = Web3ModalTheme.typo.small500.copy(color = Web3ModalTheme.colors.foreground.color300), + style = AppKitTheme.typo.small500.copy(color = AppKitTheme.colors.foreground.color300), textAlign = TextAlign.Center, modifier = Modifier.padding(horizontal = 12.dp) ) @@ -87,11 +87,11 @@ internal fun WhatIsNetworkLink(onClick: () -> Unit) { horizontalArrangement = Arrangement.Center, verticalAlignment = Alignment.CenterVertically ) { - QuestionMarkIcon(tint = Web3ModalTheme.colors.accent100, modifier = Modifier.size(12.dp)) + QuestionMarkIcon(tint = AppKitTheme.colors.accent100, modifier = Modifier.size(12.dp)) HorizontalSpacer(width = 4.dp) Text( text = "What is a network", - style = Web3ModalTheme.typo.small600.copy(color = Web3ModalTheme.colors.accent100) + style = AppKitTheme.typo.small600.copy(color = AppKitTheme.colors.accent100) ) } } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Icons.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Icons.kt index 7f1d9e662..39368ddbb 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Icons.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Icons.kt @@ -18,11 +18,11 @@ import com.walletconnect.modal.ui.components.common.roundedClickable import com.walletconnect.web3.modal.R import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme @Composable internal fun BackArrowIcon( - tint: Color = Web3ModalTheme.colors.foreground.color100, + tint: Color = AppKitTheme.colors.foreground.color100, onClick: () -> Unit ) { Icon( @@ -39,7 +39,7 @@ internal fun BackArrowIcon( @Composable internal fun QuestionMarkIcon( modifier: Modifier = Modifier, - tint: Color = Web3ModalTheme.colors.foreground.color100 + tint: Color = AppKitTheme.colors.foreground.color100 ) { Icon( imageVector = ImageVector.vectorResource(id = R.drawable.ic_question_mark), @@ -52,7 +52,7 @@ internal fun QuestionMarkIcon( @Composable internal fun CloseIcon( modifier: Modifier = Modifier, - tint: Color = Web3ModalTheme.colors.foreground.color100, + tint: Color = AppKitTheme.colors.foreground.color100, onClick: () -> Unit ) { Icon( @@ -68,7 +68,7 @@ internal fun CloseIcon( @Composable internal fun RetryIcon( - tint: Color = Web3ModalTheme.colors.inverse100 + tint: Color = AppKitTheme.colors.inverse100 ) { Icon( imageVector = ImageVector.vectorResource(id = R.drawable.ic_retry), @@ -82,18 +82,18 @@ internal fun RetryIcon( internal fun DeclinedIcon() { Icon( imageVector = ImageVector.vectorResource(R.drawable.ic_close), - tint = Web3ModalTheme.colors.error, + tint = AppKitTheme.colors.error, contentDescription = ContentDescription.DECLINED.description, modifier = Modifier .size(20.dp) - .background(Web3ModalTheme.colors.error.copy(alpha = .2f), shape = CircleShape) + .background(AppKitTheme.colors.error.copy(alpha = .2f), shape = CircleShape) .padding(4.dp) ) } @Composable internal fun WalletIcon( - tint: Color = Web3ModalTheme.colors.inverse100 + tint: Color = AppKitTheme.colors.inverse100 ) { Icon( imageVector = ImageVector.vectorResource(id = R.drawable.ic_wallet), @@ -105,7 +105,7 @@ internal fun WalletIcon( @Composable internal fun ExternalIcon( - tint: Color = Web3ModalTheme.colors.foreground.color200, + tint: Color = AppKitTheme.colors.foreground.color200, size: Dp = 12.dp, ) { Icon( @@ -119,7 +119,7 @@ internal fun ExternalIcon( @Composable internal fun CopyIcon( modifier: Modifier = Modifier, - tint: Color = Web3ModalTheme.colors.foreground.color250 + tint: Color = AppKitTheme.colors.foreground.color250 ) { Icon( imageVector = ImageVector.vectorResource(id = R.drawable.ic_copy), @@ -131,7 +131,7 @@ internal fun CopyIcon( @Composable internal fun CompassIcon( - tint: Color = Web3ModalTheme.colors.foreground.color150 + tint: Color = AppKitTheme.colors.foreground.color150 ) { Icon( imageVector = ImageVector.vectorResource(id = R.drawable.ic_compass), @@ -143,7 +143,7 @@ internal fun CompassIcon( @Composable internal fun ChevronRightIcon( - tint: Color = Web3ModalTheme.colors.foreground.color200 + tint: Color = AppKitTheme.colors.foreground.color200 ) { Icon( imageVector = ImageVector.vectorResource(id = R.drawable.ic_chevron_right), @@ -155,16 +155,16 @@ internal fun ChevronRightIcon( @Composable internal fun RecentTransactionIcon( - tint: Color = Web3ModalTheme.colors.accent100 + tint: Color = AppKitTheme.colors.accent100 ) { Icon( imageVector = ImageVector.vectorResource(id = R.drawable.ic_swap), contentDescription = ContentDescription.SWAP.description, modifier = Modifier - .border(2.dp, Web3ModalTheme.colors.grayGlass02, shape = CircleShape) + .border(2.dp, AppKitTheme.colors.grayGlass02, shape = CircleShape) .padding(2.dp) .size(32.dp) - .background(Web3ModalTheme.colors.grayGlass10, shape = CircleShape) + .background(AppKitTheme.colors.grayGlass10, shape = CircleShape) .padding(8.dp), tint = tint ) @@ -172,16 +172,16 @@ internal fun RecentTransactionIcon( @Composable internal fun DisconnectIcon( - tint: Color = Web3ModalTheme.colors.foreground.color200 + tint: Color = AppKitTheme.colors.foreground.color200 ) { Icon( imageVector = ImageVector.vectorResource(id = R.drawable.ic_disconnect), contentDescription = ContentDescription.DISCONNECT.description, modifier = Modifier - .border(2.dp, Web3ModalTheme.colors.grayGlass05, shape = CircleShape) + .border(2.dp, AppKitTheme.colors.grayGlass05, shape = CircleShape) .padding(2.dp) .size(32.dp) - .background(Web3ModalTheme.colors.grayGlass10, shape = CircleShape) + .background(AppKitTheme.colors.grayGlass10, shape = CircleShape) .padding(8.dp), tint = tint ) @@ -189,7 +189,7 @@ internal fun DisconnectIcon( @Composable internal fun ScanQRIcon( - tint: Color = Web3ModalTheme.colors.accent100, + tint: Color = AppKitTheme.colors.accent100, onClick: () -> Unit ) { Icon( @@ -199,12 +199,12 @@ internal fun ScanQRIcon( .roundedClickable { onClick() } .size(40.dp) .background( - color = Web3ModalTheme.colors.accent10, + color = AppKitTheme.colors.accent10, shape = RoundedCornerShape(12.dp) ) .border( width = 1.dp, - color = Web3ModalTheme.colors.accent10, + color = AppKitTheme.colors.accent10, shape = RoundedCornerShape(12.dp) ) .padding(10.dp), @@ -214,7 +214,7 @@ internal fun ScanQRIcon( @Composable internal fun AllWalletsIcon( - tint: Color = Web3ModalTheme.colors.accent100, + tint: Color = AppKitTheme.colors.accent100, ) { Icon( imageVector = ImageVector.vectorResource(id = R.drawable.ic_all_wallets), @@ -222,12 +222,12 @@ internal fun AllWalletsIcon( modifier = Modifier .size(40.dp) .background( - color = Web3ModalTheme.colors.accent10, + color = AppKitTheme.colors.accent10, shape = RoundedCornerShape(12.dp) ) .border( width = 1.dp, - color = Web3ModalTheme.colors.accent10, + color = AppKitTheme.colors.accent10, shape = RoundedCornerShape(12.dp) ) .padding(8.dp), @@ -237,7 +237,7 @@ internal fun AllWalletsIcon( @Composable internal fun SelectNetworkIcon( - tint: Color = Web3ModalTheme.colors.foreground.color100 + tint: Color = AppKitTheme.colors.foreground.color100 ) { Icon( imageVector = ImageVector.vectorResource(id = R.drawable.ic_select_network), @@ -245,13 +245,13 @@ internal fun SelectNetworkIcon( modifier = Modifier .size(24.dp) .background( - color = Web3ModalTheme.colors.grayGlass25, + color = AppKitTheme.colors.grayGlass25, shape = CircleShape ) .padding(5.dp) .border( width = 1.dp, - color = Web3ModalTheme.colors.grayGlass10, + color = AppKitTheme.colors.grayGlass10, shape = CircleShape ), tint = tint @@ -260,7 +260,7 @@ internal fun SelectNetworkIcon( @Composable internal fun MobileIcon( - tint: Color = Web3ModalTheme.colors.inverse100 + tint: Color = AppKitTheme.colors.inverse100 ) { Icon( imageVector = ImageVector.vectorResource(id = R.drawable.ic_mobile), @@ -272,7 +272,7 @@ internal fun MobileIcon( @Composable internal fun WebIcon( - tint: Color = Web3ModalTheme.colors.inverse100 + tint: Color = AppKitTheme.colors.inverse100 ) { Icon( imageVector = ImageVector.vectorResource(id = R.drawable.ic_browser), @@ -284,7 +284,7 @@ internal fun WebIcon( @Composable internal fun ForwardIcon( - tint: Color = Web3ModalTheme.colors.inverse100 + tint: Color = AppKitTheme.colors.inverse100 ) { Icon( imageVector = ImageVector.vectorResource(id = R.drawable.ic_chevron_right), diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Label.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Label.kt index 9cc531e9e..a730f7a6e 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Label.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Label.kt @@ -13,7 +13,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme @Composable internal fun AllLabel(isEnabled: Boolean = true) { @@ -25,8 +25,8 @@ internal fun TextLabel(text: String, isEnabled: Boolean = true) { ListLabel( text = text, isEnabled = isEnabled, - backgroundColor = Web3ModalTheme.colors.grayGlass10, - labelTextColor = Web3ModalTheme.colors.foreground.color150 + backgroundColor = AppKitTheme.colors.grayGlass10, + labelTextColor = AppKitTheme.colors.foreground.color150 ) } @@ -40,8 +40,8 @@ internal fun RecentLabel(isEnabled: Boolean = true) { ListLabel( text = "RECENT", isEnabled = isEnabled, - backgroundColor = Web3ModalTheme.colors.grayGlass10, - labelTextColor = Web3ModalTheme.colors.foreground.color150 + backgroundColor = AppKitTheme.colors.grayGlass10, + labelTextColor = AppKitTheme.colors.foreground.color150 ) } @@ -50,8 +50,8 @@ internal fun InstalledLabel(isEnabled: Boolean = true) { ListLabel( text = "INSTALLED", isEnabled = isEnabled, - backgroundColor = Web3ModalTheme.colors.success15, - labelTextColor = Web3ModalTheme.colors.success + backgroundColor = AppKitTheme.colors.success15, + labelTextColor = AppKitTheme.colors.success ) } @@ -59,8 +59,8 @@ internal fun InstalledLabel(isEnabled: Boolean = true) { private fun ListLabel( text: String, isEnabled: Boolean, - backgroundColor: Color = Web3ModalTheme.colors.accent15, - labelTextColor: Color = Web3ModalTheme.colors.accent100 + backgroundColor: Color = AppKitTheme.colors.accent15, + labelTextColor: Color = AppKitTheme.colors.accent100 ) { val textColor: Color val background: Color @@ -68,8 +68,8 @@ private fun ListLabel( background = backgroundColor textColor = labelTextColor } else { - background = Web3ModalTheme.colors.grayGlass10 - textColor = Web3ModalTheme.colors.foreground.color300 + background = AppKitTheme.colors.grayGlass10 + textColor = AppKitTheme.colors.foreground.color300 } Box( modifier = Modifier @@ -78,7 +78,7 @@ private fun ListLabel( .padding( horizontal = 5.dp), contentAlignment = Alignment.Center ) { - Text(text = text, style = Web3ModalTheme.typo.micro700.copy(textColor)) + Text(text = text, style = AppKitTheme.typo.micro700.copy(textColor)) } } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/ListSelect.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/ListSelect.kt index fb8bf425d..4b283efec 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/ListSelect.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/ListSelect.kt @@ -18,7 +18,7 @@ import androidx.compose.ui.unit.dp import com.walletconnect.web3.modal.ui.components.internal.walletconnect.WalletConnectLogo import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme @Composable internal fun ListSelectRow( @@ -33,11 +33,11 @@ internal fun ListSelectRow( val background: Color val textColor: Color if (isEnabled) { - background = Web3ModalTheme.colors.grayGlass02 - textColor = Web3ModalTheme.colors.foreground.color100 + background = AppKitTheme.colors.grayGlass02 + textColor = AppKitTheme.colors.foreground.color100 } else { - background = Web3ModalTheme.colors.grayGlass15 - textColor = Web3ModalTheme.colors.foreground.color300 + background = AppKitTheme.colors.grayGlass15 + textColor = AppKitTheme.colors.foreground.color300 } Surface( color = Color.Transparent, @@ -57,7 +57,7 @@ internal fun ListSelectRow( HorizontalSpacer(width = 10.dp) Text( text = text, - style = Web3ModalTheme.typo.paragraph500.copy(textColor), + style = AppKitTheme.typo.paragraph500.copy(textColor), modifier = Modifier.weight(1f) ) label?.let { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Loading.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Loading.kt index a01570a91..4f8da099a 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Loading.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Loading.kt @@ -38,13 +38,13 @@ import androidx.compose.ui.unit.dp import com.walletconnect.web3.modal.ui.components.internal.commons.network.HexagonShape import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme @Composable internal fun LoadingSpinner( strokeWidth: Dp = 4.dp, size: Dp = 24.dp, - tint: Color = Web3ModalTheme.colors.accent100 + tint: Color = AppKitTheme.colors.accent100 ) { CircularProgressIndicator( strokeWidth = strokeWidth, @@ -93,7 +93,7 @@ private fun Modifier.drawAnimatedBorder( shape: Shape, durationMillis: Int ) = composed { - val loaderColor = Web3ModalTheme.colors.accent100 + val loaderColor = AppKitTheme.colors.accent100 var pathLenght by remember { mutableFloatStateOf(0f) } val infiniteTransition = rememberInfiniteTransition(label = "rotation") val loaderProgress by infiniteTransition.animateFloat( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Wallets.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Wallets.kt index 7fe3f2031..ffa582f92 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Wallets.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Wallets.kt @@ -36,7 +36,7 @@ import com.walletconnect.web3.modal.R import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview import com.walletconnect.web3.modal.ui.previews.testWallets -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme import com.walletconnect.web3.modal.utils.grayColorFilter import com.walletconnect.web3.modal.utils.imageHeaders @@ -45,9 +45,9 @@ internal fun MultipleWalletIcon(wallets: List) { Column( modifier = Modifier .size(40.dp) - .background(Web3ModalTheme.colors.background.color200, shape = RoundedCornerShape(10.dp)) + .background(AppKitTheme.colors.background.color200, shape = RoundedCornerShape(10.dp)) .padding(1.dp) - .border(1.dp, Web3ModalTheme.colors.grayGlass10, shape = RoundedCornerShape(10.dp)), + .border(1.dp, AppKitTheme.colors.grayGlass10, shape = RoundedCornerShape(10.dp)), verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally ) { @@ -100,7 +100,7 @@ internal fun RoundedWalletImage(url: String?) { WalletImage( url = url, modifier = Modifier .size(80.dp) - .border(width = 1.dp, color = Web3ModalTheme.colors.grayGlass10, shape = RoundedCornerShape(28.dp)) + .border(width = 1.dp, color = AppKitTheme.colors.grayGlass10, shape = RoundedCornerShape(28.dp)) .clip(RoundedCornerShape(28.dp)) ) } @@ -126,16 +126,16 @@ internal fun BoxScope.InstalledWalletIcon() { Icon( modifier = Modifier .offset(x = 2.dp, y = 2.dp) - .background(Web3ModalTheme.colors.background.color125, shape = CircleShape) + .background(AppKitTheme.colors.background.color125, shape = CircleShape) .align(Alignment.BottomEnd) - .background(Web3ModalTheme.colors.grayGlass02, shape = CircleShape) + .background(AppKitTheme.colors.grayGlass02, shape = CircleShape) .padding(2.dp) .size(12.dp) - .background(Web3ModalTheme.colors.success.copy(0.15f), shape = CircleShape) + .background(AppKitTheme.colors.success.copy(0.15f), shape = CircleShape) .padding(2.dp), imageVector = ImageVector.vectorResource(id = R.drawable.ic_check), contentDescription = "WalletConnectLogo", - tint = Web3ModalTheme.colors.success + tint = AppKitTheme.colors.success ) } @@ -152,7 +152,7 @@ internal fun WalletGridItem( modifier = Modifier .width(76.dp) .height(96.dp) - .background(Web3ModalTheme.colors.grayGlass02) + .background(AppKitTheme.colors.grayGlass02) .clickable { onWalletItemClick(wallet) }, horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center @@ -163,7 +163,7 @@ internal fun WalletGridItem( modifier = Modifier .size(56.dp) .clip(RoundedCornerShape(16.dp)) - .border(width = 1.dp, color = Web3ModalTheme.colors.grayGlass10, shape = RoundedCornerShape(16.dp)) + .border(width = 1.dp, color = AppKitTheme.colors.grayGlass10, shape = RoundedCornerShape(16.dp)) ) if (wallet.isWalletInstalled) { InstalledWalletIcon() @@ -172,7 +172,7 @@ internal fun WalletGridItem( VerticalSpacer(height = 8.dp) Text( text = wallet.name, - style = Web3ModalTheme.typo.tiny500, + style = AppKitTheme.typo.tiny500, textAlign = TextAlign.Center, maxLines = 1, overflow = TextOverflow.Ellipsis, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/account/AccountImage.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/account/AccountImage.kt index d3aa56a16..d2db57adb 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/account/AccountImage.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/account/AccountImage.kt @@ -16,7 +16,7 @@ import coil.compose.AsyncImage import coil.request.ImageRequest import com.walletconnect.web3.modal.ui.previews.ComponentPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme import kotlin.math.roundToInt @Composable @@ -26,7 +26,7 @@ internal fun AccountImage(address: String, avatarUrl: String?) { } else { Box( modifier = Modifier - .border(width = 8.dp, color = Web3ModalTheme.colors.grayGlass05, shape = CircleShape) + .border(width = 8.dp, color = AppKitTheme.colors.grayGlass05, shape = CircleShape) .padding(8.dp) .size(64.dp) .background(brush = Brush.linearGradient(generateAvatarColors(address)), shape = CircleShape) @@ -38,7 +38,7 @@ internal fun AccountImage(address: String, avatarUrl: String?) { private fun AccountAvatar(url: String) { Box( modifier = Modifier - .border(width = 8.dp, color = Web3ModalTheme.colors.grayGlass05, shape = CircleShape) + .border(width = 8.dp, color = AppKitTheme.colors.grayGlass05, shape = CircleShape) .padding(8.dp) .size(64.dp) ) { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/account/AccountName.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/account/AccountName.kt index 914b86d4f..9616d2da8 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/account/AccountName.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/account/AccountName.kt @@ -18,7 +18,7 @@ import com.walletconnect.web3.modal.ui.components.internal.commons.CopyIcon import com.walletconnect.web3.modal.ui.previews.ComponentPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview import com.walletconnect.web3.modal.ui.previews.accountDataPreview -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme import com.walletconnect.web3.modal.utils.toVisibleAddress @Composable @@ -28,7 +28,7 @@ internal fun AccountName(accountData: AccountData) { ) { val clipboardManager: ClipboardManager = LocalClipboardManager.current val name = accountData.identity?.name ?: accountData.address.toVisibleAddress() - Text(text = name, style = Web3ModalTheme.typo.mediumTitle600) + Text(text = name, style = AppKitTheme.typo.mediumTitle600) CopyIcon( modifier = Modifier .padding(10.dp) diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/Button.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/Button.kt index 5af18a62d..110d48a11 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/Button.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/Button.kt @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.RowScope -import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.shape.RoundedCornerShape @@ -23,11 +22,9 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider import androidx.compose.ui.unit.dp import com.walletconnect.web3.modal.ui.components.internal.commons.HorizontalSpacer import com.walletconnect.web3.modal.ui.components.internal.commons.RetryIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.WalletIcon import com.walletconnect.web3.modal.ui.previews.ComponentPreview import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme @Composable internal fun TryAgainButton( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/ButtonStyle.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/ButtonStyle.kt index 8e64cb11d..ff1a45ec3 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/ButtonStyle.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/ButtonStyle.kt @@ -5,7 +5,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme internal data class ButtonData( val size: ButtonSize, @@ -21,8 +21,8 @@ internal enum class ButtonSize { M, S, ACCOUNT_M, ACCOUNT_S } @Composable internal fun ButtonSize.getTextStyle() = when (this) { - ButtonSize.M, ButtonSize.ACCOUNT_M, ButtonSize.ACCOUNT_S -> Web3ModalTheme.typo.paragraph600 - ButtonSize.S -> Web3ModalTheme.typo.small600 + ButtonSize.M, ButtonSize.ACCOUNT_M, ButtonSize.ACCOUNT_S -> AppKitTheme.typo.paragraph600 + ButtonSize.S -> AppKitTheme.typo.small600 } @Composable @@ -42,26 +42,26 @@ internal fun ButtonSize.getHeight() = when (this) { @Composable internal fun ButtonStyle.getTextColor(isEnabled: Boolean) = when (this) { - ButtonStyle.MAIN -> if (isEnabled) Web3ModalTheme.colors.inverse100 else Web3ModalTheme.colors.foreground.color300 - ButtonStyle.ACCENT, ButtonStyle.LOADING -> if (isEnabled) Web3ModalTheme.colors.accent100 else Web3ModalTheme.colors.grayGlass20 - ButtonStyle.SHADE -> if (isEnabled) Web3ModalTheme.colors.foreground.color150 else Web3ModalTheme.colors.grayGlass15 - ButtonStyle.ACCOUNT -> if (isEnabled) Web3ModalTheme.colors.foreground.color100 else Web3ModalTheme.colors.grayGlass15 - ButtonStyle.LINK -> if(isEnabled) Web3ModalTheme.colors.foreground.color200 else Web3ModalTheme.colors.grayGlass15 + ButtonStyle.MAIN -> if (isEnabled) AppKitTheme.colors.inverse100 else AppKitTheme.colors.foreground.color300 + ButtonStyle.ACCENT, ButtonStyle.LOADING -> if (isEnabled) AppKitTheme.colors.accent100 else AppKitTheme.colors.grayGlass20 + ButtonStyle.SHADE -> if (isEnabled) AppKitTheme.colors.foreground.color150 else AppKitTheme.colors.grayGlass15 + ButtonStyle.ACCOUNT -> if (isEnabled) AppKitTheme.colors.foreground.color100 else AppKitTheme.colors.grayGlass15 + ButtonStyle.LINK -> if(isEnabled) AppKitTheme.colors.foreground.color200 else AppKitTheme.colors.grayGlass15 } @Composable internal fun ButtonStyle.getBackgroundColor(isEnabled: Boolean) = when (this) { - ButtonStyle.MAIN -> if (isEnabled) Web3ModalTheme.colors.accent100 else Web3ModalTheme.colors.grayGlass20 - ButtonStyle.ACCENT -> if (isEnabled) Color.Transparent else Web3ModalTheme.colors.grayGlass10 - ButtonStyle.SHADE, ButtonStyle.LINK -> if (isEnabled) Color.Transparent else Web3ModalTheme.colors.grayGlass05 - ButtonStyle.LOADING -> Web3ModalTheme.colors.grayGlass10 - ButtonStyle.ACCOUNT -> if (isEnabled) Web3ModalTheme.colors.grayGlass10 else Web3ModalTheme.colors.grayGlass15 + ButtonStyle.MAIN -> if (isEnabled) AppKitTheme.colors.accent100 else AppKitTheme.colors.grayGlass20 + ButtonStyle.ACCENT -> if (isEnabled) Color.Transparent else AppKitTheme.colors.grayGlass10 + ButtonStyle.SHADE, ButtonStyle.LINK -> if (isEnabled) Color.Transparent else AppKitTheme.colors.grayGlass05 + ButtonStyle.LOADING -> AppKitTheme.colors.grayGlass10 + ButtonStyle.ACCOUNT -> if (isEnabled) AppKitTheme.colors.grayGlass10 else AppKitTheme.colors.grayGlass15 } @Composable internal fun ButtonStyle.getBorder(isEnabled: Boolean) = when (this) { - ButtonStyle.MAIN, ButtonStyle.LINK -> if (isEnabled) Color.Transparent else Web3ModalTheme.colors.grayGlass20 - ButtonStyle.ACCENT, ButtonStyle.SHADE, ButtonStyle.LOADING, ButtonStyle.ACCOUNT -> if (isEnabled) Web3ModalTheme.colors.grayGlass10 else Web3ModalTheme.colors.grayGlass05 + ButtonStyle.MAIN, ButtonStyle.LINK -> if (isEnabled) Color.Transparent else AppKitTheme.colors.grayGlass20 + ButtonStyle.ACCENT, ButtonStyle.SHADE, ButtonStyle.LOADING, ButtonStyle.ACCOUNT -> if (isEnabled) AppKitTheme.colors.grayGlass10 else AppKitTheme.colors.grayGlass05 } internal data class ButtonPreview( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/AccountEntry.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/AccountEntry.kt index 7e558cd40..d6461b549 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/AccountEntry.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/AccountEntry.kt @@ -20,7 +20,7 @@ import com.walletconnect.web3.modal.ui.components.internal.commons.LoadingSpinne import com.walletconnect.web3.modal.ui.components.internal.commons.network.CircleNetworkImage import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme internal enum class AccountEntryState { LOADING, NEXT, INFO @@ -62,7 +62,7 @@ internal fun AccountEntry( @UiModePreview @Composable private fun AccountEntryPreview() { - val content: @Composable (EntryColors) -> Unit = { Text(text = "Account entry", style = Web3ModalTheme.typo.paragraph500.copy(color = it.textColor))} + val content: @Composable (EntryColors) -> Unit = { Text(text = "Account entry", style = AppKitTheme.typo.paragraph500.copy(color = it.textColor))} MultipleComponentsPreview( { AccountEntry( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/ActionEntry.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/ActionEntry.kt index 0ebd6fac7..c5245a823 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/ActionEntry.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/ActionEntry.kt @@ -23,7 +23,7 @@ import com.walletconnect.web3.modal.ui.components.internal.commons.button.Button import com.walletconnect.web3.modal.ui.components.internal.commons.button.LinkButton import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme @Composable internal fun ActionEntry( @@ -50,7 +50,7 @@ internal fun ActionEntry( it(colors.textColor) HorizontalSpacer(width = 8.dp) } - Text(text = text, style = Web3ModalTheme.typo.paragraph500.copy(color = colors.textColor)) + Text(text = text, style = AppKitTheme.typo.paragraph500.copy(color = colors.textColor)) } } } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/BaseEntry.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/BaseEntry.kt index 247fc0a39..3a8a45f64 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/BaseEntry.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/BaseEntry.kt @@ -8,7 +8,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp import com.walletconnect.web3.modal.ui.components.internal.commons.TransparentSurface -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme internal data class EntryColors( val background: Color, @@ -26,13 +26,13 @@ internal fun BaseEntry( val textColor: Color val secondaryColor: Color if (isEnabled) { - background = Web3ModalTheme.colors.grayGlass02 - textColor = Web3ModalTheme.colors.foreground.color100 - secondaryColor = Web3ModalTheme.colors.foreground.color200 + background = AppKitTheme.colors.grayGlass02 + textColor = AppKitTheme.colors.foreground.color100 + secondaryColor = AppKitTheme.colors.foreground.color200 } else { - background = Web3ModalTheme.colors.grayGlass15 - textColor = Web3ModalTheme.colors.grayGlass15 - secondaryColor = Web3ModalTheme.colors.grayGlass15 + background = AppKitTheme.colors.grayGlass15 + textColor = AppKitTheme.colors.grayGlass15 + secondaryColor = AppKitTheme.colors.grayGlass15 } val entryColors = EntryColors(background, textColor, secondaryColor) diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/StoreEntry.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/StoreEntry.kt index e8ddef096..1c17b5cc0 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/StoreEntry.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/StoreEntry.kt @@ -23,7 +23,7 @@ import com.walletconnect.web3.modal.ui.components.internal.commons.TransparentSu import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview import com.walletconnect.web3.modal.ui.previews.testWallets -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme @Composable internal fun StoreEntry( @@ -34,11 +34,11 @@ internal fun StoreEntry( val background: Color val textColor: Color if (isEnabled) { - textColor = Web3ModalTheme.colors.foreground.color200 - background = Web3ModalTheme.colors.grayGlass02 + textColor = AppKitTheme.colors.foreground.color200 + background = AppKitTheme.colors.grayGlass02 } else { - textColor = Web3ModalTheme.colors.foreground.color300 - background = Web3ModalTheme.colors.grayGlass10 + textColor = AppKitTheme.colors.foreground.color300 + background = AppKitTheme.colors.grayGlass10 } Surface( color = Color.Transparent, @@ -53,7 +53,7 @@ internal fun StoreEntry( horizontalArrangement = Arrangement.Center, verticalAlignment = Alignment.CenterVertically ) { - Text(text = text, style = Web3ModalTheme.typo.paragraph500.copy(color = textColor), modifier = Modifier.weight(1f)) + Text(text = text, style = AppKitTheme.typo.paragraph500.copy(color = textColor), modifier = Modifier.weight(1f)) HorizontalSpacer(width = 10.dp) GetButton(onClick) } @@ -65,15 +65,15 @@ private fun GetButton(onClick: () -> Unit) { TransparentSurface(shape = RoundedCornerShape(100)) { Row( modifier = Modifier - .border(width = 1.dp, color = Web3ModalTheme.colors.grayGlass10, shape = CircleShape) + .border(width = 1.dp, color = AppKitTheme.colors.grayGlass10, shape = CircleShape) .clickable { onClick() } .padding(start = 12.dp, end = 8.dp, top = 6.dp, bottom = 6.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Center ) { - Text(text = "Get", style = Web3ModalTheme.typo.small500.copy(color = Web3ModalTheme.colors.accent100)) + Text(text = "Get", style = AppKitTheme.typo.small500.copy(color = AppKitTheme.colors.accent100)) HorizontalSpacer(width = 4.dp) - ForwardIcon(tint = Web3ModalTheme.colors.accent100) + ForwardIcon(tint = AppKitTheme.colors.accent100) } } } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/BaseTextInput.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/BaseTextInput.kt index 1502f5ada..9ebae7299 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/BaseTextInput.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/BaseTextInput.kt @@ -17,7 +17,7 @@ import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.SolidColor import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme @Composable internal fun BaseTextInput( @@ -34,25 +34,25 @@ internal fun BaseTextInput( when { state.isFocused -> { - borderColor = Web3ModalTheme.colors.accent100 - backgroundColor = Web3ModalTheme.colors.grayGlass10 + borderColor = AppKitTheme.colors.accent100 + backgroundColor = AppKitTheme.colors.grayGlass10 } isEnabled -> { - borderColor = Web3ModalTheme.colors.grayGlass05 - backgroundColor = Web3ModalTheme.colors.grayGlass05 + borderColor = AppKitTheme.colors.grayGlass05 + backgroundColor = AppKitTheme.colors.grayGlass05 } else -> { - borderColor = Web3ModalTheme.colors.grayGlass10 - backgroundColor = Web3ModalTheme.colors.grayGlass15 + borderColor = AppKitTheme.colors.grayGlass10 + backgroundColor = AppKitTheme.colors.grayGlass15 } } BasicTextField(value = state.text, onValueChange = inputState::onTextChange, - textStyle = Web3ModalTheme.typo.paragraph400.copy(color = Web3ModalTheme.colors.foreground.color100), - cursorBrush = SolidColor(Web3ModalTheme.colors.accent100), + textStyle = AppKitTheme.typo.paragraph400.copy(color = AppKitTheme.colors.foreground.color100), + cursorBrush = SolidColor(AppKitTheme.colors.accent100), singleLine = true, keyboardActions = KeyboardActions { inputState.submit(state.text) }, keyboardOptions = keyboardOptions, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/InputCancel.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/InputCancel.kt index a4d315cd1..7656b154a 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/InputCancel.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/InputCancel.kt @@ -17,7 +17,7 @@ import com.walletconnect.web3.modal.R import com.walletconnect.web3.modal.ui.components.internal.commons.ContentDescription import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme @Composable internal fun InputCancel( @@ -29,11 +29,11 @@ internal fun InputCancel( val tint: Color if (isEnabled) { - tint = Web3ModalTheme.colors.background.color100 - background = Web3ModalTheme.colors.grayGlass20 + tint = AppKitTheme.colors.background.color100 + background = AppKitTheme.colors.grayGlass20 } else { - tint = Web3ModalTheme.colors.background.color100 - background = Web3ModalTheme.colors.grayGlass10 + tint = AppKitTheme.colors.background.color100 + background = AppKitTheme.colors.grayGlass10 } Surface( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/SearchInput.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/SearchInput.kt index 9ea186115..e0aac8c80 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/SearchInput.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/SearchInput.kt @@ -37,7 +37,7 @@ import com.walletconnect.web3.modal.R import com.walletconnect.web3.modal.ui.components.internal.commons.ContentDescription import com.walletconnect.web3.modal.ui.previews.ComponentPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow @@ -95,24 +95,24 @@ internal fun SearchInput( when { searchState.isFocused -> { - borderColor = Web3ModalTheme.colors.accent100 - backgroundColor = Web3ModalTheme.colors.grayGlass10 + borderColor = AppKitTheme.colors.accent100 + backgroundColor = AppKitTheme.colors.grayGlass10 } isEnabled -> { - borderColor = Web3ModalTheme.colors.grayGlass05 - backgroundColor = Web3ModalTheme.colors.grayGlass05 + borderColor = AppKitTheme.colors.grayGlass05 + backgroundColor = AppKitTheme.colors.grayGlass05 } else -> { - borderColor = Web3ModalTheme.colors.grayGlass10 - backgroundColor = Web3ModalTheme.colors.grayGlass15 + borderColor = AppKitTheme.colors.grayGlass10 + backgroundColor = AppKitTheme.colors.grayGlass15 } } BasicTextField( value = state.searchValue, onValueChange = searchState::onSearchValueChange, - textStyle = Web3ModalTheme.typo.paragraph400.copy(color = Web3ModalTheme.colors.foreground.color100), - cursorBrush = SolidColor(Web3ModalTheme.colors.accent100), + textStyle = AppKitTheme.typo.paragraph400.copy(color = AppKitTheme.colors.foreground.color100), + cursorBrush = SolidColor(AppKitTheme.colors.accent100), singleLine = true, keyboardActions = KeyboardActions(onSearch = { searchState.onSearchSubmit() @@ -132,7 +132,7 @@ internal fun SearchInput( ) { HorizontalSpacer(width = 10.dp) Icon( - tint = Web3ModalTheme.colors.foreground.color275, + tint = AppKitTheme.colors.foreground.color275, modifier = Modifier.size(14.dp), imageVector = ImageVector.vectorResource(id = R.drawable.ic_search), contentDescription = ContentDescription.SEARCH.description, @@ -140,7 +140,7 @@ internal fun SearchInput( HorizontalSpacer(width = 6.dp) Box(modifier = Modifier.weight(1f)) { if (state.searchValue.isBlank()) { - Text(text = "Search wallets", style = Web3ModalTheme.typo.paragraph400.copy(color = Web3ModalTheme.colors.foreground.color275)) + Text(text = "Search wallets", style = AppKitTheme.typo.paragraph400.copy(color = AppKitTheme.colors.foreground.color275)) } innerTextField() if (state.searchValue.isNotBlank()) { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/network/ChainNetworkIcons.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/network/ChainNetworkIcons.kt index 58612edff..f80d9e963 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/network/ChainNetworkIcons.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/network/ChainNetworkIcons.kt @@ -31,7 +31,7 @@ import coil.request.ImageRequest import com.walletconnect.web3.modal.R import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme import com.walletconnect.web3.modal.utils.grayColorFilter import com.walletconnect.web3.modal.utils.imageHeaders import kotlin.math.cos @@ -47,7 +47,7 @@ internal fun CircleNetworkImage( Box( modifier = Modifier .size(size) - .border(width = 2.dp, color = Web3ModalTheme.colors.grayGlass05, shape = CircleShape) + .border(width = 2.dp, color = AppKitTheme.colors.grayGlass05, shape = CircleShape) .padding(2.dp) ) { AsyncImage( @@ -72,7 +72,7 @@ internal fun HexagonNetworkImage( borderColor: Color? = null, placeholder: Drawable? = null ) { - val overlayColor = Web3ModalTheme.colors.grayGlass10 + val overlayColor = AppKitTheme.colors.grayGlass10 AsyncImage( model = ImageRequest.Builder(LocalContext.current) .data(data) diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/network/ChainNetworkItem.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/network/ChainNetworkItem.kt index 125383ebc..0d8fb700b 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/network/ChainNetworkItem.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/network/ChainNetworkItem.kt @@ -22,7 +22,7 @@ import com.walletconnect.web3.modal.ui.components.internal.commons.TransparentSu import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme @Composable internal fun ChainNetworkItem( @@ -41,20 +41,20 @@ internal fun ChainNetworkItem( val borderColor: Color? when { isSelected -> { - backgroundColor = Web3ModalTheme.colors.accent10 - textColor = Web3ModalTheme.colors.accent100 - borderColor = Web3ModalTheme.colors.accent100 + backgroundColor = AppKitTheme.colors.accent10 + textColor = AppKitTheme.colors.accent100 + borderColor = AppKitTheme.colors.accent100 } isEnabled -> { - backgroundColor = Web3ModalTheme.colors.grayGlass02 - textColor = Web3ModalTheme.colors.foreground.color100 + backgroundColor = AppKitTheme.colors.grayGlass02 + textColor = AppKitTheme.colors.foreground.color100 borderColor = null } else -> { - backgroundColor = Web3ModalTheme.colors.grayGlass10 - textColor = Web3ModalTheme.colors.grayGlass15 + backgroundColor = AppKitTheme.colors.grayGlass10 + textColor = AppKitTheme.colors.grayGlass15 borderColor = null } } @@ -79,7 +79,7 @@ internal fun ChainNetworkItem( VerticalSpacer(height = 8.dp) Text( text = networkName, - style = Web3ModalTheme.typo.tiny500.copy(textColor), + style = AppKitTheme.typo.tiny500.copy(textColor), textAlign = TextAlign.Center, maxLines = 1, overflow = TextOverflow.Ellipsis, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/switch/PlatformTabRow.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/switch/PlatformTabRow.kt index 9fd46a210..27dbfb39f 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/switch/PlatformTabRow.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/switch/PlatformTabRow.kt @@ -15,12 +15,10 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.layout.wrapContentSize import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.Icon import androidx.compose.material.Tab import androidx.compose.material.TabPosition import androidx.compose.material.TabRow @@ -31,21 +29,16 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.commons.ContentDescription import com.walletconnect.web3.modal.ui.components.internal.commons.HorizontalSpacer import com.walletconnect.web3.modal.ui.components.internal.commons.MobileIcon import com.walletconnect.web3.modal.ui.components.internal.commons.WebIcon import com.walletconnect.web3.modal.ui.previews.ComponentPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme internal enum class PlatformTab( val value: Int, val label: String @@ -70,13 +63,13 @@ internal fun PlatformTabRow( TabRow( selectedTabIndex = platformTab.value, backgroundColor = Color.Transparent, - contentColor = Web3ModalTheme.colors.foreground.color200, + contentColor = AppKitTheme.colors.foreground.color200, indicator = indicator, divider = {}, modifier = Modifier .width(210.dp) .height(32.dp) - .background(color = Web3ModalTheme.colors.grayGlass02, shape = RoundedCornerShape(80f)) + .background(color = AppKitTheme.colors.grayGlass02, shape = RoundedCornerShape(80f)) ) { PlatformTab.values().forEach { val isSelected = platformTab == it @@ -94,7 +87,7 @@ internal fun PlatformTabRow( @Composable private fun TabContent(platform: PlatformTab, isSelected: Boolean) { - val color = if (isSelected) Web3ModalTheme.colors.foreground.color100 else Web3ModalTheme.colors.foreground.color200 + val color = if (isSelected) AppKitTheme.colors.foreground.color100 else AppKitTheme.colors.foreground.color200 Row( modifier = Modifier.fillMaxHeight(), verticalAlignment = Alignment.CenterVertically, @@ -104,7 +97,7 @@ private fun TabContent(platform: PlatformTab, isSelected: Boolean) { HorizontalSpacer(width = 4.dp) Text( text = platform.label, - style = Web3ModalTheme.typo.small500.copy(color = color, textAlign = TextAlign.Center), + style = AppKitTheme.typo.small500.copy(color = color, textAlign = TextAlign.Center), modifier = Modifier.wrapContentHeight() ) } @@ -147,8 +140,8 @@ private fun CustomIndicatorWithAnimation( .width(indicatorEnd - indicatorStart) .padding(3.dp) .fillMaxSize() - .background(color = Web3ModalTheme.colors.grayGlass02, RoundedCornerShape(50)) - .border(BorderStroke(1.dp, Web3ModalTheme.colors.grayGlass02), RoundedCornerShape(50)) + .background(color = AppKitTheme.colors.grayGlass02, RoundedCornerShape(50)) + .border(BorderStroke(1.dp, AppKitTheme.colors.grayGlass02), RoundedCornerShape(50)) .zIndex(1f) ) } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/InputBox.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/InputBox.kt index 611791cbb..971f5a1f1 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/InputBox.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/InputBox.kt @@ -13,7 +13,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer import com.walletconnect.web3.modal.ui.components.internal.commons.inputs.InputState -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme @Composable internal fun InputValidationBox( @@ -33,7 +33,7 @@ internal fun InputValidationBox( modifier = Modifier .padding(horizontal = 14.dp) .fillMaxWidth(), - style = Web3ModalTheme.typo.tiny400.copy(color = Web3ModalTheme.colors.error, textAlign = errorAlign) + style = AppKitTheme.typo.tiny400.copy(color = AppKitTheme.colors.error, textAlign = errorAlign) ) } } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/code/CodeInput.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/code/CodeInput.kt index aa2a828b8..a4c3fca20 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/code/CodeInput.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/code/CodeInput.kt @@ -38,7 +38,7 @@ import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.dp import com.walletconnect.util.Empty -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme @Composable internal fun CodeInput(codeInputState: CodeInputState) { @@ -52,8 +52,8 @@ internal fun CodeInput(codeInputState: CodeInputState) { BasicTextField( value = state.text, onValueChange = codeInputState::onTextChange, - textStyle = Web3ModalTheme.typo.paragraph400.copy(color = Web3ModalTheme.colors.foreground.color100), - cursorBrush = SolidColor(Web3ModalTheme.colors.accent100), + textStyle = AppKitTheme.typo.paragraph400.copy(color = AppKitTheme.colors.foreground.color100), + cursorBrush = SolidColor(AppKitTheme.colors.accent100), singleLine = true, keyboardActions = KeyboardActions { codeInputState.submit(state.text) }, keyboardOptions = KeyboardOptions( @@ -91,15 +91,15 @@ private fun CodeDigitText( val borderColor: Color if (isFocused) { - background = Web3ModalTheme.colors.grayGlass10 - borderColor = Web3ModalTheme.colors.accent100 + background = AppKitTheme.colors.grayGlass10 + borderColor = AppKitTheme.colors.accent100 shadowModifier = Modifier .size(54.dp) - .border(4.dp, Web3ModalTheme.colors.accent20, RoundedCornerShape(20.dp)) + .border(4.dp, AppKitTheme.colors.accent20, RoundedCornerShape(20.dp)) .padding(4.dp) } else { - background = Web3ModalTheme.colors.grayGlass05 - borderColor = Web3ModalTheme.colors.grayGlass05 + background = AppKitTheme.colors.grayGlass05 + borderColor = AppKitTheme.colors.grayGlass05 shadowModifier = Modifier .size(54.dp) .padding(4.dp) @@ -126,13 +126,13 @@ private fun CodeDigitText( Box( modifier = Modifier .size(2.dp, 20.dp) - .background(Web3ModalTheme.colors.accent100) + .background(AppKitTheme.colors.accent100) ) } } else { Text( text = value, - style = Web3ModalTheme.typo.large400.copy(color = Web3ModalTheme.colors.grayGlass) + style = AppKitTheme.typo.large400.copy(color = AppKitTheme.colors.grayGlass) ) } } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/input/EmailInput.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/input/EmailInput.kt index 65e18605e..0c6cd4db2 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/input/EmailInput.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/input/EmailInput.kt @@ -22,7 +22,7 @@ import com.walletconnect.web3.modal.R import com.walletconnect.web3.modal.ui.components.internal.commons.ContentDescription import com.walletconnect.web3.modal.ui.components.internal.commons.LoadingSpinner import com.walletconnect.web3.modal.ui.components.internal.commons.inputs.BaseTextInput -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme @Composable internal fun EmailInput( @@ -45,7 +45,7 @@ internal fun EmailInput( ) { HorizontalSpacer(width = 10.dp) Icon( - tint = Web3ModalTheme.colors.foreground.color275, + tint = AppKitTheme.colors.foreground.color275, modifier = Modifier.size(14.dp), imageVector = ImageVector.vectorResource(id = R.drawable.ic_email), contentDescription = ContentDescription.EMAIL.description, @@ -53,7 +53,7 @@ internal fun EmailInput( HorizontalSpacer(width = 6.dp) Box(modifier = Modifier.weight(1f)) { if (inputData.text.isBlank()) { - Text(text = "Email", style = Web3ModalTheme.typo.paragraph400.copy(color = Web3ModalTheme.colors.foreground.color275)) + Text(text = "Email", style = AppKitTheme.typo.paragraph400.copy(color = AppKitTheme.colors.foreground.color275)) } innerTextField() } @@ -70,7 +70,7 @@ internal fun EmailInput( @Composable private fun ForwardIcon(onClick: () -> Unit) { Icon( - tint = Web3ModalTheme.colors.accent100, + tint = AppKitTheme.colors.accent100, modifier = Modifier .size(14.dp) .roundedClickable { onClick() }, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/Web3ModalRoot.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRoot.kt similarity index 79% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/Web3ModalRoot.kt rename to product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRoot.kt index 243c94b6c..5ddb60fe3 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/Web3ModalRoot.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRoot.kt @@ -22,8 +22,8 @@ import androidx.navigation.NavHostController import androidx.navigation.compose.rememberNavController import com.walletconnect.modal.ui.components.common.roundedClickable import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.domain.delegate.Web3ModalDelegate -import com.walletconnect.web3.modal.ui.components.internal.Web3ModalTopBar +import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate +import com.walletconnect.web3.modal.ui.components.internal.AppKitTopBar import com.walletconnect.web3.modal.ui.components.internal.commons.BackArrowIcon import com.walletconnect.web3.modal.ui.components.internal.commons.FullWidthDivider import com.walletconnect.web3.modal.ui.components.internal.commons.QuestionMarkIcon @@ -33,26 +33,26 @@ import com.walletconnect.web3.modal.ui.components.internal.snackbar.rememberSnac import com.walletconnect.web3.modal.ui.navigation.Route import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.ProvideWeb3ModalThemeComposition -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition +import com.walletconnect.web3.modal.ui.theme.AppKitTheme import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.filterIsInstance import kotlinx.coroutines.flow.onEach @Composable -internal fun Web3ModalRoot( +internal fun AppKitRoot( navController: NavHostController, modifier: Modifier = Modifier, closeModal: () -> Unit, content: @Composable () -> Unit ) { val scope = rememberCoroutineScope() - val rootState = rememberWeb3ModalRootState(coroutineScope = scope, navController = navController) + val rootState = rememberAppKitRootState(coroutineScope = scope, navController = navController) val snackBarState = rememberSnackBarState(coroutineScope = scope) val title by rootState.title.collectAsState(null) LaunchedEffect(Unit) { - Web3ModalDelegate + AppKitDelegate .wcEventModels .filterIsInstance() .onEach { event -> @@ -65,15 +65,15 @@ internal fun Web3ModalRoot( verticalArrangement = Arrangement.Bottom, modifier = modifier ) { - ProvideWeb3ModalThemeComposition { - Web3ModalRoot(rootState, snackBarState, title, closeModal, content) + ProvideAppKitThemeComposition { + AppKitRoot(rootState, snackBarState, title, closeModal, content) } } } @Composable -internal fun Web3ModalRoot( - rootState: Web3ModalRootState, +internal fun AppKitRoot( + rootState: AppKitRootState, snackBarState: SnackBarState, title: String?, closeModal: () -> Unit, @@ -83,10 +83,10 @@ internal fun Web3ModalRoot( Column( modifier = Modifier .fillMaxWidth() - .background(Web3ModalTheme.colors.background.color125) + .background(AppKitTheme.colors.background.color125) ) { title?.let { title -> - Web3ModalTopBar( + AppKitTopBar( title = title, startIcon = { TopBarStartIcon(rootState) }, onCloseIconClick = closeModal @@ -100,7 +100,7 @@ internal fun Web3ModalRoot( @Composable private fun TopBarStartIcon( - rootState: Web3ModalRootState + rootState: AppKitRootState ) { if (rootState.currentDestinationRoute == Route.SIWE_FALLBACK.path) { questionMark(rootState) @@ -120,7 +120,7 @@ private fun TopBarStartIcon( } @Composable -private fun questionMark(rootState: Web3ModalRootState) { +private fun questionMark(rootState: AppKitRootState) { QuestionMarkIcon( modifier = Modifier .size(36.dp) @@ -131,16 +131,16 @@ private fun questionMark(rootState: Web3ModalRootState) { @Composable @UiModePreview -private fun PreviewWeb3ModalRoot() { +private fun PreviewAppKitRoot() { val content: @Composable () -> Unit = { Box(modifier = Modifier.size(200.dp)) } val scope = rememberCoroutineScope() val navController = rememberNavController() - val rootState = rememberWeb3ModalRootState(coroutineScope = scope, navController = navController) + val rootState = rememberAppKitRootState(coroutineScope = scope, navController = navController) val snackBarState = rememberSnackBarState(coroutineScope = scope) MultipleComponentsPreview( - { Web3ModalRoot(rootState, snackBarState, null, {}, { content() }) }, - { Web3ModalRoot(rootState, snackBarState, "Top Bar Title", {}, { content() }) } + { AppKitRoot(rootState, snackBarState, null, {}, { content() }) }, + { AppKitRoot(rootState, snackBarState, "Top Bar Title", {}, { content() }) } ) } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/Web3ModalRootState.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootState.kt similarity index 92% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/Web3ModalRootState.kt rename to product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootState.kt index d7d841ba5..37a186ec7 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/Web3ModalRootState.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootState.kt @@ -16,16 +16,16 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map @Composable -internal fun rememberWeb3ModalRootState( +internal fun rememberAppKitRootState( coroutineScope: CoroutineScope, navController: NavController -): Web3ModalRootState { +): AppKitRootState { return remember(coroutineScope, navController) { - Web3ModalRootState(coroutineScope, navController) + AppKitRootState(coroutineScope, navController) } } -internal class Web3ModalRootState( +internal class AppKitRootState( private val coroutineScope: CoroutineScope, private val navController: NavController ) { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/ModalSnackBar.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/ModalSnackBar.kt index ef62b91da..279f2da5d 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/ModalSnackBar.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/ModalSnackBar.kt @@ -24,7 +24,7 @@ import com.walletconnect.web3.modal.R import com.walletconnect.web3.modal.ui.components.internal.commons.HorizontalSpacer import com.walletconnect.web3.modal.ui.previews.ComponentPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme @Composable internal fun ModalSnackBar( @@ -35,16 +35,16 @@ internal fun ModalSnackBar( modifier = Modifier .height(40.dp) .background( - color = Web3ModalTheme.colors.background.color125, + color = AppKitTheme.colors.background.color125, shape = shape ) .background( - color = Web3ModalTheme.colors.grayGlass05, + color = AppKitTheme.colors.grayGlass05, shape = shape ) .border( width = 1.dp, - color = Web3ModalTheme.colors.grayGlass05, + color = AppKitTheme.colors.grayGlass05, shape = shape ) .padding(8.dp) @@ -59,9 +59,9 @@ internal fun ModalSnackBar( SnackBarEventType.ERROR -> R.drawable.ic_error } val tint = when (snackBarEvent.type) { - SnackBarEventType.SUCCESS -> Web3ModalTheme.colors.success - SnackBarEventType.INFO -> Web3ModalTheme.colors.foreground.color200 - SnackBarEventType.ERROR -> Web3ModalTheme.colors.error + SnackBarEventType.SUCCESS -> AppKitTheme.colors.success + SnackBarEventType.INFO -> AppKitTheme.colors.foreground.color200 + SnackBarEventType.ERROR -> AppKitTheme.colors.error } Icon( @@ -73,7 +73,7 @@ internal fun ModalSnackBar( HorizontalSpacer(width = 8.dp) Text( text = snackBarEvent.message, - style = Web3ModalTheme.typo.paragraph500, + style = AppKitTheme.typo.paragraph500, modifier = Modifier.fillMaxHeight() ) HorizontalSpacer(width = 8.dp) diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/walletconnect/WalletConnectLogo.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/walletconnect/WalletConnectLogo.kt index 4f8159283..03362e9c6 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/walletconnect/WalletConnectLogo.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/walletconnect/WalletConnectLogo.kt @@ -17,7 +17,7 @@ import com.walletconnect.web3.modal.R import com.walletconnect.web3.modal.ui.components.internal.commons.ContentDescription import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme @Composable internal fun WalletConnectLogo( @@ -27,13 +27,13 @@ internal fun WalletConnectLogo( val border: Color val colorFilter: ColorFilter? if (isEnabled) { - background = Web3ModalTheme.colors.accent100 - border = Web3ModalTheme.colors.grayGlass10 + background = AppKitTheme.colors.accent100 + border = AppKitTheme.colors.grayGlass10 colorFilter = null } else { - background = Web3ModalTheme.colors.background.color300 - border = Web3ModalTheme.colors.grayGlass05 - colorFilter = ColorFilter.tint(Web3ModalTheme.colors.grayGlass30) + background = AppKitTheme.colors.background.color300 + border = AppKitTheme.colors.grayGlass05 + colorFilter = ColorFilter.tint(AppKitTheme.colors.grayGlass30) } Image( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/Route.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/Route.kt index c369a6907..22cf16c96 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/Route.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/Route.kt @@ -4,7 +4,7 @@ package com.walletconnect.web3.modal.ui.navigation enum class Route(val path: String, val title: String? = null) { //Common - WEB3MODAL("web3_modal"), + APPKIT("web3_modal"), CHOOSE_NETWORK("choose_network", "Select network"), //Connect routes CONNECT_YOUR_WALLET("connect_your_wallet", "Connect wallet"), diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/account/Navigation.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/account/Navigation.kt index a353fbcca..827aea882 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/account/Navigation.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/account/Navigation.kt @@ -9,7 +9,7 @@ import com.google.accompanist.navigation.animation.composable import androidx.navigation.navArgument import com.walletconnect.util.Empty import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.Web3Modal +import com.walletconnect.web3.modal.client.AppKit import com.walletconnect.web3.modal.ui.navigation.Route import com.walletconnect.web3.modal.ui.navigation.addTitleArg import com.walletconnect.web3.modal.ui.routes.account.AccountViewModel @@ -28,7 +28,7 @@ internal fun NavGraphBuilder.chainSwitchRoute( arguments = listOf(navArgument(CHAIN_ID_KEY) { type = NavType.StringType } ) ) { backStackEntry -> val chainId = backStackEntry.arguments?.getString(CHAIN_ID_KEY, String.Empty) - val chain = Web3Modal.chains.find { it.id == chainId } + val chain = AppKit.chains.find { it.id == chainId } chain?.let { ChainSwitchRedirectRoute(accountViewModel = accountViewModel, chain = it) } } } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/previews/Previews.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/previews/Previews.kt index 6769107ab..a8d38d63a 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/previews/Previews.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/previews/Previews.kt @@ -14,26 +14,26 @@ import androidx.compose.ui.unit.dp import androidx.navigation.compose.rememberNavController import com.walletconnect.android.internal.common.model.ProjectId import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.web3.modal.ui.components.internal.root.Web3ModalRoot +import com.walletconnect.web3.modal.ui.components.internal.root.AppKitRoot import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer -import com.walletconnect.web3.modal.ui.components.internal.root.rememberWeb3ModalRootState +import com.walletconnect.web3.modal.ui.components.internal.root.rememberAppKitRootState import com.walletconnect.web3.modal.ui.components.internal.snackbar.rememberSnackBarState -import com.walletconnect.web3.modal.ui.theme.ProvideWeb3ModalThemeComposition -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition +import com.walletconnect.web3.modal.ui.theme.AppKitTheme import org.koin.dsl.module @Composable -internal fun Web3ModalPreview( +internal fun AppKitPreview( title: String? = null, content: @Composable () -> Unit, ) { previewKoinDefinitions() - ProvideWeb3ModalThemeComposition { + ProvideAppKitThemeComposition { val scope = rememberCoroutineScope() - val rootState = rememberWeb3ModalRootState(coroutineScope = scope, navController = rememberNavController()) + val rootState = rememberAppKitRootState(coroutineScope = scope, navController = rememberNavController()) val snackBarState = rememberSnackBarState(coroutineScope = scope) - Web3ModalRoot(rootState = rootState, snackBarState = snackBarState, closeModal = {}, title = title) { + AppKitRoot(rootState = rootState, snackBarState = snackBarState, closeModal = {}, title = title) { content() } } @@ -44,8 +44,8 @@ internal fun ComponentPreview( content: @Composable () -> Unit ) { previewKoinDefinitions() - ProvideWeb3ModalThemeComposition { - Column(modifier = Modifier.background(Web3ModalTheme.colors.background.color100)) { + ProvideAppKitThemeComposition { + Column(modifier = Modifier.background(AppKitTheme.colors.background.color100)) { content() } } @@ -56,11 +56,11 @@ internal fun MultipleComponentsPreview( vararg content: @Composable () -> Unit ) { previewKoinDefinitions() - ProvideWeb3ModalThemeComposition { + ProvideAppKitThemeComposition { Column { content.forEach { VerticalSpacer(height = 5.dp) - Box(modifier = Modifier.background(Web3ModalTheme.colors.background.color100)) { it() } + Box(modifier = Modifier.background(AppKitTheme.colors.background.color100)) { it() } VerticalSpacer(height = 5.dp) } } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountViewModel.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountViewModel.kt index 4e7672ae8..3dc2fff04 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountViewModel.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountViewModel.kt @@ -20,7 +20,7 @@ import com.walletconnect.web3.modal.domain.usecase.ObserveSelectedChainUseCase import com.walletconnect.web3.modal.domain.usecase.ObserveSessionUseCase import com.walletconnect.web3.modal.domain.usecase.SaveChainSelectionUseCase import com.walletconnect.web3.modal.domain.usecase.SaveSessionUseCase -import com.walletconnect.web3.modal.engine.Web3ModalEngine +import com.walletconnect.web3.modal.engine.AppKitEngine import com.walletconnect.web3.modal.engine.coinbase.CoinbaseResult import com.walletconnect.web3.modal.ui.navigation.Navigator import com.walletconnect.web3.modal.ui.navigation.NavigatorImpl @@ -48,13 +48,13 @@ internal class AccountViewModel : ViewModel(), Navigator by NavigatorImpl() { private val observeSelectedChainUseCase: ObserveSelectedChainUseCase = wcKoinApp.koin.get() private val getIdentityUseCase: GetIdentityUseCase = wcKoinApp.koin.get() private val getEthBalanceUseCase: GetEthBalanceUseCase = wcKoinApp.koin.get() - private val web3ModalEngine: Web3ModalEngine = wcKoinApp.koin.get() + private val appKitEngine: AppKitEngine = wcKoinApp.koin.get() private val sendEventUseCase: SendEventInterface = wcKoinApp.koin.get() private val activeSessionFlow = observeSessionUseCase() private val accountDataFlow = activeSessionFlow .map { - if (web3ModalEngine.getAccount() != null) { + if (appKitEngine.getAccount() != null) { it } else { null @@ -81,7 +81,7 @@ internal class AccountViewModel : ViewModel(), Navigator by NavigatorImpl() { val accountState = accountDataFlow.stateIn(viewModelScope, started = SharingStarted.Lazily, initialValue = UiState.Loading()) - val selectedChain = observeSelectedChainUseCase().map { web3ModalEngine.getSelectedChainOrFirst() } + val selectedChain = observeSelectedChainUseCase().map { appKitEngine.getSelectedChainOrFirst() } val balanceState = combine(activeSessionFlow, selectedChain) { session, selectedChain -> if (session != null && selectedChain.rpcUrl != null) { @@ -92,7 +92,7 @@ internal class AccountViewModel : ViewModel(), Navigator by NavigatorImpl() { }.flowOn(Dispatchers.IO).catch { logger.error(it) }.stateIn(viewModelScope, started = SharingStarted.Lazily, initialValue = null) fun disconnect() { - web3ModalEngine.disconnect( + appKitEngine.disconnect( onSuccess = { closeModal() }, onError = { showError(it.localizedMessage) @@ -161,7 +161,7 @@ internal class AccountViewModel : ViewModel(), Navigator by NavigatorImpl() { onSuccess: (SentRequestResult) -> Unit, onError: (String?) -> Unit ) { - web3ModalEngine.request( + appKitEngine.request( Request(method = EthUtils.walletSwitchEthChain, params = createSwitchChainParams(to)), onSuccess ) { onError(it.message) } @@ -170,13 +170,13 @@ internal class AccountViewModel : ViewModel(), Navigator by NavigatorImpl() { private fun addEthChain( to: Modal.Model.Chain, onSuccess: (SentRequestResult) -> Unit, onError: (String?) -> Unit ) { - web3ModalEngine.request( + appKitEngine.request( Request(method = EthUtils.walletAddEthChain, params = createAddEthChainParams(to)), onSuccess ) { onError(it.message) } } - fun getSelectedChainOrFirst() = web3ModalEngine.getSelectedChainOrFirst() + fun getSelectedChainOrFirst() = appKitEngine.getSelectedChainOrFirst() fun navigateToHelp() { sendEventUseCase.send(Props(EventType.TRACK, EventType.Track.CLICK_NETWORK_HELP)) diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/account/AccountRoute.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/account/AccountRoute.kt index 8546a32a4..b479f1005 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/account/AccountRoute.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/account/AccountRoute.kt @@ -34,11 +34,11 @@ import com.walletconnect.web3.modal.ui.components.internal.commons.network.Circl import com.walletconnect.web3.modal.ui.model.UiStateBuilder import com.walletconnect.web3.modal.ui.navigation.Route import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.Web3ModalPreview +import com.walletconnect.web3.modal.ui.previews.AppKitPreview import com.walletconnect.web3.modal.ui.previews.ethereumChain import com.walletconnect.web3.modal.ui.routes.account.AccountViewModel import com.walletconnect.web3.modal.ui.previews.accountDataPreview -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme import com.walletconnect.web3.modal.utils.getImageData @Composable @@ -95,7 +95,7 @@ private fun AccountScreen( VerticalSpacer(height = 4.dp) Text( text = balance.valueWithSymbol, - style = Web3ModalTheme.typo.paragraph400.copy(Web3ModalTheme.colors.foreground.color200) + style = AppKitTheme.typo.paragraph400.copy(AppKitTheme.colors.foreground.color200) ) } selectedChain.blockExplorerUrl?.let { url -> @@ -115,14 +115,14 @@ private fun AccountScreen( onClick = onChangeNetworkClick, state = AccountEntryState.NEXT ) { - Text(text = selectedChain.chainName, style = Web3ModalTheme.typo.paragraph500.copy(color = it.textColor)) + Text(text = selectedChain.chainName, style = AppKitTheme.typo.paragraph500.copy(color = it.textColor)) } VerticalSpacer(height = 8.dp) AccountEntry( startIcon = { DisconnectIcon() }, onClick = onDisconnectClick ) { - Text(text = "Disconnect", style = Web3ModalTheme.typo.paragraph500.copy(color = it.textColor)) + Text(text = "Disconnect", style = AppKitTheme.typo.paragraph500.copy(color = it.textColor)) } } } @@ -130,7 +130,7 @@ private fun AccountScreen( @UiModePreview @Composable private fun PreviewAccountScreen() { - Web3ModalPreview { + AppKitPreview { AccountScreen(accountDataPreview, ethereumChain,null, {}, {}, {}) } } @@ -138,7 +138,7 @@ private fun PreviewAccountScreen() { @UiModePreview @Composable private fun PreviewAccountScreenWithBalance() { - Web3ModalPreview { + AppKitPreview { AccountScreen(accountDataPreview, ethereumChain, Balance(ethereumChain.token, "0000000"), {}, {}, {}) } } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/chain_redirect/ChainSwitchRedirect.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/chain_redirect/ChainSwitchRedirect.kt index ad984bec5..7f20c0bac 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/chain_redirect/ChainSwitchRedirect.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/chain_redirect/ChainSwitchRedirect.kt @@ -21,17 +21,17 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.domain.delegate.Web3ModalDelegate +import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate import com.walletconnect.web3.modal.ui.components.internal.commons.DeclinedIcon import com.walletconnect.web3.modal.ui.components.internal.commons.LoadingHexagonBorder import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer import com.walletconnect.web3.modal.ui.components.internal.commons.button.TryAgainButton import com.walletconnect.web3.modal.ui.components.internal.commons.network.HexagonNetworkImage import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.Web3ModalPreview +import com.walletconnect.web3.modal.ui.previews.AppKitPreview import com.walletconnect.web3.modal.ui.previews.testChains import com.walletconnect.web3.modal.ui.routes.account.AccountViewModel -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme import com.walletconnect.web3.modal.utils.getImageData import com.walletconnect.web3.modal.utils.toSession import kotlinx.coroutines.launch @@ -52,7 +52,7 @@ internal fun ChainSwitchRedirectRoute( } LaunchedEffect(Unit) { - Web3ModalDelegate.wcEventModels.collect { + AppKitDelegate.wcEventModels.collect { when (it) { is Modal.Model.UpdatedSession -> accountViewModel.updatedSessionAfterChainSwitch(it.toSession(chain)) is Modal.Model.SessionRequestResponse -> if (it.result is Modal.Model.JsonRpcResponse.JsonRpcError) { onReject() } @@ -100,11 +100,11 @@ internal fun ChainSwitchRedirectScreen( private fun ChainSwitchInfo(redirectState: ChainRedirectState) { AnimatedContent(targetState = redirectState, label = "Chain switch info") { state -> Column(horizontalAlignment = Alignment.CenterHorizontally) { - Text(text = state.toTitle(), style = Web3ModalTheme.typo.paragraph500) + Text(text = state.toTitle(), style = AppKitTheme.typo.paragraph500) VerticalSpacer(height = 8.dp) Text( text = state.toInformation(), - style = Web3ModalTheme.typo.small400.copy(Web3ModalTheme.colors.foreground.color200, textAlign = TextAlign.Center) + style = AppKitTheme.typo.small400.copy(AppKitTheme.colors.foreground.color200, textAlign = TextAlign.Center) ) } } @@ -150,7 +150,7 @@ private fun ChainNetworkImageWrapper( Box( modifier = Modifier .align(Alignment.BottomEnd) - .background(Web3ModalTheme.colors.background.color100, shape = CircleShape) + .background(AppKitTheme.colors.background.color100, shape = CircleShape) .padding(2.dp) ) { DeclinedIcon() @@ -171,7 +171,7 @@ private fun ChainNetworkImageWrapper( @UiModePreview private fun ChainSwitchRedirectScreenWithLoadingStatePreview() { val chain = testChains.first() - Web3ModalPreview(title = chain.chainName) { + AppKitPreview(title = chain.chainName) { ChainSwitchRedirectScreen(chain, ChainRedirectState.Loading, {}) } } @@ -180,7 +180,7 @@ private fun ChainSwitchRedirectScreenWithLoadingStatePreview() { @UiModePreview private fun ChainSwitchRedirectScreenWithDeclinedStatePreview() { val chain = testChains.first() - Web3ModalPreview(title = chain.chainName) { + AppKitPreview(title = chain.chainName) { ChainSwitchRedirectScreen(chain, ChainRedirectState.Declined, {}) } } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/change_network/ChangeNetworkRoute.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/change_network/ChangeNetworkRoute.kt index 2403ed987..99f1101ea 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/change_network/ChangeNetworkRoute.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/change_network/ChangeNetworkRoute.kt @@ -14,13 +14,13 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.Web3Modal +import com.walletconnect.web3.modal.client.AppKit import com.walletconnect.web3.modal.ui.components.internal.commons.NetworkBottomSection import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer import com.walletconnect.web3.modal.ui.components.internal.commons.network.ChainNetworkItem import com.walletconnect.web3.modal.ui.model.UiStateBuilder import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.Web3ModalPreview +import com.walletconnect.web3.modal.ui.previews.AppKitPreview import com.walletconnect.web3.modal.ui.previews.ethereumChain import com.walletconnect.web3.modal.ui.previews.testChains import com.walletconnect.web3.modal.ui.routes.account.AccountViewModel @@ -34,7 +34,7 @@ internal fun ChangeNetworkRoute( UiStateBuilder(uiStateFlow = accountViewModel.accountState) { ChangeNetworkScreen( - chains = Web3Modal.chains, + chains = AppKit.chains, selectedChain = selectedChain, onChainItemClick = { accountViewModel.changeActiveChain(it) }, onWhatIsWalletClick = { accountViewModel.navigateToHelp() } @@ -93,7 +93,7 @@ private fun ChainNetworkGrid( @Composable @UiModePreview private fun ChangeNetworkPreview() { - Web3ModalPreview("Change Network") { + AppKitPreview("Change Network") { ChangeNetworkScreen(testChains, ethereumChain, {}, {}) } } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/siwe_fallback/SIWEFallbackRoute.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/siwe_fallback/SIWEFallbackRoute.kt index f9b7d17db..b294f1e9c 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/siwe_fallback/SIWEFallbackRoute.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/siwe_fallback/SIWEFallbackRoute.kt @@ -35,7 +35,7 @@ import androidx.compose.ui.unit.sp import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer import com.walletconnect.web3.modal.ui.components.internal.commons.WalletImageWithLoader import com.walletconnect.web3.modal.ui.routes.connect.ConnectViewModel -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme @Composable internal fun SIWEFallbackRoute( @@ -71,20 +71,20 @@ private fun SIWEFallback( VerticalSpacer(4.dp) Text( text = connectViewModel.wallet?.name ?: "", - style = Web3ModalTheme.typo.paragraph400, + style = AppKitTheme.typo.paragraph400, textAlign = TextAlign.Center, ) VerticalSpacer(20.dp) Spacer(modifier = Modifier.height(20.dp)) Text( - text = "Web3Modal needs to connect to your wallet", - style = Web3ModalTheme.typo.paragraph400, + text = "AppKit needs to connect to your wallet", + style = AppKitTheme.typo.paragraph400, textAlign = TextAlign.Center, ) Spacer(modifier = Modifier.height(8.dp)) Text( text = "Sign this message to prove you own this wallet and proceed.\\n Cancelling will disconnect you.", - style = Web3ModalTheme.typo.small400.copy(Web3ModalTheme.colors.foreground.color200), + style = AppKitTheme.typo.small400.copy(AppKitTheme.colors.foreground.color200), textAlign = TextAlign.Center, ) VerticalSpacer(20.dp) @@ -114,7 +114,7 @@ fun Buttons( buttonColor = Color(0xFFFFFFFF), loaderColor = Color(0xFF000000), modifier = Modifier - .border(width = 1.dp, color = Web3ModalTheme.colors.grayGlass05, shape = RoundedCornerShape(20.dp)) + .border(width = 1.dp, color = AppKitTheme.colors.grayGlass05, shape = RoundedCornerShape(20.dp)) .weight(1f) .height(46.dp) .clickable { onCancel() }, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/what_is_network/WhatIsNetworkRoute.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/what_is_network/WhatIsNetworkRoute.kt index 2117856e0..6d7213d01 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/what_is_network/WhatIsNetworkRoute.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/what_is_network/WhatIsNetworkRoute.kt @@ -20,8 +20,8 @@ import com.walletconnect.web3.modal.ui.components.internal.commons.button.Button import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonStyle import com.walletconnect.web3.modal.ui.components.internal.commons.button.ImageButton import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.Web3ModalPreview -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.previews.AppKitPreview +import com.walletconnect.web3.modal.ui.theme.AppKitTheme @Composable internal fun WhatIsNetworkRoute() { @@ -55,7 +55,7 @@ private fun WhatIsNetwork( VerticalSpacer(height = 20.dp) ImageButton( text = "Learn more", - image = { ExternalIcon(Web3ModalTheme.colors.inverse100) }, + image = { ExternalIcon(AppKitTheme.colors.inverse100) }, style = ButtonStyle.MAIN, size = ButtonSize.S, paddingValues = PaddingValues(start = 8.dp, top = 6.dp, end = 12.dp, 6.dp), @@ -68,7 +68,7 @@ private fun WhatIsNetwork( @UiModePreview @Composable private fun WhatIsNetworkPreview() { - Web3ModalPreview { + AppKitPreview { WhatIsNetworkRoute() } } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/common/WhatIsNetwork.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/common/WhatIsNetwork.kt index 866c7834e..1e92cec6d 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/common/WhatIsNetwork.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/common/WhatIsNetwork.kt @@ -16,8 +16,8 @@ import com.walletconnect.web3.modal.ui.components.internal.commons.button.Button import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonStyle import com.walletconnect.web3.modal.ui.components.internal.commons.button.ImageButton import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.Web3ModalPreview -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.previews.AppKitPreview +import com.walletconnect.web3.modal.ui.theme.AppKitTheme @Composable internal fun WhatIsNetworkRoute() { @@ -51,7 +51,7 @@ private fun WhatIsNetwork( Spacer(modifier = Modifier.height(10.dp)) ImageButton( text = "Learn more", - image = { ExternalIcon(Web3ModalTheme.colors.accent100) }, + image = { ExternalIcon(AppKitTheme.colors.accent100) }, style = ButtonStyle.MAIN, size = ButtonSize.S, onClick = onLearnMoreClick @@ -63,7 +63,7 @@ private fun WhatIsNetwork( @UiModePreview @Composable private fun WhatIsNetworkPreview() { - Web3ModalPreview(title = "What is a network?") { + AppKitPreview(title = "What is a network?") { WhatIsNetworkRoute() } } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectViewModel.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectViewModel.kt index d31016185..2fc466b2b 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectViewModel.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectViewModel.kt @@ -13,14 +13,14 @@ import com.walletconnect.foundation.util.Logger import com.walletconnect.modal.ui.model.LoadingState import com.walletconnect.modal.ui.model.UiState import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.Web3Modal +import com.walletconnect.web3.modal.client.AppKit import com.walletconnect.web3.modal.client.models.request.Request import com.walletconnect.web3.modal.client.models.request.SentRequestResult -import com.walletconnect.web3.modal.domain.delegate.Web3ModalDelegate +import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate import com.walletconnect.web3.modal.domain.usecase.ObserveSelectedChainUseCase import com.walletconnect.web3.modal.domain.usecase.SaveChainSelectionUseCase import com.walletconnect.web3.modal.domain.usecase.SaveRecentWalletUseCase -import com.walletconnect.web3.modal.engine.Web3ModalEngine +import com.walletconnect.web3.modal.engine.AppKitEngine import com.walletconnect.web3.modal.ui.navigation.Navigator import com.walletconnect.web3.modal.ui.navigation.NavigatorImpl import com.walletconnect.web3.modal.ui.navigation.Route @@ -43,11 +43,11 @@ internal class ConnectViewModel : ViewModel(), Navigator by NavigatorImpl(), Par private val saveRecentWalletUseCase: SaveRecentWalletUseCase = wcKoinApp.koin.get() private val saveChainSelectionUseCase: SaveChainSelectionUseCase = wcKoinApp.koin.get() private val observeSelectedChainUseCase: ObserveSelectedChainUseCase = wcKoinApp.koin.get() - private val web3ModalEngine: Web3ModalEngine = wcKoinApp.koin.get() + private val appKitEngine: AppKitEngine = wcKoinApp.koin.get() private val sendEventUseCase: SendEventInterface = wcKoinApp.koin.get() - private var sessionParams = getSessionParamsSelectedChain(Web3Modal.selectedChain?.id) + private var sessionParams = getSessionParamsSelectedChain(AppKit.selectedChain?.id) val selectedChain = observeSelectedChainUseCase().map { savedChainId -> - Web3Modal.chains.find { it.id == savedChainId } ?: web3ModalEngine.getSelectedChainOrFirst() + AppKit.chains.find { it.id == savedChainId } ?: appKitEngine.getSelectedChainOrFirst() } private var _isConfirmLoading: MutableStateFlow = MutableStateFlow(false) val isConfirmLoading get() = _isConfirmLoading.asStateFlow() @@ -68,7 +68,7 @@ internal class ConnectViewModel : ViewModel(), Navigator by NavigatorImpl(), Par get() = walletsDataStore.searchPhrase init { - Web3ModalDelegate + AppKitDelegate .wcEventModels .filterIsInstance() .onEach { @@ -82,7 +82,7 @@ internal class ConnectViewModel : ViewModel(), Navigator by NavigatorImpl(), Par fun disconnect() { _isCancelLoading.value = true - web3ModalEngine.disconnect( + appKitEngine.disconnect( onSuccess = { _isCancelLoading.value = false closeModal() @@ -97,21 +97,21 @@ internal class ConnectViewModel : ViewModel(), Navigator by NavigatorImpl(), Par fun sendSIWEOverPersonalSign() { _isConfirmLoading.value = true - web3ModalEngine.shouldDisconnect = false - val account = web3ModalEngine.getAccount() ?: throw IllegalStateException("Account is null") + appKitEngine.shouldDisconnect = false + val account = appKitEngine.getAccount() ?: throw IllegalStateException("Account is null") val issuer = "did:pkh:${account.chain.id}:${account.address}" - val siweMessage = web3ModalEngine.formatSIWEMessage(Web3Modal.authPayloadParams!!, issuer) + val siweMessage = appKitEngine.formatSIWEMessage(AppKit.authPayloadParams!!, issuer) val msg = siweMessage.encodeToByteArray().joinToString(separator = "", prefix = "0x") { eachByte -> "%02x".format(eachByte) } val body = "[\"$msg\", \"${account.address}\"]" - web3ModalEngine.request( + appKitEngine.request( request = Request("personal_sign", body), onSuccess = { sendRequest -> logger.log("SIWE sent successfully") - web3ModalEngine.siweRequestIdWithMessage = Pair((sendRequest as SentRequestResult.WalletConnect).requestId, siweMessage) + appKitEngine.siweRequestIdWithMessage = Pair((sendRequest as SentRequestResult.WalletConnect).requestId, siweMessage) }, onError = { - if (it !is Web3ModalEngine.RedirectMissingThrowable) { - web3ModalEngine.shouldDisconnect = true + if (it !is AppKitEngine.RedirectMissingThrowable) { + appKitEngine.shouldDisconnect = true } _isConfirmLoading.value = false @@ -154,11 +154,11 @@ internal class ConnectViewModel : ViewModel(), Navigator by NavigatorImpl(), Par } fun connectWalletConnect(name: String, method: String, linkMode: String?, onSuccess: (String) -> Unit) { - if (Web3Modal.authPayloadParams != null) { + if (AppKit.authPayloadParams != null) { authenticate( name, method, walletAppLink = linkMode, - authParams = if (Web3Modal.selectedChain != null) Web3Modal.authPayloadParams!!.copy(chains = listOf(Web3Modal.selectedChain!!.id)) else Web3Modal.authPayloadParams!!, + authParams = if (AppKit.selectedChain != null) AppKit.authPayloadParams!!.copy(chains = listOf(AppKit.selectedChain!!.id)) else AppKit.authPayloadParams!!, onSuccess = { onSuccess(it) }, onError = { sendEventUseCase.send(Props(EventType.TRACK, EventType.Track.CONNECT_ERROR, Properties(message = it.message ?: "Relay error while connecting"))) @@ -181,7 +181,7 @@ internal class ConnectViewModel : ViewModel(), Navigator by NavigatorImpl(), Par } fun connectCoinbase(onSuccess: () -> Unit = {}) { - web3ModalEngine.connectCoinbase( + appKitEngine.connectCoinbase( onSuccess = onSuccess, onError = { showError(it.localizedMessage) @@ -217,7 +217,7 @@ internal class ConnectViewModel : ViewModel(), Navigator by NavigatorImpl(), Par } } - private fun getSessionParamsSelectedChain(chainId: String?) = with(Web3Modal.chains) { + private fun getSessionParamsSelectedChain(chainId: String?) = with(AppKit.chains) { val selectedChain = getSelectedChain(chainId) Modal.Params.SessionParams( requiredNamespaces = mapOf( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ParingController.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ParingController.kt index 661361db3..4c2a9d810 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ParingController.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ParingController.kt @@ -5,7 +5,7 @@ import com.walletconnect.android.CoreClient import com.walletconnect.android.internal.common.wcKoinApp import com.walletconnect.web3.modal.client.Modal import com.walletconnect.web3.modal.client.toModel -import com.walletconnect.web3.modal.engine.Web3ModalEngine +import com.walletconnect.web3.modal.engine.AppKitEngine internal interface ParingController { @@ -29,7 +29,7 @@ internal interface ParingController { internal class PairingControllerImpl : ParingController { - private val web3ModalEngine: Web3ModalEngine = wcKoinApp.koin.get() + private val appKitEngine: AppKitEngine = wcKoinApp.koin.get() private var _pairing: Core.Model.Pairing? = null @@ -50,7 +50,7 @@ internal class PairingControllerImpl : ParingController { sessionParams.properties, pairing ) - web3ModalEngine.connectWC( + appKitEngine.connectWC( name = name, method = method, connect = connectParams, onSuccess = onSuccess, @@ -71,7 +71,7 @@ internal class PairingControllerImpl : ParingController { ) { try { generateAuthenticatedPairing() - web3ModalEngine.authenticate( + appKitEngine.authenticate( name = name, method = method, authenticate = authParams.toModel(pairing.topic), diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/WalletDataSource.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/WalletDataSource.kt index d85580708..5f94e6f27 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/WalletDataSource.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/WalletDataSource.kt @@ -7,7 +7,7 @@ import com.walletconnect.android.internal.common.modal.domain.usecase.GetWallets import com.walletconnect.android.internal.common.wcKoinApp import com.walletconnect.util.Empty import com.walletconnect.web3.modal.domain.usecase.GetRecentWalletUseCase -import com.walletconnect.web3.modal.engine.Web3ModalEngine +import com.walletconnect.web3.modal.engine.AppKitEngine import com.walletconnect.web3.modal.engine.coinbase.COINBASE_WALLET_ID import com.walletconnect.modal.ui.model.LoadingState import kotlinx.coroutines.flow.MutableStateFlow @@ -33,7 +33,7 @@ internal class WalletDataSource( private val getWalletsAppDataUseCase: GetInstalledWalletsIdsUseCaseInterface = wcKoinApp.koin.get() private val getRecentWalletUseCase: GetRecentWalletUseCase = wcKoinApp.koin.get() private val getSampleWalletsUseCase: GetSampleWalletsUseCaseInterface = wcKoinApp.koin.get() - private val web3ModalEngine: Web3ModalEngine = wcKoinApp.koin.get() + private val appKitEngine: AppKitEngine = wcKoinApp.koin.get() private var installedWalletsIds: List = listOf() @@ -48,7 +48,7 @@ internal class WalletDataSource( val wallets: List get() = walletsListingData.wallets - private fun getPriorityWallets() = (getRecentWalletUseCase()?.let { listOf(it) } ?: listOf()) + installedWalletsIds + web3ModalEngine.recommendedWalletsIds + private fun getPriorityWallets() = (getRecentWalletUseCase()?.let { listOf(it) } ?: listOf()) + installedWalletsIds + appKitEngine.recommendedWalletsIds private val searchState: MutableStateFlow = MutableStateFlow(WalletsData.empty()) val walletState: MutableStateFlow = MutableStateFlow(WalletsData.empty()) @@ -62,7 +62,7 @@ internal class WalletDataSource( fetchWalletsAppData() val installedWallets = fetchInstalledAndRecommendedWallets() val samples = getSampleWalletsUseCase() - val walletsListing = getWalletsUseCase(sdkType = W3M_SDK, page = 1, excludeIds = getPriorityWallets() + web3ModalEngine.excludedWalletsIds) + val walletsListing = getWalletsUseCase(sdkType = W3M_SDK, page = 1, excludeIds = getPriorityWallets() + appKitEngine.excludedWalletsIds) walletsListingData = ListingData( page = 1, totalCount = walletsListing.totalCount + samples.size, @@ -81,7 +81,7 @@ internal class WalletDataSource( private suspend fun fetchWalletsAppData() { val walletsIds = getWalletsAppDataUseCase(sdkType = W3M_SDK).toMutableList() - if (!web3ModalEngine.coinbaseIsEnabled()) { + if (!appKitEngine.coinbaseIsEnabled()) { walletsIds.remove(COINBASE_WALLET_ID) } installedWalletsIds = walletsIds @@ -91,7 +91,7 @@ internal class WalletDataSource( sdkType = W3M_SDK, page = 1, includes = getPriorityWallets(), - excludeIds = web3ModalEngine.excludedWalletsIds + excludeIds = appKitEngine.excludedWalletsIds ) suspend fun fetchMoreWallets() { @@ -99,7 +99,7 @@ internal class WalletDataSource( if (walletsListingData.wallets.size < walletsListingData.totalCount) { try { walletState.value = WalletsData.append(walletsListingData.wallets) - val response = getWalletsUseCase(sdkType = W3M_SDK, page = walletsListingData.page + 1, excludeIds = getPriorityWallets() + web3ModalEngine.excludedWalletsIds) + val response = getWalletsUseCase(sdkType = W3M_SDK, page = walletsListingData.page + 1, excludeIds = getPriorityWallets() + appKitEngine.excludedWalletsIds) walletsListingData.addNextPage(response.wallets) walletState.value = WalletsData.submit(walletsListingData.wallets) } catch (exception: Exception) { @@ -125,7 +125,7 @@ internal class WalletDataSource( if (walletsListingData.wallets.size < walletsListingData.totalCount) { try { searchState.value = WalletsData.refresh() - val searchResponse = getWalletsUseCase(sdkType = W3M_SDK, search = searchPhrase, page = 1, excludeIds = web3ModalEngine.excludedWalletsIds) + val searchResponse = getWalletsUseCase(sdkType = W3M_SDK, search = searchPhrase, page = 1, excludeIds = appKitEngine.excludedWalletsIds) searchListingData = ListingData(page = 1, totalCount = searchResponse.totalCount, wallets = searchResponse.wallets) searchState.value = WalletsData.submit(wallets = searchListingData.wallets) } catch (exception: Exception) { @@ -143,7 +143,7 @@ internal class WalletDataSource( if (searchListingData.wallets.size < searchListingData.totalCount) { try { searchState.value = WalletsData.append(searchListingData.wallets) - val searchResponse = getWalletsUseCase(sdkType = W3M_SDK, search = searchPhrase, page = searchListingData.page + 1, excludeIds = web3ModalEngine.excludedWalletsIds) + val searchResponse = getWalletsUseCase(sdkType = W3M_SDK, search = searchPhrase, page = searchListingData.page + 1, excludeIds = appKitEngine.excludedWalletsIds) searchListingData.addNextPage(searchResponse.wallets) searchState.value = WalletsData.submit(searchListingData.wallets) } catch (exception: Exception) { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/all_wallets/AllWalletsRoute.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/all_wallets/AllWalletsRoute.kt index 0f871fef2..d78bacb62 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/all_wallets/AllWalletsRoute.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/all_wallets/AllWalletsRoute.kt @@ -65,11 +65,11 @@ import com.walletconnect.web3.modal.ui.components.internal.commons.walletsGridIt import com.walletconnect.modal.ui.model.LoadingState import com.walletconnect.web3.modal.ui.previews.ComponentPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.Web3ModalPreview +import com.walletconnect.web3.modal.ui.previews.AppKitPreview import com.walletconnect.web3.modal.ui.previews.testWallets import com.walletconnect.web3.modal.ui.routes.connect.ConnectViewModel import com.walletconnect.web3.modal.ui.routes.connect.WalletsData -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme import com.walletconnect.web3.modal.ui.utils.conditionalModifier import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.filter @@ -141,7 +141,7 @@ private fun WalletsGrid( walletsData: WalletsData, onWalletItemClick: (Wallet) -> Unit ) { - val color = Web3ModalTheme.colors.background.color275 + val color = AppKitTheme.colors.background.color275 Box { LazyVerticalGrid( state = gridState, @@ -178,7 +178,7 @@ private fun LazyGridScope.loadingWalletsItems() { modifier = Modifier .width(76.dp) .height(96.dp) - .background(Web3ModalTheme.colors.grayGlass02), + .background(AppKitTheme.colors.grayGlass02), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center ) { @@ -188,13 +188,13 @@ private fun LazyGridScope.loadingWalletsItems() { modifier = Modifier .size(54.dp) .clip(RoundedCornerShape(16.dp)) - .border(width = 1.dp, color = Web3ModalTheme.colors.grayGlass10, shape = RoundedCornerShape(16.dp)) + .border(width = 1.dp, color = AppKitTheme.colors.grayGlass10, shape = RoundedCornerShape(16.dp)) ) VerticalSpacer(height = 8.dp) Text( text = String.Empty, - style = Web3ModalTheme.typo.tiny500, + style = AppKitTheme.typo.tiny500, textAlign = TextAlign.Center, maxLines = 1, overflow = TextOverflow.Ellipsis, @@ -214,7 +214,7 @@ private fun SearchInputRow( val defaultSpacing: Dp = 12.dp val focusBorderWidth: Dp = 4.dp val focusedSpacing: Dp = defaultSpacing - focusBorderWidth - val focusBorderColor = Web3ModalTheme.colors.accent20 + val focusBorderColor = AppKitTheme.colors.accent20 val state by searchState.state.collectAsState() val paddingValues: PaddingValues @@ -255,13 +255,13 @@ private fun ColumnScope.NoWalletsFoundItem() { contentDescription = ContentDescription.WALLET.description, modifier = Modifier .size(40.dp) - .background(Web3ModalTheme.colors.grayGlass05, RoundedCornerShape(12.dp)) + .background(AppKitTheme.colors.grayGlass05, RoundedCornerShape(12.dp)) .padding(7.dp) ) VerticalSpacer(height = 20.dp) Text( text = "No Wallet found", - style = TextStyle(color = Web3ModalTheme.colors.foreground.color125, fontSize = 16.sp), + style = TextStyle(color = AppKitTheme.colors.foreground.color125, fontSize = 16.sp), textAlign = TextAlign.Center, modifier = Modifier.fillMaxWidth() ) @@ -280,7 +280,7 @@ private fun SearchRowPreview( @UiModePreview @Composable private fun AllWalletsEmptyPreview() { - Web3ModalPreview { + AppKitPreview { AllWalletsContent(WalletsData.empty(), "", {}, {}, {}, {}, {}) } } @@ -288,7 +288,7 @@ private fun AllWalletsEmptyPreview() { @UiModePreview @Composable private fun AllWalletsPreview() { - Web3ModalPreview { + AppKitPreview { AllWalletsContent(WalletsData.submit(testWallets),"", {}, {}, {}, {}, {}) } } @@ -296,7 +296,7 @@ private fun AllWalletsPreview() { @UiModePreview @Composable private fun AllWalletsLoadingRefreshPreview() { - Web3ModalPreview { + AppKitPreview { AllWalletsContent(WalletsData.refresh(),"", {}, {}, {}, {}, {}) } } @@ -304,7 +304,7 @@ private fun AllWalletsLoadingRefreshPreview() { @UiModePreview @Composable private fun AllWalletsLoadingAppendPreview() { - Web3ModalPreview { + AppKitPreview { AllWalletsContent(WalletsData.append(testWallets),"", {}, {}, {}, {}, {}) } } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/choose_network/ChooseNetworkRoute.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/choose_network/ChooseNetworkRoute.kt index 34463c8a4..bc75467ef 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/choose_network/ChooseNetworkRoute.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/choose_network/ChooseNetworkRoute.kt @@ -14,7 +14,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.Web3Modal +import com.walletconnect.web3.modal.client.AppKit import com.walletconnect.web3.modal.ui.components.internal.commons.NetworkBottomSection import com.walletconnect.web3.modal.ui.components.internal.commons.network.ChainNetworkItem import com.walletconnect.web3.modal.ui.routes.connect.ConnectViewModel @@ -24,7 +24,7 @@ import com.walletconnect.web3.modal.utils.getChainNetworkImageUrl internal fun ChooseNetworkRoute( connectViewModel: ConnectViewModel ) { - val chains = Web3Modal.chains + val chains = AppKit.chains val selectedChain by connectViewModel.selectedChain.collectAsState(initial = null) ChainNetworkSelector( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/connect_wallet/ConnectWalletRoute.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/connect_wallet/ConnectWalletRoute.kt index aa9895d44..dc26403ef 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/connect_wallet/ConnectWalletRoute.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/connect_wallet/ConnectWalletRoute.kt @@ -20,9 +20,9 @@ import com.walletconnect.web3.modal.ui.components.internal.walletconnect.allWall import com.walletconnect.web3.modal.ui.model.UiStateBuilder import com.walletconnect.web3.modal.ui.previews.ConnectYourWalletPreviewProvider import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.Web3ModalPreview +import com.walletconnect.web3.modal.ui.previews.AppKitPreview import com.walletconnect.web3.modal.ui.routes.connect.ConnectViewModel -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme @Composable internal fun ConnectWalletRoute( @@ -98,7 +98,7 @@ private fun WalletListSelect(item: Wallet, onWalletItemClick: (Wallet) -> Unit) url = item.imageUrl, modifier = Modifier .size(40.dp) - .border(width = 1.dp, color = Web3ModalTheme.colors.grayGlass10, shape = RoundedCornerShape(12.dp)) + .border(width = 1.dp, color = AppKitTheme.colors.grayGlass10, shape = RoundedCornerShape(12.dp)) .clip(RoundedCornerShape(12.dp)) ) if (item.isWalletInstalled) { @@ -118,7 +118,7 @@ private fun WalletListSelect(item: Wallet, onWalletItemClick: (Wallet) -> Unit) private fun ConnectYourWalletPreview( @PreviewParameter(ConnectYourWalletPreviewProvider::class) wallets: List ) { - Web3ModalPreview(title = "Connect Wallet") { + AppKitPreview(title = "Connect Wallet") { ConnectWalletContent(wallets, 200, {}, {}) } } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/get_wallet/GetAWalletRoute.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/get_wallet/GetAWalletRoute.kt index 5ac4e4261..dca69f4da 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/get_wallet/GetAWalletRoute.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/get_wallet/GetAWalletRoute.kt @@ -19,7 +19,7 @@ import com.walletconnect.web3.modal.ui.components.internal.commons.ExternalIcon import com.walletconnect.web3.modal.ui.components.internal.commons.ListSelectRow import com.walletconnect.web3.modal.ui.components.internal.commons.WalletImage import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.Web3ModalPreview +import com.walletconnect.web3.modal.ui.previews.AppKitPreview import com.walletconnect.web3.modal.ui.previews.testWallets @Composable @@ -70,7 +70,7 @@ private fun GetAWalletContent( @UiModePreview @Composable private fun PreviewGetAWallet() { - Web3ModalPreview(title = "Get a Wallet") { + AppKitPreview(title = "Get a Wallet") { GetAWalletContent(wallets = testWallets) } } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/redirect/RedirectWalletScreen.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/redirect/RedirectWalletScreen.kt index 401695cfe..bba922d5c 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/redirect/RedirectWalletScreen.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/redirect/RedirectWalletScreen.kt @@ -36,7 +36,7 @@ import com.walletconnect.modal.utils.openPlayStore import com.walletconnect.modal.utils.openWebAppLink import com.walletconnect.util.Empty import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.domain.delegate.Web3ModalDelegate +import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate import com.walletconnect.web3.modal.engine.coinbase.isCoinbaseWallet import com.walletconnect.web3.modal.ui.components.internal.OrientationBox import com.walletconnect.web3.modal.ui.components.internal.commons.DeclinedIcon @@ -56,10 +56,10 @@ import com.walletconnect.web3.modal.ui.components.internal.commons.switch.rememb import com.walletconnect.web3.modal.ui.components.internal.snackbar.LocalSnackBarHandler import com.walletconnect.web3.modal.ui.previews.Landscape import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.Web3ModalPreview +import com.walletconnect.web3.modal.ui.previews.AppKitPreview import com.walletconnect.web3.modal.ui.previews.testWallets import com.walletconnect.web3.modal.ui.routes.connect.ConnectViewModel -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme @Composable internal fun RedirectWalletRoute( @@ -88,7 +88,7 @@ internal fun RedirectWalletRoute( LaunchedEffect(Unit) { - Web3ModalDelegate.wcEventModels.collect { + AppKitDelegate.wcEventModels.collect { when (it) { is Modal.Model.RejectedSession, is Modal.Model.SessionAuthenticateResponse.Error -> { redirectState = RedirectState.Reject @@ -294,30 +294,30 @@ private fun RedirectLabel(state: RedirectState, wallet: Wallet) { when (state) { RedirectState.Loading -> { header = "Continue in ${wallet.name}" - headerStyle = Web3ModalTheme.typo.paragraph500 + headerStyle = AppKitTheme.typo.paragraph500 description = "Accept connection request in your wallet app" - descriptionStyle = Web3ModalTheme.typo.small400.copy(color = Web3ModalTheme.colors.foreground.color200) + descriptionStyle = AppKitTheme.typo.small400.copy(color = AppKitTheme.colors.foreground.color200) } RedirectState.Reject -> { header = "Connection declined" description = "Connection can be declined if a previous request is still active" - headerStyle = Web3ModalTheme.typo.paragraph400.copy(Web3ModalTheme.colors.error) - descriptionStyle = Web3ModalTheme.typo.small400.copy(color = Web3ModalTheme.colors.foreground.color200) + headerStyle = AppKitTheme.typo.paragraph400.copy(AppKitTheme.colors.error) + descriptionStyle = AppKitTheme.typo.small400.copy(color = AppKitTheme.colors.foreground.color200) } RedirectState.Expired -> { header = "Connection expired" description = String.Empty - headerStyle = Web3ModalTheme.typo.paragraph400.copy(Web3ModalTheme.colors.error) - descriptionStyle = Web3ModalTheme.typo.small400.copy(color = Web3ModalTheme.colors.foreground.color200) + headerStyle = AppKitTheme.typo.paragraph400.copy(AppKitTheme.colors.error) + descriptionStyle = AppKitTheme.typo.small400.copy(color = AppKitTheme.colors.foreground.color200) } RedirectState.NotDetected -> { header = "App not installed" description = String.Empty - headerStyle = Web3ModalTheme.typo.paragraph400 - descriptionStyle = Web3ModalTheme.typo.small400.copy(color = Web3ModalTheme.colors.foreground.color200) + headerStyle = AppKitTheme.typo.paragraph400 + descriptionStyle = AppKitTheme.typo.small400.copy(color = AppKitTheme.colors.foreground.color200) } } Column( @@ -384,11 +384,11 @@ private fun RedirectWebWalletScreen( Column( horizontalAlignment = Alignment.CenterHorizontally ) { - Text(text = "Continue in ${wallet.name}", style = Web3ModalTheme.typo.paragraph400) + Text(text = "Continue in ${wallet.name}", style = AppKitTheme.typo.paragraph400) VerticalSpacer(height = 8.dp) Text( text = "Accept connection request in the wallet", - style = Web3ModalTheme.typo.small400.copy(color = Web3ModalTheme.colors.foreground.color200), + style = AppKitTheme.typo.small400.copy(color = AppKitTheme.colors.foreground.color200), textAlign = TextAlign.Center ) VerticalSpacer(height = 20.dp) @@ -455,7 +455,7 @@ private fun RejectWalletImage(url: String) { Box( modifier = Modifier .align(Alignment.BottomEnd) - .background(Web3ModalTheme.colors.background.color125, shape = CircleShape) + .background(AppKitTheme.colors.background.color125, shape = CircleShape) .padding(2.dp) ) { DeclinedIcon() @@ -468,7 +468,7 @@ private fun RejectWalletImage(url: String) { @Composable private fun PreviewRedirectWalletScreenWithLoadingState() { val wallet = testWallets.first() - Web3ModalPreview(wallet.name) { + AppKitPreview(wallet.name) { RedirectWalletScreen(redirectState = RedirectState.Loading, platformTab = PlatformTab.MOBILE, {}, wallet, {}, {}, {}, {}) } } @@ -478,7 +478,7 @@ private fun PreviewRedirectWalletScreenWithLoadingState() { @Composable private fun PreviewRedirectWalletScreenWithRejectedState() { val wallet = testWallets.first() - Web3ModalPreview(wallet.name) { + AppKitPreview(wallet.name) { RedirectWalletScreen(redirectState = RedirectState.Reject, platformTab = PlatformTab.MOBILE, {}, wallet, {}, {}, {}, {}) } } @@ -488,7 +488,7 @@ private fun PreviewRedirectWalletScreenWithRejectedState() { @Composable private fun PreviewRedirectWalletScreenWithExpiredState() { val wallet = testWallets.first() - Web3ModalPreview(wallet.name) { + AppKitPreview(wallet.name) { RedirectWalletScreen(redirectState = RedirectState.Expired, platformTab = PlatformTab.MOBILE, {}, wallet, {}, {}, {}, {}) } } @@ -498,7 +498,7 @@ private fun PreviewRedirectWalletScreenWithExpiredState() { @Composable private fun PreviewRedirectWalletScreenWithNotDetectedState() { val wallet = testWallets.first() - Web3ModalPreview(wallet.name) { + AppKitPreview(wallet.name) { RedirectWalletScreen(redirectState = RedirectState.NotDetected, platformTab = PlatformTab.MOBILE, {}, wallet, {}, {}, {}, {}) } } @@ -508,7 +508,7 @@ private fun PreviewRedirectWalletScreenWithNotDetectedState() { @Composable private fun PreviewRedirectWebWalletScreen() { val wallet = testWallets.first() - Web3ModalPreview(wallet.name) { + AppKitPreview(wallet.name) { RedirectWalletScreen(redirectState = RedirectState.Loading, platformTab = PlatformTab.WEB, {}, wallet, {}, {}, {}, {}) } } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/scan_code/ScanCodeRoute.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/scan_code/ScanCodeRoute.kt index c94b9fc54..c2d76dda5 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/scan_code/ScanCodeRoute.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/scan_code/ScanCodeRoute.kt @@ -30,15 +30,15 @@ import com.walletconnect.android.pulse.model.ConnectionMethod import com.walletconnect.modal.ui.components.qr.QrCodeType import com.walletconnect.modal.ui.components.qr.WalletConnectQRCode import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.domain.delegate.Web3ModalDelegate +import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate import com.walletconnect.web3.modal.ui.components.internal.OrientationBox import com.walletconnect.web3.modal.ui.components.internal.commons.entry.CopyActionEntry import com.walletconnect.web3.modal.ui.components.internal.snackbar.LocalSnackBarHandler import com.walletconnect.web3.modal.ui.previews.Landscape import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.Web3ModalPreview +import com.walletconnect.web3.modal.ui.previews.AppKitPreview import com.walletconnect.web3.modal.ui.routes.connect.ConnectViewModel -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.AppKitTheme import kotlinx.coroutines.flow.filter @Composable @@ -48,7 +48,7 @@ internal fun ScanQRCodeRoute(connectViewModel: ConnectViewModel) { var uri by remember { mutableStateOf(connectViewModel.uri) } LaunchedEffect(Unit) { - Web3ModalDelegate + AppKitDelegate .wcEventModels .filter { event -> event is Modal.Model.RejectedSession || event is Modal.Model.SessionAuthenticateResponse.Error } .collect { @@ -131,7 +131,7 @@ private fun PortraitContent( private fun ScanQrCodeLabel() { Text( text = "Scan this QR code with your phone", - modifier = Modifier.fillMaxWidth(), style = Web3ModalTheme.typo.paragraph400, textAlign = TextAlign.Center + modifier = Modifier.fillMaxWidth(), style = AppKitTheme.typo.paragraph400, textAlign = TextAlign.Center ) } @@ -140,21 +140,21 @@ private fun QRCode(uri: String) { if (isSystemInDarkTheme()) { Box( modifier = Modifier - .background(Web3ModalTheme.colors.inverse100, shape = RoundedCornerShape(36.dp)) + .background(AppKitTheme.colors.inverse100, shape = RoundedCornerShape(36.dp)) .padding(16.dp) ) { WalletConnectQRCode( qrData = uri, - primaryColor = Web3ModalTheme.colors.inverse000, - logoColor = Web3ModalTheme.colors.accent100, + primaryColor = AppKitTheme.colors.inverse000, + logoColor = AppKitTheme.colors.accent100, type = QrCodeType.W3M ) } } else { WalletConnectQRCode( qrData = uri, - primaryColor = Web3ModalTheme.colors.inverse000, - logoColor = Web3ModalTheme.colors.accent100, + primaryColor = AppKitTheme.colors.inverse000, + logoColor = AppKitTheme.colors.accent100, type = QrCodeType.W3M ) } @@ -164,7 +164,7 @@ private fun QRCode(uri: String) { @Landscape @Composable private fun ScanQRCodePreview() { - Web3ModalPreview("Mobile Wallets") { + AppKitPreview("Mobile Wallets") { ScanQRCodeContent("47442c19ea7c6a7a836fa3e53af1ddd375438daaeea9acdbf595e989a731b73249a10a7cc0e343ca627e536609", {}) } } \ No newline at end of file diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/what_is_wallet/WhatIsWallet.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/what_is_wallet/WhatIsWallet.kt index 0ae450076..3ef985a5f 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/what_is_wallet/WhatIsWallet.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/what_is_wallet/WhatIsWallet.kt @@ -23,8 +23,8 @@ import com.walletconnect.web3.modal.ui.components.internal.commons.button.Button import com.walletconnect.web3.modal.ui.components.internal.commons.button.ImageButton import com.walletconnect.web3.modal.ui.navigation.Route import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.Web3ModalPreview -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.previews.AppKitPreview +import com.walletconnect.web3.modal.ui.theme.AppKitTheme @Composable internal fun WhatIsWallet( @@ -68,7 +68,7 @@ private fun WhatIsWallet( VerticalSpacer(20.dp) ImageButton( text = "Get a wallet", - image = { WalletIcon(Web3ModalTheme.colors.inverse100) }, + image = { WalletIcon(AppKitTheme.colors.inverse100) }, style = ButtonStyle.MAIN, size = ButtonSize.S, paddingValues = PaddingValues(start = 8.dp, top = 6.dp, end = 12.dp, 6.dp), @@ -81,7 +81,7 @@ private fun WhatIsWallet( @Composable @UiModePreview private fun HelpContentPreview() { - Web3ModalPreview("What is a Wallet?") { + AppKitPreview("What is a Wallet?") { WhatIsWallet {} } } \ No newline at end of file diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/Web3ModalColors.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/AppKitColors.kt similarity index 79% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/Web3ModalColors.kt rename to product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/AppKitColors.kt index 66b78b5a5..80db5894f 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/Web3ModalColors.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/AppKitColors.kt @@ -3,9 +3,9 @@ package com.walletconnect.web3.modal.ui.theme import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color -import com.walletconnect.web3.modal.ui.Web3ModalTheme +import com.walletconnect.web3.modal.ui.AppKitTheme -internal data class Web3ModalColors( +internal data class AppKitColors( val accent100: Color, val accent90: Color, val accent80: Color, @@ -49,8 +49,8 @@ data class ColorPalette( val color300: Color, ) @Composable -internal fun provideWeb3ModalColors(composition: CustomComposition): Web3ModalColors = if (composition.mode.isDarkTheme()) { - Web3ModalColors( +internal fun provideAppKitColors(composition: CustomComposition): AppKitColors = if (composition.mode.isDarkTheme()) { + AppKitColors( accent100 = composition.darkColors.accent100, accent90 = composition.darkColors.accent90, accent80 = composition.darkColors.accent80, @@ -59,14 +59,14 @@ internal fun provideWeb3ModalColors(composition: CustomComposition): Web3ModalCo grayGlass = composition.darkColors.grayGlass, success = composition.darkColors.success, error = composition.darkColors.error, - teal = defaultDarkWeb3ModalColors.teal, - magenta = defaultDarkWeb3ModalColors.magenta, - indigo = defaultDarkWeb3ModalColors.indigo, - orange = defaultDarkWeb3ModalColors.orange, - purple = defaultDarkWeb3ModalColors.purple + teal = defaultDarkAppKitColors.teal, + magenta = defaultDarkAppKitColors.magenta, + indigo = defaultDarkAppKitColors.indigo, + orange = defaultDarkAppKitColors.orange, + purple = defaultDarkAppKitColors.purple ) } else { - Web3ModalColors( + AppKitColors( accent100 = composition.lightColors.accent100, accent90 = composition.lightColors.accent90, accent80 = composition.lightColors.accent80, @@ -75,22 +75,22 @@ internal fun provideWeb3ModalColors(composition: CustomComposition): Web3ModalCo grayGlass = composition.lightColors.grayGlass, success = composition.lightColors.success, error = composition.lightColors.error, - teal = defaultLightWeb3ModalColors.teal, - magenta = defaultLightWeb3ModalColors.magenta, - indigo = defaultLightWeb3ModalColors.indigo, - orange = defaultLightWeb3ModalColors.orange, - purple = defaultLightWeb3ModalColors.purple + teal = defaultLightAppKitColors.teal, + magenta = defaultLightAppKitColors.magenta, + indigo = defaultLightAppKitColors.indigo, + orange = defaultLightAppKitColors.orange, + purple = defaultLightAppKitColors.purple ) } @Composable -private fun Web3ModalTheme.Mode.isDarkTheme() = when(this) { - Web3ModalTheme.Mode.LIGHT -> false - Web3ModalTheme.Mode.DARK -> true - Web3ModalTheme.Mode.AUTO -> isSystemInDarkTheme() +private fun AppKitTheme.Mode.isDarkTheme() = when(this) { + AppKitTheme.Mode.LIGHT -> false + AppKitTheme.Mode.DARK -> true + AppKitTheme.Mode.AUTO -> isSystemInDarkTheme() } -internal val defaultDarkWeb3ModalColors = Web3ModalColors( +internal val defaultDarkAppKitColors = AppKitColors( accent100 = Color(0xFF47A1FF), accent90 = Color(0xFF59AAFF), accent80 = Color(0xFF6CB4FF), @@ -126,7 +126,7 @@ internal val defaultDarkWeb3ModalColors = Web3ModalColors( purple = Color(0xFF9063F7), ) -internal val defaultLightWeb3ModalColors = Web3ModalColors( +internal val defaultLightAppKitColors = AppKitColors( accent100 = Color(0xFF3396FF), accent90 = Color(0xFF2D7DD2), accent80 = Color(0xFF2978CC), diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/CustomComposition.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/CustomComposition.kt index d540be972..c2e8d3cea 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/CustomComposition.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/CustomComposition.kt @@ -1,12 +1,12 @@ package com.walletconnect.web3.modal.ui.theme import androidx.compose.runtime.compositionLocalOf -import com.walletconnect.web3.modal.ui.Web3ModalTheme +import com.walletconnect.web3.modal.ui.AppKitTheme internal data class CustomComposition( - val mode: Web3ModalTheme.Mode = Web3ModalTheme.Mode.AUTO, - val lightColors: Web3ModalTheme.Colors = Web3ModalTheme.provideLightWeb3ModalColors(), - val darkColors: Web3ModalTheme.Colors = Web3ModalTheme.provideDarkWeb3ModalColor(), + val mode: AppKitTheme.Mode = AppKitTheme.Mode.AUTO, + val lightColors: AppKitTheme.Colors = AppKitTheme.provideLightAppKitColors(), + val darkColors: AppKitTheme.Colors = AppKitTheme.provideDarkAppKitColor(), ) internal val LocalCustomComposition = compositionLocalOf { CustomComposition() } \ No newline at end of file diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/Theme.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/Theme.kt index 5e77dd895..4636a002d 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/Theme.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/Theme.kt @@ -5,11 +5,11 @@ import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.compositionLocalOf @Composable -internal fun ProvideWeb3ModalThemeComposition( +internal fun ProvideAppKitThemeComposition( content: @Composable () -> Unit, ) { val composition = LocalCustomComposition.current - val colors = provideWeb3ModalColors(composition) + val colors = provideAppKitColors(composition) val typography = provideDefaultTypography(colors) CompositionLocalProvider( LocalColorsComposition provides colors, @@ -18,20 +18,20 @@ internal fun ProvideWeb3ModalThemeComposition( ) } -internal object Web3ModalTheme { - val colors: Web3ModalColors +internal object AppKitTheme { + val colors: AppKitColors @Composable get() = LocalColorsComposition.current - val typo: Web3ModalTypography + val typo: AppKitTypography @Composable get() = LocalTypographyComposition.current } -private val LocalTypographyComposition = compositionLocalOf { +private val LocalTypographyComposition = compositionLocalOf { error("No typography provided") } -private val LocalColorsComposition = compositionLocalOf { +private val LocalColorsComposition = compositionLocalOf { error("No colors provided") } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/Typography.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/Typography.kt index c4cc9a679..865e3276e 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/Typography.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/Typography.kt @@ -4,7 +4,7 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp -internal fun provideDefaultTypography(colors: Web3ModalColors) = Web3ModalTypography( +internal fun provideDefaultTypography(colors: AppKitColors) = AppKitTypography( mediumTitle400 = TextStyle( fontWeight = FontWeight.Normal, fontSize = 24.sp, @@ -122,7 +122,7 @@ internal fun provideDefaultTypography(colors: Web3ModalColors) = Web3ModalTypogr ), ) -internal data class Web3ModalTypography( +internal data class AppKitTypography( val mediumTitle400: TextStyle, val mediumTitle500: TextStyle, val mediumTitle600: TextStyle, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/SessionUtils.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/SessionUtils.kt index 35db5ea72..6e38759c9 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/SessionUtils.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/SessionUtils.kt @@ -4,7 +4,7 @@ import com.walletconnect.android.internal.utils.CoreValidator import com.walletconnect.sign.client.Sign import com.walletconnect.util.Empty import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.Web3Modal +import com.walletconnect.web3.modal.client.AppKit import com.walletconnect.web3.modal.client.models.Account import com.walletconnect.web3.modal.client.toModal import com.walletconnect.web3.modal.domain.model.Session @@ -31,7 +31,7 @@ internal fun Modal.Model.UpdatedSession.toSession(selectedChain: Modal.Model.Cha return Session.WalletConnect(getAddress(chain), chain.id, topic) } -internal fun String.toChain() = Web3Modal.chains.find { it.id == this } +internal fun String.toChain() = AppKit.chains.find { it.id == this } private fun Modal.Model.Session.getAccounts() = namespaces.values.toList().flatMap { it.accounts } @@ -52,8 +52,8 @@ internal fun Modal.Model.ApprovedSession.WalletConnectSession.getAddress(chain: ?.last() ?: String.Empty internal fun Session.getChains() = when(this) { - is Session.Coinbase -> Web3Modal.chains.filter { it.id == this.chain } - is Session.WalletConnect -> Web3Modal.getActiveSessionByTopic(topic)?.getChains() ?: Web3Modal.chains + is Session.Coinbase -> AppKit.chains.filter { it.id == this.chain } + is Session.WalletConnect -> AppKit.getActiveSessionByTopic(topic)?.getChains() ?: AppKit.chains } internal fun Session.toAccount() = Account(address, getChain(chain)) @@ -64,7 +64,7 @@ internal fun Sign.Model.Session.toAccount(session: Session.WalletConnect) = toMo Account(address, chain) } -internal fun getChain(chainId: String) = Web3Modal.chains.find { it.id == chainId } ?: Web3Modal.chains.first() +internal fun getChain(chainId: String) = AppKit.chains.find { it.id == chainId } ?: AppKit.chains.first() internal fun Session.toConnectorType() = when(this) { is Session.Coinbase -> Modal.ConnectorType.WALLET_CONNECT diff --git a/product/web3modal/src/main/res/navigation/web3modal_graph.xml b/product/web3modal/src/main/res/navigation/web3modal_graph.xml index f2369aaf5..e1029a32d 100644 --- a/product/web3modal/src/main/res/navigation/web3modal_graph.xml +++ b/product/web3modal/src/main/res/navigation/web3modal_graph.xml @@ -6,6 +6,6 @@ + android:name="com.walletconnect.web3.modal.ui.AppKitSheet" /> diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/components/buttons/ButtonsTest.kt b/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/components/buttons/ButtonsTest.kt index f361f70f7..8004b0b71 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/components/buttons/ButtonsTest.kt +++ b/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/components/buttons/ButtonsTest.kt @@ -2,7 +2,7 @@ package com.walletconnect.web3.modal.ui.components.buttons import com.android.resources.NightMode import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.presets.Web3ModalChainsPresets +import com.walletconnect.web3.modal.presets.AppKitChainsPresets import com.walletconnect.web3.modal.ui.components.button.AccountButtonState import com.walletconnect.web3.modal.ui.components.button.ConnectButton import com.walletconnect.web3.modal.ui.components.button.ConnectButtonSize @@ -33,7 +33,7 @@ internal class ButtonsTest : ScreenShotTest("component/button") { @Test fun `test AccountButton in LightMode`() = runComponentScreenShotTest { - val chain = Web3ModalChainsPresets.ethChains["1"]!! + val chain = AppKitChainsPresets.ethChains["1"]!! AccountButtonState(AccountButtonState.Invalid) {} AccountButtonState(AccountButtonState.Loading) {} AccountButtonState(AccountButtonState.Normal("0x2765d421FB91182490D602E671a")) {} @@ -42,7 +42,7 @@ internal class ButtonsTest : ScreenShotTest("component/button") { @Test fun `test AccountButton in DarkMode`() = runComponentScreenShotTest(nightMode = NightMode.NIGHT) { - val chain = Web3ModalChainsPresets.ethChains["1"]!! + val chain = AppKitChainsPresets.ethChains["1"]!! AccountButtonState(AccountButtonState.Invalid) {} AccountButtonState(AccountButtonState.Loading) {} AccountButtonState(AccountButtonState.Normal("0x2765d421FB91182490D602E671a")) {} diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountRouteTest.kt b/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountRouteTest.kt index 65c8e78fe..a5cf37a69 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountRouteTest.kt +++ b/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountRouteTest.kt @@ -6,11 +6,11 @@ import com.android.resources.ScreenOrientation import com.walletconnect.android.internal.common.wcKoinApp import com.walletconnect.modal.ui.model.UiState import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.Web3Modal +import com.walletconnect.web3.modal.client.AppKit import com.walletconnect.web3.modal.domain.model.AccountData import com.walletconnect.web3.modal.domain.model.Balance import com.walletconnect.web3.modal.domain.usecase.GetSelectedChainUseCase -import com.walletconnect.web3.modal.presets.Web3ModalChainsPresets +import com.walletconnect.web3.modal.presets.AppKitChainsPresets import com.walletconnect.web3.modal.ui.navigation.Route import com.walletconnect.web3.modal.ui.routes.account.account.AccountRoute import com.walletconnect.web3.modal.utils.ScreenShotTest @@ -33,19 +33,19 @@ internal class AccountRouteTest: ScreenShotTest("account/${Route.ACCOUNT.path}") private val getSelectedChainUseCase: GetSelectedChainUseCase = mockk() private val accountData = AccountData( address = "0x2765d421FB91182490D602E671a", - chains = Web3ModalChainsPresets.ethChains.values.toList() + chains = AppKitChainsPresets.ethChains.values.toList() ) @Before fun setup() { - Web3Modal.chains = Web3ModalChainsPresets.ethChains.values.toList() + AppKit.chains = AppKitChainsPresets.ethChains.values.toList() every { viewModel.accountState } returns uiState every { viewModel.selectedChain } returns selectedChain every { viewModel.balanceState } returns balance - every { selectedChain.value } returns Web3ModalChainsPresets.ethChains["1"]!! - every { balance.value } returns Balance(Web3ModalChainsPresets.ethToken, "0x0") + every { selectedChain.value } returns AppKitChainsPresets.ethChains["1"]!! + every { balance.value } returns Balance(AppKitChainsPresets.ethToken, "0x0") every { getSelectedChainUseCase() } returns "1" - every { viewModel.getSelectedChainOrFirst() } returns Web3ModalChainsPresets.ethChains.getOrElse("1") { throw IllegalStateException("Chain not found") } + every { viewModel.getSelectedChainOrFirst() } returns AppKitChainsPresets.ethChains.getOrElse("1") { throw IllegalStateException("Chain not found") } val modules = listOf( module { single { getSelectedChainUseCase } } diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/ChainSwitchRedirectTest.kt b/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/ChainSwitchRedirectTest.kt index 7df8faedf..ba912be89 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/ChainSwitchRedirectTest.kt +++ b/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/ChainSwitchRedirectTest.kt @@ -1,7 +1,7 @@ package com.walletconnect.web3.modal.ui.routes.account import com.android.resources.NightMode -import com.walletconnect.web3.modal.presets.Web3ModalChainsPresets +import com.walletconnect.web3.modal.presets.AppKitChainsPresets import com.walletconnect.web3.modal.ui.navigation.Route import com.walletconnect.web3.modal.ui.routes.account.chain_redirect.ChainRedirectState import com.walletconnect.web3.modal.ui.routes.account.chain_redirect.ChainSwitchRedirectScreen @@ -12,7 +12,7 @@ import org.junit.Test @Ignore("This test is not working on CI for Sonar only") internal class ChainSwitchRedirectTest : ScreenShotTest("account/" + Route.CHAIN_SWITCH_REDIRECT.path) { - private val chain = Web3ModalChainsPresets.ethChains["1"]!! + private val chain = AppKitChainsPresets.ethChains["1"]!! @Test fun `test ChainSwitchRedirect with Loading in LightMode`() = runRouteScreenShotTest( diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/ChangeNetworkRouteTest.kt b/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/ChangeNetworkRouteTest.kt index 3d4a73b5b..c6bf9cb8a 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/ChangeNetworkRouteTest.kt +++ b/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/ChangeNetworkRouteTest.kt @@ -5,10 +5,10 @@ import com.android.resources.ScreenOrientation import com.walletconnect.android.internal.common.wcKoinApp import com.walletconnect.modal.ui.model.UiState import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.Web3Modal +import com.walletconnect.web3.modal.client.AppKit import com.walletconnect.web3.modal.domain.model.AccountData import com.walletconnect.web3.modal.domain.usecase.GetSelectedChainUseCase -import com.walletconnect.web3.modal.presets.Web3ModalChainsPresets +import com.walletconnect.web3.modal.presets.AppKitChainsPresets import com.walletconnect.web3.modal.ui.navigation.Route import com.walletconnect.web3.modal.ui.routes.account.change_network.ChangeNetworkRoute import com.walletconnect.web3.modal.utils.ScreenShotTest @@ -30,13 +30,13 @@ internal class ChangeNetworkRouteTest: ScreenShotTest("account/${Route.CHANGE_NE @Before fun setup() { - Web3Modal.chains = Web3ModalChainsPresets.ethChains.values.toList() + AppKit.chains = AppKitChainsPresets.ethChains.values.toList() every { viewModel.accountState } returns uiState - every { uiState.value } returns UiState.Success(AccountData("0x2765d421FB91182490D602E671a", Web3ModalChainsPresets.ethChains.values.toList())) + every { uiState.value } returns UiState.Success(AccountData("0x2765d421FB91182490D602E671a", AppKitChainsPresets.ethChains.values.toList())) every { viewModel.selectedChain } returns selectedChain - every { selectedChain.value } returns Web3ModalChainsPresets.ethChains["1"]!! + every { selectedChain.value } returns AppKitChainsPresets.ethChains["1"]!! every { getSelectedChainUseCase() } returns "1" - every { viewModel.getSelectedChainOrFirst() } returns Web3ModalChainsPresets.ethChains.getOrElse("1") { throw IllegalStateException("Chain not found") } + every { viewModel.getSelectedChainOrFirst() } returns AppKitChainsPresets.ethChains.getOrElse("1") { throw IllegalStateException("Chain not found") } wcKoinApp.koin.loadModules(modules = listOf(module { single { getSelectedChainUseCase } })) } diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/utils/PaparazziUtilts.kt b/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/utils/PaparazziUtilts.kt index 44f340ff2..8bb01a8d2 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/utils/PaparazziUtilts.kt +++ b/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/utils/PaparazziUtilts.kt @@ -25,11 +25,11 @@ import com.android.resources.NightMode import com.android.resources.ScreenOrientation import com.walletconnect.android.internal.common.model.ProjectId import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.web3.modal.ui.components.internal.root.Web3ModalRoot -import com.walletconnect.web3.modal.ui.components.internal.root.rememberWeb3ModalRootState +import com.walletconnect.web3.modal.ui.components.internal.root.AppKitRoot +import com.walletconnect.web3.modal.ui.components.internal.root.rememberAppKitRootState import com.walletconnect.web3.modal.ui.components.internal.snackbar.rememberSnackBarState -import com.walletconnect.web3.modal.ui.theme.ProvideWeb3ModalThemeComposition -import com.walletconnect.web3.modal.ui.theme.Web3ModalTheme +import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition +import com.walletconnect.web3.modal.ui.theme.AppKitTheme import org.junit.Rule import org.koin.dsl.module import java.io.File @@ -82,14 +82,14 @@ internal abstract class ScreenShotTest( ) snapshot { val scope = rememberCoroutineScope() - val rootState = rememberWeb3ModalRootState(coroutineScope = scope, navController = rememberNavController()) + val rootState = rememberAppKitRootState(coroutineScope = scope, navController = rememberNavController()) val snackBarState = rememberSnackBarState(coroutineScope = scope) - ProvideWeb3ModalThemeComposition { + ProvideAppKitThemeComposition { Surface( color = Color.Transparent, shape = RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp) ) { - Web3ModalRoot( + AppKitRoot( rootState = rootState, snackBarState = snackBarState, closeModal = {}, @@ -113,8 +113,8 @@ internal abstract class ScreenShotTest( DeviceConfig(nightMode = nightMode, orientation = orientation, keyboardState = keyboardState) ) snapshot { - ProvideWeb3ModalThemeComposition { - Box(modifier = Modifier.background(Web3ModalTheme.colors.background.color100)) { + ProvideAppKitThemeComposition { + Box(modifier = Modifier.background(AppKitTheme.colors.background.color100)) { Column(modifier = Modifier.padding(4.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) { content() } diff --git a/sample/modal/src/main/AndroidManifest.xml b/sample/modal/src/main/AndroidManifest.xml index 5afc62b49..dfef0f518 100644 --- a/sample/modal/src/main/AndroidManifest.xml +++ b/sample/modal/src/main/AndroidManifest.xml @@ -53,7 +53,7 @@ + AppKit.initialize(Modal.Params.Init(core = CoreClient)) { error -> Timber.e(tag(this), error.throwable.stackTraceToString()) Firebase.crashlytics.recordException(error.throwable) } - Web3Modal.setChains(Web3ModalChainsPresets.ethChains.values.toList()) + AppKit.setChains(AppKitChainsPresets.ethChains.values.toList()) val authParams = Modal.Model.AuthPayloadParams( - chains = Web3ModalChainsPresets.ethChains.values.toList().map { it.id }, + chains = AppKitChainsPresets.ethChains.values.toList().map { it.id }, domain = "sample.kotlin.modal", uri = "https://web3inbox.com/all-apps", nonce = randomBytes(12).bytesToHex(), statement = "I accept the Terms of Service: https://yourDappDomain.com/", methods = EthUtils.ethMethods ) - Web3Modal.setAuthRequestParams(authParams) + AppKit.setAuthRequestParams(authParams) FirebaseAppDistribution.getInstance().updateIfNewReleaseAvailable() } diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/MainActivity.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/MainActivity.kt index f5eb0fac0..1a17bf993 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/MainActivity.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/MainActivity.kt @@ -76,9 +76,9 @@ import com.walletconnect.sample.modal.ui.predefinedRedDarkTheme import com.walletconnect.sample.modal.ui.predefinedRedLightTheme import com.walletconnect.sample.modal.ui.theme.WalletConnectTheme import com.walletconnect.sample.modal.view.ViewActivity -import com.walletconnect.web3.modal.client.Web3Modal -import com.walletconnect.web3.modal.ui.Web3ModalTheme -import com.walletconnect.web3.modal.ui.web3ModalGraph +import com.walletconnect.web3.modal.client.AppKit +import com.walletconnect.web3.modal.ui.AppKitTheme +import com.walletconnect.web3.modal.ui.appKitGraph import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.launch @@ -93,14 +93,14 @@ class MainActivity : ComponentActivity() { var counter = 10 while (!isRegistered && counter-- > 0) { try { - Web3Modal.register(this) + AppKit.register(this) isRegistered = true } catch (e: Exception) { Timber.e(e) runBlocking { delay(100) } } } - if (counter <= 0) throw IllegalStateException("Web3Modal registration failed") + if (counter <= 0) throw IllegalStateException("AppKit registration failed") setContent { WalletConnectTheme { @@ -114,10 +114,10 @@ class MainActivity : ComponentActivity() { val isDarkTheme = isSystemInDarkTheme() var isDark by remember { mutableStateOf(isDarkTheme) } - var darkColors by remember { mutableStateOf(Web3ModalTheme.provideDarkWeb3ModalColor()) } - var lightColors by remember { mutableStateOf(Web3ModalTheme.provideLightWeb3ModalColors()) } - Web3ModalTheme( - mode = if (isDark) Web3ModalTheme.Mode.DARK else Web3ModalTheme.Mode.LIGHT, + var darkColors by remember { mutableStateOf(AppKitTheme.provideDarkAppKitColor()) } + var lightColors by remember { mutableStateOf(AppKitTheme.provideLightAppKitColors()) } + AppKitTheme( + mode = if (isDark) AppKitTheme.Mode.DARK else AppKitTheme.Mode.LIGHT, lightColors = lightColors, darkColors = darkColors ) { @@ -132,7 +132,7 @@ class MainActivity : ComponentActivity() { TopAppBar( title = { Text( - text = "Web3Modal Lab", + text = "AppKit Lab", modifier = Modifier.fillMaxWidth(), textAlign = TextAlign.Center ) @@ -160,7 +160,7 @@ class MainActivity : ComponentActivity() { composable(Route.Lab.path) { LabScreen(navController = navController) } - web3ModalGraph(navController) + appKitGraph(navController) dialog( route = Route.AlertDialog.path + "/{$messageArg}", arguments = listOf(navArgument(messageArg) { type = NavType.StringType }), @@ -178,7 +178,7 @@ class MainActivity : ComponentActivity() { } if (intent?.dataString?.contains("wc_ev") == true) { - Web3Modal.handleDeepLink(intent.dataString ?: "") { + AppKit.handleDeepLink(intent.dataString ?: "") { lifecycleScope.launch(Dispatchers.Main) { Toast.makeText(this@MainActivity, "Error dispatching envelope: ${it.throwable.message}", Toast.LENGTH_SHORT).show() } @@ -190,7 +190,7 @@ class MainActivity : ComponentActivity() { super.onNewIntent(intent) if (intent?.dataString?.contains("wc_ev") == true) { - Web3Modal.handleDeepLink(intent.dataString ?: "") { + AppKit.handleDeepLink(intent.dataString ?: "") { lifecycleScope.launch(Dispatchers.Main) { Toast.makeText(this@MainActivity, "Error dispatching envelope: ${it.throwable.message}", Toast.LENGTH_SHORT).show() } @@ -200,13 +200,13 @@ class MainActivity : ComponentActivity() { override fun onDestroy() { super.onDestroy() - Web3Modal.unregister() + AppKit.unregister() } } @Composable private fun PredefineThemes( - onClick: (Web3ModalTheme.Colors, Web3ModalTheme.Colors) -> Unit, + onClick: (AppKitTheme.Colors, AppKitTheme.Colors) -> Unit, ) { LazyRow( modifier = Modifier @@ -214,7 +214,7 @@ private fun PredefineThemes( .padding(horizontal = 18.dp, vertical = 4.dp), horizontalArrangement = Arrangement.Center ) { - item { ThemeItem(color = Color(0xFF47A1FF), text = "Default") { onClick(Web3ModalTheme.provideLightWeb3ModalColors(), Web3ModalTheme.provideDarkWeb3ModalColor()) } } + item { ThemeItem(color = Color(0xFF47A1FF), text = "Default") { onClick(AppKitTheme.provideLightAppKitColors(), AppKitTheme.provideDarkAppKitColor()) } } item { ThemeItem(color = Color(0xFFFFA500), text = "Orange") { onClick(predefinedOrangeLightTheme, predefinedOrangeDarkTheme) } } item { ThemeItem(color = Color(0xFFB7342B), text = "Red") { onClick(predefinedRedLightTheme, predefinedRedDarkTheme) } } item { ThemeItem(color = Color(0xFF10B124), text = "Green") { onClick(predefinedGreenLightTheme, predefinedGreenDarkTheme) } } diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ModalSampleDelegate.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ModalSampleDelegate.kt index eef293b55..652e8c135 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ModalSampleDelegate.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ModalSampleDelegate.kt @@ -2,7 +2,7 @@ package com.walletconnect.sample.modal import com.walletconnect.sample.common.tag import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.Web3Modal +import com.walletconnect.web3.modal.client.AppKit import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob @@ -12,14 +12,14 @@ import kotlinx.coroutines.flow.asSharedFlow import kotlinx.coroutines.launch import timber.log.Timber -object ModalSampleDelegate : Web3Modal.ModalDelegate { +object ModalSampleDelegate : AppKit.ModalDelegate { private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) private val _wcEventModels: MutableSharedFlow = MutableSharedFlow() val wcEventModels: SharedFlow = _wcEventModels.asSharedFlow() init { - Web3Modal.setDelegate(this) + AppKit.setDelegate(this) } override fun onSessionApproved(approvedSession: Modal.Model.ApprovedSession) { diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/ComposeActivity.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/ComposeActivity.kt index e26042b0c..718651b30 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/ComposeActivity.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/ComposeActivity.kt @@ -29,7 +29,7 @@ import com.google.accompanist.navigation.material.ExperimentalMaterialNavigation import com.google.accompanist.navigation.material.ModalBottomSheetLayout import com.walletconnect.sample.modal.common.Route import com.walletconnect.sample.modal.ui.theme.WalletConnectTheme -import com.walletconnect.web3.modal.ui.web3ModalGraph +import com.walletconnect.web3.modal.ui.appKitGraph class ComposeActivity : ComponentActivity() { @@ -66,7 +66,7 @@ class ComposeActivity : ComponentActivity() { composable(Route.Home.path) { HomeScreen(navController = navController) } - web3ModalGraph(navController) + appKitGraph(navController) } } } diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/HomeScreen.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/HomeScreen.kt index b6a1534b5..76f84f887 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/HomeScreen.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/HomeScreen.kt @@ -16,11 +16,11 @@ import com.walletconnect.web3.modal.ui.components.button.ConnectButton import com.walletconnect.web3.modal.ui.components.button.ConnectButtonSize import com.walletconnect.web3.modal.ui.components.button.NetworkButton import com.walletconnect.web3.modal.ui.components.button.Web3Button -import com.walletconnect.web3.modal.ui.components.button.rememberWeb3ModalState +import com.walletconnect.web3.modal.ui.components.button.rememberAppKitState @Composable fun HomeScreen(navController: NavController) { - val web3ModalState = rememberWeb3ModalState(navController = navController) + val web3ModalState = rememberAppKitState(navController = navController) Column( modifier = Modifier.fillMaxSize(), verticalArrangement = Arrangement.Center, diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/kotlindsl/KotlinDSLActivity.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/kotlindsl/KotlinDSLActivity.kt index f1e761eb2..dba6afb52 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/kotlindsl/KotlinDSLActivity.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/kotlindsl/KotlinDSLActivity.kt @@ -7,7 +7,7 @@ import androidx.navigation.fragment.NavHostFragment import androidx.navigation.fragment.fragment import com.walletconnect.sample.modal.common.Route import com.walletconnect.sample.modal.R -import com.walletconnect.web3.modal.ui.web3Modal +import com.walletconnect.web3.modal.ui.appKit class KotlinDSLActivity : AppCompatActivity(R.layout.activity_kotlin_dsl) { @@ -20,7 +20,7 @@ class KotlinDSLActivity : AppCompatActivity(R.layout.activity_kotlin_dsl) { startDestination = Route.Home.path ) { fragment(Route.Home.path) - web3Modal() + appKit() } } } \ No newline at end of file diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/LabScreen.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/LabScreen.kt index 366bcb1b7..d2574ad2e 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/LabScreen.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/LabScreen.kt @@ -20,14 +20,14 @@ import com.walletconnect.sample.common.getPersonalSignBody import com.walletconnect.sample.common.ui.commons.BlueButton import com.walletconnect.sample.modal.ModalSampleDelegate import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.Web3Modal +import com.walletconnect.web3.modal.client.AppKit import com.walletconnect.web3.modal.client.models.request.Request import com.walletconnect.web3.modal.client.models.request.SentRequestResult -import com.walletconnect.web3.modal.ui.Web3ModalTheme +import com.walletconnect.web3.modal.ui.AppKitTheme import com.walletconnect.web3.modal.ui.components.button.AccountButtonType import com.walletconnect.web3.modal.ui.components.button.NetworkButton import com.walletconnect.web3.modal.ui.components.button.Web3Button -import com.walletconnect.web3.modal.ui.components.button.rememberWeb3ModalState +import com.walletconnect.web3.modal.ui.components.button.rememberAppKitState import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -35,7 +35,7 @@ import kotlinx.coroutines.launch fun LabScreen( navController: NavController ) { - val web3ModalState = rememberWeb3ModalState(navController = navController) + val web3ModalState = rememberAppKitState(navController = navController) val isConnected by web3ModalState.isConnected.collectAsState() val coroutineScope = rememberCoroutineScope() @@ -62,8 +62,8 @@ fun LabScreen( } } - Web3ModalTheme( - mode = Web3ModalTheme.Mode.AUTO + AppKitTheme( + mode = AppKitTheme.Mode.AUTO ) { LazyColumn( modifier = Modifier.fillMaxSize(), @@ -73,7 +73,7 @@ fun LabScreen( item { Web3Button(state = web3ModalState, accountButtonType = AccountButtonType.MIXED) } item { NetworkButton(state = web3ModalState) } if (isConnected) { - Web3Modal.getAccount()?.let { session -> + AppKit.getAccount()?.let { session -> val account = session.address val onError: (Throwable) -> Unit = { coroutineScope.launch(Dispatchers.Main) { @@ -94,7 +94,7 @@ private fun sendPersonalSignRequest( onSuccess: (SentRequestResult) -> Unit, onError: (Throwable) -> Unit ) { - Web3Modal.request( + AppKit.request( request = Request("personal_sign", getPersonalSignBody(account)), onSuccess = onSuccess, onError = onError, @@ -106,7 +106,7 @@ private fun sendEthSendTransactionRequest( onSuccess: (SentRequestResult) -> Unit, onError: (Throwable) -> Unit ) { - Web3Modal.request( + AppKit.request( request = Request("eth_sendTransaction", getEthSendTransaction(account)), onSuccess = onSuccess, onError = onError, @@ -118,7 +118,7 @@ private fun sendEthSignTypedDataRequest( onSuccess: (SentRequestResult) -> Unit, onError: (Throwable) -> Unit ) { - Web3Modal.request( + AppKit.request( request = Request("eth_signTypedData", getEthSignTypedData(account)), onSuccess = onSuccess, onError = onError, diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/PredifinedThemes.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/PredifinedThemes.kt index fbd5d59a6..164ac248a 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/PredifinedThemes.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/PredifinedThemes.kt @@ -1,41 +1,41 @@ package com.walletconnect.sample.modal.ui import androidx.compose.ui.graphics.Color -import com.walletconnect.web3.modal.ui.Web3ModalTheme +import com.walletconnect.web3.modal.ui.AppKitTheme -val predefinedOrangeLightTheme = Web3ModalTheme.provideLightWeb3ModalColors( +val predefinedOrangeLightTheme = AppKitTheme.provideLightAppKitColors( accent100 = Color(0xFFFFA500), accent90 = Color(0xFFC7912F), accent80 = Color(0xFFA5864E), - foreground = Web3ModalTheme.provideForegroundLightColorPalette(color100 = Color(0xFFBE7B00)) + foreground = AppKitTheme.provideForegroundLightColorPalette(color100 = Color(0xFFBE7B00)) ) -val predefinedOrangeDarkTheme = Web3ModalTheme.provideDarkWeb3ModalColor( +val predefinedOrangeDarkTheme = AppKitTheme.provideDarkAppKitColor( accent100 = Color(0xFFFFA500), accent90 = Color(0xFFC7912F), accent80 = Color(0xFFA5864E), - foreground = Web3ModalTheme.provideForegroundDarkColorPalette(color100 = Color(0xFFFFA500)) + foreground = AppKitTheme.provideForegroundDarkColorPalette(color100 = Color(0xFFFFA500)) ) -val predefinedRedLightTheme = Web3ModalTheme.provideLightWeb3ModalColors( +val predefinedRedLightTheme = AppKitTheme.provideLightAppKitColors( accent100 = Color(0xFFB7342B), accent90 = Color(0xFFA54740), accent80 = Color(0xFF94504B), - background = Web3ModalTheme.provideBackgroundLightColorPalette(color100 = Color(0xFFFFCECA)) + background = AppKitTheme.provideBackgroundLightColorPalette(color100 = Color(0xFFFFCECA)) ) -val predefinedRedDarkTheme = Web3ModalTheme.provideDarkWeb3ModalColor( +val predefinedRedDarkTheme = AppKitTheme.provideDarkAppKitColor( accent100 = Color(0xFFB7342B), accent90 = Color(0xFFA54740), accent80 = Color(0xFF94504B), - background = Web3ModalTheme.provideBackgroundDarkColorPalette(color100 = Color(0xFF350400)) + background = AppKitTheme.provideBackgroundDarkColorPalette(color100 = Color(0xFF350400)) ) -val predefinedGreenLightTheme = Web3ModalTheme.provideLightWeb3ModalColors( +val predefinedGreenLightTheme = AppKitTheme.provideLightAppKitColors( accent100 = Color(0xFF10B124), accent90 = Color(0xFF31AD41), accent80 = Color(0xFF3B7242), overlay = Color(0xFF10B124) ) -val predefinedGreenDarkTheme = Web3ModalTheme.provideDarkWeb3ModalColor( +val predefinedGreenDarkTheme = AppKitTheme.provideDarkAppKitColor( accent100 = Color(0xFF10B124), accent90 = Color(0xFF31AD41), accent80 = Color(0xFF3B7242), diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/view/ViewActivity.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/view/ViewActivity.kt index 2882a5dee..4a4ecb2ec 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/view/ViewActivity.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/view/ViewActivity.kt @@ -3,13 +3,13 @@ package com.walletconnect.sample.modal.view import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import com.walletconnect.sample.modal.R -import com.walletconnect.web3.modal.ui.Web3ModalView +import com.walletconnect.web3.modal.ui.AppKitView class ViewActivity: AppCompatActivity(R.layout.activity_view) { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - val view = findViewById(R.id.web3Modal) + val view = findViewById(R.id.web3Modal) view.setOnCloseModal { finish() } } diff --git a/sample/modal/src/main/res/layout/activity_view.xml b/sample/modal/src/main/res/layout/activity_view.xml index f01a4f678..2edde0de1 100644 --- a/sample/modal/src/main/res/layout/activity_view.xml +++ b/sample/modal/src/main/res/layout/activity_view.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - Web3Modal Lab + AppKit Lab Connect Wallet \ No newline at end of file From b1a3fff452d3a31756f3b5e0b4f992b2e3106c79 Mon Sep 17 00:00:00 2001 From: kubel Date: Wed, 4 Sep 2024 14:59:42 +0200 Subject: [PATCH 14/51] Rename com.walletconnect.foundation to com.walletconnect.reown --- .github/actions/ci_relay/action.yml | 2 +- .../android/LinkModeInteractorTests.kt | 2 +- .../WCInstrumentedActivityScenario.kt | 2 +- .../KeyserverInstrumentedAndroidTest.kt | 4 ++-- .../android/test/utils/ChainAccounts.kt | 2 +- .../android/internal/Validator.kt | 2 +- .../connection/DefaultConnectionLifecycle.kt | 2 +- .../connection/ManualConnectionLifecycle.kt | 2 +- .../common/crypto/codec/ChaChaPolyCodec.kt | 4 ++-- .../internal/common/crypto/codec/Codec.kt | 2 +- .../BouncyCastleKeyManagementRepository.kt | 8 +++---- .../crypto/kmr/KeyManagementRepository.kt | 8 +++---- .../internal/common/di/CoreCommonModule.kt | 6 ++--- .../internal/common/di/CoreCryptoModule.kt | 4 ++-- .../internal/common/di/CoreNetworkModule.kt | 4 ++-- .../common/explorer/ExplorerProtocol.kt | 2 +- .../link_mode/LinkModeJsonRpcInteractor.kt | 2 +- .../domain/relay/RelayJsonRpcInteractor.kt | 8 +++---- .../common/json_rpc/model/JsonRpcMapper.kt | 4 ++-- .../clientid/ClientIdJwtRepositoryAndroid.kt | 6 ++--- .../GenerateJwtStoreClientIdUseCase.kt | 2 +- .../common/jwt/did/DidJwtRepository.kt | 4 ++-- .../jwt/did/EncodeDidJwtPayloadUseCase.kt | 8 +++---- .../EncodeIdentityKeyDidJwtPayloadUseCase.kt | 4 ++-- .../internal/common/model/IrnParams.kt | 2 +- .../android/internal/common/model/Pairing.kt | 2 +- .../internal/common/model/Participants.kt | 2 +- .../internal/common/model/SymmetricKey.kt | 2 +- .../internal/common/model/WCRequest.kt | 2 +- .../internal/common/model/WCResponse.kt | 2 +- .../internal/common/model/WalletConnectUri.kt | 2 +- .../type/RelayJsonRpcInteractorInterface.kt | 2 +- .../internal/common/model/type/Sequence.kt | 2 +- .../common/storage/key_chain/KeyChain.kt | 2 +- .../common/storage/key_chain/KeyStore.kt | 2 +- .../metadata/MetadataStorageRepository.kt | 2 +- .../MetadataStorageRepositoryInterface.kt | 2 +- .../pairing/PairingStorageRepository.kt | 2 +- .../PairingStorageRepositoryInterface.kt | 2 +- .../common/storage/rpc/JsonRpcHistory.kt | 4 ++-- .../android/internal/utils/Context.kt | 2 +- .../keyserver/domain/IdentitiesInteractor.kt | 14 +++++------ .../android/pairing/client/PairingProtocol.kt | 2 +- .../pairing/engine/domain/PairingEngine.kt | 6 ++--- .../pairing/handler/PairingController.kt | 2 +- .../handler/PairingControllerInterface.kt | 2 +- .../pairing/model/mapper/PairingMapper.kt | 2 +- .../domain/InsertTelemetryEventUseCase.kt | 2 +- .../pulse/domain/SendBatchEventUseCase.kt | 2 +- .../android/pulse/domain/SendEventUseCase.kt | 2 +- .../android/relay/RelayClient.kt | 4 ++-- .../android/relay/RelayConnectionInterface.kt | 2 +- .../android/verify/domain/JWTRepository.kt | 2 +- .../di/CoreStorageModule.kt | 2 +- .../BouncyCastleCryptoRepositoryTest.kt | 6 ++--- .../android/internal/ChaChaPolyCodecTest.kt | 4 ++-- .../internal/InsertEventUseCaseTest.kt | 2 +- .../InsertTelemetryEventUseCaseTest.kt | 2 +- .../android/internal/KeyChainMock.kt | 2 +- .../android/internal/RelayClientTests.kt | 4 ++-- .../internal/ResolveAttestationUseCaseTest.kt | 2 +- .../internal/SendBatchEventUseCaseTest.kt | 2 +- .../android/internal/SendEventUseCaseTest.kt | 2 +- .../android/internal/ValidatorTest.kt | 2 +- .../ClientIdJwtRepositoryAndroidTest.kt | 6 ++--- .../internal/domain/RelayerInteractorTest.kt | 10 ++++---- .../foundation/common/RelayMapper.kt | 6 ++--- .../common/adapters/SubscriptionIdAdapter.kt | 4 ++-- .../common/adapters/TopicAdapter.kt | 4 ++-- .../foundation/common/adapters/TtlAdapter.kt | 4 ++-- .../foundation/common/model/Key.kt | 2 +- .../foundation/common/model/SubscriptionId.kt | 2 +- .../foundation/common/model/Topic.kt | 2 +- .../foundation/common/model/Ttl.kt | 2 +- .../repository/BaseClientIdJwtRepository.kt | 20 ++++++++-------- .../data/repository/ClientIdJwtRepository.kt | 2 +- .../data/repository/model/IrnJwtClaims.kt | 4 ++-- .../foundation/di/FoundationCommonModule.kt | 16 ++++++------- .../foundation/di/FoundationCryptoModule.kt | 18 ++++++++++++++ .../foundation/di/FoundationDITags.kt | 2 +- .../foundation/di/FoundationNetworkModule.kt | 8 +++---- .../foundation/network/BaseRelayClient.kt | 24 +++++++++---------- .../foundation/network/ConnectionLifecycle.kt | 2 +- .../foundation/network/RelayInterface.kt | 4 ++-- .../network/data/adapter/FlowStreamAdapter.kt | 2 +- .../network/data/service/RelayService.kt | 4 ++-- .../foundation/network/model/JsonRpcRelay.kt | 2 +- .../foundation/network/model/Relay.kt | 2 +- .../foundation/network/model/RelayDTO.kt | 14 +++++------ .../foundation/util/Logger.kt | 2 +- .../foundation/util/Scope.kt | 2 +- .../foundation/util/UtilFunctions.kt | 0 .../foundation/util/jwt/JwtClaims.kt | 2 +- .../foundation/util/jwt/JwtHeader.kt | 2 +- .../foundation/util/jwt/JwtUtils.kt | 6 ++--- .../foundation/di/FoundationCryptoModule.kt | 18 -------------- .../foundation/BaseRelayClientTest.kt | 20 ++++++++-------- .../com/walletconnect/foundation/RelayTest.kt | 20 ++++++++-------- .../com/walletconnect/foundation/UtilsTest.kt | 2 +- .../adapters/SubscriptionIdAdapterTest.kt | 6 ++--- .../foundation/adapters/TopicAdapterTest.kt | 6 ++--- .../foundation/adapters/TtlAdapterTest.kt | 6 ++--- .../repository/ClientIdJwtRepositoryTest.kt | 8 +++---- .../wcmodal/ui/WalletConnectModalViewModel.kt | 2 +- .../ui/WalletConnectModalViewModelTest.kt | 2 +- .../web3/modal/data/BalanceRpcRepository.kt | 2 +- .../web3/modal/engine/AppKitEngine.kt | 2 +- .../modal/ui/components/button/AppKitState.kt | 2 +- .../ui/routes/account/AccountViewModel.kt | 2 +- .../ui/routes/connect/ConnectViewModel.kt | 2 +- .../ClientInstrumentedActivityScenario.kt | 2 +- .../notify/test/utils/TestClient.kt | 2 +- .../com/walletconnect/notify/client/Notify.kt | 2 +- .../CacaoPayloadWithIdentityPrivateKey.kt | 2 +- .../notify/common/model/RegisteredAccount.kt | 4 ++-- .../notify/common/model/Subscription.kt | 4 ++-- .../notify/common/model/TimeoutInfo.kt | 2 +- .../notify/data/jwt/NotifyJwtBase.kt | 2 +- .../delete/EncodeDeleteRequestJwtUseCase.kt | 8 +++---- ...EncodeGetNotificationsRequestJwtUseCase.kt | 8 +++---- .../EncodeMessageResponseJwtUseCase.kt | 8 +++---- .../EncodeSubscriptionRequestJwtUseCase.kt | 8 +++---- ...eSubscriptionsChangedResponseJwtUseCase.kt | 6 ++--- .../update/EncodeUpdateRequestJwtUseCase.kt | 8 +++---- ...codeWatchSubscriptionsRequestJwtUseCase.kt | 8 +++---- .../storage/RegisteredAccountsRepository.kt | 4 ++-- .../data/storage/SubscriptionRepository.kt | 4 ++-- .../calls/DecryptNotifyMessageUseCase.kt | 4 ++-- .../engine/calls/DeleteSubscriptionUseCase.kt | 4 ++-- .../calls/GetNotificationHistoryUseCase.kt | 6 ++--- .../calls/PrepareRegistrationUseCase.kt | 2 +- .../engine/calls/SubscribeToDappUseCase.kt | 8 +++---- .../notify/engine/calls/UnregisterUseCase.kt | 2 +- .../engine/calls/UpdateSubscriptionUseCase.kt | 4 ++-- .../ExtractPublicKeysFromDidJsonUseCase.kt | 2 +- .../engine/domain/FetchDidJwtInteractor.kt | 4 ++-- .../FindRequestedSubscriptionUseCase.kt | 2 +- .../GetSelfKeyForWatchSubscriptionUseCase.kt | 2 +- .../domain/SetActiveSubscriptionsUseCase.kt | 4 ++-- ...iptionsForEveryRegisteredAccountUseCase.kt | 2 +- .../domain/WatchSubscriptionsUseCase.kt | 2 +- .../engine/requests/OnMessageUseCase.kt | 8 +++---- .../requests/OnSubscriptionsChangedUseCase.kt | 8 +++---- .../responses/OnDeleteResponseUseCase.kt | 4 ++-- .../OnGetNotificationsResponseUseCase.kt | 2 +- .../responses/OnSubscribeResponseUseCase.kt | 6 ++--- .../responses/OnUpdateResponseUseCase.kt | 4 ++-- .../OnWatchSubscriptionsResponseUseCase.kt | 6 ++--- .../HybridAppInstrumentedActivityScenario.kt | 2 +- .../SignClientInstrumentedActivityScenario.kt | 2 +- .../walletconnect/sign/client/SignProtocol.kt | 2 +- .../sign/common/model/Request.kt | 2 +- .../common/model/vo/proposal/ProposalVO.kt | 2 +- .../common/model/vo/sequence/SessionVO.kt | 4 ++-- .../sign/common/validator/SignValidator.kt | 2 +- .../sign/engine/domain/SignEngine.kt | 2 +- .../sign/engine/model/EngineDO.kt | 2 +- .../sign/engine/model/mapper/EngineMapper.kt | 4 ++-- .../ApproveSessionAuthenticateUseCase.kt | 8 +++---- .../use_case/calls/ApproveSessionUseCase.kt | 8 +++---- .../calls/DecryptSignMessageUseCase.kt | 2 +- .../calls/DisconnectSessionUseCase.kt | 6 ++--- .../engine/use_case/calls/EmitEventUseCase.kt | 6 ++--- .../use_case/calls/ExtendSessionUseCase.kt | 6 ++--- .../sign/engine/use_case/calls/PingUseCase.kt | 6 ++--- .../use_case/calls/ProposeSessionUseCase.kt | 6 ++--- .../calls/RejectSessionAuthenticateUseCase.kt | 8 +++---- .../use_case/calls/RejectSessionUseCase.kt | 4 ++-- .../calls/RespondSessionRequestUseCase.kt | 6 ++--- .../calls/SessionAuthenticateUseCase.kt | 8 +++---- .../use_case/calls/SessionRequestUseCase.kt | 6 ++--- .../use_case/calls/SessionUpdateUseCase.kt | 6 ++--- .../engine/use_case/requests/OnPingUseCase.kt | 4 ++-- .../requests/OnSessionAuthenticateUseCase.kt | 4 ++-- .../requests/OnSessionDeleteUseCase.kt | 4 ++-- .../requests/OnSessionEventUseCase.kt | 4 ++-- .../requests/OnSessionExtendUseCase.kt | 4 ++-- .../requests/OnSessionProposalUseCase.kt | 4 ++-- .../requests/OnSessionRequestUseCase.kt | 4 ++-- .../requests/OnSessionSettleUseCase.kt | 6 ++--- .../requests/OnSessionUpdateUseCase.kt | 4 ++-- .../OnSessionAuthenticateResponseUseCase.kt | 6 ++--- .../OnSessionProposalResponseUseCase.kt | 4 ++-- .../OnSessionRequestResponseUseCase.kt | 2 +- .../OnSessionSettleResponseUseCase.kt | 2 +- .../OnSessionUpdateResponseUseCase.kt | 2 +- .../GetPendingRequestsByTopicUseCase.kt | 2 +- .../GetPendingSessionRequestByTopicUseCase.kt | 2 +- .../sign/json_rpc/model/JsonRpcMapper.kt | 2 +- .../proposal/ProposalStorageRepository.kt | 2 +- .../sequence/SessionStorageRepository.kt | 4 ++-- .../ApproveSessionAuthenticateUseCaseTest.kt | 6 ++--- .../calls/ApproveSessionUseCaseTest.kt | 6 ++--- .../calls/DisconnectSessionUseCaseTest.kt | 2 +- .../use_case/calls/EmitEventUseCaseTest.kt | 4 ++-- .../calls/ExtendSessionUseCaseTest.kt | 6 ++--- .../calls/ProposeSessionUseCaseTest.kt | 4 ++-- .../use_case/calls/ProposeUseCaseTest.kt | 6 ++--- .../RejectSessionAuthenticateUseCaseTest.kt | 6 ++--- .../calls/RespondSessionRequestUseCaseTest.kt | 2 +- .../calls/SessionAuthenticateUseCaseTest.kt | 6 ++--- .../calls/SessionRequestUseCaseTest.kt | 2 +- .../calls/SessionUpdateUseCaseTest.kt | 2 +- .../sign/mappers/EngineMapperTest.kt | 2 +- .../sign/validator/ValidatorTest.kt | 2 +- .../sample/wallet/WalletKitApplication.kt | 2 +- .../sample/wallet/Web3WalletMessageService.kt | 2 +- 207 files changed, 443 insertions(+), 443 deletions(-) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/common/RelayMapper.kt (93%) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/common/adapters/SubscriptionIdAdapter.kt (88%) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/common/adapters/TopicAdapter.kt (88%) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/common/adapters/TtlAdapter.kt (88%) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/common/model/Key.kt (85%) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/common/model/SubscriptionId.kt (69%) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/common/model/Topic.kt (76%) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/common/model/Ttl.kt (68%) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/crypto/data/repository/BaseClientIdJwtRepository.kt (81%) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/crypto/data/repository/ClientIdJwtRepository.kt (67%) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/crypto/data/repository/model/IrnJwtClaims.kt (75%) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/di/FoundationCommonModule.kt (75%) create mode 100644 foundation/src/main/kotlin/com/reown/foundation/di/FoundationCryptoModule.kt rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/di/FoundationDITags.kt (78%) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/di/FoundationNetworkModule.kt (91%) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/network/BaseRelayClient.kt (96%) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/network/ConnectionLifecycle.kt (74%) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/network/RelayInterface.kt (90%) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/network/data/adapter/FlowStreamAdapter.kt (92%) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/network/data/service/RelayService.kt (93%) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/network/model/JsonRpcRelay.kt (88%) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/network/model/Relay.kt (99%) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/network/model/RelayDTO.kt (95%) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/util/Logger.kt (79%) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/util/Scope.kt (83%) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/util/UtilFunctions.kt (100%) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/util/jwt/JwtClaims.kt (50%) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/util/jwt/JwtHeader.kt (90%) rename foundation/src/main/kotlin/com/{walletconnect => reown}/foundation/util/jwt/JwtUtils.kt (97%) delete mode 100644 foundation/src/main/kotlin/com/walletconnect/foundation/di/FoundationCryptoModule.kt diff --git a/.github/actions/ci_relay/action.yml b/.github/actions/ci_relay/action.yml index 0346f9a53..d490aaf1e 100644 --- a/.github/actions/ci_relay/action.yml +++ b/.github/actions/ci_relay/action.yml @@ -35,4 +35,4 @@ runs: - name: Relay integration tests # TODO: Add SDK_VERSION env var shell: bash - run: ./gradlew :foundation:test --tests "com.walletconnect.foundation.RelayTest" -i \ No newline at end of file + run: ./gradlew :foundation:test --tests "com.reown.foundation.RelayTest" -i \ No newline at end of file diff --git a/core/android/src/androidTest/kotlin/com/walletconnect/android/LinkModeInteractorTests.kt b/core/android/src/androidTest/kotlin/com/walletconnect/android/LinkModeInteractorTests.kt index 314535021..0aadda012 100644 --- a/core/android/src/androidTest/kotlin/com/walletconnect/android/LinkModeInteractorTests.kt +++ b/core/android/src/androidTest/kotlin/com/walletconnect/android/LinkModeInteractorTests.kt @@ -13,7 +13,7 @@ import com.walletconnect.android.internal.common.model.sync.ClientJsonRpc import com.walletconnect.android.internal.common.model.type.JsonRpcClientSync import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic import io.mockk.coEvery import io.mockk.coVerify import io.mockk.every diff --git a/core/android/src/androidTest/kotlin/com/walletconnect/android/test/activity/WCInstrumentedActivityScenario.kt b/core/android/src/androidTest/kotlin/com/walletconnect/android/test/activity/WCInstrumentedActivityScenario.kt index 72fea4d22..4efbfac66 100644 --- a/core/android/src/androidTest/kotlin/com/walletconnect/android/test/activity/WCInstrumentedActivityScenario.kt +++ b/core/android/src/androidTest/kotlin/com/walletconnect/android/test/activity/WCInstrumentedActivityScenario.kt @@ -5,7 +5,7 @@ import androidx.test.core.app.ActivityScenario import com.walletconnect.android.BuildConfig import com.walletconnect.android.internal.common.scope import com.walletconnect.android.test.utils.TestClient -import com.walletconnect.foundation.network.model.Relay +import com.reown.foundation.network.model.Relay import junit.framework.TestCase.assertTrue import junit.framework.TestCase.fail import kotlinx.coroutines.CoroutineScope diff --git a/core/android/src/androidTest/kotlin/com/walletconnect/android/test/client/KeyserverInstrumentedAndroidTest.kt b/core/android/src/androidTest/kotlin/com/walletconnect/android/test/client/KeyserverInstrumentedAndroidTest.kt index 90506eee9..a17fdb70d 100644 --- a/core/android/src/androidTest/kotlin/com/walletconnect/android/test/client/KeyserverInstrumentedAndroidTest.kt +++ b/core/android/src/androidTest/kotlin/com/walletconnect/android/test/client/KeyserverInstrumentedAndroidTest.kt @@ -12,8 +12,8 @@ import com.walletconnect.android.test.utils.TestClient import com.walletconnect.android.test.utils.globalOnError import com.walletconnect.android.utils.cacao.CacaoSignerInterface import com.walletconnect.android.utils.cacao.sign -import com.walletconnect.foundation.common.model.PrivateKey -import com.walletconnect.foundation.util.jwt.encodeEd25519DidKey +import com.reown.foundation.common.model.PrivateKey +import com.reown.foundation.util.jwt.encodeEd25519DidKey import org.junit.Rule import org.junit.Test import timber.log.Timber diff --git a/core/android/src/androidTest/kotlin/com/walletconnect/android/test/utils/ChainAccounts.kt b/core/android/src/androidTest/kotlin/com/walletconnect/android/test/utils/ChainAccounts.kt index 412c3dd3f..89afbf2ae 100644 --- a/core/android/src/androidTest/kotlin/com/walletconnect/android/test/utils/ChainAccounts.kt +++ b/core/android/src/androidTest/kotlin/com/walletconnect/android/test/utils/ChainAccounts.kt @@ -1,6 +1,6 @@ package com.walletconnect.android.test.utils -import com.walletconnect.foundation.common.model.PublicKey +import com.reown.foundation.common.model.PublicKey import io.ipfs.multibase.Multibase import org.web3j.crypto.Keys diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/Validator.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/Validator.kt index f571bef80..d5ec7d5c8 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/Validator.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/Validator.kt @@ -6,7 +6,7 @@ import com.walletconnect.android.internal.common.model.Expiry import com.walletconnect.android.internal.common.model.RelayProtocolOptions import com.walletconnect.android.internal.common.model.SymmetricKey import com.walletconnect.android.internal.common.model.WalletConnectUri -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic import java.net.URI import java.net.URISyntaxException import java.net.URLDecoder diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/DefaultConnectionLifecycle.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/DefaultConnectionLifecycle.kt index d8b4c86b6..579dc3a9f 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/DefaultConnectionLifecycle.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/DefaultConnectionLifecycle.kt @@ -8,7 +8,7 @@ import android.os.Bundle import com.tinder.scarlet.Lifecycle import com.tinder.scarlet.ShutdownReason import com.tinder.scarlet.lifecycle.LifecycleRegistry -import com.walletconnect.foundation.network.ConnectionLifecycle +import com.reown.foundation.network.ConnectionLifecycle import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/ManualConnectionLifecycle.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/ManualConnectionLifecycle.kt index d331c965b..c4ccdca98 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/ManualConnectionLifecycle.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/ManualConnectionLifecycle.kt @@ -4,7 +4,7 @@ package com.walletconnect.android.internal.common.connection import com.tinder.scarlet.Lifecycle import com.tinder.scarlet.lifecycle.LifecycleRegistry -import com.walletconnect.foundation.network.ConnectionLifecycle +import com.reown.foundation.network.ConnectionLifecycle import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/codec/ChaChaPolyCodec.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/codec/ChaChaPolyCodec.kt index 7a1f42789..8e309b656 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/codec/ChaChaPolyCodec.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/codec/ChaChaPolyCodec.kt @@ -10,8 +10,8 @@ import com.walletconnect.android.internal.common.model.Participants import com.walletconnect.android.internal.common.model.SymmetricKey import com.walletconnect.android.internal.common.model.UnknownEnvelopeTypeException import com.walletconnect.android.internal.utils.getParticipantTag -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic +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 diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/codec/Codec.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/codec/Codec.kt index 3b0e27f80..b536a5b4d 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/codec/Codec.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/codec/Codec.kt @@ -2,7 +2,7 @@ package com.walletconnect.android.internal.common.crypto.codec import com.walletconnect.android.internal.common.model.EnvelopeType import com.walletconnect.android.internal.common.model.Participants -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic interface Codec { fun encrypt(topic: Topic, payload: String, envelopeType: EnvelopeType, participants: Participants? = null): ByteArray diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/kmr/BouncyCastleKeyManagementRepository.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/kmr/BouncyCastleKeyManagementRepository.kt index 375bcdb77..48f1bd7f4 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/kmr/BouncyCastleKeyManagementRepository.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/kmr/BouncyCastleKeyManagementRepository.kt @@ -6,10 +6,10 @@ import com.walletconnect.android.internal.common.crypto.sha256 import com.walletconnect.android.internal.common.model.MissingKeyException import com.walletconnect.android.internal.common.model.SymmetricKey import com.walletconnect.android.internal.common.storage.key_chain.KeyStore -import com.walletconnect.foundation.common.model.Key -import com.walletconnect.foundation.common.model.PrivateKey -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic +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 org.bouncycastle.crypto.digests.SHA256Digest diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/kmr/KeyManagementRepository.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/kmr/KeyManagementRepository.kt index c3b602f8f..a4e037351 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/kmr/KeyManagementRepository.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/kmr/KeyManagementRepository.kt @@ -2,10 +2,10 @@ package com.walletconnect.android.internal.common.crypto.kmr import com.walletconnect.android.internal.common.model.MissingKeyException import com.walletconnect.android.internal.common.model.SymmetricKey -import com.walletconnect.foundation.common.model.Key -import com.walletconnect.foundation.common.model.PrivateKey -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic +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 interface KeyManagementRepository { fun setKey(key: Key, tag: String) diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreCommonModule.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreCommonModule.kt index 092f4b2f0..9a233329f 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreCommonModule.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreCommonModule.kt @@ -10,9 +10,9 @@ import com.walletconnect.android.internal.common.adapter.TagsAdapter import com.walletconnect.android.internal.common.model.Expiry import com.walletconnect.android.internal.common.model.Tags import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.foundation.di.FoundationDITags -import com.walletconnect.foundation.di.foundationCommonModule -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.di.FoundationDITags +import com.reown.foundation.di.foundationCommonModule +import com.reown.foundation.util.Logger import org.koin.core.qualifier.named import org.koin.dsl.module import timber.log.Timber diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreCryptoModule.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreCryptoModule.kt index 26dc9649d..585edba22 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreCryptoModule.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreCryptoModule.kt @@ -13,8 +13,8 @@ import com.walletconnect.android.internal.common.crypto.kmr.BouncyCastleKeyManag import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository import com.walletconnect.android.internal.common.jwt.clientid.ClientIdJwtRepositoryAndroid import com.walletconnect.android.internal.common.storage.key_chain.KeyChain -import com.walletconnect.foundation.crypto.data.repository.ClientIdJwtRepository -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.crypto.data.repository.ClientIdJwtRepository +import com.reown.foundation.util.Logger import org.koin.android.ext.koin.androidContext import org.koin.core.qualifier.named import org.koin.core.scope.Scope diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreNetworkModule.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreNetworkModule.kt index b72ff5fc5..24b7b3235 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreNetworkModule.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreNetworkModule.kt @@ -16,8 +16,8 @@ import com.walletconnect.android.internal.common.connection.ManualConnectionLife import com.walletconnect.android.internal.common.jwt.clientid.GenerateJwtStoreClientIdUseCase import com.walletconnect.android.relay.ConnectionType import com.walletconnect.android.relay.NetworkClientTimeout -import com.walletconnect.foundation.network.data.adapter.FlowStreamAdapter -import com.walletconnect.foundation.network.data.service.RelayService +import com.reown.foundation.network.data.adapter.FlowStreamAdapter +import com.reown.foundation.network.data.service.RelayService import okhttp3.Authenticator import okhttp3.Interceptor import okhttp3.OkHttpClient diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/ExplorerProtocol.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/ExplorerProtocol.kt index e94413a63..e7971e622 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/ExplorerProtocol.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/ExplorerProtocol.kt @@ -4,7 +4,7 @@ import com.walletconnect.android.internal.common.di.AndroidCommonDITags import com.walletconnect.android.internal.common.explorer.data.model.Project import com.walletconnect.android.internal.common.explorer.domain.usecase.GetProjectsWithPaginationUseCase import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import org.koin.core.KoinApplication import org.koin.core.qualifier.named diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/link_mode/LinkModeJsonRpcInteractor.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/link_mode/LinkModeJsonRpcInteractor.kt index 9918553b2..538dca1fe 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/link_mode/LinkModeJsonRpcInteractor.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/link_mode/LinkModeJsonRpcInteractor.kt @@ -21,7 +21,7 @@ import com.walletconnect.android.internal.common.model.type.JsonRpcInteractorInt import com.walletconnect.android.internal.common.scope import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic import com.walletconnect.util.Empty import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt index eb0da508c..efd0b14d5 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt @@ -30,10 +30,10 @@ import com.walletconnect.android.internal.common.wcKoinApp import com.walletconnect.android.internal.utils.ObservableMap import com.walletconnect.android.relay.RelayConnectionInterface import com.walletconnect.android.relay.WSSConnectionState -import com.walletconnect.foundation.common.model.SubscriptionId -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.network.model.Relay -import com.walletconnect.foundation.util.Logger +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 kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableSharedFlow diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/model/JsonRpcMapper.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/model/JsonRpcMapper.kt index 4c1098e66..e2f0025a6 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/model/JsonRpcMapper.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/model/JsonRpcMapper.kt @@ -10,8 +10,8 @@ import com.walletconnect.android.internal.common.model.WCRequest import com.walletconnect.android.internal.common.model.WCResponse import com.walletconnect.android.internal.common.model.sync.ClientJsonRpc import com.walletconnect.android.internal.common.model.type.ClientParams -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.network.model.Relay +import com.reown.foundation.common.model.Topic +import com.reown.foundation.network.model.Relay @JvmSynthetic internal fun JsonRpcHistoryRecord.toWCResponse(result: JsonRpcResponse, params: ClientParams): WCResponse = diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/clientid/ClientIdJwtRepositoryAndroid.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/clientid/ClientIdJwtRepositoryAndroid.kt index 99c8d1c4e..b44dd7926 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/clientid/ClientIdJwtRepositoryAndroid.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/clientid/ClientIdJwtRepositoryAndroid.kt @@ -4,9 +4,9 @@ package com.walletconnect.android.internal.common.jwt.clientid import com.walletconnect.android.internal.common.exception.CannotFindKeyPairException import com.walletconnect.android.internal.common.storage.key_chain.KeyStore -import com.walletconnect.foundation.common.model.PrivateKey -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.crypto.data.repository.BaseClientIdJwtRepository +import com.reown.foundation.common.model.PrivateKey +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.crypto.data.repository.BaseClientIdJwtRepository internal class ClientIdJwtRepositoryAndroid(private val keyChain: KeyStore) : BaseClientIdJwtRepository() { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/clientid/GenerateJwtStoreClientIdUseCase.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/clientid/GenerateJwtStoreClientIdUseCase.kt index 9737692b5..944c6908e 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/clientid/GenerateJwtStoreClientIdUseCase.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/clientid/GenerateJwtStoreClientIdUseCase.kt @@ -6,7 +6,7 @@ import android.content.SharedPreferences import androidx.core.content.edit import com.walletconnect.android.internal.common.di.KEY_CLIENT_ID import com.walletconnect.android.utils.strippedUrl -import com.walletconnect.foundation.crypto.data.repository.ClientIdJwtRepository +import com.reown.foundation.crypto.data.repository.ClientIdJwtRepository internal class GenerateJwtStoreClientIdUseCase(private val clientIdJwtRepository: ClientIdJwtRepository, private val sharedPreferences: SharedPreferences) { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/did/DidJwtRepository.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/did/DidJwtRepository.kt index 817ebd73f..7b096e8b1 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/did/DidJwtRepository.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/did/DidJwtRepository.kt @@ -4,8 +4,8 @@ package com.walletconnect.android.internal.common.jwt.did import com.walletconnect.android.internal.common.model.DidJwt -import com.walletconnect.foundation.common.model.PrivateKey -import com.walletconnect.foundation.util.jwt.* +import com.reown.foundation.common.model.PrivateKey +import com.reown.foundation.util.jwt.* fun encodeDidJwt( identityPrivateKey: PrivateKey, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/did/EncodeDidJwtPayloadUseCase.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/did/EncodeDidJwtPayloadUseCase.kt index a723cff17..49ebeb347 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/did/EncodeDidJwtPayloadUseCase.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/did/EncodeDidJwtPayloadUseCase.kt @@ -2,10 +2,10 @@ package com.walletconnect.android.internal.common.jwt.did -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.util.jwt.JwtClaims -import com.walletconnect.foundation.util.jwt.encodeEd25519DidKey -import com.walletconnect.foundation.util.jwt.jwtIatAndExp +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.util.jwt.JwtClaims +import com.reown.foundation.util.jwt.encodeEd25519DidKey +import com.reown.foundation.util.jwt.jwtIatAndExp import java.util.concurrent.TimeUnit interface EncodeDidJwtPayloadUseCase { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/did/EncodeIdentityKeyDidJwtPayloadUseCase.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/did/EncodeIdentityKeyDidJwtPayloadUseCase.kt index 062beeba9..2166d9dfb 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/did/EncodeIdentityKeyDidJwtPayloadUseCase.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/did/EncodeIdentityKeyDidJwtPayloadUseCase.kt @@ -3,8 +3,8 @@ package com.walletconnect.android.internal.common.jwt.did import com.squareup.moshi.Json import com.squareup.moshi.JsonClass import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.foundation.util.jwt.JwtClaims -import com.walletconnect.foundation.util.jwt.encodeDidPkh +import com.reown.foundation.util.jwt.JwtClaims +import com.reown.foundation.util.jwt.encodeDidPkh internal class EncodeIdentityKeyDidJwtPayloadUseCase( private val accountId: AccountId, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/IrnParams.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/IrnParams.kt index 30f508615..b903e2780 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/IrnParams.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/IrnParams.kt @@ -1,5 +1,5 @@ package com.walletconnect.android.internal.common.model -import com.walletconnect.foundation.common.model.Ttl +import com.reown.foundation.common.model.Ttl data class IrnParams(val tag: Tags, val ttl: Ttl, val prompt: Boolean = false) \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Pairing.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Pairing.kt index b4aca8537..bf96df3db 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Pairing.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Pairing.kt @@ -2,7 +2,7 @@ package com.walletconnect.android.internal.common.model import com.walletconnect.android.internal.common.model.type.Sequence import com.walletconnect.android.pairing.model.pairingExpiry -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic data class Pairing( override val topic: Topic, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Participants.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Participants.kt index 1a516c618..bd3c8991f 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Participants.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Participants.kt @@ -1,6 +1,6 @@ package com.walletconnect.android.internal.common.model -import com.walletconnect.foundation.common.model.PublicKey +import com.reown.foundation.common.model.PublicKey data class Participants( val senderPublicKey: PublicKey, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/SymmetricKey.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/SymmetricKey.kt index 469363dab..f7297dfd1 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/SymmetricKey.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/SymmetricKey.kt @@ -1,6 +1,6 @@ package com.walletconnect.android.internal.common.model -import com.walletconnect.foundation.common.model.Key +import com.reown.foundation.common.model.Key @JvmInline value class SymmetricKey(override val keyAsHex: String) : Key \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/WCRequest.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/WCRequest.kt index cb3ac8703..d085a4dcd 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/WCRequest.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/WCRequest.kt @@ -1,7 +1,7 @@ package com.walletconnect.android.internal.common.model import com.walletconnect.android.internal.common.model.type.ClientParams -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic import com.walletconnect.utils.Empty data class WCRequest( diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/WCResponse.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/WCResponse.kt index bbc948193..ad4b7bf88 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/WCResponse.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/WCResponse.kt @@ -2,7 +2,7 @@ package com.walletconnect.android.internal.common.model import com.walletconnect.android.internal.common.JsonRpcResponse import com.walletconnect.android.internal.common.model.type.ClientParams -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic data class WCResponse( val topic: Topic, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/WalletConnectUri.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/WalletConnectUri.kt index 51dafd2db..5e7156cef 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/WalletConnectUri.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/WalletConnectUri.kt @@ -2,7 +2,7 @@ package com.walletconnect.android.internal.common.model -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic data class WalletConnectUri( val topic: Topic, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/RelayJsonRpcInteractorInterface.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/RelayJsonRpcInteractorInterface.kt index 7f535b97c..3522c7171 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/RelayJsonRpcInteractorInterface.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/RelayJsonRpcInteractorInterface.kt @@ -6,7 +6,7 @@ import com.walletconnect.android.internal.common.model.IrnParams import com.walletconnect.android.internal.common.model.Participants import com.walletconnect.android.internal.common.model.WCRequest import com.walletconnect.android.relay.WSSConnectionState -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.StateFlow diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/Sequence.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/Sequence.kt index c675a5c13..0258c61c4 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/Sequence.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/Sequence.kt @@ -1,7 +1,7 @@ package com.walletconnect.android.internal.common.model.type import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic interface Sequence { val topic: Topic diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/key_chain/KeyChain.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/key_chain/KeyChain.kt index ae1d2a0d8..b1b75c655 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/key_chain/KeyChain.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/key_chain/KeyChain.kt @@ -3,7 +3,7 @@ package com.walletconnect.android.internal.common.storage.key_chain import android.content.SharedPreferences -import com.walletconnect.foundation.common.model.Key +import com.reown.foundation.common.model.Key import com.walletconnect.util.bytesToHex import com.walletconnect.util.hexToBytes diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/key_chain/KeyStore.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/key_chain/KeyStore.kt index 780393a40..cc6a0979e 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/key_chain/KeyStore.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/key_chain/KeyStore.kt @@ -2,7 +2,7 @@ package com.walletconnect.android.internal.common.storage.key_chain -import com.walletconnect.foundation.common.model.Key +import com.reown.foundation.common.model.Key interface KeyStore { fun getKey(tag: String): String? diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/metadata/MetadataStorageRepository.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/metadata/MetadataStorageRepository.kt index 8c3d8e721..845953e86 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/metadata/MetadataStorageRepository.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/metadata/MetadataStorageRepository.kt @@ -7,7 +7,7 @@ import com.walletconnect.android.internal.common.model.AppMetaData import com.walletconnect.android.internal.common.model.AppMetaDataType import com.walletconnect.android.internal.common.model.Redirect import com.walletconnect.android.sdk.storage.data.dao.MetaDataQueries -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic internal class MetadataStorageRepository(private val metaDataQueries: MetaDataQueries) : MetadataStorageRepositoryInterface { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/metadata/MetadataStorageRepositoryInterface.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/metadata/MetadataStorageRepositoryInterface.kt index 32a131c8f..d1628353f 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/metadata/MetadataStorageRepositoryInterface.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/metadata/MetadataStorageRepositoryInterface.kt @@ -2,7 +2,7 @@ package com.walletconnect.android.internal.common.storage.metadata import com.walletconnect.android.internal.common.model.AppMetaData import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic interface MetadataStorageRepositoryInterface { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/pairing/PairingStorageRepository.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/pairing/PairingStorageRepository.kt index 63b38f103..6d196be7f 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/pairing/PairingStorageRepository.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/pairing/PairingStorageRepository.kt @@ -7,7 +7,7 @@ import com.walletconnect.android.internal.common.model.Expiry import com.walletconnect.android.internal.common.model.Pairing import com.walletconnect.android.internal.common.model.Redirect import com.walletconnect.android.sdk.storage.data.dao.PairingQueries -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic import com.walletconnect.utils.Empty class PairingStorageRepository(private val pairingQueries: PairingQueries) : PairingStorageRepositoryInterface { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/pairing/PairingStorageRepositoryInterface.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/pairing/PairingStorageRepositoryInterface.kt index 62e18fd05..2842249f0 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/pairing/PairingStorageRepositoryInterface.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/pairing/PairingStorageRepositoryInterface.kt @@ -2,7 +2,7 @@ package com.walletconnect.android.internal.common.storage.pairing import com.walletconnect.android.internal.common.model.Expiry import com.walletconnect.android.internal.common.model.Pairing -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic interface PairingStorageRepositoryInterface { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/rpc/JsonRpcHistory.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/rpc/JsonRpcHistory.kt index 4a6d96176..f297ff2e4 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/rpc/JsonRpcHistory.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/rpc/JsonRpcHistory.kt @@ -3,8 +3,8 @@ package com.walletconnect.android.internal.common.storage.rpc import com.walletconnect.android.internal.common.json_rpc.model.JsonRpcHistoryRecord import com.walletconnect.android.internal.common.model.TransportType import com.walletconnect.android.sdk.storage.data.dao.JsonRpcHistoryQueries -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.Topic +import com.reown.foundation.util.Logger class JsonRpcHistory( private val jsonRpcHistoryQueries: JsonRpcHistoryQueries, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/utils/Context.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/utils/Context.kt index 3e47b5f3d..fe2e61253 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/utils/Context.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/internal/utils/Context.kt @@ -1,7 +1,7 @@ package com.walletconnect.android.internal.utils import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic private const val SELF_PARTICIPANT_CONTEXT = "self_participant/" private const val SELF_INVITE_PUBLIC_KEY_CONTEXT = "self_inviteKey/" diff --git a/core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/IdentitiesInteractor.kt b/core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/IdentitiesInteractor.kt index d500efea8..287a84abf 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/IdentitiesInteractor.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/IdentitiesInteractor.kt @@ -25,13 +25,13 @@ import com.walletconnect.android.internal.utils.getIdentityTag import com.walletconnect.android.keyserver.domain.use_case.RegisterIdentityUseCase import com.walletconnect.android.keyserver.domain.use_case.ResolveIdentityUseCase import com.walletconnect.android.keyserver.domain.use_case.UnregisterIdentityUseCase -import com.walletconnect.foundation.common.model.PrivateKey -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.util.Logger -import com.walletconnect.foundation.util.jwt.DID_DELIMITER -import com.walletconnect.foundation.util.jwt.decodeDidPkh -import com.walletconnect.foundation.util.jwt.encodeDidPkh -import com.walletconnect.foundation.util.jwt.encodeEd25519DidKey +import com.reown.foundation.common.model.PrivateKey +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.util.Logger +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 java.text.SimpleDateFormat diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingProtocol.kt b/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingProtocol.kt index 2f8d9d938..0a11a648f 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingProtocol.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingProtocol.kt @@ -11,7 +11,7 @@ import com.walletconnect.android.pairing.engine.model.EngineDO import com.walletconnect.android.pairing.model.mapper.toCore import com.walletconnect.android.pulse.domain.InsertTelemetryEventUseCase import com.walletconnect.android.relay.RelayConnectionInterface -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import kotlinx.coroutines.flow.* import org.koin.core.KoinApplication diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pairing/engine/domain/PairingEngine.kt b/core/android/src/main/kotlin/com/walletconnect/android/pairing/engine/domain/PairingEngine.kt index aec626150..0e21f67e4 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pairing/engine/domain/PairingEngine.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/pairing/engine/domain/PairingEngine.kt @@ -46,9 +46,9 @@ import com.walletconnect.android.pulse.model.EventType import com.walletconnect.android.pulse.model.Trace import com.walletconnect.android.pulse.model.properties.Properties import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger +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 kotlinx.coroutines.Dispatchers diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pairing/handler/PairingController.kt b/core/android/src/main/kotlin/com/walletconnect/android/pairing/handler/PairingController.kt index 6cb9a20c9..1f44d1622 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pairing/handler/PairingController.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/pairing/handler/PairingController.kt @@ -6,7 +6,7 @@ import com.walletconnect.android.internal.common.model.SDKError import com.walletconnect.android.internal.common.wcKoinApp import com.walletconnect.android.pairing.engine.domain.PairingEngine import com.walletconnect.android.pairing.model.mapper.toAppMetaData -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.merge diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pairing/handler/PairingControllerInterface.kt b/core/android/src/main/kotlin/com/walletconnect/android/pairing/handler/PairingControllerInterface.kt index 0b95ea384..676c1fb9a 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pairing/handler/PairingControllerInterface.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/pairing/handler/PairingControllerInterface.kt @@ -3,7 +3,7 @@ package com.walletconnect.android.pairing.handler import com.walletconnect.android.Core import com.walletconnect.android.internal.common.model.Pairing import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.SharedFlow diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pairing/model/mapper/PairingMapper.kt b/core/android/src/main/kotlin/com/walletconnect/android/pairing/model/mapper/PairingMapper.kt index 5eed91204..5e00de231 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pairing/model/mapper/PairingMapper.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/pairing/model/mapper/PairingMapper.kt @@ -6,7 +6,7 @@ import com.walletconnect.android.internal.common.model.Expiry import com.walletconnect.android.internal.common.model.Pairing import com.walletconnect.android.internal.common.model.Redirect import com.walletconnect.android.pairing.engine.model.EngineDO -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic import com.walletconnect.utils.Empty @JvmSynthetic diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pulse/domain/InsertTelemetryEventUseCase.kt b/core/android/src/main/kotlin/com/walletconnect/android/pulse/domain/InsertTelemetryEventUseCase.kt index ff6858fcb..c73ddf52f 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pulse/domain/InsertTelemetryEventUseCase.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/pulse/domain/InsertTelemetryEventUseCase.kt @@ -2,7 +2,7 @@ package com.walletconnect.android.pulse.domain import com.walletconnect.android.internal.common.storage.events.EventsRepository import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pulse/domain/SendBatchEventUseCase.kt b/core/android/src/main/kotlin/com/walletconnect/android/pulse/domain/SendBatchEventUseCase.kt index d8dd89cb8..21d7c555c 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pulse/domain/SendBatchEventUseCase.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/pulse/domain/SendBatchEventUseCase.kt @@ -5,7 +5,7 @@ import com.walletconnect.android.internal.common.storage.events.EventsRepository import com.walletconnect.android.pulse.data.PulseService import com.walletconnect.android.pulse.model.Event import com.walletconnect.android.pulse.model.SDKType -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pulse/domain/SendEventUseCase.kt b/core/android/src/main/kotlin/com/walletconnect/android/pulse/domain/SendEventUseCase.kt index 6ba684c72..c11faf446 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pulse/domain/SendEventUseCase.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/pulse/domain/SendEventUseCase.kt @@ -8,7 +8,7 @@ import com.walletconnect.android.pulse.data.PulseService import com.walletconnect.android.pulse.model.Event import com.walletconnect.android.pulse.model.SDKType import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import com.walletconnect.util.generateId import kotlinx.coroutines.launch import kotlinx.coroutines.supervisorScope diff --git a/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayClient.kt b/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayClient.kt index e9d556325..017fe3cd7 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayClient.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayClient.kt @@ -11,8 +11,8 @@ import com.walletconnect.android.internal.common.exception.WRONG_CONNECTION_TYPE import com.walletconnect.android.internal.common.scope import com.walletconnect.android.internal.common.wcKoinApp import com.walletconnect.android.utils.toWalletConnectException -import com.walletconnect.foundation.network.BaseRelayClient -import com.walletconnect.foundation.network.model.Relay +import com.reown.foundation.network.BaseRelayClient +import com.reown.foundation.network.model.Relay import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayConnectionInterface.kt b/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayConnectionInterface.kt index 0a6606c63..2527d3875 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayConnectionInterface.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayConnectionInterface.kt @@ -1,7 +1,7 @@ package com.walletconnect.android.relay import com.walletconnect.android.Core -import com.walletconnect.foundation.network.RelayInterface +import com.reown.foundation.network.RelayInterface import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.StateFlow diff --git a/core/android/src/main/kotlin/com/walletconnect/android/verify/domain/JWTRepository.kt b/core/android/src/main/kotlin/com/walletconnect/android/verify/domain/JWTRepository.kt index 5696d0c95..ccd86b3d9 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/verify/domain/JWTRepository.kt +++ b/core/android/src/main/kotlin/com/walletconnect/android/verify/domain/JWTRepository.kt @@ -1,7 +1,7 @@ package com.walletconnect.android.verify.domain import com.walletconnect.android.verify.model.JWK -import com.walletconnect.foundation.util.jwt.JWT_DELIMITER +import com.reown.foundation.util.jwt.JWT_DELIMITER import com.walletconnect.util.bytesToHex import org.bouncycastle.crypto.digests.SHA256Digest import org.bouncycastle.crypto.params.ECDomainParameters diff --git a/core/android/src/release/kotlin/com.walletconnect.android/di/CoreStorageModule.kt b/core/android/src/release/kotlin/com.walletconnect.android/di/CoreStorageModule.kt index def462799..9f1c96988 100644 --- a/core/android/src/release/kotlin/com.walletconnect.android/di/CoreStorageModule.kt +++ b/core/android/src/release/kotlin/com.walletconnect.android/di/CoreStorageModule.kt @@ -19,7 +19,7 @@ import com.walletconnect.android.internal.common.di.DatabaseConfig import com.walletconnect.android.internal.common.di.baseStorageModule import com.walletconnect.android.internal.common.di.deleteDatabases import com.walletconnect.android.sdk.core.AndroidCoreDatabase -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import com.walletconnect.util.randomBytes import com.walletconnect.utils.Empty import net.sqlcipher.database.SQLiteDatabaseHook diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/BouncyCastleCryptoRepositoryTest.kt b/core/android/src/test/kotlin/com/walletconnect/android/internal/BouncyCastleCryptoRepositoryTest.kt index 078c6d22e..fa2031bf5 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/BouncyCastleCryptoRepositoryTest.kt +++ b/core/android/src/test/kotlin/com/walletconnect/android/internal/BouncyCastleCryptoRepositoryTest.kt @@ -2,9 +2,9 @@ package com.walletconnect.android.internal import com.walletconnect.android.internal.common.crypto.kmr.BouncyCastleKeyManagementRepository import com.walletconnect.android.internal.common.storage.key_chain.KeyStore -import com.walletconnect.foundation.common.model.PrivateKey -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic +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 io.mockk.spyk import junit.framework.TestCase.assertEquals diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/ChaChaPolyCodecTest.kt b/core/android/src/test/kotlin/com/walletconnect/android/internal/ChaChaPolyCodecTest.kt index 178cc1914..86cd2e567 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/ChaChaPolyCodecTest.kt +++ b/core/android/src/test/kotlin/com/walletconnect/android/internal/ChaChaPolyCodecTest.kt @@ -8,8 +8,8 @@ import com.walletconnect.android.internal.common.model.Participants import com.walletconnect.android.internal.common.model.SymmetricKey import com.walletconnect.android.internal.common.model.EnvelopeType import com.walletconnect.android.internal.utils.getParticipantTag -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.common.model.Topic import com.walletconnect.utils.Empty import io.mockk.every import io.mockk.mockk diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/InsertEventUseCaseTest.kt b/core/android/src/test/kotlin/com/walletconnect/android/internal/InsertEventUseCaseTest.kt index a63787c4a..9db278775 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/InsertEventUseCaseTest.kt +++ b/core/android/src/test/kotlin/com/walletconnect/android/internal/InsertEventUseCaseTest.kt @@ -2,7 +2,7 @@ package com.walletconnect.android.internal import com.walletconnect.android.internal.common.storage.events.EventsRepository import com.walletconnect.android.pulse.domain.InsertEventUseCase import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import io.mockk.coEvery import io.mockk.coVerify import io.mockk.mockk diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/InsertTelemetryEventUseCaseTest.kt b/core/android/src/test/kotlin/com/walletconnect/android/internal/InsertTelemetryEventUseCaseTest.kt index ef53b7d2e..bb2aacd65 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/InsertTelemetryEventUseCaseTest.kt +++ b/core/android/src/test/kotlin/com/walletconnect/android/internal/InsertTelemetryEventUseCaseTest.kt @@ -3,7 +3,7 @@ package com.walletconnect.android.internal import com.walletconnect.android.internal.common.storage.events.EventsRepository import com.walletconnect.android.pulse.domain.InsertTelemetryEventUseCase import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import io.mockk.Runs import io.mockk.coEvery import io.mockk.coVerify diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/KeyChainMock.kt b/core/android/src/test/kotlin/com/walletconnect/android/internal/KeyChainMock.kt index 8beb25bf9..3ef2b2de9 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/KeyChainMock.kt +++ b/core/android/src/test/kotlin/com/walletconnect/android/internal/KeyChainMock.kt @@ -1,7 +1,7 @@ package com.walletconnect.android.internal import com.walletconnect.android.internal.common.storage.key_chain.KeyStore -import com.walletconnect.foundation.common.model.Key +import com.reown.foundation.common.model.Key import com.walletconnect.util.bytesToHex import com.walletconnect.util.hexToBytes diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/RelayClientTests.kt b/core/android/src/test/kotlin/com/walletconnect/android/internal/RelayClientTests.kt index a594ec549..a2c9e3071 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/RelayClientTests.kt +++ b/core/android/src/test/kotlin/com/walletconnect/android/internal/RelayClientTests.kt @@ -8,8 +8,8 @@ import com.walletconnect.android.internal.common.di.AndroidCommonDITags import com.walletconnect.android.internal.common.scope import com.walletconnect.android.relay.ConnectionType import com.walletconnect.android.relay.RelayClient -import com.walletconnect.foundation.network.data.service.RelayService -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.network.data.service.RelayService +import com.reown.foundation.util.Logger import io.mockk.clearAllMocks import io.mockk.coVerify import io.mockk.every diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/ResolveAttestationUseCaseTest.kt b/core/android/src/test/kotlin/com/walletconnect/android/internal/ResolveAttestationUseCaseTest.kt index 5320f20ea..05d9acadd 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/ResolveAttestationUseCaseTest.kt +++ b/core/android/src/test/kotlin/com/walletconnect/android/internal/ResolveAttestationUseCaseTest.kt @@ -10,7 +10,7 @@ import com.walletconnect.android.verify.client.VerifyInterface import com.walletconnect.android.verify.domain.ResolveAttestationIdUseCase import com.walletconnect.android.verify.domain.VerifyResult import com.walletconnect.android.verify.model.VerifyContext -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic import com.walletconnect.utils.Empty import io.mockk.Runs import io.mockk.coEvery diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/SendBatchEventUseCaseTest.kt b/core/android/src/test/kotlin/com/walletconnect/android/internal/SendBatchEventUseCaseTest.kt index 04a8e17b2..9332bb303 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/SendBatchEventUseCaseTest.kt +++ b/core/android/src/test/kotlin/com/walletconnect/android/internal/SendBatchEventUseCaseTest.kt @@ -8,7 +8,7 @@ import com.walletconnect.android.pulse.model.Event import com.walletconnect.android.pulse.model.SDKType import com.walletconnect.android.pulse.model.properties.Properties import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import io.mockk.Runs import io.mockk.coEvery import io.mockk.coVerify diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/SendEventUseCaseTest.kt b/core/android/src/test/kotlin/com/walletconnect/android/internal/SendEventUseCaseTest.kt index 5b14e1ff5..add5656ed 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/SendEventUseCaseTest.kt +++ b/core/android/src/test/kotlin/com/walletconnect/android/internal/SendEventUseCaseTest.kt @@ -7,7 +7,7 @@ import com.walletconnect.android.pulse.domain.SendEventUseCase import com.walletconnect.android.pulse.model.Event import com.walletconnect.android.pulse.model.SDKType import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import io.mockk.Runs import io.mockk.coEvery import io.mockk.coVerify diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/ValidatorTest.kt b/core/android/src/test/kotlin/com/walletconnect/android/internal/ValidatorTest.kt index dcf9dc7c0..2e7156199 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/ValidatorTest.kt +++ b/core/android/src/test/kotlin/com/walletconnect/android/internal/ValidatorTest.kt @@ -4,7 +4,7 @@ import com.walletconnect.android.internal.common.model.Expiry import com.walletconnect.android.internal.common.model.RelayProtocolOptions import com.walletconnect.android.internal.common.model.SymmetricKey import com.walletconnect.android.internal.common.model.WalletConnectUri -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic import junit.framework.TestCase.assertEquals import junit.framework.TestCase.assertNotNull import junit.framework.TestCase.assertNull diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/common/ClientIdJwtRepositoryAndroidTest.kt b/core/android/src/test/kotlin/com/walletconnect/android/internal/common/ClientIdJwtRepositoryAndroidTest.kt index 892772dfa..d00e536aa 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/common/ClientIdJwtRepositoryAndroidTest.kt +++ b/core/android/src/test/kotlin/com/walletconnect/android/internal/common/ClientIdJwtRepositoryAndroidTest.kt @@ -2,9 +2,9 @@ package com.walletconnect.android.internal.common import com.walletconnect.android.internal.KeyChainMock import com.walletconnect.android.internal.common.jwt.clientid.ClientIdJwtRepositoryAndroid -import com.walletconnect.foundation.common.model.PrivateKey -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.util.jwt.jwtIatAndExp +import com.reown.foundation.common.model.PrivateKey +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.util.jwt.jwtIatAndExp import io.mockk.every import io.mockk.mockkStatic import io.mockk.spyk diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/domain/RelayerInteractorTest.kt b/core/android/src/test/kotlin/com/walletconnect/android/internal/domain/RelayerInteractorTest.kt index ea4a6d2db..1662700b9 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/domain/RelayerInteractorTest.kt +++ b/core/android/src/test/kotlin/com/walletconnect/android/internal/domain/RelayerInteractorTest.kt @@ -16,11 +16,11 @@ import com.walletconnect.android.internal.common.storage.push_messages.PushMessa import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory import com.walletconnect.android.internal.common.wcKoinApp import com.walletconnect.android.relay.RelayConnectionInterface -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.network.model.Relay -import com.walletconnect.foundation.network.model.RelayDTO -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.Topic +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.network.model.Relay +import com.reown.foundation.network.model.RelayDTO +import com.reown.foundation.util.Logger import com.walletconnect.utils.Empty import io.mockk.Called import io.mockk.every diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/common/RelayMapper.kt b/foundation/src/main/kotlin/com/reown/foundation/common/RelayMapper.kt similarity index 93% rename from foundation/src/main/kotlin/com/walletconnect/foundation/common/RelayMapper.kt rename to foundation/src/main/kotlin/com/reown/foundation/common/RelayMapper.kt index af6a3adc4..c2767495d 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/common/RelayMapper.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/common/RelayMapper.kt @@ -1,12 +1,12 @@ @file:JvmSynthetic -package com.walletconnect.foundation.common +package com.reown.foundation.common import com.tinder.scarlet.Message import com.tinder.scarlet.ShutdownReason import com.tinder.scarlet.WebSocket -import com.walletconnect.foundation.network.model.Relay -import com.walletconnect.foundation.network.model.RelayDTO +import com.reown.foundation.network.model.Relay +import com.reown.foundation.network.model.RelayDTO @JvmSynthetic fun WebSocket.Event.toRelayEvent() = when (this) { diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/common/adapters/SubscriptionIdAdapter.kt b/foundation/src/main/kotlin/com/reown/foundation/common/adapters/SubscriptionIdAdapter.kt similarity index 88% rename from foundation/src/main/kotlin/com/walletconnect/foundation/common/adapters/SubscriptionIdAdapter.kt rename to foundation/src/main/kotlin/com/reown/foundation/common/adapters/SubscriptionIdAdapter.kt index 111e3ff95..97a14e38d 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/common/adapters/SubscriptionIdAdapter.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/common/adapters/SubscriptionIdAdapter.kt @@ -1,7 +1,7 @@ -package com.walletconnect.foundation.common.adapters +package com.reown.foundation.common.adapters import com.squareup.moshi.* -import com.walletconnect.foundation.common.model.SubscriptionId +import com.reown.foundation.common.model.SubscriptionId internal object SubscriptionIdAdapter: JsonAdapter() { diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/common/adapters/TopicAdapter.kt b/foundation/src/main/kotlin/com/reown/foundation/common/adapters/TopicAdapter.kt similarity index 88% rename from foundation/src/main/kotlin/com/walletconnect/foundation/common/adapters/TopicAdapter.kt rename to foundation/src/main/kotlin/com/reown/foundation/common/adapters/TopicAdapter.kt index e55c6cb6c..5e1bb82dc 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/common/adapters/TopicAdapter.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/common/adapters/TopicAdapter.kt @@ -1,7 +1,7 @@ -package com.walletconnect.foundation.common.adapters +package com.reown.foundation.common.adapters import com.squareup.moshi.* -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic internal object TopicAdapter: JsonAdapter() { diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/common/adapters/TtlAdapter.kt b/foundation/src/main/kotlin/com/reown/foundation/common/adapters/TtlAdapter.kt similarity index 88% rename from foundation/src/main/kotlin/com/walletconnect/foundation/common/adapters/TtlAdapter.kt rename to foundation/src/main/kotlin/com/reown/foundation/common/adapters/TtlAdapter.kt index b16310add..bc30f56b5 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/common/adapters/TtlAdapter.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/common/adapters/TtlAdapter.kt @@ -1,7 +1,7 @@ -package com.walletconnect.foundation.common.adapters +package com.reown.foundation.common.adapters import com.squareup.moshi.* -import com.walletconnect.foundation.common.model.Ttl +import com.reown.foundation.common.model.Ttl internal object TtlAdapter : JsonAdapter() { diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/common/model/Key.kt b/foundation/src/main/kotlin/com/reown/foundation/common/model/Key.kt similarity index 85% rename from foundation/src/main/kotlin/com/walletconnect/foundation/common/model/Key.kt rename to foundation/src/main/kotlin/com/reown/foundation/common/model/Key.kt index 52c55ed8c..62aab91b8 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/common/model/Key.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/common/model/Key.kt @@ -1,4 +1,4 @@ -package com.walletconnect.foundation.common.model +package com.reown.foundation.common.model import com.walletconnect.util.hexToBytes diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/common/model/SubscriptionId.kt b/foundation/src/main/kotlin/com/reown/foundation/common/model/SubscriptionId.kt similarity index 69% rename from foundation/src/main/kotlin/com/walletconnect/foundation/common/model/SubscriptionId.kt rename to foundation/src/main/kotlin/com/reown/foundation/common/model/SubscriptionId.kt index 5ebb1d509..88ac264e5 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/common/model/SubscriptionId.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/common/model/SubscriptionId.kt @@ -1,4 +1,4 @@ -package com.walletconnect.foundation.common.model +package com.reown.foundation.common.model import com.squareup.moshi.JsonClass diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/common/model/Topic.kt b/foundation/src/main/kotlin/com/reown/foundation/common/model/Topic.kt similarity index 76% rename from foundation/src/main/kotlin/com/walletconnect/foundation/common/model/Topic.kt rename to foundation/src/main/kotlin/com/reown/foundation/common/model/Topic.kt index 1e5b76088..da8483acb 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/common/model/Topic.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/common/model/Topic.kt @@ -1,4 +1,4 @@ -package com.walletconnect.foundation.common.model +package com.reown.foundation.common.model import com.squareup.moshi.JsonClass import com.walletconnect.util.Empty diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/common/model/Ttl.kt b/foundation/src/main/kotlin/com/reown/foundation/common/model/Ttl.kt similarity index 68% rename from foundation/src/main/kotlin/com/walletconnect/foundation/common/model/Ttl.kt rename to foundation/src/main/kotlin/com/reown/foundation/common/model/Ttl.kt index db9120d34..0f2956056 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/common/model/Ttl.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/common/model/Ttl.kt @@ -1,4 +1,4 @@ -package com.walletconnect.foundation.common.model +package com.reown.foundation.common.model import com.squareup.moshi.JsonClass diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/crypto/data/repository/BaseClientIdJwtRepository.kt b/foundation/src/main/kotlin/com/reown/foundation/crypto/data/repository/BaseClientIdJwtRepository.kt similarity index 81% rename from foundation/src/main/kotlin/com/walletconnect/foundation/crypto/data/repository/BaseClientIdJwtRepository.kt rename to foundation/src/main/kotlin/com/reown/foundation/crypto/data/repository/BaseClientIdJwtRepository.kt index 663c01ee0..a59eb8643 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/crypto/data/repository/BaseClientIdJwtRepository.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/crypto/data/repository/BaseClientIdJwtRepository.kt @@ -1,14 +1,14 @@ -package com.walletconnect.foundation.crypto.data.repository +package com.reown.foundation.crypto.data.repository -import com.walletconnect.foundation.common.model.PrivateKey -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.crypto.data.repository.model.IrnJwtClaims -import com.walletconnect.foundation.util.jwt.JwtHeader -import com.walletconnect.foundation.util.jwt.encodeData -import com.walletconnect.foundation.util.jwt.encodeEd25519DidKey -import com.walletconnect.foundation.util.jwt.encodeJWT -import com.walletconnect.foundation.util.jwt.jwtIatAndExp -import com.walletconnect.foundation.util.jwt.signJwt +import com.reown.foundation.common.model.PrivateKey +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.crypto.data.repository.model.IrnJwtClaims +import com.reown.foundation.util.jwt.JwtHeader +import com.reown.foundation.util.jwt.encodeData +import com.reown.foundation.util.jwt.encodeEd25519DidKey +import com.reown.foundation.util.jwt.encodeJWT +import com.reown.foundation.util.jwt.jwtIatAndExp +import com.reown.foundation.util.jwt.signJwt import com.walletconnect.util.bytesToHex import com.walletconnect.util.hexToBytes import com.walletconnect.util.randomBytes diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/crypto/data/repository/ClientIdJwtRepository.kt b/foundation/src/main/kotlin/com/reown/foundation/crypto/data/repository/ClientIdJwtRepository.kt similarity index 67% rename from foundation/src/main/kotlin/com/walletconnect/foundation/crypto/data/repository/ClientIdJwtRepository.kt rename to foundation/src/main/kotlin/com/reown/foundation/crypto/data/repository/ClientIdJwtRepository.kt index 7d015bd3a..7cdf038d8 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/crypto/data/repository/ClientIdJwtRepository.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/crypto/data/repository/ClientIdJwtRepository.kt @@ -1,4 +1,4 @@ -package com.walletconnect.foundation.crypto.data.repository +package com.reown.foundation.crypto.data.repository interface ClientIdJwtRepository { diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/crypto/data/repository/model/IrnJwtClaims.kt b/foundation/src/main/kotlin/com/reown/foundation/crypto/data/repository/model/IrnJwtClaims.kt similarity index 75% rename from foundation/src/main/kotlin/com/walletconnect/foundation/crypto/data/repository/model/IrnJwtClaims.kt rename to foundation/src/main/kotlin/com/reown/foundation/crypto/data/repository/model/IrnJwtClaims.kt index d2c4bca22..01cd2ae36 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/crypto/data/repository/model/IrnJwtClaims.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/crypto/data/repository/model/IrnJwtClaims.kt @@ -1,8 +1,8 @@ -package com.walletconnect.foundation.crypto.data.repository.model +package com.reown.foundation.crypto.data.repository.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.foundation.util.jwt.JwtClaims +import com.reown.foundation.util.jwt.JwtClaims @JsonClass(generateAdapter = true) data class IrnJwtClaims( diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/di/FoundationCommonModule.kt b/foundation/src/main/kotlin/com/reown/foundation/di/FoundationCommonModule.kt similarity index 75% rename from foundation/src/main/kotlin/com/walletconnect/foundation/di/FoundationCommonModule.kt rename to foundation/src/main/kotlin/com/reown/foundation/di/FoundationCommonModule.kt index 65bc2db19..56eac095d 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/di/FoundationCommonModule.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/di/FoundationCommonModule.kt @@ -1,15 +1,15 @@ -package com.walletconnect.foundation.di +package com.reown.foundation.di import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory import com.tinder.scarlet.utils.getRawType -import com.walletconnect.foundation.common.adapters.SubscriptionIdAdapter -import com.walletconnect.foundation.common.adapters.TopicAdapter -import com.walletconnect.foundation.common.adapters.TtlAdapter -import com.walletconnect.foundation.common.model.SubscriptionId -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.adapters.SubscriptionIdAdapter +import com.reown.foundation.common.adapters.TopicAdapter +import com.reown.foundation.common.adapters.TtlAdapter +import com.reown.foundation.common.model.SubscriptionId +import com.reown.foundation.common.model.Topic +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger import org.koin.core.qualifier.named import org.koin.dsl.module import kotlin.reflect.jvm.jvmName diff --git a/foundation/src/main/kotlin/com/reown/foundation/di/FoundationCryptoModule.kt b/foundation/src/main/kotlin/com/reown/foundation/di/FoundationCryptoModule.kt new file mode 100644 index 000000000..b2c7296f7 --- /dev/null +++ b/foundation/src/main/kotlin/com/reown/foundation/di/FoundationCryptoModule.kt @@ -0,0 +1,18 @@ +@file:JvmSynthetic + +package com.reown.foundation.di + +import com.reown.foundation.common.model.PrivateKey +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.crypto.data.repository.BaseClientIdJwtRepository +import com.reown.foundation.crypto.data.repository.ClientIdJwtRepository +import org.koin.dsl.module + +internal fun cryptoModule() = module { + + single { + object: BaseClientIdJwtRepository() { + override fun setKeyPair(key: String, privateKey: PrivateKey, publicKey: PublicKey) {} + } + } +} diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/di/FoundationDITags.kt b/foundation/src/main/kotlin/com/reown/foundation/di/FoundationDITags.kt similarity index 78% rename from foundation/src/main/kotlin/com/walletconnect/foundation/di/FoundationDITags.kt rename to foundation/src/main/kotlin/com/reown/foundation/di/FoundationDITags.kt index 808a69c78..4b80ff8d9 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/di/FoundationDITags.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/di/FoundationDITags.kt @@ -1,4 +1,4 @@ -package com.walletconnect.foundation.di +package com.reown.foundation.di enum class FoundationDITags { MOSHI, INTERCEPTOR, OK_HTTP, RELAY_SERVICE, SCARLET, MSG_ADAPTER, MANUAL_CONNECTION_CONTROLLER, MANUAL_LIFECYCLE diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/di/FoundationNetworkModule.kt b/foundation/src/main/kotlin/com/reown/foundation/di/FoundationNetworkModule.kt similarity index 91% rename from foundation/src/main/kotlin/com/walletconnect/foundation/di/FoundationNetworkModule.kt rename to foundation/src/main/kotlin/com/reown/foundation/di/FoundationNetworkModule.kt index 88070e2e6..0ed01af79 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/di/FoundationNetworkModule.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/di/FoundationNetworkModule.kt @@ -1,12 +1,12 @@ -package com.walletconnect.foundation.di +package com.reown.foundation.di import com.tinder.scarlet.Scarlet import com.tinder.scarlet.messageadapter.moshi.MoshiMessageAdapter import com.tinder.scarlet.retry.LinearBackoffStrategy import com.tinder.scarlet.websocket.okhttp.newWebSocketFactory -import com.walletconnect.foundation.network.BaseRelayClient -import com.walletconnect.foundation.network.data.adapter.FlowStreamAdapter -import com.walletconnect.foundation.network.data.service.RelayService +import com.reown.foundation.network.BaseRelayClient +import com.reown.foundation.network.data.adapter.FlowStreamAdapter +import com.reown.foundation.network.data.service.RelayService import okhttp3.Interceptor import okhttp3.OkHttpClient import okhttp3.logging.HttpLoggingInterceptor diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/network/BaseRelayClient.kt b/foundation/src/main/kotlin/com/reown/foundation/network/BaseRelayClient.kt similarity index 96% rename from foundation/src/main/kotlin/com/walletconnect/foundation/network/BaseRelayClient.kt rename to foundation/src/main/kotlin/com/reown/foundation/network/BaseRelayClient.kt index 6d73522e4..4ecc24c75 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/network/BaseRelayClient.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/network/BaseRelayClient.kt @@ -1,17 +1,17 @@ -package com.walletconnect.foundation.network +package com.reown.foundation.network import com.tinder.scarlet.WebSocket -import com.walletconnect.foundation.common.model.SubscriptionId -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.common.toRelay -import com.walletconnect.foundation.common.toRelayEvent -import com.walletconnect.foundation.di.foundationCommonModule -import com.walletconnect.foundation.network.data.service.RelayService -import com.walletconnect.foundation.network.model.Relay -import com.walletconnect.foundation.network.model.RelayDTO -import com.walletconnect.foundation.util.Logger -import com.walletconnect.foundation.util.scope +import com.reown.foundation.common.model.SubscriptionId +import com.reown.foundation.common.model.Topic +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.common.toRelay +import com.reown.foundation.common.toRelayEvent +import com.reown.foundation.di.foundationCommonModule +import com.reown.foundation.network.data.service.RelayService +import com.reown.foundation.network.model.Relay +import com.reown.foundation.network.model.RelayDTO +import com.reown.foundation.util.Logger +import com.reown.foundation.util.scope import com.walletconnect.util.generateClientToServerId import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/network/ConnectionLifecycle.kt b/foundation/src/main/kotlin/com/reown/foundation/network/ConnectionLifecycle.kt similarity index 74% rename from foundation/src/main/kotlin/com/walletconnect/foundation/network/ConnectionLifecycle.kt rename to foundation/src/main/kotlin/com/reown/foundation/network/ConnectionLifecycle.kt index bdd927e93..6c1a16045 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/network/ConnectionLifecycle.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/network/ConnectionLifecycle.kt @@ -1,4 +1,4 @@ -package com.walletconnect.foundation.network +package com.reown.foundation.network import kotlinx.coroutines.flow.StateFlow diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/network/RelayInterface.kt b/foundation/src/main/kotlin/com/reown/foundation/network/RelayInterface.kt similarity index 90% rename from foundation/src/main/kotlin/com/walletconnect/foundation/network/RelayInterface.kt rename to foundation/src/main/kotlin/com/reown/foundation/network/RelayInterface.kt index 1e3638c5a..ed91f69f6 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/network/RelayInterface.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/network/RelayInterface.kt @@ -1,6 +1,6 @@ -package com.walletconnect.foundation.network +package com.reown.foundation.network -import com.walletconnect.foundation.network.model.Relay +import com.reown.foundation.network.model.Relay import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.SharedFlow diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/network/data/adapter/FlowStreamAdapter.kt b/foundation/src/main/kotlin/com/reown/foundation/network/data/adapter/FlowStreamAdapter.kt similarity index 92% rename from foundation/src/main/kotlin/com/walletconnect/foundation/network/data/adapter/FlowStreamAdapter.kt rename to foundation/src/main/kotlin/com/reown/foundation/network/data/adapter/FlowStreamAdapter.kt index cd81d91ad..34bca919e 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/network/data/adapter/FlowStreamAdapter.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/network/data/adapter/FlowStreamAdapter.kt @@ -1,4 +1,4 @@ -package com.walletconnect.foundation.network.data.adapter +package com.reown.foundation.network.data.adapter import com.tinder.scarlet.Stream import com.tinder.scarlet.StreamAdapter diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/network/data/service/RelayService.kt b/foundation/src/main/kotlin/com/reown/foundation/network/data/service/RelayService.kt similarity index 93% rename from foundation/src/main/kotlin/com/walletconnect/foundation/network/data/service/RelayService.kt rename to foundation/src/main/kotlin/com/reown/foundation/network/data/service/RelayService.kt index 62def0bcc..17f826e6b 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/network/data/service/RelayService.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/network/data/service/RelayService.kt @@ -1,9 +1,9 @@ -package com.walletconnect.foundation.network.data.service +package com.reown.foundation.network.data.service import com.tinder.scarlet.WebSocket import com.tinder.scarlet.ws.Receive import com.tinder.scarlet.ws.Send -import com.walletconnect.foundation.network.model.RelayDTO +import com.reown.foundation.network.model.RelayDTO import kotlinx.coroutines.flow.Flow interface RelayService { diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/network/model/JsonRpcRelay.kt b/foundation/src/main/kotlin/com/reown/foundation/network/model/JsonRpcRelay.kt similarity index 88% rename from foundation/src/main/kotlin/com/walletconnect/foundation/network/model/JsonRpcRelay.kt rename to foundation/src/main/kotlin/com/reown/foundation/network/model/JsonRpcRelay.kt index f15ab606f..7ad8cc408 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/network/model/JsonRpcRelay.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/network/model/JsonRpcRelay.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.foundation.network.model +package com.reown.foundation.network.model private const val SUFFIX = "irn" internal const val IRN_PUBLISH: String = "${SUFFIX}_publish" diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/network/model/Relay.kt b/foundation/src/main/kotlin/com/reown/foundation/network/model/Relay.kt similarity index 99% rename from foundation/src/main/kotlin/com/walletconnect/foundation/network/model/Relay.kt rename to foundation/src/main/kotlin/com/reown/foundation/network/model/Relay.kt index e329e852e..e0d6ab0fb 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/network/model/Relay.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/network/model/Relay.kt @@ -1,4 +1,4 @@ -package com.walletconnect.foundation.network.model +package com.reown.foundation.network.model object Relay { diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/network/model/RelayDTO.kt b/foundation/src/main/kotlin/com/reown/foundation/network/model/RelayDTO.kt similarity index 95% rename from foundation/src/main/kotlin/com/walletconnect/foundation/network/model/RelayDTO.kt rename to foundation/src/main/kotlin/com/reown/foundation/network/model/RelayDTO.kt index 234090742..2656f1796 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/network/model/RelayDTO.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/network/model/RelayDTO.kt @@ -1,13 +1,13 @@ -package com.walletconnect.foundation.network.model +package com.reown.foundation.network.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.foundation.common.adapters.SubscriptionIdAdapter -import com.walletconnect.foundation.common.adapters.TopicAdapter -import com.walletconnect.foundation.common.adapters.TtlAdapter -import com.walletconnect.foundation.common.model.SubscriptionId -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.common.model.Ttl +import com.reown.foundation.common.adapters.SubscriptionIdAdapter +import com.reown.foundation.common.adapters.TopicAdapter +import com.reown.foundation.common.adapters.TtlAdapter +import com.reown.foundation.common.model.SubscriptionId +import com.reown.foundation.common.model.Topic +import com.reown.foundation.common.model.Ttl import com.walletconnect.util.generateClientToServerId sealed class RelayDTO { diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/util/Logger.kt b/foundation/src/main/kotlin/com/reown/foundation/util/Logger.kt similarity index 79% rename from foundation/src/main/kotlin/com/walletconnect/foundation/util/Logger.kt rename to foundation/src/main/kotlin/com/reown/foundation/util/Logger.kt index 72072b636..163539f7c 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/util/Logger.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/util/Logger.kt @@ -1,4 +1,4 @@ -package com.walletconnect.foundation.util +package com.reown.foundation.util interface Logger { diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/util/Scope.kt b/foundation/src/main/kotlin/com/reown/foundation/util/Scope.kt similarity index 83% rename from foundation/src/main/kotlin/com/walletconnect/foundation/util/Scope.kt rename to foundation/src/main/kotlin/com/reown/foundation/util/Scope.kt index 248e8a79b..c932bd18f 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/util/Scope.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/util/Scope.kt @@ -1,4 +1,4 @@ -package com.walletconnect.foundation.util +package com.reown.foundation.util import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/util/UtilFunctions.kt b/foundation/src/main/kotlin/com/reown/foundation/util/UtilFunctions.kt similarity index 100% rename from foundation/src/main/kotlin/com/walletconnect/foundation/util/UtilFunctions.kt rename to foundation/src/main/kotlin/com/reown/foundation/util/UtilFunctions.kt diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/util/jwt/JwtClaims.kt b/foundation/src/main/kotlin/com/reown/foundation/util/jwt/JwtClaims.kt similarity index 50% rename from foundation/src/main/kotlin/com/walletconnect/foundation/util/jwt/JwtClaims.kt rename to foundation/src/main/kotlin/com/reown/foundation/util/jwt/JwtClaims.kt index 69bbd4eb4..ef11a1488 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/util/jwt/JwtClaims.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/util/jwt/JwtClaims.kt @@ -1,4 +1,4 @@ -package com.walletconnect.foundation.util.jwt +package com.reown.foundation.util.jwt interface JwtClaims { val issuer: String diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/util/jwt/JwtHeader.kt b/foundation/src/main/kotlin/com/reown/foundation/util/jwt/JwtHeader.kt similarity index 90% rename from foundation/src/main/kotlin/com/walletconnect/foundation/util/jwt/JwtHeader.kt rename to foundation/src/main/kotlin/com/reown/foundation/util/jwt/JwtHeader.kt index dca35ff3d..942bbd261 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/util/jwt/JwtHeader.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/util/jwt/JwtHeader.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.foundation.util.jwt +package com.reown.foundation.util.jwt import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/util/jwt/JwtUtils.kt b/foundation/src/main/kotlin/com/reown/foundation/util/jwt/JwtUtils.kt similarity index 97% rename from foundation/src/main/kotlin/com/walletconnect/foundation/util/jwt/JwtUtils.kt rename to foundation/src/main/kotlin/com/reown/foundation/util/jwt/JwtUtils.kt index 19331a6af..b5b13a28b 100644 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/util/jwt/JwtUtils.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/util/jwt/JwtUtils.kt @@ -1,12 +1,12 @@ @file:JvmSynthetic -package com.walletconnect.foundation.util.jwt +package com.reown.foundation.util.jwt import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory -import com.walletconnect.foundation.common.model.PrivateKey -import com.walletconnect.foundation.common.model.PublicKey +import com.reown.foundation.common.model.PrivateKey +import com.reown.foundation.common.model.PublicKey import com.walletconnect.util.bytesToHex import io.ipfs.multibase.Base58 import io.ipfs.multibase.Multibase diff --git a/foundation/src/main/kotlin/com/walletconnect/foundation/di/FoundationCryptoModule.kt b/foundation/src/main/kotlin/com/walletconnect/foundation/di/FoundationCryptoModule.kt deleted file mode 100644 index 9d0fe483f..000000000 --- a/foundation/src/main/kotlin/com/walletconnect/foundation/di/FoundationCryptoModule.kt +++ /dev/null @@ -1,18 +0,0 @@ -@file:JvmSynthetic - -package com.walletconnect.foundation.di - -import com.walletconnect.foundation.common.model.PrivateKey -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.crypto.data.repository.BaseClientIdJwtRepository -import com.walletconnect.foundation.crypto.data.repository.ClientIdJwtRepository -import org.koin.dsl.module - -internal fun cryptoModule() = module { - - single { - object: BaseClientIdJwtRepository() { - override fun setKeyPair(key: String, privateKey: PrivateKey, publicKey: PublicKey) {} - } - } -} diff --git a/foundation/src/test/kotlin/com/walletconnect/foundation/BaseRelayClientTest.kt b/foundation/src/test/kotlin/com/walletconnect/foundation/BaseRelayClientTest.kt index 24e577221..499362f96 100644 --- a/foundation/src/test/kotlin/com/walletconnect/foundation/BaseRelayClientTest.kt +++ b/foundation/src/test/kotlin/com/walletconnect/foundation/BaseRelayClientTest.kt @@ -1,15 +1,15 @@ -package com.walletconnect.foundation +package com.reown.foundation import com.tinder.scarlet.WebSocket -import com.walletconnect.foundation.common.model.SubscriptionId -import com.walletconnect.foundation.network.BaseRelayClient -import com.walletconnect.foundation.network.ConnectionLifecycle -import com.walletconnect.foundation.network.ConnectionState -import com.walletconnect.foundation.network.data.service.RelayService -import com.walletconnect.foundation.network.model.Relay -import com.walletconnect.foundation.network.model.RelayDTO -import com.walletconnect.foundation.util.Logger -import com.walletconnect.foundation.util.scope +import com.reown.foundation.common.model.SubscriptionId +import com.reown.foundation.network.BaseRelayClient +import com.reown.foundation.network.ConnectionLifecycle +import com.reown.foundation.network.ConnectionState +import com.reown.foundation.network.data.service.RelayService +import com.reown.foundation.network.model.Relay +import com.reown.foundation.network.model.RelayDTO +import com.reown.foundation.util.Logger +import com.reown.foundation.util.scope import io.mockk.Runs import io.mockk.coEvery import io.mockk.coVerify diff --git a/foundation/src/test/kotlin/com/walletconnect/foundation/RelayTest.kt b/foundation/src/test/kotlin/com/walletconnect/foundation/RelayTest.kt index 91e03bc0f..79fc23e2a 100644 --- a/foundation/src/test/kotlin/com/walletconnect/foundation/RelayTest.kt +++ b/foundation/src/test/kotlin/com/walletconnect/foundation/RelayTest.kt @@ -1,13 +1,13 @@ -package com.walletconnect.foundation - -import com.walletconnect.foundation.crypto.data.repository.ClientIdJwtRepository -import com.walletconnect.foundation.di.FoundationDITags -import com.walletconnect.foundation.di.cryptoModule -import com.walletconnect.foundation.di.foundationCommonModule -import com.walletconnect.foundation.di.networkModule -import com.walletconnect.foundation.network.BaseRelayClient -import com.walletconnect.foundation.network.RelayInterface -import com.walletconnect.foundation.network.model.Relay +package com.reown.foundation + +import com.reown.foundation.crypto.data.repository.ClientIdJwtRepository +import com.reown.foundation.di.FoundationDITags +import com.reown.foundation.di.cryptoModule +import com.reown.foundation.di.foundationCommonModule +import com.reown.foundation.di.networkModule +import com.reown.foundation.network.BaseRelayClient +import com.reown.foundation.network.RelayInterface +import com.reown.foundation.network.model.Relay import com.walletconnect.util.addUserAgent import com.walletconnect.util.bytesToHex import junit.framework.TestCase.assertEquals diff --git a/foundation/src/test/kotlin/com/walletconnect/foundation/UtilsTest.kt b/foundation/src/test/kotlin/com/walletconnect/foundation/UtilsTest.kt index 70f572461..9d06ab7e6 100644 --- a/foundation/src/test/kotlin/com/walletconnect/foundation/UtilsTest.kt +++ b/foundation/src/test/kotlin/com/walletconnect/foundation/UtilsTest.kt @@ -1,4 +1,4 @@ -package com.walletconnect.foundation +package com.reown.foundation import com.walletconnect.util.generateClientToServerId import com.walletconnect.util.generateId diff --git a/foundation/src/test/kotlin/com/walletconnect/foundation/adapters/SubscriptionIdAdapterTest.kt b/foundation/src/test/kotlin/com/walletconnect/foundation/adapters/SubscriptionIdAdapterTest.kt index d2300c273..eb473fd96 100644 --- a/foundation/src/test/kotlin/com/walletconnect/foundation/adapters/SubscriptionIdAdapterTest.kt +++ b/foundation/src/test/kotlin/com/walletconnect/foundation/adapters/SubscriptionIdAdapterTest.kt @@ -1,9 +1,9 @@ -package com.walletconnect.foundation.adapters +package com.reown.foundation.adapters import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory -import com.walletconnect.foundation.common.adapters.SubscriptionIdAdapter -import com.walletconnect.foundation.common.model.SubscriptionId +import com.reown.foundation.common.adapters.SubscriptionIdAdapter +import com.reown.foundation.common.model.SubscriptionId import junit.framework.TestCase.assertEquals import junit.framework.TestCase.assertNotNull import org.junit.Test diff --git a/foundation/src/test/kotlin/com/walletconnect/foundation/adapters/TopicAdapterTest.kt b/foundation/src/test/kotlin/com/walletconnect/foundation/adapters/TopicAdapterTest.kt index a04885ec7..1e81da86f 100644 --- a/foundation/src/test/kotlin/com/walletconnect/foundation/adapters/TopicAdapterTest.kt +++ b/foundation/src/test/kotlin/com/walletconnect/foundation/adapters/TopicAdapterTest.kt @@ -1,9 +1,9 @@ -package com.walletconnect.foundation.adapters +package com.reown.foundation.adapters import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory -import com.walletconnect.foundation.common.adapters.TopicAdapter -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.adapters.TopicAdapter +import com.reown.foundation.common.model.Topic import junit.framework.TestCase.assertEquals import junit.framework.TestCase.assertNotNull import org.junit.Test diff --git a/foundation/src/test/kotlin/com/walletconnect/foundation/adapters/TtlAdapterTest.kt b/foundation/src/test/kotlin/com/walletconnect/foundation/adapters/TtlAdapterTest.kt index 539a2bdc4..6c56f53c2 100644 --- a/foundation/src/test/kotlin/com/walletconnect/foundation/adapters/TtlAdapterTest.kt +++ b/foundation/src/test/kotlin/com/walletconnect/foundation/adapters/TtlAdapterTest.kt @@ -1,9 +1,9 @@ -package com.walletconnect.foundation.adapters +package com.reown.foundation.adapters import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory -import com.walletconnect.foundation.common.adapters.TtlAdapter -import com.walletconnect.foundation.common.model.Ttl +import com.reown.foundation.common.adapters.TtlAdapter +import com.reown.foundation.common.model.Ttl import junit.framework.TestCase.assertEquals import org.junit.Test diff --git a/foundation/src/test/kotlin/com/walletconnect/foundation/crypto/data/repository/ClientIdJwtRepositoryTest.kt b/foundation/src/test/kotlin/com/walletconnect/foundation/crypto/data/repository/ClientIdJwtRepositoryTest.kt index 8db23b58f..812ab378f 100644 --- a/foundation/src/test/kotlin/com/walletconnect/foundation/crypto/data/repository/ClientIdJwtRepositoryTest.kt +++ b/foundation/src/test/kotlin/com/walletconnect/foundation/crypto/data/repository/ClientIdJwtRepositoryTest.kt @@ -1,8 +1,8 @@ -package com.walletconnect.foundation.crypto.data.repository +package com.reown.foundation.crypto.data.repository -import com.walletconnect.foundation.common.model.PrivateKey -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.util.jwt.jwtIatAndExp +import com.reown.foundation.common.model.PrivateKey +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.util.jwt.jwtIatAndExp import io.mockk.every import io.mockk.mockkStatic import io.mockk.spyk diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalViewModel.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalViewModel.kt index bc072744f..59d6278b4 100644 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalViewModel.kt +++ b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalViewModel.kt @@ -5,7 +5,7 @@ import androidx.lifecycle.viewModelScope import com.walletconnect.android.CoreClient import com.walletconnect.android.internal.common.modal.data.model.Wallet import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import com.walletconnect.modal.ui.model.LoadingState import com.walletconnect.modal.ui.model.UiState import com.walletconnect.wcmodal.client.Modal diff --git a/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalViewModelTest.kt b/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalViewModelTest.kt index 8112b2f7f..4a97b0513 100644 --- a/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalViewModelTest.kt +++ b/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalViewModelTest.kt @@ -7,7 +7,7 @@ import com.walletconnect.android.internal.common.modal.domain.usecase.GetInstall import com.walletconnect.android.internal.common.modal.domain.usecase.GetSampleWalletsUseCaseInterface import com.walletconnect.android.internal.common.modal.domain.usecase.GetWalletsUseCaseInterface import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import com.walletconnect.modal.ui.model.UiState import com.walletconnect.wcmodal.client.Modal import com.walletconnect.wcmodal.client.WalletConnectModal diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/BalanceRpcRepository.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/BalanceRpcRepository.kt index 4e3875361..55851ea06 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/BalanceRpcRepository.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/BalanceRpcRepository.kt @@ -1,6 +1,6 @@ package com.walletconnect.web3.modal.data -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import com.walletconnect.web3.modal.client.Modal import com.walletconnect.web3.modal.data.json_rpc.balance.BalanceRequest import com.walletconnect.web3.modal.data.json_rpc.balance.BalanceRpcResponse diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/AppKitEngine.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/AppKitEngine.kt index 40b0e1c36..51ee6dd0b 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/AppKitEngine.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/AppKitEngine.kt @@ -12,7 +12,7 @@ import com.walletconnect.android.pulse.domain.SendEventInterface import com.walletconnect.android.pulse.model.EventType import com.walletconnect.android.pulse.model.properties.Properties import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import com.walletconnect.sign.client.Sign import com.walletconnect.sign.client.SignClient import com.walletconnect.util.Empty diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AppKitState.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AppKitState.kt index e70f3fbe3..114f32dbe 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AppKitState.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AppKitState.kt @@ -9,7 +9,7 @@ import com.walletconnect.android.pulse.domain.SendEventInterface import com.walletconnect.android.pulse.model.EventType import com.walletconnect.android.pulse.model.properties.Properties import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import com.walletconnect.web3.modal.client.Modal import com.walletconnect.web3.modal.client.AppKit import com.walletconnect.web3.modal.domain.model.Session diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountViewModel.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountViewModel.kt index 3dc2fff04..01c90160e 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountViewModel.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountViewModel.kt @@ -7,7 +7,7 @@ import com.walletconnect.android.pulse.domain.SendEventInterface import com.walletconnect.android.pulse.model.EventType import com.walletconnect.android.pulse.model.properties.Properties import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import com.walletconnect.modal.ui.model.UiState import com.walletconnect.web3.modal.client.Modal import com.walletconnect.web3.modal.client.models.request.Request diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectViewModel.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectViewModel.kt index 2fc466b2b..81a9487ff 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectViewModel.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectViewModel.kt @@ -9,7 +9,7 @@ import com.walletconnect.android.pulse.model.ConnectionMethod import com.walletconnect.android.pulse.model.EventType import com.walletconnect.android.pulse.model.properties.Properties import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import com.walletconnect.modal.ui.model.LoadingState import com.walletconnect.modal.ui.model.UiState import com.walletconnect.web3.modal.client.Modal diff --git a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/scenario/ClientInstrumentedActivityScenario.kt b/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/scenario/ClientInstrumentedActivityScenario.kt index 3faccbf63..ad271761b 100644 --- a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/scenario/ClientInstrumentedActivityScenario.kt +++ b/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/scenario/ClientInstrumentedActivityScenario.kt @@ -3,7 +3,7 @@ package com.walletconnect.notify.test.scenario import com.walletconnect.android.Core import com.walletconnect.android.internal.common.scope import com.walletconnect.android.relay.WSSConnectionState -import com.walletconnect.foundation.network.model.Relay +import com.reown.foundation.network.model.Relay import com.walletconnect.notify.client.Notify import com.walletconnect.notify.test.BuildConfig import com.walletconnect.notify.test.utils.TestClient diff --git a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/TestClient.kt b/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/TestClient.kt index 0a43aa206..a27cb69df 100644 --- a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/TestClient.kt +++ b/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/TestClient.kt @@ -9,7 +9,7 @@ import com.walletconnect.android.cacao.signature.SignatureType import com.walletconnect.android.relay.ConnectionType import com.walletconnect.android.relay.RelayClient import com.walletconnect.android.utils.cacao.sign -import com.walletconnect.foundation.common.model.PrivateKey +import com.reown.foundation.common.model.PrivateKey import com.walletconnect.notify.client.Notify import com.walletconnect.notify.client.NotifyClient import com.walletconnect.notify.client.NotifyProtocol diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/Notify.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/Notify.kt index 156b014fa..231b07285 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/Notify.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/Notify.kt @@ -5,7 +5,7 @@ import androidx.annotation.Keep import com.walletconnect.android.Core import com.walletconnect.android.CoreInterface import com.walletconnect.android.cacao.SignatureInterface -import com.walletconnect.foundation.common.model.PrivateKey +import com.reown.foundation.common.model.PrivateKey import kotlin.time.Duration object Notify { diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/CacaoPayloadWithIdentityPrivateKey.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/CacaoPayloadWithIdentityPrivateKey.kt index 19aff3d99..22cf6bc9b 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/CacaoPayloadWithIdentityPrivateKey.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/CacaoPayloadWithIdentityPrivateKey.kt @@ -1,6 +1,6 @@ package com.walletconnect.notify.common.model import com.walletconnect.android.internal.common.signing.cacao.Cacao -import com.walletconnect.foundation.common.model.PrivateKey +import com.reown.foundation.common.model.PrivateKey internal data class CacaoPayloadWithIdentityPrivateKey(val payload: Cacao.Payload, val key: PrivateKey) diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/RegisteredAccount.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/RegisteredAccount.kt index 791cf0528..9fc8539ed 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/RegisteredAccount.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/RegisteredAccount.kt @@ -1,8 +1,8 @@ package com.walletconnect.notify.common.model import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.common.model.Topic data class RegisteredAccount( val accountId: AccountId, diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Subscription.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Subscription.kt index 510d49ea9..53109d3d5 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Subscription.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Subscription.kt @@ -6,8 +6,8 @@ import com.walletconnect.android.internal.common.model.AccountId import com.walletconnect.android.internal.common.model.AppMetaData import com.walletconnect.android.internal.common.model.Expiry import com.walletconnect.android.internal.common.model.RelayProtocolOptions -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.common.model.Topic internal sealed class Subscription { abstract val account: AccountId diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/TimeoutInfo.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/TimeoutInfo.kt index 355398f48..b0e438983 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/TimeoutInfo.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/TimeoutInfo.kt @@ -1,6 +1,6 @@ package com.walletconnect.notify.common.model -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic internal sealed interface TimeoutInfo { data class Data(val requestId: Long, val topic: Topic) : TimeoutInfo diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/NotifyJwtBase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/NotifyJwtBase.kt index cbb3a9898..b15a489e5 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/NotifyJwtBase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/NotifyJwtBase.kt @@ -2,7 +2,7 @@ package com.walletconnect.notify.data.jwt -import com.walletconnect.foundation.util.jwt.JwtClaims +import com.reown.foundation.util.jwt.JwtClaims import java.util.concurrent.TimeUnit internal interface NotifyJwtBase : JwtClaims { diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/delete/EncodeDeleteRequestJwtUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/delete/EncodeDeleteRequestJwtUseCase.kt index fb0ce0ecb..8e179b880 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/delete/EncodeDeleteRequestJwtUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/delete/EncodeDeleteRequestJwtUseCase.kt @@ -4,10 +4,10 @@ package com.walletconnect.notify.data.jwt.delete import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.util.jwt.encodeDidPkh -import com.walletconnect.foundation.util.jwt.encodeDidWeb -import com.walletconnect.foundation.util.jwt.encodeEd25519DidKey +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.util.jwt.encodeDidPkh +import com.reown.foundation.util.jwt.encodeDidWeb +import com.reown.foundation.util.jwt.encodeEd25519DidKey internal class EncodeDeleteRequestJwtUseCase( private val app: String, diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/getNotifications/EncodeGetNotificationsRequestJwtUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/getNotifications/EncodeGetNotificationsRequestJwtUseCase.kt index 355013c31..f906c6bae 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/getNotifications/EncodeGetNotificationsRequestJwtUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/getNotifications/EncodeGetNotificationsRequestJwtUseCase.kt @@ -4,10 +4,10 @@ package com.walletconnect.notify.data.jwt.getNotifications import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.util.jwt.encodeDidPkh -import com.walletconnect.foundation.util.jwt.encodeDidWeb -import com.walletconnect.foundation.util.jwt.encodeEd25519DidKey +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.util.jwt.encodeDidPkh +import com.reown.foundation.util.jwt.encodeDidWeb +import com.reown.foundation.util.jwt.encodeEd25519DidKey internal class EncodeGetNotificationsRequestJwtUseCase( private val app: String, diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/message/EncodeMessageResponseJwtUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/message/EncodeMessageResponseJwtUseCase.kt index 45956e3a7..5fb32c3c6 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/message/EncodeMessageResponseJwtUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/message/EncodeMessageResponseJwtUseCase.kt @@ -4,10 +4,10 @@ package com.walletconnect.notify.data.jwt.message import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.util.jwt.encodeDidPkh -import com.walletconnect.foundation.util.jwt.encodeDidWeb -import com.walletconnect.foundation.util.jwt.encodeEd25519DidKey +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.util.jwt.encodeDidPkh +import com.reown.foundation.util.jwt.encodeDidWeb +import com.reown.foundation.util.jwt.encodeEd25519DidKey internal class EncodeMessageResponseJwtUseCase( private val app: String, diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscription/EncodeSubscriptionRequestJwtUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscription/EncodeSubscriptionRequestJwtUseCase.kt index 4217958c7..3f4bd0a95 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscription/EncodeSubscriptionRequestJwtUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscription/EncodeSubscriptionRequestJwtUseCase.kt @@ -4,10 +4,10 @@ package com.walletconnect.notify.data.jwt.subscription import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.util.jwt.encodeDidPkh -import com.walletconnect.foundation.util.jwt.encodeDidWeb -import com.walletconnect.foundation.util.jwt.encodeEd25519DidKey +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.util.jwt.encodeDidPkh +import com.reown.foundation.util.jwt.encodeDidWeb +import com.reown.foundation.util.jwt.encodeEd25519DidKey internal class EncodeSubscriptionRequestJwtUseCase( private val app: String, diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscriptionsChanged/EncodeSubscriptionsChangedResponseJwtUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscriptionsChanged/EncodeSubscriptionsChangedResponseJwtUseCase.kt index 0ae9ae80a..a92411648 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscriptionsChanged/EncodeSubscriptionsChangedResponseJwtUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscriptionsChanged/EncodeSubscriptionsChangedResponseJwtUseCase.kt @@ -4,9 +4,9 @@ package com.walletconnect.notify.data.jwt.subscriptionsChanged import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.util.jwt.encodeDidPkh -import com.walletconnect.foundation.util.jwt.encodeEd25519DidKey +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.util.jwt.encodeDidPkh +import com.reown.foundation.util.jwt.encodeEd25519DidKey internal class EncodeSubscriptionsChangedResponseJwtUseCase( private val accountId: AccountId, diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/update/EncodeUpdateRequestJwtUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/update/EncodeUpdateRequestJwtUseCase.kt index ff3d57425..8e1526a2e 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/update/EncodeUpdateRequestJwtUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/update/EncodeUpdateRequestJwtUseCase.kt @@ -4,10 +4,10 @@ package com.walletconnect.notify.data.jwt.update import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.util.jwt.encodeDidPkh -import com.walletconnect.foundation.util.jwt.encodeDidWeb -import com.walletconnect.foundation.util.jwt.encodeEd25519DidKey +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.util.jwt.encodeDidPkh +import com.reown.foundation.util.jwt.encodeDidWeb +import com.reown.foundation.util.jwt.encodeEd25519DidKey internal class EncodeUpdateRequestJwtUseCase( private val accountId: AccountId, diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/watchSubscriptions/EncodeWatchSubscriptionsRequestJwtUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/watchSubscriptions/EncodeWatchSubscriptionsRequestJwtUseCase.kt index 993f44500..a50752e0a 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/watchSubscriptions/EncodeWatchSubscriptionsRequestJwtUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/watchSubscriptions/EncodeWatchSubscriptionsRequestJwtUseCase.kt @@ -4,10 +4,10 @@ package com.walletconnect.notify.data.jwt.watchSubscriptions import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.util.jwt.encodeDidPkh -import com.walletconnect.foundation.util.jwt.encodeDidWeb -import com.walletconnect.foundation.util.jwt.encodeEd25519DidKey +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.util.jwt.encodeDidPkh +import com.reown.foundation.util.jwt.encodeDidWeb +import com.reown.foundation.util.jwt.encodeEd25519DidKey internal class EncodeWatchSubscriptionsRequestJwtUseCase( private val accountId: AccountId, diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/storage/RegisteredAccountsRepository.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/storage/RegisteredAccountsRepository.kt index 689e0558b..ddc7cf9d9 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/storage/RegisteredAccountsRepository.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/storage/RegisteredAccountsRepository.kt @@ -3,8 +3,8 @@ package com.walletconnect.notify.data.storage import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.common.model.Topic import com.walletconnect.notify.common.model.RegisteredAccount import com.walletconnect.notify.common.storage.data.dao.RegisteredAccountsQueries import kotlinx.coroutines.Dispatchers diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/storage/SubscriptionRepository.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/storage/SubscriptionRepository.kt index cedb521b9..0123b640b 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/storage/SubscriptionRepository.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/storage/SubscriptionRepository.kt @@ -5,8 +5,8 @@ package com.walletconnect.notify.data.storage import com.walletconnect.android.internal.common.model.AccountId import com.walletconnect.android.internal.common.model.Expiry import com.walletconnect.android.internal.common.model.RelayProtocolOptions -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.common.model.Topic import com.walletconnect.notify.common.model.Scope import com.walletconnect.notify.common.model.Subscription import com.walletconnect.notify.common.storage.data.dao.ActiveSubscriptionsQueries diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/DecryptNotifyMessageUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/DecryptNotifyMessageUseCase.kt index d5c09fe72..50f89ce67 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/DecryptNotifyMessageUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/DecryptNotifyMessageUseCase.kt @@ -14,8 +14,8 @@ import com.walletconnect.android.internal.common.model.sync.ClientJsonRpc import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory import com.walletconnect.android.push.notifications.DecryptMessageUseCaseInterface -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.Topic +import com.reown.foundation.util.Logger import com.walletconnect.notify.common.model.Notification import com.walletconnect.notify.common.model.NotificationMessage import com.walletconnect.notify.common.model.toCore diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/DeleteSubscriptionUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/DeleteSubscriptionUseCase.kt index 6296de29a..9decc4f46 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/DeleteSubscriptionUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/DeleteSubscriptionUseCase.kt @@ -10,8 +10,8 @@ import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteract import com.walletconnect.android.internal.common.scope import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface import com.walletconnect.android.internal.utils.monthInSeconds -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.common.model.Ttl +import com.reown.foundation.common.model.Topic +import com.reown.foundation.common.model.Ttl import com.walletconnect.notify.common.model.DeleteSubscription import com.walletconnect.notify.common.model.NotifyRpc import com.walletconnect.notify.common.model.Subscription diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetNotificationHistoryUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetNotificationHistoryUseCase.kt index e6a4dc4fd..71a09fe26 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetNotificationHistoryUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetNotificationHistoryUseCase.kt @@ -11,9 +11,9 @@ import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteract import com.walletconnect.android.internal.common.scope import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface import com.walletconnect.android.internal.utils.fiveMinutesInSeconds -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.Topic +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger import com.walletconnect.notify.common.model.GetNotificationHistory import com.walletconnect.notify.common.model.NotifyRpc import com.walletconnect.notify.common.model.TimeoutInfo diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/PrepareRegistrationUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/PrepareRegistrationUseCase.kt index 8abdfb7cd..dcf7d20f8 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/PrepareRegistrationUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/PrepareRegistrationUseCase.kt @@ -6,7 +6,7 @@ import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementReposit import com.walletconnect.android.internal.common.model.AccountId import com.walletconnect.android.internal.common.signing.cacao.toCAIP222Message import com.walletconnect.android.keyserver.domain.IdentitiesInteractor -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import com.walletconnect.notify.common.model.CacaoPayloadWithIdentityPrivateKey import com.walletconnect.notify.engine.domain.createAuthorizationReCaps diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/SubscribeToDappUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/SubscribeToDappUseCase.kt index bc8b771fa..a1e378fb8 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/SubscribeToDappUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/SubscribeToDappUseCase.kt @@ -18,10 +18,10 @@ import com.walletconnect.android.internal.common.scope import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface import com.walletconnect.android.internal.utils.monthInSeconds import com.walletconnect.android.internal.utils.thirtySeconds -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.common.model.Topic +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger import com.walletconnect.notify.common.model.CreateSubscription import com.walletconnect.notify.common.model.NotifyRpc import com.walletconnect.notify.common.model.Scope diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/UnregisterUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/UnregisterUseCase.kt index 05479871d..46fd68d60 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/UnregisterUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/UnregisterUseCase.kt @@ -5,7 +5,7 @@ package com.walletconnect.notify.engine.calls import com.walletconnect.android.internal.common.model.AccountId import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.walletconnect.android.keyserver.domain.IdentitiesInteractor -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic import com.walletconnect.notify.data.storage.NotificationsRepository import com.walletconnect.notify.data.storage.RegisteredAccountsRepository import com.walletconnect.notify.data.storage.SubscriptionRepository diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/UpdateSubscriptionUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/UpdateSubscriptionUseCase.kt index d0e94f179..bf529a0a1 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/UpdateSubscriptionUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/UpdateSubscriptionUseCase.kt @@ -11,8 +11,8 @@ import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteract import com.walletconnect.android.internal.common.scope import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface import com.walletconnect.android.internal.utils.thirtySeconds -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.common.model.Ttl +import com.reown.foundation.common.model.Topic +import com.reown.foundation.common.model.Ttl import com.walletconnect.notify.common.model.NotifyRpc import com.walletconnect.notify.common.model.TimeoutInfo import com.walletconnect.notify.common.model.UpdateSubscription diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/ExtractPublicKeysFromDidJsonUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/ExtractPublicKeysFromDidJsonUseCase.kt index df3052f04..e206fdc60 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/ExtractPublicKeysFromDidJsonUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/ExtractPublicKeysFromDidJsonUseCase.kt @@ -5,7 +5,7 @@ package com.walletconnect.notify.engine.domain import android.net.Uri import android.util.Base64 import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer -import com.walletconnect.foundation.common.model.PublicKey +import com.reown.foundation.common.model.PublicKey import com.walletconnect.notify.client.InvalidDidJsonFileException import com.walletconnect.notify.data.wellknown.did.DidJsonDTO import com.walletconnect.notify.data.wellknown.did.VerificationMethodDTO diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/FetchDidJwtInteractor.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/FetchDidJwtInteractor.kt index babd12670..f1027ac2b 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/FetchDidJwtInteractor.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/FetchDidJwtInteractor.kt @@ -7,8 +7,8 @@ import com.walletconnect.android.internal.common.jwt.did.encodeDidJwt import com.walletconnect.android.internal.common.model.AccountId import com.walletconnect.android.internal.common.model.DidJwt import com.walletconnect.android.keyserver.domain.IdentitiesInteractor -import com.walletconnect.foundation.common.model.PrivateKey -import com.walletconnect.foundation.common.model.PublicKey +import com.reown.foundation.common.model.PrivateKey +import com.reown.foundation.common.model.PublicKey import com.walletconnect.notify.data.jwt.delete.EncodeDeleteRequestJwtUseCase import com.walletconnect.notify.data.jwt.getNotifications.EncodeGetNotificationsRequestJwtUseCase import com.walletconnect.notify.data.jwt.message.EncodeMessageResponseJwtUseCase diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/FindRequestedSubscriptionUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/FindRequestedSubscriptionUseCase.kt index 0d73c6215..10a53090e 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/FindRequestedSubscriptionUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/FindRequestedSubscriptionUseCase.kt @@ -2,7 +2,7 @@ package com.walletconnect.notify.engine.domain import com.walletconnect.android.internal.common.model.AppMetaDataType import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.foundation.util.jwt.encodeEd25519DidKey +import com.reown.foundation.util.jwt.encodeEd25519DidKey import com.walletconnect.notify.common.model.Subscription import kotlinx.coroutines.supervisorScope diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/GetSelfKeyForWatchSubscriptionUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/GetSelfKeyForWatchSubscriptionUseCase.kt index be2003ba5..b034aeffb 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/GetSelfKeyForWatchSubscriptionUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/GetSelfKeyForWatchSubscriptionUseCase.kt @@ -5,7 +5,7 @@ package com.walletconnect.notify.engine.domain import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository import com.walletconnect.android.internal.common.model.AccountId import com.walletconnect.android.internal.utils.getPeerTag -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic internal class GetSelfKeyForWatchSubscriptionUseCase( private val keyManagementRepository: KeyManagementRepository, diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/SetActiveSubscriptionsUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/SetActiveSubscriptionsUseCase.kt index 934f7317e..5f8ebfdcb 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/SetActiveSubscriptionsUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/SetActiveSubscriptionsUseCase.kt @@ -11,8 +11,8 @@ import com.walletconnect.android.internal.common.model.type.EngineEvent import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.walletconnect.android.internal.common.storage.key_chain.KeyStore import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.util.jwt.decodeEd25519DidKey +import com.reown.foundation.common.model.Topic +import com.reown.foundation.util.jwt.decodeEd25519DidKey import com.walletconnect.notify.common.model.Scope import com.walletconnect.notify.common.model.ServerSubscription import com.walletconnect.notify.common.model.Subscription diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/WatchSubscriptionsForEveryRegisteredAccountUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/WatchSubscriptionsForEveryRegisteredAccountUseCase.kt index 3918cc552..582f30a11 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/WatchSubscriptionsForEveryRegisteredAccountUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/WatchSubscriptionsForEveryRegisteredAccountUseCase.kt @@ -2,7 +2,7 @@ package com.walletconnect.notify.engine.domain -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import com.walletconnect.notify.data.storage.RegisteredAccountsRepository import kotlinx.coroutines.supervisorScope diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/WatchSubscriptionsUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/WatchSubscriptionsUseCase.kt index da68fcd12..0f2cf3d1e 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/WatchSubscriptionsUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/WatchSubscriptionsUseCase.kt @@ -11,7 +11,7 @@ import com.walletconnect.android.internal.common.model.Tags import com.walletconnect.android.internal.common.model.params.CoreNotifyParams import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.walletconnect.android.internal.utils.thirtySeconds -import com.walletconnect.foundation.common.model.Ttl +import com.reown.foundation.common.model.Ttl import com.walletconnect.notify.common.NotifyServerUrl import com.walletconnect.notify.common.model.NotifyRpc import com.walletconnect.notify.data.storage.RegisteredAccountsRepository diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/requests/OnMessageUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/requests/OnMessageUseCase.kt index dc73fe1a6..d4e1a4916 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/requests/OnMessageUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/requests/OnMessageUseCase.kt @@ -15,10 +15,10 @@ import com.walletconnect.android.internal.common.model.type.EngineEvent import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface import com.walletconnect.android.internal.utils.monthInSeconds -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger -import com.walletconnect.foundation.util.jwt.decodeDidWeb -import com.walletconnect.foundation.util.jwt.decodeEd25519DidKey +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger +import com.reown.foundation.util.jwt.decodeDidWeb +import com.reown.foundation.util.jwt.decodeEd25519DidKey import com.walletconnect.notify.common.convertToUTF8 import com.walletconnect.notify.common.model.Notification import com.walletconnect.notify.common.model.NotificationMessage diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/requests/OnSubscriptionsChangedUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/requests/OnSubscriptionsChangedUseCase.kt index 2ce3a7c5e..afd5c142a 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/requests/OnSubscriptionsChangedUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/requests/OnSubscriptionsChangedUseCase.kt @@ -13,10 +13,10 @@ import com.walletconnect.android.internal.common.model.params.CoreNotifyParams import com.walletconnect.android.internal.common.model.type.EngineEvent import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.walletconnect.android.internal.utils.fiveMinutesInSeconds -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger -import com.walletconnect.foundation.util.jwt.decodeDidPkh -import com.walletconnect.foundation.util.jwt.decodeEd25519DidKey +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger +import com.reown.foundation.util.jwt.decodeDidPkh +import com.reown.foundation.util.jwt.decodeEd25519DidKey import com.walletconnect.notify.common.NotifyServerUrl import com.walletconnect.notify.common.model.SubscriptionChanged import com.walletconnect.notify.data.jwt.subscriptionsChanged.SubscriptionsChangedRequestJwtClaim diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnDeleteResponseUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnDeleteResponseUseCase.kt index d1807a6e6..1628cdc30 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnDeleteResponseUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnDeleteResponseUseCase.kt @@ -9,8 +9,8 @@ import com.walletconnect.android.internal.common.model.params.ChatNotifyResponse import com.walletconnect.android.internal.common.model.params.CoreNotifyParams import com.walletconnect.android.internal.common.model.type.EngineEvent import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.foundation.util.Logger -import com.walletconnect.foundation.util.jwt.decodeDidPkh +import com.reown.foundation.util.Logger +import com.reown.foundation.util.jwt.decodeDidPkh import com.walletconnect.notify.common.model.DeleteSubscription import com.walletconnect.notify.data.jwt.delete.DeleteResponseJwtClaim import com.walletconnect.notify.data.storage.NotificationsRepository diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnGetNotificationsResponseUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnGetNotificationsResponseUseCase.kt index 6e326f576..e263d6f68 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnGetNotificationsResponseUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnGetNotificationsResponseUseCase.kt @@ -11,7 +11,7 @@ import com.walletconnect.android.internal.common.model.params.ChatNotifyResponse import com.walletconnect.android.internal.common.model.params.CoreNotifyParams import com.walletconnect.android.internal.common.model.type.EngineEvent import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import com.walletconnect.notify.common.convertToUTF8 import com.walletconnect.notify.common.model.GetNotificationHistory import com.walletconnect.notify.common.model.Notification diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnSubscribeResponseUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnSubscribeResponseUseCase.kt index 48dd02063..fc5776fae 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnSubscribeResponseUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnSubscribeResponseUseCase.kt @@ -9,9 +9,9 @@ import com.walletconnect.android.internal.common.model.params.ChatNotifyResponse import com.walletconnect.android.internal.common.model.params.CoreNotifyParams import com.walletconnect.android.internal.common.model.type.EngineEvent import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.util.Logger -import com.walletconnect.foundation.util.jwt.decodeDidPkh +import com.reown.foundation.common.model.Topic +import com.reown.foundation.util.Logger +import com.reown.foundation.util.jwt.decodeDidPkh import com.walletconnect.notify.common.model.CreateSubscription import com.walletconnect.notify.data.jwt.subscription.SubscriptionRequestJwtClaim import com.walletconnect.notify.data.jwt.subscription.SubscriptionResponseJwtClaim diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnUpdateResponseUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnUpdateResponseUseCase.kt index 74bc0e62f..5a4e580cb 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnUpdateResponseUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnUpdateResponseUseCase.kt @@ -9,8 +9,8 @@ import com.walletconnect.android.internal.common.model.WCResponse import com.walletconnect.android.internal.common.model.params.ChatNotifyResponseAuthParams import com.walletconnect.android.internal.common.model.params.CoreNotifyParams import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.foundation.util.Logger -import com.walletconnect.foundation.util.jwt.decodeDidPkh +import com.reown.foundation.util.Logger +import com.reown.foundation.util.jwt.decodeDidPkh import com.walletconnect.notify.common.model.CreateSubscription import com.walletconnect.notify.common.model.UpdateSubscription import com.walletconnect.notify.data.jwt.update.UpdateRequestJwtClaim diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnWatchSubscriptionsResponseUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnWatchSubscriptionsResponseUseCase.kt index 27c85faae..ca5de1e68 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnWatchSubscriptionsResponseUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnWatchSubscriptionsResponseUseCase.kt @@ -8,9 +8,9 @@ import com.walletconnect.android.internal.common.model.SDKError import com.walletconnect.android.internal.common.model.WCResponse import com.walletconnect.android.internal.common.model.params.ChatNotifyResponseAuthParams import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.foundation.util.Logger -import com.walletconnect.foundation.util.jwt.decodeDidPkh -import com.walletconnect.foundation.util.jwt.decodeEd25519DidKey +import com.reown.foundation.util.Logger +import com.reown.foundation.util.jwt.decodeDidPkh +import com.reown.foundation.util.jwt.decodeEd25519DidKey import com.walletconnect.notify.common.NotifyServerUrl import com.walletconnect.notify.common.model.SubscriptionChanged import com.walletconnect.notify.data.jwt.watchSubscriptions.WatchSubscriptionsResponseJwtClaim diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/scenario/HybridAppInstrumentedActivityScenario.kt b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/scenario/HybridAppInstrumentedActivityScenario.kt index 6e2fc192e..150e957a0 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/scenario/HybridAppInstrumentedActivityScenario.kt +++ b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/scenario/HybridAppInstrumentedActivityScenario.kt @@ -1,7 +1,7 @@ package com.walletconnect.sign.test.scenario import com.walletconnect.android.internal.common.scope -import com.walletconnect.foundation.network.model.Relay +import com.reown.foundation.network.model.Relay import com.walletconnect.sign.test.BuildConfig import com.walletconnect.sign.test.utils.TestClient import junit.framework.TestCase diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/scenario/SignClientInstrumentedActivityScenario.kt b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/scenario/SignClientInstrumentedActivityScenario.kt index 611273cec..99ac9bf68 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/scenario/SignClientInstrumentedActivityScenario.kt +++ b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/scenario/SignClientInstrumentedActivityScenario.kt @@ -1,7 +1,7 @@ package com.walletconnect.sign.test.scenario import com.walletconnect.android.internal.common.scope -import com.walletconnect.foundation.network.model.Relay +import com.reown.foundation.network.model.Relay import com.walletconnect.sign.test.BuildConfig import com.walletconnect.sign.test.utils.TestClient import junit.framework.TestCase.fail diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignProtocol.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignProtocol.kt index ca5333dcb..82d64aef1 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignProtocol.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignProtocol.kt @@ -11,7 +11,7 @@ import com.walletconnect.android.internal.common.scope import com.walletconnect.android.internal.common.wcKoinApp import com.walletconnect.android.pairing.model.mapper.toPairing import com.walletconnect.android.relay.WSSConnectionState -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic import com.walletconnect.sign.client.mapper.* import com.walletconnect.sign.common.exceptions.SignClientAlreadyInitializedException import com.walletconnect.sign.di.engineModule diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/Request.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/Request.kt index d6b65e586..f7f5c0d12 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/Request.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/Request.kt @@ -2,7 +2,7 @@ package com.walletconnect.sign.common.model import com.walletconnect.android.internal.common.model.Expiry import com.walletconnect.android.internal.common.model.TransportType -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic internal data class Request( val id: Long, diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/proposal/ProposalVO.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/proposal/ProposalVO.kt index 725070f7f..7d025f0f2 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/proposal/ProposalVO.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/proposal/ProposalVO.kt @@ -4,7 +4,7 @@ import com.walletconnect.android.internal.common.model.AppMetaData import com.walletconnect.android.internal.common.model.Expiry import com.walletconnect.android.internal.common.model.Namespace import com.walletconnect.android.internal.common.model.Redirect -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic internal data class ProposalVO( val requestId: Long, diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/sequence/SessionVO.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/sequence/SessionVO.kt index 11ef42f48..84b6ff329 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/sequence/SessionVO.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/sequence/SessionVO.kt @@ -8,8 +8,8 @@ import com.walletconnect.android.internal.common.model.Namespace import com.walletconnect.android.internal.common.model.TransportType import com.walletconnect.android.internal.common.model.type.Sequence import com.walletconnect.android.internal.utils.ACTIVE_SESSION -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.common.model.Topic import com.walletconnect.sign.common.model.vo.clientsync.common.SessionParticipant import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams import com.walletconnect.sign.common.model.vo.proposal.ProposalVO diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/validator/SignValidator.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/validator/SignValidator.kt index bd6f6e88a..c31465b89 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/validator/SignValidator.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/validator/SignValidator.kt @@ -10,7 +10,7 @@ import com.walletconnect.android.internal.utils.CoreValidator.isAccountIdCAIP10C import com.walletconnect.android.internal.utils.CoreValidator.isChainIdCAIP2Compliant import com.walletconnect.android.internal.utils.CoreValidator.isNamespaceRegexCompliant import com.walletconnect.android.internal.utils.weekInSeconds -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic import com.walletconnect.sign.common.exceptions.NAMESPACE_ACCOUNTS_CAIP_10_MESSAGE import com.walletconnect.sign.common.exceptions.NAMESPACE_ACCOUNTS_WRONG_NAMESPACE_MESSAGE import com.walletconnect.sign.common.exceptions.NAMESPACE_CHAINS_CAIP_2_MESSAGE diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/domain/SignEngine.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/domain/SignEngine.kt index bd9366ded..81daae289 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/domain/SignEngine.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/domain/SignEngine.kt @@ -22,7 +22,7 @@ import com.walletconnect.android.pulse.model.properties.Props import com.walletconnect.android.push.notifications.DecryptMessageUseCaseInterface import com.walletconnect.android.relay.WSSConnectionState import com.walletconnect.android.verify.model.VerifyContext -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams import com.walletconnect.sign.engine.model.EngineDO import com.walletconnect.sign.engine.model.mapper.toEngineDO diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/EngineDO.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/EngineDO.kt index d6955b633..a53b07473 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/EngineDO.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/EngineDO.kt @@ -10,7 +10,7 @@ import com.walletconnect.android.internal.common.model.Validation import com.walletconnect.android.internal.common.model.type.EngineEvent import com.walletconnect.android.internal.common.model.type.Sequence import com.walletconnect.android.internal.common.signing.cacao.Cacao -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic import java.net.URI import com.walletconnect.android.internal.common.model.RelayProtocolOptions as CoreRelayProtocolOptions diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/mapper/EngineMapper.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/mapper/EngineMapper.kt index c45af4b32..13eddde31 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/mapper/EngineMapper.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/mapper/EngineMapper.kt @@ -16,8 +16,8 @@ import com.walletconnect.android.internal.common.signing.cacao.CacaoType import com.walletconnect.android.internal.common.signing.cacao.Issuer import com.walletconnect.android.internal.common.signing.cacao.toCAIP222Message import com.walletconnect.android.verify.model.VerifyContext -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.common.model.Topic import com.walletconnect.sign.common.exceptions.PeerError import com.walletconnect.sign.common.model.Request import com.walletconnect.sign.common.model.vo.clientsync.common.PayloadParams diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCase.kt index c8bceaf41..7d9a5052b 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCase.kt @@ -35,10 +35,10 @@ import com.walletconnect.android.pulse.model.EventType import com.walletconnect.android.pulse.model.Trace import com.walletconnect.android.pulse.model.properties.Properties import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.common.model.Topic +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.exceptions.MissingSessionAuthenticateRequest import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams import com.walletconnect.sign.common.model.vo.sequence.SessionVO diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionUseCase.kt index 897c42332..75b19caf1 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionUseCase.kt @@ -19,10 +19,10 @@ import com.walletconnect.android.pulse.model.EventType import com.walletconnect.android.pulse.model.Trace import com.walletconnect.android.pulse.model.properties.Properties import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.common.model.Topic +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.exceptions.InvalidNamespaceException import com.walletconnect.sign.common.exceptions.SessionProposalExpiredException import com.walletconnect.sign.common.model.vo.clientsync.common.SessionParticipant diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/DecryptSignMessageUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/DecryptSignMessageUseCase.kt index f04c28eca..60ff8d990 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/DecryptSignMessageUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/DecryptSignMessageUseCase.kt @@ -13,7 +13,7 @@ import com.walletconnect.android.internal.common.storage.metadata.MetadataStorag import com.walletconnect.android.internal.common.storage.push_messages.PushMessagesRepository import com.walletconnect.android.push.notifications.DecryptMessageUseCaseInterface import com.walletconnect.android.utils.toClient -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic import com.walletconnect.sign.common.exceptions.InvalidSignParamsType import com.walletconnect.sign.common.model.vo.clientsync.common.PayloadParams import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/DisconnectSessionUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/DisconnectSessionUseCase.kt index f73590a1b..a92298936 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/DisconnectSessionUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/DisconnectSessionUseCase.kt @@ -6,9 +6,9 @@ import com.walletconnect.android.internal.common.model.IrnParams import com.walletconnect.android.internal.common.model.Tags import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.walletconnect.android.internal.utils.dayInSeconds -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.Topic +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.exceptions.NO_SEQUENCE_FOR_TOPIC_MESSAGE import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/EmitEventUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/EmitEventUseCase.kt index 3c3bce582..a3dd4186d 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/EmitEventUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/EmitEventUseCase.kt @@ -5,9 +5,9 @@ import com.walletconnect.android.internal.common.model.IrnParams import com.walletconnect.android.internal.common.model.Tags import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.walletconnect.android.internal.utils.fiveMinutesInSeconds -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.Topic +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.exceptions.InvalidEventException import com.walletconnect.sign.common.exceptions.NO_SEQUENCE_FOR_TOPIC_MESSAGE import com.walletconnect.sign.common.exceptions.UNAUTHORIZED_EMIT_MESSAGE diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ExtendSessionUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ExtendSessionUseCase.kt index bc5f2b5fa..30844caa8 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ExtendSessionUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ExtendSessionUseCase.kt @@ -6,9 +6,9 @@ import com.walletconnect.android.internal.common.model.Tags import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.walletconnect.android.internal.utils.dayInSeconds import com.walletconnect.android.internal.utils.weekInSeconds -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.Topic +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.exceptions.NO_SEQUENCE_FOR_TOPIC_MESSAGE import com.walletconnect.sign.common.exceptions.NotSettledSessionException import com.walletconnect.sign.common.exceptions.SESSION_IS_NOT_ACKNOWLEDGED_MESSAGE diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/PingUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/PingUseCase.kt index ba971d3af..49f67a64a 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/PingUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/PingUseCase.kt @@ -6,9 +6,9 @@ import com.walletconnect.android.internal.common.model.Tags import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.walletconnect.android.internal.common.scope import com.walletconnect.android.internal.utils.thirtySeconds -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.Topic +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams import com.walletconnect.sign.storage.sequence.SessionStorageRepository diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeSessionUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeSessionUseCase.kt index 3982b6468..d902b3f09 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeSessionUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeSessionUseCase.kt @@ -10,9 +10,9 @@ import com.walletconnect.android.internal.common.model.Tags import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.walletconnect.android.internal.utils.PROPOSAL_EXPIRY import com.walletconnect.android.internal.utils.fiveMinutesInSeconds -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.exceptions.InvalidNamespaceException import com.walletconnect.sign.common.exceptions.InvalidPropertiesException import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionAuthenticateUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionAuthenticateUseCase.kt index 039dd8f2e..5575333f7 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionAuthenticateUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionAuthenticateUseCase.kt @@ -21,10 +21,10 @@ import com.walletconnect.android.pulse.model.Direction import com.walletconnect.android.pulse.model.EventType import com.walletconnect.android.pulse.model.properties.Properties import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.common.model.Topic +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.exceptions.MissingSessionAuthenticateRequest import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams import com.walletconnect.sign.json_rpc.domain.GetPendingSessionAuthenticateRequest diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionUseCase.kt index 16466d5e3..2b5b6660b 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionUseCase.kt @@ -9,8 +9,8 @@ import com.walletconnect.android.internal.common.storage.verify.VerifyContextSto import com.walletconnect.android.internal.utils.CoreValidator.isExpired import com.walletconnect.android.internal.utils.fiveMinutesInSeconds import com.walletconnect.android.pairing.handler.PairingControllerInterface -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.exceptions.PeerError import com.walletconnect.sign.common.exceptions.SessionProposalExpiredException import com.walletconnect.sign.engine.model.mapper.toSessionProposeRequest diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RespondSessionRequestUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RespondSessionRequestUseCase.kt index 51c29b089..6f75bd166 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RespondSessionRequestUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RespondSessionRequestUseCase.kt @@ -21,9 +21,9 @@ import com.walletconnect.android.pulse.model.Direction import com.walletconnect.android.pulse.model.EventType import com.walletconnect.android.pulse.model.properties.Properties import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.Topic +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.exceptions.NO_SEQUENCE_FOR_TOPIC_MESSAGE import com.walletconnect.sign.engine.sessionRequestEventsQueue import com.walletconnect.sign.json_rpc.domain.GetPendingJsonRpcHistoryEntryByIdUseCase diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionAuthenticateUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionAuthenticateUseCase.kt index 758cd0312..652a4b123 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionAuthenticateUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionAuthenticateUseCase.kt @@ -26,10 +26,10 @@ import com.walletconnect.android.pulse.model.Direction import com.walletconnect.android.pulse.model.EventType import com.walletconnect.android.pulse.model.properties.Properties import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.common.model.Topic +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.model.vo.clientsync.common.Requester import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionRequestUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionRequestUseCase.kt index 41d8244c4..558dbb4e4 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionRequestUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionRequestUseCase.kt @@ -22,9 +22,9 @@ import com.walletconnect.android.pulse.model.Direction import com.walletconnect.android.pulse.model.EventType import com.walletconnect.android.pulse.model.properties.Properties import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.Topic +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.exceptions.InvalidRequestException import com.walletconnect.sign.common.exceptions.NO_SEQUENCE_FOR_TOPIC_MESSAGE import com.walletconnect.sign.common.exceptions.UnauthorizedMethodException diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionUpdateUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionUpdateUseCase.kt index 6d3529b57..8026c2c7e 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionUpdateUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionUpdateUseCase.kt @@ -6,9 +6,9 @@ import com.walletconnect.android.internal.common.model.IrnParams import com.walletconnect.android.internal.common.model.Tags import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.walletconnect.android.internal.utils.dayInSeconds -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.Topic +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.exceptions.InvalidNamespaceException import com.walletconnect.sign.common.exceptions.NO_SEQUENCE_FOR_TOPIC_MESSAGE import com.walletconnect.sign.common.exceptions.NotSettledSessionException diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnPingUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnPingUseCase.kt index 944ba6ac0..010deafd5 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnPingUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnPingUseCase.kt @@ -5,8 +5,8 @@ import com.walletconnect.android.internal.common.model.Tags import com.walletconnect.android.internal.common.model.WCRequest import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.walletconnect.android.internal.utils.thirtySeconds -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger import kotlinx.coroutines.supervisorScope internal class OnPingUseCase(private val jsonRpcInteractor: RelayJsonRpcInteractorInterface, private val logger: Logger) { diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionAuthenticateUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionAuthenticateUseCase.kt index b3209f9ae..0503e007e 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionAuthenticateUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionAuthenticateUseCase.kt @@ -23,8 +23,8 @@ import com.walletconnect.android.pulse.model.properties.Properties import com.walletconnect.android.pulse.model.properties.Props import com.walletconnect.android.verify.domain.ResolveAttestationIdUseCase import com.walletconnect.android.verify.model.VerifyContext -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams import com.walletconnect.sign.engine.model.EngineDO import com.walletconnect.sign.engine.model.mapper.toEngineDO diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionDeleteUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionDeleteUseCase.kt index 787845c91..dd857b41e 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionDeleteUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionDeleteUseCase.kt @@ -9,8 +9,8 @@ import com.walletconnect.android.internal.common.model.WCRequest import com.walletconnect.android.internal.common.model.type.EngineEvent import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.walletconnect.android.internal.utils.dayInSeconds -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.model.type.Sequences import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams import com.walletconnect.sign.engine.model.mapper.toEngineDO diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionEventUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionEventUseCase.kt index e08efc62f..5ad8a8694 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionEventUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionEventUseCase.kt @@ -8,8 +8,8 @@ import com.walletconnect.android.internal.common.model.WCRequest import com.walletconnect.android.internal.common.model.type.EngineEvent import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.walletconnect.android.internal.utils.fiveMinutesInSeconds -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.exceptions.PeerError import com.walletconnect.sign.common.model.type.Sequences import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionExtendUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionExtendUseCase.kt index 3780fa067..12057f6a8 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionExtendUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionExtendUseCase.kt @@ -9,8 +9,8 @@ import com.walletconnect.android.internal.common.model.WCRequest import com.walletconnect.android.internal.common.model.type.EngineEvent import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.walletconnect.android.internal.utils.dayInSeconds -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.model.type.Sequences import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams import com.walletconnect.sign.common.validator.SignValidator diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionProposalUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionProposalUseCase.kt index d5a28e19f..288418b9a 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionProposalUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionProposalUseCase.kt @@ -19,8 +19,8 @@ import com.walletconnect.android.pulse.model.EventType import com.walletconnect.android.pulse.model.properties.Properties import com.walletconnect.android.pulse.model.properties.Props import com.walletconnect.android.verify.domain.ResolveAttestationIdUseCase -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams import com.walletconnect.sign.common.validator.SignValidator import com.walletconnect.sign.engine.model.EngineDO diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionRequestUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionRequestUseCase.kt index 75f15d746..42636cd8c 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionRequestUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionRequestUseCase.kt @@ -24,8 +24,8 @@ import com.walletconnect.android.pulse.model.properties.Properties import com.walletconnect.android.pulse.model.properties.Props import com.walletconnect.android.verify.domain.ResolveAttestationIdUseCase import com.walletconnect.android.verify.model.VerifyContext -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.model.type.Sequences import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams import com.walletconnect.sign.common.validator.SignValidator diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionSettleUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionSettleUseCase.kt index 689a1e3f1..01ba00a71 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionSettleUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionSettleUseCase.kt @@ -14,9 +14,9 @@ import com.walletconnect.android.internal.common.storage.metadata.MetadataStorag import com.walletconnect.android.internal.utils.fiveMinutesInSeconds import com.walletconnect.android.pairing.handler.PairingControllerInterface import com.walletconnect.android.utils.toClient -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.exceptions.PeerError import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams import com.walletconnect.sign.common.model.vo.sequence.SessionVO diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionUpdateUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionUpdateUseCase.kt index ef8b5e2a9..2c0f60b74 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionUpdateUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionUpdateUseCase.kt @@ -8,8 +8,8 @@ import com.walletconnect.android.internal.common.model.WCRequest import com.walletconnect.android.internal.common.model.type.EngineEvent import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.walletconnect.android.internal.utils.dayInSeconds -import com.walletconnect.foundation.common.model.Ttl -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.Ttl +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.exceptions.PeerError import com.walletconnect.sign.common.model.type.Sequences import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionAuthenticateResponseUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionAuthenticateResponseUseCase.kt index 8bc06f516..16326a03a 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionAuthenticateResponseUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionAuthenticateResponseUseCase.kt @@ -27,9 +27,9 @@ import com.walletconnect.android.pulse.model.EventType import com.walletconnect.android.pulse.model.properties.Properties import com.walletconnect.android.pulse.model.properties.Props import com.walletconnect.android.utils.toClient -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.common.model.Topic +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams import com.walletconnect.sign.common.model.vo.sequence.SessionVO import com.walletconnect.sign.common.validator.SignValidator diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionProposalResponseUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionProposalResponseUseCase.kt index 4499df4fd..482d0dc32 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionProposalResponseUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionProposalResponseUseCase.kt @@ -10,8 +10,8 @@ import com.walletconnect.android.internal.common.model.type.EngineEvent import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.walletconnect.android.internal.common.scope import com.walletconnect.android.pairing.handler.PairingControllerInterface -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams import com.walletconnect.sign.engine.model.EngineDO import com.walletconnect.sign.storage.proposal.ProposalStorageRepository diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionRequestResponseUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionRequestResponseUseCase.kt index 959caf800..c6ec58953 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionRequestResponseUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionRequestResponseUseCase.kt @@ -11,7 +11,7 @@ import com.walletconnect.android.pulse.model.Direction import com.walletconnect.android.pulse.model.EventType import com.walletconnect.android.pulse.model.properties.Properties import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams import com.walletconnect.sign.engine.model.EngineDO import com.walletconnect.sign.engine.model.mapper.toEngineDO diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionSettleResponseUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionSettleResponseUseCase.kt index b0465b415..86627f521 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionSettleResponseUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionSettleResponseUseCase.kt @@ -8,7 +8,7 @@ import com.walletconnect.android.internal.common.model.WCResponse import com.walletconnect.android.internal.common.model.type.EngineEvent import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import com.walletconnect.sign.engine.model.EngineDO import com.walletconnect.sign.engine.model.mapper.toEngineDO import com.walletconnect.sign.storage.sequence.SessionStorageRepository diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionUpdateResponseUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionUpdateResponseUseCase.kt index 72633a749..1af1e0f3e 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionUpdateResponseUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionUpdateResponseUseCase.kt @@ -4,7 +4,7 @@ import com.walletconnect.android.internal.common.JsonRpcResponse import com.walletconnect.android.internal.common.model.SDKError import com.walletconnect.android.internal.common.model.WCResponse import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import com.walletconnect.sign.engine.model.EngineDO import com.walletconnect.sign.engine.model.mapper.toMapOfEngineNamespacesSession import com.walletconnect.sign.storage.sequence.SessionStorageRepository diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingRequestsByTopicUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingRequestsByTopicUseCase.kt index cf489b8d1..3fcbe1cfc 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingRequestsByTopicUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingRequestsByTopicUseCase.kt @@ -2,7 +2,7 @@ package com.walletconnect.sign.json_rpc.domain import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic import com.walletconnect.sign.common.model.Request import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc import com.walletconnect.sign.json_rpc.model.JsonRpcMethod diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingSessionRequestByTopicUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingSessionRequestByTopicUseCase.kt index f605c989b..c38d2e033 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingSessionRequestByTopicUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingSessionRequestByTopicUseCase.kt @@ -4,7 +4,7 @@ import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer import com.walletconnect.android.internal.common.model.AppMetaDataType import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc import com.walletconnect.sign.engine.model.EngineDO import com.walletconnect.sign.engine.model.mapper.toSessionRequest diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/model/JsonRpcMapper.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/model/JsonRpcMapper.kt index 3d0ab67c7..9dd427a9a 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/model/JsonRpcMapper.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/model/JsonRpcMapper.kt @@ -4,7 +4,7 @@ package com.walletconnect.sign.json_rpc.model import com.walletconnect.android.internal.common.json_rpc.model.JsonRpcHistoryRecord import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic import com.walletconnect.sign.common.model.Request import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/proposal/ProposalStorageRepository.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/proposal/ProposalStorageRepository.kt index 326b8435d..7702ed44e 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/proposal/ProposalStorageRepository.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/proposal/ProposalStorageRepository.kt @@ -7,7 +7,7 @@ import app.cash.sqldelight.async.coroutines.awaitAsList import com.walletconnect.android.internal.common.model.Expiry import com.walletconnect.android.internal.common.model.Namespace import com.walletconnect.android.internal.common.scope -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic import com.walletconnect.sign.common.model.vo.proposal.ProposalVO import com.walletconnect.sign.storage.data.dao.optionalnamespaces.OptionalNamespaceDaoQueries import com.walletconnect.sign.storage.data.dao.proposal.ProposalDaoQueries diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/sequence/SessionStorageRepository.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/sequence/SessionStorageRepository.kt index 13217fca4..544a6a730 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/sequence/SessionStorageRepository.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/sequence/SessionStorageRepository.kt @@ -6,8 +6,8 @@ import android.database.sqlite.SQLiteException import com.walletconnect.android.internal.common.model.Expiry import com.walletconnect.android.internal.common.model.Namespace import com.walletconnect.android.internal.common.model.TransportType -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.common.model.Topic import com.walletconnect.sign.common.model.vo.sequence.SessionVO import com.walletconnect.sign.engine.sessionRequestEventsQueue import com.walletconnect.sign.storage.data.dao.namespace.NamespaceDaoQueries diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCaseTest.kt index 091d511f0..5d0c6201d 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCaseTest.kt @@ -17,9 +17,9 @@ import com.walletconnect.android.internal.utils.fiveMinutesInSeconds import com.walletconnect.android.pulse.domain.InsertEventUseCase import com.walletconnect.android.pulse.domain.InsertTelemetryEventUseCase import com.walletconnect.android.pulse.model.Trace -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.common.model.Topic +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.exceptions.MissingSessionAuthenticateRequest import com.walletconnect.sign.common.model.Request import com.walletconnect.sign.common.model.vo.clientsync.common.PayloadParams diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionUseCaseTest.kt index 071b3b974..7977e5abe 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionUseCaseTest.kt @@ -7,9 +7,9 @@ import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteract import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface import com.walletconnect.android.internal.common.storage.verify.VerifyContextStorageRepository import com.walletconnect.android.pulse.domain.InsertTelemetryEventUseCase -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.common.model.Topic +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.exceptions.InvalidNamespaceException import com.walletconnect.sign.common.exceptions.SessionProposalExpiredException import com.walletconnect.sign.common.model.vo.proposal.ProposalVO diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/DisconnectSessionUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/DisconnectSessionUseCaseTest.kt index ec96a92b6..bcaaaf6d7 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/DisconnectSessionUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/DisconnectSessionUseCaseTest.kt @@ -2,7 +2,7 @@ package com.walletconnect.sign.engine.use_case.calls import com.walletconnect.android.internal.common.exception.CannotFindSequenceForTopic import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import com.walletconnect.sign.storage.sequence.SessionStorageRepository import io.mockk.every import io.mockk.mockk diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/EmitEventUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/EmitEventUseCaseTest.kt index 3dcdf8eec..9487e7662 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/EmitEventUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/EmitEventUseCaseTest.kt @@ -3,8 +3,8 @@ package com.walletconnect.sign.engine.use_case.calls import com.walletconnect.android.internal.common.exception.CannotFindSequenceForTopic import com.walletconnect.android.internal.common.model.Namespace import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.Topic +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.model.vo.sequence.SessionVO import com.walletconnect.sign.engine.model.EngineDO import com.walletconnect.sign.storage.sequence.SessionStorageRepository diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ExtendSessionUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ExtendSessionUseCaseTest.kt index 72de2e774..0674313e6 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ExtendSessionUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ExtendSessionUseCaseTest.kt @@ -3,9 +3,9 @@ package com.walletconnect.sign.engine.use_case.calls import com.walletconnect.android.internal.common.exception.CannotFindSequenceForTopic import com.walletconnect.android.internal.common.model.Expiry import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.common.model.Topic +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.exceptions.NotSettledSessionException import com.walletconnect.sign.common.model.vo.sequence.SessionVO import com.walletconnect.sign.storage.sequence.SessionStorageRepository diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeSessionUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeSessionUseCaseTest.kt index 2aaf2e542..ff805d7fb 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeSessionUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeSessionUseCaseTest.kt @@ -6,8 +6,8 @@ import com.walletconnect.android.internal.common.model.Expiry import com.walletconnect.android.internal.common.model.RelayProtocolOptions import com.walletconnect.android.internal.common.model.SymmetricKey import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.Topic +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.exceptions.InvalidNamespaceException import com.walletconnect.sign.engine.model.EngineDO import com.walletconnect.sign.storage.proposal.ProposalStorageRepository diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeUseCaseTest.kt index 62fc54232..1580de1c7 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeUseCaseTest.kt @@ -8,9 +8,9 @@ import com.walletconnect.android.internal.common.model.RelayProtocolOptions import com.walletconnect.android.internal.common.model.SymmetricKey import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.walletconnect.android.internal.utils.fiveMinutesInSeconds -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.common.model.Topic +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.exceptions.InvalidNamespaceException import com.walletconnect.sign.engine.model.EngineDO import com.walletconnect.sign.storage.proposal.ProposalStorageRepository diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionAuthenticateUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionAuthenticateUseCaseTest.kt index 68d942136..7ce4da846 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionAuthenticateUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionAuthenticateUseCaseTest.kt @@ -10,9 +10,9 @@ import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteract import com.walletconnect.android.internal.common.storage.verify.VerifyContextStorageRepository import com.walletconnect.android.internal.utils.fiveMinutesInSeconds import com.walletconnect.android.pulse.domain.InsertEventUseCase -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.common.model.Topic +import com.reown.foundation.util.Logger import com.walletconnect.sign.common.exceptions.MissingSessionAuthenticateRequest import com.walletconnect.sign.common.model.Request import com.walletconnect.sign.common.model.vo.clientsync.common.PayloadParams diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/RespondSessionRequestUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/RespondSessionRequestUseCaseTest.kt index 249b506bb..a0983f34a 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/RespondSessionRequestUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/RespondSessionRequestUseCaseTest.kt @@ -7,7 +7,7 @@ import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteract import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface import com.walletconnect.android.internal.common.storage.verify.VerifyContextStorageRepository import com.walletconnect.android.pulse.domain.InsertEventUseCase -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import com.walletconnect.sign.json_rpc.domain.GetPendingJsonRpcHistoryEntryByIdUseCase import com.walletconnect.sign.storage.sequence.SessionStorageRepository import io.mockk.every diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionAuthenticateUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionAuthenticateUseCaseTest.kt index 56a2fbd38..c28ed56e5 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionAuthenticateUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionAuthenticateUseCaseTest.kt @@ -12,9 +12,9 @@ import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteract import com.walletconnect.android.internal.utils.currentTimeInSeconds import com.walletconnect.android.internal.utils.fiveMinutesInSeconds import com.walletconnect.android.pulse.domain.InsertEventUseCase -import com.walletconnect.foundation.common.model.PublicKey -import com.walletconnect.foundation.common.model.Topic -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.common.model.PublicKey +import com.reown.foundation.common.model.Topic +import com.reown.foundation.util.Logger import com.walletconnect.sign.engine.model.EngineDO import com.walletconnect.sign.storage.authenticate.AuthenticateResponseTopicRepository import com.walletconnect.sign.storage.link_mode.LinkModeStorageRepository diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionRequestUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionRequestUseCaseTest.kt index 75ccc19e9..c0affc681 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionRequestUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionRequestUseCaseTest.kt @@ -5,7 +5,7 @@ import com.walletconnect.android.internal.common.json_rpc.domain.link_mode.LinkM import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface import com.walletconnect.android.pulse.domain.InsertEventUseCase -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import com.walletconnect.sign.engine.model.EngineDO import com.walletconnect.sign.storage.sequence.SessionStorageRepository import io.mockk.every diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionUpdateUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionUpdateUseCaseTest.kt index 619c5db3c..00a3909b9 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionUpdateUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionUpdateUseCaseTest.kt @@ -2,7 +2,7 @@ package com.walletconnect.sign.engine.use_case.calls import com.walletconnect.android.internal.common.exception.CannotFindSequenceForTopic import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import com.walletconnect.sign.storage.sequence.SessionStorageRepository import io.mockk.every import io.mockk.mockk diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/mappers/EngineMapperTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/mappers/EngineMapperTest.kt index 2fd4f13da..b9f35aa1e 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/mappers/EngineMapperTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/mappers/EngineMapperTest.kt @@ -3,7 +3,7 @@ package com.walletconnect.sign.mappers import com.walletconnect.android.internal.common.model.AppMetaData import com.walletconnect.android.internal.common.model.RelayProtocolOptions import com.walletconnect.android.internal.common.model.SessionProposer -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams import com.walletconnect.sign.engine.model.mapper.toEngineDO import org.junit.Test diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/validator/ValidatorTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/validator/ValidatorTest.kt index b71ce9e16..c3a576e3f 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/validator/ValidatorTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/validator/ValidatorTest.kt @@ -6,7 +6,7 @@ import com.walletconnect.android.internal.utils.dayInSeconds import com.walletconnect.android.internal.utils.fiveMinutesInSeconds import com.walletconnect.android.internal.utils.monthInSeconds import com.walletconnect.android.internal.utils.weekInSeconds -import com.walletconnect.foundation.common.model.Topic +import com.reown.foundation.common.model.Topic import com.walletconnect.sign.common.exceptions.EMPTY_NAMESPACES_MESSAGE import com.walletconnect.sign.common.exceptions.INVALID_EVENT_MESSAGE import com.walletconnect.sign.common.exceptions.INVALID_EXTEND_TIME diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/WalletKitApplication.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/WalletKitApplication.kt index c8aeb758f..c18eb8af6 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/WalletKitApplication.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/WalletKitApplication.kt @@ -21,7 +21,7 @@ import com.walletconnect.android.cacao.signature.SignatureType import com.walletconnect.android.internal.common.di.AndroidCommonDITags import com.walletconnect.android.internal.common.wcKoinApp import com.walletconnect.android.utils.cacao.sign -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import com.walletconnect.notify.client.Notify import com.walletconnect.notify.client.NotifyClient import com.walletconnect.notify.client.cacao.CacaoSigner diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/Web3WalletMessageService.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/Web3WalletMessageService.kt index 11e3d22c3..e08542a06 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/Web3WalletMessageService.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/Web3WalletMessageService.kt @@ -6,7 +6,7 @@ import com.walletconnect.android.Core import com.walletconnect.android.internal.common.di.AndroidCommonDITags import com.walletconnect.android.internal.common.wcKoinApp import com.walletconnect.android.push.notifications.PushMessagingService -import com.walletconnect.foundation.util.Logger +import com.reown.foundation.util.Logger import com.walletconnect.sample.wallet.domain.NotificationHandler import kotlinx.coroutines.runBlocking import org.koin.core.qualifier.named From 7bf671d712c1a813178b0eb6846dd749fac7cf92 Mon Sep 17 00:00:00 2001 From: kubel Date: Wed, 4 Sep 2024 15:39:52 +0200 Subject: [PATCH 15/51] Remove walletconnectModal and use AppKit in sample Dapp --- .github/workflows/ci_verify_snapshots.yml | 45 --- ReadMe.md | 106 +++--- build.gradle.kts | 1 - buildSrc/src/main/kotlin/Versions.kt | 2 - core/bom/build.gradle.kts | 1 - product/walletconnectmodal/ReadMe.md | 44 --- product/walletconnectmodal/build.gradle.kts | 99 ------ product/walletconnectmodal/proguard-rules.pro | 21 -- .../src/main/AndroidManifest.xml | 4 - .../wcmodal/client/ClientMapper.kt | 159 --------- .../com/walletconnect/wcmodal/client/Modal.kt | 231 ------------- .../wcmodal/client/WalletConnectModal.kt | 236 -------------- .../wcmodal/di/WalletConnectModalModule.kt | 14 - .../wcmodal/domain/RecentWalletsRepository.kt | 14 - .../domain/WalletConnectModalDelegate.kt | 99 ------ .../domain/dataStore/WalletDataStore.kt | 175 ---------- .../domain/usecase/GetRecentWalletUseCase.kt | 7 - .../domain/usecase/SaveRecentWalletUseCase.kt | 9 - .../wcmodal/ui/WalletConnectModal.kt | 109 ------- .../wcmodal/ui/WalletConnectModalEvents.kt | 8 - .../wcmodal/ui/WalletConnectModalNav.kt | 25 -- .../wcmodal/ui/WalletConnectModalSheet.kt | 69 ---- .../wcmodal/ui/WalletConnectModalViewModel.kt | 94 ------ .../wcmodal/ui/components/Buttons.kt | 123 ------- .../wcmodal/ui/components/CircleButton.kt | 99 ------ .../wcmodal/ui/components/Images.kt | 24 -- .../wcmodal/ui/components/ModalRoot.kt | 55 ---- .../wcmodal/ui/components/ModalTopBar.kt | 170 ---------- .../wcmodal/ui/components/Wallets.kt | 122 ------- .../wcmodal/ui/navigation/ModalNavGraph.kt | 56 ---- .../wcmodal/ui/navigation/Route.kt | 21 -- .../wcmodal/ui/preview/Preview.kt | 34 -- .../ui/routes/all_wallets/AllWalletsRoute.kt | 202 ------------ .../connect_wallet/ConnectYourWalletRoute.kt | 209 ------------ .../ui/routes/get_wallet/GetAWalletRoute.kt | 160 --------- .../wcmodal/ui/routes/help/HelpRoute.kt | 168 ---------- .../ui/routes/on_hold/RedirectOnHoldScreen.kt | 305 ------------------ .../ui/routes/on_hold/RedirectState.kt | 7 - .../ui/routes/scan_code/ScanCodeRoute.kt | 117 ------- .../wcmodal/ui/state/ModalState.kt | 37 --- .../wcmodal/ui/theme/Composition.kt | 11 - .../wcmodal/ui/theme/ModalColors.kt | 57 ---- .../walletconnect/wcmodal/ui/theme/Theme.kt | 44 --- .../walletconnect/wcmodal/ui/utils/Image.kt | 12 - .../src/main/res/drawable/browser.xml | 32 -- .../src/main/res/drawable/chevron_left.xml | 9 - .../src/main/res/drawable/dao.xml | 47 --- .../src/main/res/drawable/defi.xml | 35 -- .../src/main/res/drawable/eth.xml | 41 --- .../src/main/res/drawable/ic_close.xml | 9 - .../src/main/res/drawable/ic_copy.xml | 10 - .../main/res/drawable/ic_external_link.xml | 9 - .../main/res/drawable/ic_forward_chevron.xml | 10 - .../main/res/drawable/ic_question_mark.xml | 12 - .../src/main/res/drawable/ic_retry.xml | 9 - .../src/main/res/drawable/ic_scan.xml | 42 --- .../src/main/res/drawable/ic_search.xml | 10 - .../src/main/res/drawable/ic_wallet.xml | 10 - .../res/drawable/ic_wallet_connect_logo.xml | 9 - .../drawable/ic_wallet_connect_qr_logo.xml | 5 - .../src/main/res/drawable/lock.xml | 25 -- .../src/main/res/drawable/login.xml | 29 -- .../src/main/res/drawable/nft.xml | 28 -- .../src/main/res/drawable/noun.xml | 35 -- .../src/main/res/drawable/profile.xml | 42 --- .../src/main/res/values/attrs.xml | 5 - .../src/main/res/values/theme.xml | 9 - .../ui/WalletConnectModalViewModelTest.kt | 100 ------ .../routes/snapshots/AllWalletsRouteTest.kt | 76 ----- .../snapshots/ConnectYourWalletRouteTest.kt | 75 ----- .../snapshots/RedirectOnHoldRouteTest.kt | 47 --- .../ui/routes/snapshots/ScanCodeRouteTest.kt | 37 --- .../wcmodal/utils/DataProvider.kt | 37 --- .../wcmodal/utils/MainDispatcherRule.kt | 30 -- .../wcmodal/utils/ScreenShotTest.kt | 37 --- sample/dapp/build.gradle.kts | 6 +- .../sample/dapp/DappSampleApp.kt | 26 +- .../sample/dapp/domain/DappDelegate.kt | 10 +- .../sample/dapp/ui/DappSampleNavGraph.kt | 4 +- .../account/AccountViewModel.kt | 40 +-- .../chain_selection/ChainSelectionRoute.kt | 20 +- .../ChainSelectionViewModel.kt | 12 +- .../ui/routes/host/DappSampleViewModel.kt | 2 +- 83 files changed, 110 insertions(+), 4526 deletions(-) delete mode 100644 .github/workflows/ci_verify_snapshots.yml delete mode 100644 product/walletconnectmodal/ReadMe.md delete mode 100644 product/walletconnectmodal/build.gradle.kts delete mode 100644 product/walletconnectmodal/proguard-rules.pro delete mode 100644 product/walletconnectmodal/src/main/AndroidManifest.xml delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/client/ClientMapper.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/client/Modal.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/client/WalletConnectModal.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/di/WalletConnectModalModule.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/domain/RecentWalletsRepository.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/domain/WalletConnectModalDelegate.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/domain/dataStore/WalletDataStore.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/domain/usecase/GetRecentWalletUseCase.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/domain/usecase/SaveRecentWalletUseCase.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModal.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalEvents.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalNav.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalSheet.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalViewModel.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/components/Buttons.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/components/CircleButton.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/components/Images.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/components/ModalRoot.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/components/ModalTopBar.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/components/Wallets.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/navigation/ModalNavGraph.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/navigation/Route.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/preview/Preview.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/all_wallets/AllWalletsRoute.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/connect_wallet/ConnectYourWalletRoute.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/get_wallet/GetAWalletRoute.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/help/HelpRoute.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/on_hold/RedirectOnHoldScreen.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/on_hold/RedirectState.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/scan_code/ScanCodeRoute.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/state/ModalState.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/theme/Composition.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/theme/ModalColors.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/theme/Theme.kt delete mode 100644 product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/utils/Image.kt delete mode 100644 product/walletconnectmodal/src/main/res/drawable/browser.xml delete mode 100644 product/walletconnectmodal/src/main/res/drawable/chevron_left.xml delete mode 100644 product/walletconnectmodal/src/main/res/drawable/dao.xml delete mode 100644 product/walletconnectmodal/src/main/res/drawable/defi.xml delete mode 100644 product/walletconnectmodal/src/main/res/drawable/eth.xml delete mode 100644 product/walletconnectmodal/src/main/res/drawable/ic_close.xml delete mode 100644 product/walletconnectmodal/src/main/res/drawable/ic_copy.xml delete mode 100644 product/walletconnectmodal/src/main/res/drawable/ic_external_link.xml delete mode 100644 product/walletconnectmodal/src/main/res/drawable/ic_forward_chevron.xml delete mode 100644 product/walletconnectmodal/src/main/res/drawable/ic_question_mark.xml delete mode 100644 product/walletconnectmodal/src/main/res/drawable/ic_retry.xml delete mode 100644 product/walletconnectmodal/src/main/res/drawable/ic_scan.xml delete mode 100644 product/walletconnectmodal/src/main/res/drawable/ic_search.xml delete mode 100644 product/walletconnectmodal/src/main/res/drawable/ic_wallet.xml delete mode 100644 product/walletconnectmodal/src/main/res/drawable/ic_wallet_connect_logo.xml delete mode 100644 product/walletconnectmodal/src/main/res/drawable/ic_wallet_connect_qr_logo.xml delete mode 100644 product/walletconnectmodal/src/main/res/drawable/lock.xml delete mode 100644 product/walletconnectmodal/src/main/res/drawable/login.xml delete mode 100644 product/walletconnectmodal/src/main/res/drawable/nft.xml delete mode 100644 product/walletconnectmodal/src/main/res/drawable/noun.xml delete mode 100644 product/walletconnectmodal/src/main/res/drawable/profile.xml delete mode 100644 product/walletconnectmodal/src/main/res/values/attrs.xml delete mode 100644 product/walletconnectmodal/src/main/res/values/theme.xml delete mode 100644 product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalViewModelTest.kt delete mode 100644 product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/ui/routes/snapshots/AllWalletsRouteTest.kt delete mode 100644 product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/ui/routes/snapshots/ConnectYourWalletRouteTest.kt delete mode 100644 product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/ui/routes/snapshots/RedirectOnHoldRouteTest.kt delete mode 100644 product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/ui/routes/snapshots/ScanCodeRouteTest.kt delete mode 100644 product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/utils/DataProvider.kt delete mode 100644 product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/utils/MainDispatcherRule.kt delete mode 100644 product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/utils/ScreenShotTest.kt diff --git a/.github/workflows/ci_verify_snapshots.yml b/.github/workflows/ci_verify_snapshots.yml deleted file mode 100644 index 02a7c0712..000000000 --- a/.github/workflows/ci_verify_snapshots.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Verify Snapshots - -on: - workflow_dispatch: - -jobs: - verify_snapshots: - strategy: - matrix: - conf: [ - { name: wcm, command: ":product:walletconnectmodal:verifyPaparazziDebug"} - ] - name: ${{ matrix.conf.name }} - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - - name: Setup Java 17 - uses: actions/setup-java@v3 - with: - distribution: 'zulu' - java-version: '17' - architecture: x86_64 - cache: 'gradle' - - - name: Cache Gradle - uses: actions/cache@v3 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - - name: Fetch Properties File - env: - SECRETS_PROPERTIES: ${{ secrets.SECRETS_PROPERTIES }} - run: echo $SECRETS_PROPERTIES | base64 --decode > secrets.properties - - - name: Verify snapshots - run: ./gradlew ${{ matrix.conf.command }} - - - name: Stop Gradle - run: ./gradlew --stop diff --git a/ReadMe.md b/ReadMe.md index 9c8483055..af6dc6f9d 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -22,59 +22,59 @@ dependencies { ## SDK Chart -| BOM | [Core SDK](core/android) | [Sign SDK](protocol/sign) | [Notify SDK](protocol/notify) | [WalletKit](product/web3wallet) | [AppKit](product/web3modal) | [WalletConnectModal](product/walletconnectmodal) | -|-----------------------------------------------------------------------------------------|--------------------------|---------------------------|:------------------------------|---------------------------------|-----------------------------|--------------------------------------------------| -| 1.35.1 | 1.35.1 | 2.35.1 | 1.3.10 | 1.35.1 | 1.6.5 | 1.5.10 | -| 1.35.0 | 1.35.0 | 2.35.0 | 1.3.9 | 1.35.0 | 1.6.4 | 1.5.9 | -| 1.34.1 | 1.34.1 | 2.34.1 | 1.3.8 | 1.34.1 | 1.6.3 | 1.5.8 | -| 1.34.0 | 1.34.0 | 2.34.0 | 1.3.7 | 1.34.0 | 1.6.2 | 1.5.7 | -| 1.33.1 | 1.33.1 | 2.33.1 | 1.3.6 | 1.33.1 | 1.6.1 | 1.5.6 | -| 1.33.0 | 1.33.0 | 2.33.0 | 1.3.5 | 1.33.0 | 1.6.0 | 1.5.5 | -| 1.32.1 | 1.32.0 | 2.32.0 | 1.3.4 | 1.32.1 | 1.5.4 | 1.5.4 | -| 1.31.3 | 1.31.2 | 2.31.2 | 1.3.2 | 1.31.2 | 1.5.2 | 1.5.2 | -| 1.31.1 | 1.31.1 | 2.31.1 | 1.3.1 | 1.31.1 | 1.5.1 | 1.5.1 | -| 1.31.0[**](https://gist.github.com/TalhaAli00/7b9e1cadf19b9dc5141cd033aa4e6172) | 1.31.0 | 2.31.0 | 1.3.0 | 1.31.0 | 1.5.0 | 1.5.0 | -| 1.30.0 | 1.30.0 | 2.30.0 | 1.2.0 | 1.30.0 | 1.4.0 | 1.4.0 | -| 1.23.0 | 1.28.0 | 2.26.0 | 1.1.0 | 1.21.0 | 1.3.0 | 1.3.0 | -| 1.22.2 | 1.27.2 | 2.25.2 | 1.0.2 | 1.20.2 | 1.2.2 | 1.2.2 | -| 1.22.1 | 1.27.0 | 2.25.0 | 1.0.0 | 1.20.0 | 1.2.1 | 1.2.0 | -| 1.22.0 | 1.27.0 | 2.25.0 | 1.0.0 | 1.20.0 | 1.2.0 | 1.2.0 | -| 1.21.1 | 1.26.0 | 2.24.0 | 1.0.0-beta04 | 1.19.0 | 1.1.1 | 1.1.1 | -| 1.21.0 | 1.26.0 | 2.24.0 | 1.0.0-beta04 | 1.19.0 | 1.1.0 | 1.1.0 | -| 1.20.0 | 1.25.0 | 2.23.0 | 1.0.0-beta03 | 1.18.0 | 1.0.0 | 1.0.0-beta02 | -| 1.19.1 | 1.24.0 | 2.22.0 | 1.0.0-beta02 | 1.17.0 | 1.0.0-beta02 | 1.0.0-beta01 | -| 1.19.0 | 1.24.0 | 2.22.0 | 1.0.0-beta02 | 1.17.0 | 1.0.0-beta01 | 1.0.0-beta01 | -| 1.18.0 | 1.23.0 | 2.21.0 | 1.0.0-beta01 | 1.16.0 | 1.0.0-alpha11 | 1.0.0-alpha07 | -| 1.17.2 | 1.22.1 | 2.20.1 | 1.0.0-alpha05 | 1.15.1 | 1.0.0-alpha10 | 1.0.0-alpha06 | -| 1.17.1 | 1.22.0 | 2.20.0 | 1.0.0-alpha04 | 1.15.0 | 1.0.0-alpha09 | 1.0.0-alpha05 | -| 1.17.0 | 1.22.0 | 2.20.0 | 1.0.0-alpha03 | 1.15.0 | 1.0.0-alpha09 | 1.0.0-alpha05 | -| 1.16.0 | 1.21.0 | 2.19.0 | 1.0.0-alpha02 | 1.14.0 | | 1.0.0-alpha04 | -| 1.15.0 | 1.20.0 | 2.18.0 | | 1.13.0 | | 1.0.0-alpha03 | -| 1.14.0 | 1.19.0 | 2.17.0 | | 1.12.0 | | 1.0.0-alpha02 | -| 1.13.1 | 1.18.0 | 2.16.0 | | 1.11.0 | | 1.0.0-alpha01 | -| 1.12.0 | 1.17.0 | 2.15.0 | | 1.10.0 | | | -| 1.11.1 | 1.16.1 | 2.14.1 | | 1.9.1 | | | -| 1.11.0 | 1.16.0 | 2.14.0 | | 1.9.0 | | | -| 1.10.0 | 1.15.0 | 2.13.0 | | 1.8.0 | | | -| 1.9.3 | 1.14.3 | 2.12.3 | | 1.7.3 | | | -| 1.9.2 | 1.14.2 | 2.12.2 | | 1.7.2 | | | -| 1.9.1 | 1.14.1 | 2.12.1 | | 1.7.1 | | | -| 1.9.0[**](https://github.com/WalletConnect/WalletConnectKotlinV2/issues/821) | 1.14.0 | 2.12.0 | | 1.7.0 | | | -| 1.8.0 | 1.13.0 | 2.11.0 | | 1.6.0 | | | -| 1.7.0 | 1.12.0 | 2.10.0 | | 1.5.0 | | | -| 1.6.1 | 1.11.1 | 2.9.1 | | 1.4.1 | | | -| 1.6.0 | 1.11.0 | 2.9.0 | | 1.4.0 | | | -| 1.5.0 | 1.10.0 | 2.8.0 | | 1.3.0 | | | -| 1.4.1 | 1.9.1 | 2.7.1 | | 1.2.1 | | | -| 1.3.0 | 1.8.0 | 2.6.0 | | 1.1.0 | | | -| 1.2.0 | 1.7.0 | 2.5.0 | | 1.0.0 | | | -| 1.1.1 | 1.6.0 | 2.4.0 | | | | | -| 1.0.1 | 1.5.0 | 2.3.1 | | | | | -| | 1.4.0 | 2.2.0 | | | | | -| | 1.3.0 | 2.1.0 | | | | | -| | 1.2.0 | | | | | | -| | 1.1.0 | 2.0.0 | | | | | -| | 1.0.0 | 2.0.0-rc.5 | | | | | +| BOM | [Core SDK](core/android) | [Sign SDK](protocol/sign) | [Notify SDK](protocol/notify) | [WalletKit](product/web3wallet) | [AppKit](product/web3modal) | +|-----------------------------------------------------------------------------------------|--------------------------|---------------------------|:------------------------------|---------------------------------|-----------------------------| +| 1.35.1 | 1.35.1 | 2.35.1 | 1.3.10 | 1.35.1 | 1.6.5 | +| 1.35.0 | 1.35.0 | 2.35.0 | 1.3.9 | 1.35.0 | 1.6.4 | +| 1.34.1 | 1.34.1 | 2.34.1 | 1.3.8 | 1.34.1 | 1.6.3 | +| 1.34.0 | 1.34.0 | 2.34.0 | 1.3.7 | 1.34.0 | 1.6.2 | +| 1.33.1 | 1.33.1 | 2.33.1 | 1.3.6 | 1.33.1 | 1.6.1 | +| 1.33.0 | 1.33.0 | 2.33.0 | 1.3.5 | 1.33.0 | 1.6.0 | +| 1.32.1 | 1.32.0 | 2.32.0 | 1.3.4 | 1.32.1 | 1.5.4 | +| 1.31.3 | 1.31.2 | 2.31.2 | 1.3.2 | 1.31.2 | 1.5.2 | +| 1.31.1 | 1.31.1 | 2.31.1 | 1.3.1 | 1.31.1 | 1.5.1 | +| 1.31.0[**](https://gist.github.com/TalhaAli00/7b9e1cadf19b9dc5141cd033aa4e6172) | 1.31.0 | 2.31.0 | 1.3.0 | 1.31.0 | 1.5.0 | +| 1.30.0 | 1.30.0 | 2.30.0 | 1.2.0 | 1.30.0 | 1.4.0 | +| 1.23.0 | 1.28.0 | 2.26.0 | 1.1.0 | 1.21.0 | 1.3.0 | +| 1.22.2 | 1.27.2 | 2.25.2 | 1.0.2 | 1.20.2 | 1.2.2 | +| 1.22.1 | 1.27.0 | 2.25.0 | 1.0.0 | 1.20.0 | 1.2.1 | +| 1.22.0 | 1.27.0 | 2.25.0 | 1.0.0 | 1.20.0 | 1.2.0 | +| 1.21.1 | 1.26.0 | 2.24.0 | 1.0.0-beta04 | 1.19.0 | 1.1.1 | +| 1.21.0 | 1.26.0 | 2.24.0 | 1.0.0-beta04 | 1.19.0 | 1.1.0 | +| 1.20.0 | 1.25.0 | 2.23.0 | 1.0.0-beta03 | 1.18.0 | 1.0.0 | +| 1.19.1 | 1.24.0 | 2.22.0 | 1.0.0-beta02 | 1.17.0 | 1.0.0-beta02 | +| 1.19.0 | 1.24.0 | 2.22.0 | 1.0.0-beta02 | 1.17.0 | 1.0.0-beta01 | +| 1.18.0 | 1.23.0 | 2.21.0 | 1.0.0-beta01 | 1.16.0 | 1.0.0-alpha11 | +| 1.17.2 | 1.22.1 | 2.20.1 | 1.0.0-alpha05 | 1.15.1 | 1.0.0-alpha10 | +| 1.17.1 | 1.22.0 | 2.20.0 | 1.0.0-alpha04 | 1.15.0 | 1.0.0-alpha09 | +| 1.17.0 | 1.22.0 | 2.20.0 | 1.0.0-alpha03 | 1.15.0 | 1.0.0-alpha09 | +| 1.16.0 | 1.21.0 | 2.19.0 | 1.0.0-alpha02 | 1.14.0 | | +| 1.15.0 | 1.20.0 | 2.18.0 | | 1.13.0 | | +| 1.14.0 | 1.19.0 | 2.17.0 | | 1.12.0 | | +| 1.13.1 | 1.18.0 | 2.16.0 | | 1.11.0 | | +| 1.12.0 | 1.17.0 | 2.15.0 | | 1.10.0 | | +| 1.11.1 | 1.16.1 | 2.14.1 | | 1.9.1 | | +| 1.11.0 | 1.16.0 | 2.14.0 | | 1.9.0 | | +| 1.10.0 | 1.15.0 | 2.13.0 | | 1.8.0 | | +| 1.9.3 | 1.14.3 | 2.12.3 | | 1.7.3 | | +| 1.9.2 | 1.14.2 | 2.12.2 | | 1.7.2 | | +| 1.9.1 | 1.14.1 | 2.12.1 | | 1.7.1 | | +| 1.9.0[**](https://github.com/WalletConnect/WalletConnectKotlinV2/issues/821) | 1.14.0 | 2.12.0 | | 1.7.0 | | +| 1.8.0 | 1.13.0 | 2.11.0 | | 1.6.0 | | +| 1.7.0 | 1.12.0 | 2.10.0 | | 1.5.0 | | +| 1.6.1 | 1.11.1 | 2.9.1 | | 1.4.1 | | +| 1.6.0 | 1.11.0 | 2.9.0 | | 1.4.0 | | +| 1.5.0 | 1.10.0 | 2.8.0 | | 1.3.0 | | +| 1.4.1 | 1.9.1 | 2.7.1 | | 1.2.1 | | +| 1.3.0 | 1.8.0 | 2.6.0 | | 1.1.0 | | +| 1.2.0 | 1.7.0 | 2.5.0 | | 1.0.0 | | +| 1.1.1 | 1.6.0 | 2.4.0 | | | | +| 1.0.1 | 1.5.0 | 2.3.1 | | | | +| | 1.4.0 | 2.2.0 | | | | +| | 1.3.0 | 2.1.0 | | | | +| | 1.2.0 | | | | | +| | 1.1.0 | 2.0.0 | | | | +| | 1.0.0 | 2.0.0-rc.5 | | | | ## License diff --git a/build.gradle.kts b/build.gradle.kts index c65075b42..1125385af 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -335,6 +335,5 @@ private val repoIdWithVersion = listOf( Pair(NOTIFY, NOTIFY_VERSION), Pair(WEB_3_WALLET, WEB_3_WALLET_VERSION), Pair(WEB_3_MODAL, WEB_3_MODAL_VERSION), - Pair(WC_MODAL, WC_MODAL_VERSION), Pair(MODAL_CORE, MODAL_CORE_VERSION) ) \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 9c5aa2215..739171b79 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -12,7 +12,6 @@ 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 WC_MODAL_VERSION = "1.5.10" const val MODAL_CORE_VERSION = "1.6.5" //Artifact ids @@ -23,7 +22,6 @@ const val SIGN = "sign" const val NOTIFY = "notify" const val WEB_3_WALLET = "web3wallet" const val WEB_3_MODAL = "web3modal" -const val WC_MODAL = "walletconnect-modal" const val MODAL_CORE = "modal-core" val jvmVersion = JavaVersion.VERSION_11 diff --git a/core/bom/build.gradle.kts b/core/bom/build.gradle.kts index b643dfcb8..dfe3ee844 100644 --- a/core/bom/build.gradle.kts +++ b/core/bom/build.gradle.kts @@ -16,7 +16,6 @@ dependencies { api(project(":core:modal")) api(project(":protocol:sign")) api(project(":protocol:notify")) - api(project(":product:walletconnectmodal")) api(project(":product:web3modal")) api(project(":product:web3wallet")) } diff --git a/product/walletconnectmodal/ReadMe.md b/product/walletconnectmodal/ReadMe.md deleted file mode 100644 index 8de2b0437..000000000 --- a/product/walletconnectmodal/ReadMe.md +++ /dev/null @@ -1,44 +0,0 @@ -# **WalletConnect Modal - Kotlin** - -# Installation - -:::caution -**The WalletConnectModal SDK is currently in Alpha and is not production-ready**. - -It's public API and associated documentation may still see significant and breaking changes. -::: - -Kotlin implementation of WalletConnectModal for Android applications. - -Android Core ![Maven Central](https://img.shields.io/maven-central/v/com.walletconnect/android-core) - -WalletConnectModal ![Maven Central](https://img.shields.io/maven-central/v/com.walletconnect/walletconnect-modal) - -## Requirements - -* Android min SDK 23 -* Java 11 - -## Documentation and usage -* [WalletConnectModal installation](https://docs.walletconnect.com/2.0/android/walletconnectmodal/installation) -* [WalletConnectModal usage](https://docs.walletconnect.com/2.0/android/walletconnectmodal/usage) - -## Installation -root/build.gradle.kts: -```gradle -allprojects { - repositories { - mavenCentral() - maven { url "https://jitpack.io" } - } -} -``` - -app/build.gradle.kts - -```gradle -implementation(platform("com.reown:android-bom:$BOM_VERSION")) -implementation("com.reown:android-core") -implementation("com.reown:walletconnect-modal") -``` - diff --git a/product/walletconnectmodal/build.gradle.kts b/product/walletconnectmodal/build.gradle.kts deleted file mode 100644 index 0ac53fef6..000000000 --- a/product/walletconnectmodal/build.gradle.kts +++ /dev/null @@ -1,99 +0,0 @@ -plugins { - id("com.android.library") - id(libs.plugins.kotlin.android.get().pluginId) - alias(libs.plugins.google.ksp) - alias(libs.plugins.paparazzi) - id("publish-module-android") - id("jacoco-report") -} - -project.apply { - extra[KEY_PUBLISH_ARTIFACT_ID] = WC_MODAL - extra[KEY_PUBLISH_VERSION] = WC_MODAL_VERSION - extra[KEY_SDK_NAME] = "Wallet Connect Modal" -} - -android { - namespace = "com.walletconnect.wcmodal" - compileSdk = COMPILE_SDK - - defaultConfig { - minSdk = MIN_SDK - - aarMetadata { - minCompileSdk = MIN_SDK - } - - buildConfigField(type = "String", name = "SDK_VERSION", value = "\"${requireNotNull(extra.get(KEY_PUBLISH_VERSION))}\"") - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - - File("${rootDir.path}/gradle/consumer-rules").listFiles()?.let { proguardFiles -> - consumerProguardFiles(*proguardFiles) - } - } - - buildTypes { - release { - isMinifyEnabled = true - proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "${rootDir.path}/gradle/proguard-rules/sdk-rules.pro") - } - } - - lint { - abortOnError = true - ignoreWarnings = true - warningsAsErrors = false - } - - compileOptions { - sourceCompatibility = jvmVersion - targetCompatibility = jvmVersion - } - kotlinOptions { - jvmTarget = jvmVersion.toString() - freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.time.ExperimentalTime" - } - buildFeatures { - compose = true - buildConfig = true - } - composeOptions { - kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get() - } - - tasks.withType(Test::class.java) { - jvmArgs("-XX:+AllowRedefinitionToAddDeleteMethods") - } -} - -dependencies { - implementation(libs.bundles.androidxAppCompat) - implementation(libs.bundles.accompanist) - - implementation(platform(libs.androidx.compose.bom)) - implementation(libs.androidx.compose.ui) - implementation(libs.androidx.compose.ui.tooling.preview) - implementation(libs.androidx.compose.material) - implementation(libs.androidx.compose.navigation) - implementation(libs.androidx.compose.lifecycle) - debugImplementation(libs.androidx.compose.ui.tooling) - debugImplementation(libs.androidx.compose.ui.test.manifest) - androidTestImplementation(libs.androidx.compose.ui.test.junit) - androidTestImplementation(libs.androidx.compose.navigation.testing) - - implementation(libs.coil) - implementation(libs.bundles.androidxLifecycle) - api(libs.bundles.androidxNavigation) - implementation(libs.qrCodeGenerator) - - testImplementation(libs.coroutines.test) - testImplementation(libs.turbine) - - releaseImplementation("com.walletconnect:android-core:$CORE_VERSION") - releaseImplementation("com.walletconnect:sign:$SIGN_VERSION") - releaseImplementation("com.walletconnect:modal-core:$MODAL_CORE_VERSION") - - debugImplementation(project(":core:android")) - debugImplementation(project(":protocol:sign")) - debugImplementation(project(":core:modal")) -} \ No newline at end of file diff --git a/product/walletconnectmodal/proguard-rules.pro b/product/walletconnectmodal/proguard-rules.pro deleted file mode 100644 index 481bb4348..000000000 --- a/product/walletconnectmodal/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/product/walletconnectmodal/src/main/AndroidManifest.xml b/product/walletconnectmodal/src/main/AndroidManifest.xml deleted file mode 100644 index a5918e68a..000000000 --- a/product/walletconnectmodal/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/client/ClientMapper.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/client/ClientMapper.kt deleted file mode 100644 index ee797e5fe..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/client/ClientMapper.kt +++ /dev/null @@ -1,159 +0,0 @@ -package com.walletconnect.wcmodal.client - -import com.walletconnect.android.internal.common.signing.cacao.CacaoType -import com.walletconnect.sign.client.Sign - -// toModal() - -internal fun Sign.Model.ApprovedSession.toModal() = Modal.Model.ApprovedSession(topic, metaData, namespaces.toModal(), accounts) - -internal fun Map.toModal() = - mapValues { (_, namespace) -> Modal.Model.Namespace.Session(namespace.chains, namespace.accounts, namespace.methods, namespace.events) } - -internal fun Sign.Model.RejectedSession.toModal() = Modal.Model.RejectedSession(topic, reason) - -internal fun Sign.Model.UpdatedSession.toModal() = Modal.Model.UpdatedSession(topic, namespaces.toModal()) - -internal fun Sign.Model.SessionEvent.toModal() = Modal.Model.SessionEvent(name, data) - -internal fun Sign.Model.Event.toModal() = Modal.Model.Event(topic, name, data, chainId) - -internal fun Sign.Model.Session.toModal() = Modal.Model.Session(pairingTopic, topic, expiry, namespaces.toModal(), metaData) - -internal fun Sign.Model.SessionProposal.toModal() = Modal.Model.SessionProposal( - pairingTopic, - name, - description, - url, - icons, - redirect, - requiredNamespaces.toMapOfClientNamespacesProposal(), - optionalNamespaces.toMapOfClientNamespacesProposal(), - properties, - proposerPublicKey, - relayProtocol, - relayData -) - -@JvmSynthetic -internal fun Map.toMapOfClientNamespacesProposal(): Map = - mapValues { (_, namespace) -> - Modal.Model.Namespace.Proposal(namespace.chains, namespace.methods, namespace.events) - } - -internal fun Sign.Model.DeletedSession.toModal() = when (this) { - is Sign.Model.DeletedSession.Error -> Modal.Model.DeletedSession.Error(error) - is Sign.Model.DeletedSession.Success -> Modal.Model.DeletedSession.Success(topic, reason) -} - -internal fun Sign.Model.SessionRequestResponse.toModal() = Modal.Model.SessionRequestResponse(topic, chainId, method, result.toModal()) - -internal fun Sign.Model.JsonRpcResponse.toModal() = when (this) { - is Sign.Model.JsonRpcResponse.JsonRpcError -> Modal.Model.JsonRpcResponse.JsonRpcError(id, code, message) - is Sign.Model.JsonRpcResponse.JsonRpcResult -> Modal.Model.JsonRpcResponse.JsonRpcResult(id, result) -} - -@JvmSynthetic -internal fun Sign.Model.ExpiredProposal.toModal(): Modal.Model.ExpiredProposal = Modal.Model.ExpiredProposal(pairingTopic, proposerPublicKey) - -@JvmSynthetic -internal fun Sign.Model.ExpiredRequest.toModal(): Modal.Model.ExpiredRequest = Modal.Model.ExpiredRequest(topic, id) - - -@JvmSynthetic -internal fun Sign.Model.SessionAuthenticateResponse.toModal(): Modal.Model.SessionAuthenticateResponse = - when (this) { - is Sign.Model.SessionAuthenticateResponse.Result -> Modal.Model.SessionAuthenticateResponse.Result(id, cacaos.toClient(), session?.toModal()) - is Sign.Model.SessionAuthenticateResponse.Error -> Modal.Model.SessionAuthenticateResponse.Error(id, code, message) - } - -@JvmSynthetic -internal fun List.toClient(): List = this.map { - with(it) { - Modal.Model.Cacao( - Modal.Model.Cacao.Header(header.t), - Modal.Model.Cacao.Payload( - payload.iss, - payload.domain, - payload.aud, - payload.version, - payload.nonce, - payload.iat, - payload.nbf, - payload.exp, - payload.statement, - payload.requestId, - payload.resources - ), - Modal.Model.Cacao.Signature(signature.t, signature.s, signature.m) - ) - } -} - -internal fun Sign.Model.ConnectionState.toModal() = Modal.Model.ConnectionState(isAvailable) - -internal fun Sign.Model.Error.toModal() = Modal.Model.Error(throwable) - -internal fun Sign.Params.Disconnect.toModal() = Modal.Params.Disconnect(sessionTopic) - -internal fun Sign.Model.SentRequest.toModal() = Modal.Model.SentRequest(requestId, sessionTopic, method, params, chainId) - -internal fun Sign.Model.Ping.Success.toModal() = Modal.Model.Ping.Success(topic) - -internal fun Sign.Model.Ping.Error.toModal() = Modal.Model.Ping.Error(error) - -// toSign() -internal fun Modal.Params.Connect.toSign() = Sign.Params.Connect(namespaces?.toSign(), optionalNamespaces?.toSign(), properties, pairing) - -internal fun Modal.Params.Authenticate.toSign(): Sign.Params.Authenticate = with(this) { - Sign.Params.Authenticate( - pairingTopic, - chains = chains, - domain = domain, - uri = uri, - nonce = nonce, - nbf = nbf, - exp = exp, - statement = statement, - requestId = requestId, - resources = resources, - methods = methods, - expiry = expiry - ) -} - -internal fun Modal.Model.PayloadParams.toSign(): Sign.Model.PayloadParams = with(this) { - Sign.Model.PayloadParams( - chains = chains, - type = type ?: CacaoType.CAIP222.header, - domain = domain, - aud = aud, - nonce = nonce, - nbf = nbf, - exp = exp, - statement = statement, - requestId = requestId, - resources = resources, - iat = iat - ) -} - -internal fun Map.toSign() = mapValues { (_, namespace) -> Sign.Model.Namespace.Proposal(namespace.chains, namespace.methods, namespace.events) } - -internal fun Modal.Params.Disconnect.toSign() = Sign.Params.Disconnect(sessionTopic) - -internal fun Modal.Params.Ping.toSign() = Sign.Params.Ping(topic) - -internal fun Modal.Params.Request.toSign() = Sign.Params.Request(sessionTopic, method, params, chainId, expiry) - - -internal fun Modal.Listeners.SessionPing.toSign() = object : Sign.Listeners.SessionPing { - override fun onSuccess(pingSuccess: Sign.Model.Ping.Success) { - this@toSign.onSuccess(pingSuccess.toModal()) - } - - override fun onError(pingError: Sign.Model.Ping.Error) { - this@toSign.onError(pingError.toModal()) - } - -} diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/client/Modal.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/client/Modal.kt deleted file mode 100644 index b3ae83916..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/client/Modal.kt +++ /dev/null @@ -1,231 +0,0 @@ -package com.walletconnect.wcmodal.client - -import androidx.annotation.Keep -import com.walletconnect.android.Core -import com.walletconnect.android.CoreClient -import com.walletconnect.android.cacao.SignatureInterface -import com.walletconnect.android.internal.common.signing.cacao.Issuer -import java.net.URI - -object Modal { - - sealed interface Listeners { - interface SessionPing : Listeners { - fun onSuccess(pingSuccess: Model.Ping.Success) - fun onError(pingError: Model.Ping.Error) - } - } - - sealed class Params { - data class Init( - val core: CoreClient, - val excludedWalletIds: List = listOf(), - val recommendedWalletsIds: List = listOf(), - val sessionParams: SessionParams? = null, - ) : Params() - - data class Connect( - val namespaces: Map? = null, - val optionalNamespaces: Map? = null, - val properties: Map? = null, - val pairing: Core.Model.Pairing, - ) : Params() - - data class Authenticate( - val pairingTopic: String? = null, - val chains: List, - val domain: String, - val nonce: String, - val uri: String, - val nbf: String? = null, - val exp: String? = null, - val statement: String? = null, - val requestId: String? = null, - val resources: List? = null, - val methods: List? = null, - val expiry: Long? = null - ) : Params() - - data class Disconnect(val sessionTopic: String) : Params() - - data class Ping(val topic: String) : Params() - - data class Request( - val sessionTopic: String, - val method: String, - val params: String, - val chainId: String, - val expiry: Long? = null, - ) : Params() - - data class SessionParams( - val requiredNamespaces: Map, - val optionalNamespaces: Map? = null, - val properties: Map? = null, - ) - } - - sealed class Model { - data class Error(val throwable: Throwable) : Model() - - sealed class Namespace : Model() { - data class Proposal( - val chains: List? = null, - val methods: List, - val events: List, - ) : Namespace() - - data class Session( - val chains: List? = null, - val accounts: List, - val methods: List, - val events: List, - ) : Namespace() - } - - data class PayloadParams( - val chains: List, - val domain: String, - val nonce: String, - val aud: String, - val type: String?, - val nbf: String?, - val iat: String, - val exp: String?, - val statement: String?, - val requestId: String?, - val resources: List? - ) : Model() - - data class ApprovedSession( - val topic: String, - val metaData: Core.Model.AppMetaData?, - val namespaces: Map, - val accounts: List, - ) : Model() - - data class RejectedSession(val topic: String, val reason: String) : Model() - - data class UpdatedSession( - val topic: String, - val namespaces: Map, - ) : Model() - - data class SessionEvent( - val name: String, - val data: String, - ) : Model() - - data class Event( - val topic: String, - val name: String, - val data: String, - val chainId: String, - ) : Model() - - sealed class DeletedSession : Model() { - data class Success(val topic: String, val reason: String) : DeletedSession() - data class Error(val error: Throwable) : DeletedSession() - } - - data class Session( - val pairingTopic: String, - val topic: String, - val expiry: Long, - val namespaces: Map, - val metaData: Core.Model.AppMetaData?, - ) : Model() { - val redirect: String? = metaData?.redirect - } - - data class SessionRequestResponse( - val topic: String, - val chainId: String?, - val method: String, - val result: JsonRpcResponse, - ) : Model() - - data class ExpiredProposal(val pairingTopic: String, val proposerPublicKey: String) : Model() - - data class SessionProposal( - val pairingTopic: String, - val name: String, - val description: String, - val url: String, - val icons: List, - val redirect: String, - val requiredNamespaces: Map, - val optionalNamespaces: Map, - val properties: Map?, - val proposerPublicKey: String, - val relayProtocol: String, - val relayData: String?, - ) : Model() - - data class ExpiredRequest(val topic: String, val id: Long) : Model() - - data class ConnectionState( - val isAvailable: Boolean, - ) : Model() - - - sealed class JsonRpcResponse : Model() { - abstract val id: Long - val jsonrpc: String = "2.0" - - data class JsonRpcResult( - override val id: Long, - val result: String, - ) : JsonRpcResponse() - - data class JsonRpcError( - override val id: Long, - val code: Int, - val message: String, - ) : JsonRpcResponse() - } - - sealed class SessionAuthenticateResponse : Model() { - data class Result(val id: Long, val cacaos: List, val session: Session?) : SessionAuthenticateResponse() - data class Error(val id: Long, val code: Int, val message: String) : SessionAuthenticateResponse() - } - - data class Cacao( - val header: Header, - val payload: Payload, - val signature: Signature, - ) : Model() { - @Keep - data class Signature(override val t: String, override val s: String, override val m: String? = null) : Model(), SignatureInterface - data class Header(val t: String) : Model() - data class Payload( - val iss: String, - val domain: String, - val aud: String, - val version: String, - val nonce: String, - val iat: String, - val nbf: String?, - val exp: String?, - val statement: String?, - val requestId: String?, - val resources: List?, - ) : Model() { - val address: String get() = Issuer(iss).address - } - } - - data class SentRequest( - val requestId: Long, - val sessionTopic: String, - val method: String, - val params: String, - val chainId: String, - ) : Model() - - sealed class Ping : Model() { - data class Success(val topic: String) : Ping() - data class Error(val error: Throwable) : Ping() - } - } -} \ No newline at end of file diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/client/WalletConnectModal.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/client/WalletConnectModal.kt deleted file mode 100644 index be6d7e62c..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/client/WalletConnectModal.kt +++ /dev/null @@ -1,236 +0,0 @@ -package com.walletconnect.wcmodal.client - -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.sign.client.Sign -import com.walletconnect.sign.client.SignClient -import com.walletconnect.sign.common.exceptions.SignClientAlreadyInitializedException -import com.walletconnect.wcmodal.di.walletConnectModalModule -import com.walletconnect.wcmodal.domain.WalletConnectModalDelegate -import kotlinx.coroutines.flow.launchIn -import kotlinx.coroutines.flow.onEach - -object WalletConnectModal { - - internal var excludedWalletsIds: List = listOf() - internal var recommendedWalletsIds: List = listOf() - - private var _sessionParams: Modal.Params.SessionParams? = null - val sessionParams: Modal.Params.SessionParams - get() = requireNotNull(_sessionParams) { "Be sure to set the SessionParams in either the Modal.Params.Init or WalletConnectModal.setSessionParams." } - - interface ModalDelegate { - fun onSessionApproved(approvedSession: Modal.Model.ApprovedSession) - fun onSessionRejected(rejectedSession: Modal.Model.RejectedSession) - fun onSessionUpdate(updatedSession: Modal.Model.UpdatedSession) - - @Deprecated( - message = "Use onSessionEvent(Modal.Model.Event) instead. Using both will result in duplicate events.", - replaceWith = ReplaceWith(expression = "onSessionEvent(sessionEvent)") - ) - fun onSessionEvent(sessionEvent: Modal.Model.SessionEvent) - fun onSessionEvent(sessionEvent: Modal.Model.Event) {} - fun onSessionExtend(session: Modal.Model.Session) - fun onSessionDelete(deletedSession: Modal.Model.DeletedSession) - - //Responses - fun onSessionRequestResponse(response: Modal.Model.SessionRequestResponse) - fun onSessionAuthenticateResponse(sessionUpdateResponse: Modal.Model.SessionAuthenticateResponse) {} - - // Utils - fun onProposalExpired(proposal: Modal.Model.ExpiredProposal) - fun onRequestExpired(request: Modal.Model.ExpiredRequest) - fun onConnectionStateChange(state: Modal.Model.ConnectionState) - fun onError(error: Modal.Model.Error) - } - - fun initialize( - init: Modal.Params.Init, - onSuccess: () -> Unit = {}, - onError: (Modal.Model.Error) -> Unit, - ) { - SignClient.initialize( - init = Sign.Params.Init(init.core), - onSuccess = { onInitializedClient(init, onSuccess, onError) }, - onError = { error -> - if (error.throwable is SignClientAlreadyInitializedException) { - onInitializedClient(init, onSuccess, onError) - } else { - onError(Modal.Model.Error(error.throwable)) - return@initialize - } - } - ) - } - - private fun onInitializedClient( - init: Modal.Params.Init, - onSuccess: () -> Unit = {}, - onError: (Modal.Model.Error) -> Unit, - ) { - this.excludedWalletsIds = init.excludedWalletIds - this.recommendedWalletsIds = init.recommendedWalletsIds - _sessionParams = init.sessionParams - runCatching { - wcKoinApp.modules(walletConnectModalModule()) - setInternalDelegate(WalletConnectModalDelegate) - }.onFailure { error -> return@onInitializedClient onError(Modal.Model.Error(error)) } - onSuccess() - } - - @Throws(IllegalStateException::class) - fun setDelegate(delegate: ModalDelegate) { - - WalletConnectModalDelegate.connectionState.onEach { event -> delegate.onConnectionStateChange(event) }.launchIn(scope) - WalletConnectModalDelegate.wcEventModels.onEach { event -> - when (event) { - is Modal.Model.ApprovedSession -> delegate.onSessionApproved(event) - is Modal.Model.DeletedSession.Success -> delegate.onSessionDelete(event) - is Modal.Model.Error -> delegate.onError(event) - is Modal.Model.RejectedSession -> delegate.onSessionRejected(event) - is Modal.Model.Session -> delegate.onSessionExtend(event) - //todo: how to notify developer to not us both at the same time - is Modal.Model.SessionEvent -> delegate.onSessionEvent(event) - is Modal.Model.Event -> delegate.onSessionEvent(event) - is Modal.Model.SessionRequestResponse -> delegate.onSessionRequestResponse(event) - is Modal.Model.UpdatedSession -> delegate.onSessionUpdate(event) - is Modal.Model.ExpiredProposal -> delegate.onProposalExpired(event) - is Modal.Model.ExpiredRequest -> delegate.onRequestExpired(event) - is Modal.Model.SessionAuthenticateResponse -> delegate.onSessionAuthenticateResponse(event) - else -> Unit - } - }.launchIn(scope) - } - - @Throws(IllegalStateException::class) - private fun setInternalDelegate(delegate: ModalDelegate) { - val signDelegate = object : SignClient.DappDelegate { - override fun onSessionApproved(approvedSession: Sign.Model.ApprovedSession) { - delegate.onSessionApproved(approvedSession.toModal()) - } - - override fun onSessionRejected(rejectedSession: Sign.Model.RejectedSession) { - delegate.onSessionRejected(rejectedSession.toModal()) - } - - override fun onSessionUpdate(updatedSession: Sign.Model.UpdatedSession) { - delegate.onSessionUpdate(updatedSession.toModal()) - } - - override fun onSessionEvent(sessionEvent: Sign.Model.SessionEvent) { - delegate.onSessionEvent(sessionEvent.toModal()) - } - - override fun onSessionEvent(sessionEvent: Sign.Model.Event) { - delegate.onSessionEvent(sessionEvent.toModal()) - } - - override fun onSessionExtend(session: Sign.Model.Session) { - delegate.onSessionExtend(session.toModal()) - } - - override fun onSessionDelete(deletedSession: Sign.Model.DeletedSession) { - delegate.onSessionDelete(deletedSession.toModal()) - } - - override fun onSessionRequestResponse(response: Sign.Model.SessionRequestResponse) { - delegate.onSessionRequestResponse(response.toModal()) - } - - override fun onProposalExpired(proposal: Sign.Model.ExpiredProposal) { - delegate.onProposalExpired(proposal.toModal()) - } - - override fun onRequestExpired(request: Sign.Model.ExpiredRequest) { - delegate.onRequestExpired(request.toModal()) - } - - override fun onSessionAuthenticateResponse(sessionAuthenticateResponse: Sign.Model.SessionAuthenticateResponse) { - delegate.onSessionAuthenticateResponse(sessionAuthenticateResponse.toModal()) - } - - override fun onConnectionStateChange(state: Sign.Model.ConnectionState) { - delegate.onConnectionStateChange(state.toModal()) - } - - override fun onError(error: Sign.Model.Error) { - delegate.onError(error.toModal()) - } - } - SignClient.setDappDelegate(signDelegate) - } - - fun setSessionParams(sessionParams: Modal.Params.SessionParams) { - _sessionParams = sessionParams - } - - @Deprecated( - message = "Replaced with the same name method but onSuccess callback returns a Pairing URL", - replaceWith = ReplaceWith(expression = "fun connect(connect: Modal.Params.Connect, onSuccess: (String) -> Unit, onError: (Modal.Model.Error) -> Unit)") - ) - fun connect( - connect: Modal.Params.Connect, - onSuccess: () -> Unit, - onError: (Modal.Model.Error) -> Unit, - ) { - SignClient.connect( - connect = connect.toSign(), - onSuccess = onSuccess, - onError = { onError(it.toModal()) } - ) - } - - fun connect( - connect: Modal.Params.Connect, - onSuccess: (String) -> Unit, - onError: (Modal.Model.Error) -> Unit, - ) { - SignClient.connect( - connect = connect.toSign(), - onSuccess = { url -> onSuccess(url) }, - onError = { onError(it.toModal()) } - ) - } - - fun request(request: Modal.Params.Request, onSuccess: (Modal.Model.SentRequest) -> Unit = {}, onError: (Modal.Model.Error) -> Unit) { - SignClient.request( - request.toSign(), - { onSuccess(it.toModal()) }, - { onError(it.toModal()) } - ) - } - - fun ping(ping: Modal.Params.Ping, sessionPing: Modal.Listeners.SessionPing? = null) { - SignClient.ping( - ping = ping.toSign(), - sessionPing = sessionPing?.toSign() - ) - } - - fun disconnect(disconnect: Modal.Params.Disconnect, onSuccess: (Modal.Params.Disconnect) -> Unit = {}, onError: (Modal.Model.Error) -> Unit) { - SignClient.disconnect( - disconnect = disconnect.toSign(), - onSuccess = { onSuccess(it.toModal()) }, - onError = { onError(it.toModal()) } - ) - } - - /** - * Caution: This function is blocking and runs on the current thread. - * It is advised that this function be called from background operation - */ - fun getListOfActiveSessions() = SignClient.getListOfActiveSessions().map { it.toModal() } - - /** - * Caution: This function is blocking and runs on the current thread. - * It is advised that this function be called from background operation - */ - fun getListOfProposals() = SignClient.getSessionProposals().map { it.toModal() } - - /** - * Caution: This function is blocking and runs on the current thread. - * It is advised that this function be called from background operation - */ - fun getActiveSessionByTopic(topic: String) = SignClient.getActiveSessionByTopic(topic)?.toModal() - -} diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/di/WalletConnectModalModule.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/di/WalletConnectModalModule.kt deleted file mode 100644 index 66ef39c79..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/di/WalletConnectModalModule.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.walletconnect.wcmodal.di - -import com.walletconnect.wcmodal.domain.RecentWalletsRepository -import com.walletconnect.wcmodal.domain.usecase.GetRecentWalletUseCase -import com.walletconnect.wcmodal.domain.usecase.SaveRecentWalletUseCase -import org.koin.dsl.module - -internal fun walletConnectModalModule() = module { - - single { RecentWalletsRepository(get()) } - - factory { GetRecentWalletUseCase(get()) } - factory { SaveRecentWalletUseCase(get()) } -} \ No newline at end of file diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/domain/RecentWalletsRepository.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/domain/RecentWalletsRepository.kt deleted file mode 100644 index 667c4c238..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/domain/RecentWalletsRepository.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.walletconnect.wcmodal.domain - -import android.content.SharedPreferences - -private const val RECENT_WALLET_ID = "recent_wallet_id" - -class RecentWalletsRepository( - private val sharedPreferences: SharedPreferences -) { - - fun saveRecentWalletId(id: String) = sharedPreferences.edit().putString(RECENT_WALLET_ID, id).apply() - - fun getRecentWalletId() = sharedPreferences.getString(RECENT_WALLET_ID, null) -} diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/domain/WalletConnectModalDelegate.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/domain/WalletConnectModalDelegate.kt deleted file mode 100644 index 9c1e524e7..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/domain/WalletConnectModalDelegate.kt +++ /dev/null @@ -1,99 +0,0 @@ -package com.walletconnect.wcmodal.domain - -import com.walletconnect.wcmodal.client.Modal -import com.walletconnect.wcmodal.client.WalletConnectModal -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.SupervisorJob -import kotlinx.coroutines.flow.MutableSharedFlow -import kotlinx.coroutines.flow.SharedFlow -import kotlinx.coroutines.flow.asSharedFlow -import kotlinx.coroutines.launch - -internal object WalletConnectModalDelegate : WalletConnectModal.ModalDelegate { - private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) - private val _wcEventModels: MutableSharedFlow = MutableSharedFlow() - val wcEventModels: SharedFlow = _wcEventModels.asSharedFlow() - - private val _connectionState: MutableSharedFlow = MutableSharedFlow(replay = 1) - val connectionState: SharedFlow = _connectionState.asSharedFlow() - - override fun onConnectionStateChange(state: Modal.Model.ConnectionState) { - scope.launch { - _connectionState.emit(state) - } - } - - - override fun onSessionApproved(approvedSession: Modal.Model.ApprovedSession) { - scope.launch { - _wcEventModels.emit(approvedSession) - } - } - - override fun onSessionRejected(rejectedSession: Modal.Model.RejectedSession) { - scope.launch { - _wcEventModels.emit(rejectedSession) - } - } - - override fun onSessionUpdate(updatedSession: Modal.Model.UpdatedSession) { - scope.launch { - _wcEventModels.emit(updatedSession) - } - } - - override fun onSessionEvent(sessionEvent: Modal.Model.SessionEvent) { - scope.launch { - _wcEventModels.emit(sessionEvent) - } - } - - override fun onSessionEvent(sessionEvent: Modal.Model.Event) { - scope.launch { - _wcEventModels.emit(sessionEvent) - } - } - - override fun onSessionDelete(deletedSession: Modal.Model.DeletedSession) { - scope.launch { - _wcEventModels.emit(deletedSession) - } - } - - override fun onSessionExtend(session: Modal.Model.Session) { - scope.launch { - _wcEventModels.emit(session) - } - } - - override fun onSessionRequestResponse(response: Modal.Model.SessionRequestResponse) { - scope.launch { - _wcEventModels.emit(response) - } - } - - override fun onProposalExpired(proposal: Modal.Model.ExpiredProposal) { - scope.launch { - _wcEventModels.emit(proposal) - } - } - - override fun onRequestExpired(request: Modal.Model.ExpiredRequest) { - scope.launch { - _wcEventModels.emit(request) - } - } - - override fun onSessionAuthenticateResponse(sessionUpdateResponse: Modal.Model.SessionAuthenticateResponse) { - scope.launch { - _wcEventModels.emit(sessionUpdateResponse) - } - } - - override fun onError(error: Modal.Model.Error) { - scope.launch { - _wcEventModels.emit(error) - } - } -} \ No newline at end of file diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/domain/dataStore/WalletDataStore.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/domain/dataStore/WalletDataStore.kt deleted file mode 100644 index 9a0f8533c..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/domain/dataStore/WalletDataStore.kt +++ /dev/null @@ -1,175 +0,0 @@ -package com.walletconnect.wcmodal.domain.dataStore - -import com.walletconnect.android.internal.common.modal.data.model.Wallet -import com.walletconnect.android.internal.common.modal.domain.usecase.GetInstalledWalletsIdsUseCaseInterface -import com.walletconnect.android.internal.common.modal.domain.usecase.GetSampleWalletsUseCaseInterface -import com.walletconnect.android.internal.common.modal.domain.usecase.GetWalletsUseCaseInterface -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.modal.ui.model.LoadingState -import com.walletconnect.util.Empty -import com.walletconnect.wcmodal.client.WalletConnectModal -import com.walletconnect.wcmodal.domain.usecase.GetRecentWalletUseCase -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.combine - -private const val WCM_SDK = "wcm" - -private data class ListingData( - var page: Int = 1, - var totalCount: Int = 0, - var wallets: List = listOf() -) { - fun addNextPage(wallets: List) { - page += 1 - this.wallets = this.wallets + wallets - } -} - -internal class WalletDataSource( - private val showError: (Exception) -> Unit -) { - private val getWalletsUseCase: GetWalletsUseCaseInterface = wcKoinApp.koin.get() - private val getWalletsAppDataUseCase: GetInstalledWalletsIdsUseCaseInterface = wcKoinApp.koin.get() - private val getRecentWalletUseCase: GetRecentWalletUseCase = wcKoinApp.koin.get() - private val getSampleWalletsUseCase: GetSampleWalletsUseCaseInterface = wcKoinApp.koin.get() - - - private var installedWalletsIds: List = listOf() - - private var walletsListingData = ListingData() - private var searchListingData = ListingData() - - var searchPhrase = String.Empty - - val wallets: List - get() = walletsListingData.wallets - - private fun getPriorityWallets() = (getRecentWalletUseCase()?.let { listOf(it) } ?: listOf()) + installedWalletsIds + WalletConnectModal.recommendedWalletsIds - - private val searchState: MutableStateFlow = MutableStateFlow(WalletsData.empty()) - val walletState: MutableStateFlow = MutableStateFlow(WalletsData.empty()) - - val searchWalletsState = combine(walletState, searchState) { state, search -> - if (searchPhrase.isEmpty()) { state } else { search } - } - - suspend fun fetchInitialWallets() { - walletState.value = WalletsData.refresh() - try { - fetchWalletsAppData() - val installedWallets = fetchInstalledAndRecommendedWallets() - val samples = getSampleWalletsUseCase() - val walletsListing = getWalletsUseCase(sdkType = WCM_SDK, page = 1, excludeIds = getPriorityWallets() + WalletConnectModal.excludedWalletsIds) - walletsListingData = ListingData( - page = 1, - totalCount = walletsListing.totalCount + samples.size, - wallets = (samples + installedWallets.wallets + walletsListing.wallets).mapRecentWallet(getRecentWalletUseCase()) - ) - walletState.value = WalletsData.submit(walletsListingData.wallets) - } catch (exception: Exception) { - showError(exception) - walletState.value = WalletsData.error(error = exception) - } - } - - fun updateRecentWallet(walletId: String) { - walletState.tryEmit(WalletsData.append(walletState.value.wallets.mapRecentWallet(walletId))) - } - - private suspend fun fetchWalletsAppData() { - installedWalletsIds = getWalletsAppDataUseCase(sdkType = WCM_SDK) - } - - private suspend fun fetchInstalledAndRecommendedWallets() = getWalletsUseCase( - sdkType = WCM_SDK, - page = 1, - includes = getPriorityWallets(), - excludeIds = WalletConnectModal.excludedWalletsIds - ) - - suspend fun fetchMoreWallets() { - if (searchPhrase.isEmpty()) { - if (walletsListingData.wallets.size < walletsListingData.totalCount) { - try { - walletState.value = WalletsData.append(walletsListingData.wallets) - val response = getWalletsUseCase(sdkType = WCM_SDK, page = walletsListingData.page + 1, excludeIds = getPriorityWallets() + WalletConnectModal.excludedWalletsIds) - walletsListingData.addNextPage(response.wallets) - walletState.value = WalletsData.submit(walletsListingData.wallets) - } catch (exception: Exception) { - showError(exception) - walletState.value = WalletsData.error(walletsListingData.wallets, error = exception) - } - } - } else { - fetchNextSearchPage() - } - } - - fun clearSearch() { - searchState.value = WalletsData.empty() - searchPhrase = String.Empty - } - - suspend fun searchWallet(searchPhrase: String) { - if (searchPhrase.isEmpty()) { - clearSearch() - } else { - this.searchPhrase = searchPhrase - if (walletsListingData.wallets.size < walletsListingData.totalCount) { - try { - searchState.value = WalletsData.refresh() - val searchResponse = getWalletsUseCase(sdkType = WCM_SDK, search = searchPhrase, page = 1, excludeIds = WalletConnectModal.excludedWalletsIds) - searchListingData = ListingData(page = 1, totalCount = searchResponse.totalCount, wallets = searchResponse.wallets) - searchState.value = WalletsData.submit(wallets = searchListingData.wallets) - } catch (exception: Exception) { - showError(exception) - searchState.value = WalletsData.error(walletsListingData.wallets, error = exception) - } - } else { - val searchedWallets = walletsListingData.wallets.filteredWallets(searchPhrase) - searchState.value = WalletsData.submit(wallets = searchedWallets) - } - } - } - - private suspend fun fetchNextSearchPage() { - if (searchListingData.wallets.size < searchListingData.totalCount) { - try { - searchState.value = WalletsData.append(searchListingData.wallets) - val searchResponse = getWalletsUseCase(sdkType = WCM_SDK, search = searchPhrase, page = searchListingData.page + 1, excludeIds = WalletConnectModal.excludedWalletsIds) - searchListingData.addNextPage(searchResponse.wallets) - searchState.value = WalletsData.submit(searchListingData.wallets) - } catch (exception: Exception) { - showError(exception) - searchState.value = WalletsData.error(searchListingData.wallets, error = exception) - } - } - } - - fun getWallet(walletId: String?) = walletsListingData.wallets.find { wallet -> wallet.id == walletId } -} - -private fun List.filteredWallets(value: String): List = this.filter { it.name.startsWith(prefix = value, ignoreCase = true) } - -private fun List.mapRecentWallet(id: String?) = map { - it.apply { it.isRecent = it.id == id } -}.sortedWith(compareByDescending { it.isRecent }.thenByDescending { it.isWalletInstalled }) - - -internal data class WalletsData( - val wallets: List = listOf(), - val loadingState: LoadingState? = null, - val error: Exception? = null -) { - companion object { - fun empty() = WalletsData() - - fun refresh() = WalletsData(loadingState = LoadingState.REFRESH) - - fun submit(wallets: List) = WalletsData(wallets) - - fun append(wallets: List) = WalletsData(wallets, LoadingState.APPEND) - - fun error(wallets: List = listOf(), error: Exception) = WalletsData(wallets = wallets, error = error) - } -} diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/domain/usecase/GetRecentWalletUseCase.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/domain/usecase/GetRecentWalletUseCase.kt deleted file mode 100644 index eea08e0d2..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/domain/usecase/GetRecentWalletUseCase.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.walletconnect.wcmodal.domain.usecase - -import com.walletconnect.wcmodal.domain.RecentWalletsRepository - -class GetRecentWalletUseCase(private val repository: RecentWalletsRepository) { - operator fun invoke() = repository.getRecentWalletId() -} \ No newline at end of file diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/domain/usecase/SaveRecentWalletUseCase.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/domain/usecase/SaveRecentWalletUseCase.kt deleted file mode 100644 index 8d7250aca..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/domain/usecase/SaveRecentWalletUseCase.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.walletconnect.wcmodal.domain.usecase - -import com.walletconnect.wcmodal.domain.RecentWalletsRepository - -class SaveRecentWalletUseCase( - private val repository: RecentWalletsRepository -) { - operator fun invoke(id: String) = repository.saveRecentWalletId(id) -} \ No newline at end of file diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModal.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModal.kt deleted file mode 100644 index 90eebabbc..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModal.kt +++ /dev/null @@ -1,109 +0,0 @@ -@file:OptIn(ExperimentalAnimationApi::class) - -package com.walletconnect.wcmodal.ui - -import android.content.Context -import android.widget.Toast -import androidx.compose.animation.ExperimentalAnimationApi -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.material.CircularProgressIndicator -import androidx.compose.material.Text -import androidx.compose.runtime.Composable -import androidx.compose.runtime.LaunchedEffect -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -import androidx.lifecycle.viewmodel.compose.viewModel -import androidx.navigation.NavController -import com.google.accompanist.navigation.animation.rememberAnimatedNavController -import com.walletconnect.modal.ui.components.common.VerticalSpacer -import com.walletconnect.wcmodal.client.Modal -import com.walletconnect.wcmodal.domain.WalletConnectModalDelegate -import com.walletconnect.wcmodal.ui.components.ModalRoot -import com.walletconnect.wcmodal.ui.components.RoundedMainButton -import com.walletconnect.wcmodal.ui.navigation.ModalNavGraph -import com.walletconnect.wcmodal.ui.theme.ModalTheme -import kotlinx.coroutines.flow.collect -import kotlinx.coroutines.flow.onEach - -@Composable -internal fun WalletConnectModal( - navController: NavController -) { - WalletConnectModalComponent( - closeModal = { navController.popBackStack() } - ) -} - -@ExperimentalAnimationApi -@Composable -internal fun WalletConnectModalComponent(closeModal: () -> Unit) { - val context = LocalContext.current - val viewModel: WalletConnectModalViewModel = viewModel() - val navController = rememberAnimatedNavController() - LaunchedEffect(Unit) { - WalletConnectModalDelegate - .wcEventModels - .onEach { event -> event?.handleEvent(context, closeModal) } - .collect() - } - - ModalRoot( - navController = navController, - closeModal = closeModal, - ) { - ModalNavGraph( - navController = navController, - viewModel = viewModel - ) - } -} - - -@Composable -internal fun LoadingModalState() { - Box( - modifier = Modifier - .fillMaxWidth() - .height(300.dp) - ) { - CircularProgressIndicator(color = ModalTheme.colors.main, modifier = Modifier.align(Alignment.Center)) - } -} - -@Composable -internal fun ErrorModalState(retry: () -> Unit) { - Column( - modifier = Modifier - .fillMaxWidth() - .height(300.dp), - verticalArrangement = Arrangement.Center, - horizontalAlignment = Alignment.CenterHorizontally - ) { - Text(text = "Something went wrong", style = TextStyle(color = ModalTheme.colors.onBackgroundColor, fontSize = 18.sp)) - VerticalSpacer(height = 10.dp) - RoundedMainButton( - text = "Retry", - onClick = { retry() }, - ) - } -} - -private fun Modal.Model.handleEvent(context: Context, closeModal: () -> Unit) { - when (this) { - is Modal.Model.ApprovedSession -> { - closeModal() - } - is Modal.Model.Error -> { - Toast.makeText(context, "Something went wrong", Toast.LENGTH_SHORT).show() - } - else -> Unit - } -} diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalEvents.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalEvents.kt deleted file mode 100644 index 81c0b10ae..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalEvents.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.walletconnect.wcmodal.ui - -sealed class WalletConnectModalEvents { - object SessionApproved: WalletConnectModalEvents() - object SessionRejected: WalletConnectModalEvents() - object NoAction: WalletConnectModalEvents() - object InvalidState: WalletConnectModalEvents() -} \ No newline at end of file diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalNav.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalNav.kt deleted file mode 100644 index 72e1156e0..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalNav.kt +++ /dev/null @@ -1,25 +0,0 @@ -@file:OptIn(ExperimentalMaterialNavigationApi::class) - -package com.walletconnect.wcmodal.ui - -import androidx.annotation.IdRes -import androidx.navigation.NavController -import androidx.navigation.NavGraphBuilder -import androidx.navigation.fragment.dialog -import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi -import com.google.accompanist.navigation.material.bottomSheet -import com.walletconnect.wcmodal.ui.navigation.Route - -fun NavGraphBuilder.walletConnectModal() { - dialog(route = Route.WalletConnectModalRoot.path) -} - -fun NavController.openWalletConnectModal(@IdRes id: Int) = navigate(id) - -fun NavController.openWalletConnectModal() = navigate(Route.WalletConnectModalRoot.path) - -fun NavGraphBuilder.walletConnectModalGraph(navController: NavController) { - bottomSheet(route = Route.WalletConnectModalRoot.path) { - WalletConnectModal(navController = navController) - } -} diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalSheet.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalSheet.kt deleted file mode 100644 index 5fbdda975..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalSheet.kt +++ /dev/null @@ -1,69 +0,0 @@ -@file:OptIn(ExperimentalAnimationApi::class) - -package com.walletconnect.wcmodal.ui - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.activity.ComponentDialog -import androidx.activity.OnBackPressedCallback -import androidx.compose.animation.ExperimentalAnimationApi -import androidx.compose.runtime.Composable -import androidx.compose.ui.platform.ComposeView -import androidx.compose.ui.platform.ViewCompositionStrategy -import androidx.navigation.NavHostController -import androidx.navigation.compose.rememberNavController -import com.google.android.material.bottomsheet.BottomSheetDialogFragment -import com.walletconnect.modal.utils.theme.themeColor -import com.walletconnect.wcmodal.R -import com.walletconnect.wcmodal.ui.theme.WalletConnectModalTheme - -class WalletConnectModalSheet : BottomSheetDialogFragment() { - - override fun onCreate(savedInstanceState: Bundle?) { - requireContext().setTheme(R.style.WalletConnectModalTheme) - super.onCreate(savedInstanceState) - } - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View { - - val accentColor = requireContext().themeColor(R.attr.accentColor) - val onAccentColor = requireContext().themeColor(R.attr.onAccentColor) - - return ComposeView(requireContext()).apply { - setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed) - setContent { - WalletConnectModalTheme( - accentColor = accentColor, - onAccentColor = onAccentColor, - ) { - ModalComposeView() - } - } - } - } - - @Composable - private fun ModalComposeView() { - val navController = rememberNavController() - (dialog as? ComponentDialog)?.onBackPressedDispatcher?.addCallback( - this@WalletConnectModalSheet, - onBackPressedCallback(navController) - ) - WalletConnectModalComponent(closeModal = { this@WalletConnectModalSheet.dismiss() }) - } - - - private fun onBackPressedCallback(navController: NavHostController) = - object : OnBackPressedCallback(true) { - override fun handleOnBackPressed() { - if (navController.popBackStack().not()) { - dismiss() - } - } - } -} diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalViewModel.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalViewModel.kt deleted file mode 100644 index 59d6278b4..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalViewModel.kt +++ /dev/null @@ -1,94 +0,0 @@ -package com.walletconnect.wcmodal.ui - -import androidx.lifecycle.ViewModel -import androidx.lifecycle.viewModelScope -import com.walletconnect.android.CoreClient -import com.walletconnect.android.internal.common.modal.data.model.Wallet -import com.walletconnect.android.internal.common.wcKoinApp -import com.reown.foundation.util.Logger -import com.walletconnect.modal.ui.model.LoadingState -import com.walletconnect.modal.ui.model.UiState -import com.walletconnect.wcmodal.client.Modal -import com.walletconnect.wcmodal.client.WalletConnectModal -import com.walletconnect.wcmodal.domain.dataStore.WalletDataSource -import com.walletconnect.wcmodal.domain.dataStore.WalletsData -import kotlinx.coroutines.flow.SharingStarted -import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.map -import kotlinx.coroutines.flow.stateIn -import kotlinx.coroutines.launch - -internal class WalletConnectModalViewModel : ViewModel() { - - private val logger: Logger = wcKoinApp.koin.get() - private val walletsDataStore = WalletDataSource { handleError(it) } - - val walletsState: StateFlow = walletsDataStore.searchWalletsState.stateIn(viewModelScope, SharingStarted.Lazily, WalletsData.empty()) - - val uiState: StateFlow>> = walletsDataStore.walletState.map { pagingData -> - when { - pagingData.error != null -> UiState.Error(pagingData.error) - pagingData.loadingState == LoadingState.REFRESH -> UiState.Loading() - else -> UiState.Success(pagingData.wallets) - } - }.stateIn(viewModelScope, started = SharingStarted.Lazily, initialValue = UiState.Loading()) - - val searchPhrase - get() = walletsDataStore.searchPhrase - - - init { - fetchInitialWallets() - } - - fun fetchInitialWallets() { - viewModelScope.launch { walletsDataStore.fetchInitialWallets() } - } - - fun connect(onSuccess: (String) -> Unit) { - try { - val pairing = - CoreClient.Pairing.create { error -> - throw IllegalStateException("Creating Pairing failed: ${error.throwable.stackTraceToString()}") - }!! - - val sessionParams = WalletConnectModal.sessionParams - val connectParams = Modal.Params.Connect( - sessionParams.requiredNamespaces, - sessionParams.optionalNamespaces, - sessionParams.properties, - pairing - ) - - WalletConnectModal.connect( - connect = connectParams, - onSuccess = { url -> viewModelScope.launch { onSuccess(url) } }, - onError = { handleError(it.throwable) } - ) - } catch (e: Exception) { - handleError(e) - } - } - - fun fetchMoreWallets() { - viewModelScope.launch { walletsDataStore.fetchMoreWallets() } - } - - fun search(searchPhrase: String) { - viewModelScope.launch { walletsDataStore.searchWallet(searchPhrase) } - } - - fun saveRecentWallet(wallet: Wallet) { - walletsDataStore.updateRecentWallet(wallet.id) - } - - fun clearSearch() = walletsDataStore.clearSearch() - - fun getWallet(walletId: String?) = walletsDataStore.getWallet(walletId) - - fun getNotInstalledWallets() = walletsDataStore.wallets.filterNot { it.isWalletInstalled } - - private fun handleError(error: Throwable) { - logger.error(error) - } -} \ No newline at end of file diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/components/Buttons.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/components/Buttons.kt deleted file mode 100644 index 0c92a9d5f..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/components/Buttons.kt +++ /dev/null @@ -1,123 +0,0 @@ -package com.walletconnect.wcmodal.ui.components - -import androidx.compose.foundation.background -import androidx.compose.foundation.border -import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.* -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.Button -import androidx.compose.material.ButtonDefaults -import androidx.compose.material.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.unit.dp -import com.walletconnect.wcmodal.ui.theme.ModalTheme - -@Composable -internal fun MainButton( - text: String, - onClick: () -> Unit, - modifier: Modifier = Modifier -) { - val contentColor = ModalTheme.colors.onMainColor - val background = ModalTheme.colors.main - Button( - shape = RoundedCornerShape(12.dp), - modifier = modifier, - colors = ButtonDefaults.buttonColors( - backgroundColor = background, - contentColor = contentColor, - ), - onClick = { - onClick() - }, - ) { - Text(text = text, color = contentColor) - } -} - -@Composable -internal fun RoundedOutLineButton( - text: String, - onClick: () -> Unit, - modifier: Modifier = Modifier, - startIcon: (@Composable () -> Unit)? = null, - endIcon: (@Composable () -> Unit)? = null, -) { - RoundedButton( - onClick = onClick, - modifier = modifier - .border( - width = 1.dp, - color = ModalTheme.colors.dividerColor, - RoundedCornerShape(18.dp) - ) - .padding(vertical = 8.dp, horizontal = 12.dp), - startIcon = startIcon, endIcon = endIcon - ) { - Text( - text = text, - style = TextStyle( - color = ModalTheme.colors.main, - textAlign = TextAlign.Center - ), - ) - } -} - -@Composable -internal fun RoundedMainButton( - text: String, - onClick: () -> Unit, - modifier: Modifier = Modifier, - startIcon: (@Composable () -> Unit)? = null, - endIcon: (@Composable () -> Unit)? = null, -) { - RoundedButton( - onClick = onClick, - modifier = modifier - .background( - ModalTheme.colors.main, - shape = RoundedCornerShape(18.dp) - ) - .padding(vertical = 8.dp, horizontal = 12.dp), - startIcon = startIcon, endIcon = endIcon - ) { - Text( - text = text, - style = TextStyle( - color = ModalTheme.colors.onMainColor, - textAlign = TextAlign.Center - ), - ) - } -} - -@Composable -private fun RoundedButton( - onClick: () -> Unit, - modifier: Modifier = Modifier, - startIcon: (@Composable () -> Unit)? = null, - endIcon: (@Composable () -> Unit)? = null, - content: @Composable RowScope.() -> Unit -) { - Row( - modifier = Modifier - .clickable { onClick() } - .then(modifier), - verticalAlignment = Alignment.CenterVertically, - ) { - startIcon?.let { - startIcon() - Spacer(modifier = Modifier.width(6.dp)) - } - content() - endIcon?.let { - Spacer(modifier = Modifier.width(6.dp)) - endIcon() - } - } -} diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/components/CircleButton.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/components/CircleButton.kt deleted file mode 100644 index a66ef9847..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/components/CircleButton.kt +++ /dev/null @@ -1,99 +0,0 @@ -package com.walletconnect.wcmodal.ui.components - -import androidx.compose.foundation.Image -import androidx.compose.foundation.background -import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.shape.CircleShape -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.shadow -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.ColorFilter -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.res.vectorResource -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import androidx.navigation.NavController -import androidx.navigation.compose.currentBackStackEntryAsState -import androidx.navigation.compose.rememberNavController -import com.walletconnect.modal.ui.components.common.VerticalSpacer -import com.walletconnect.modal.ui.components.common.roundedClickable -import com.walletconnect.wcmodal.R -import com.walletconnect.wcmodal.ui.navigation.Route -import com.walletconnect.wcmodal.ui.preview.ComponentPreview -import com.walletconnect.wcmodal.ui.theme.ModalTheme - - -@Composable -private fun CircleButtonWithIcon( - icon: @Composable () -> Unit, - backgroundColor: Color, - onClick: () -> Unit -) { - Box( - modifier = Modifier - .size(28.dp) - .shadow(elevation = 4.dp, shape = CircleShape) - .background(backgroundColor) - .roundedClickable(onClick = onClick), - contentAlignment = Alignment.Center - ) { - icon() - } -} - -@Composable -internal fun QuestionMarkIconButton(navController: NavController) { - val currentPath = navController.currentBackStackEntryAsState().value?.destination?.route - val tint: Color - val background: Color - val onClick: () -> Unit - if (currentPath == Route.Help.path) { - tint = ModalTheme.colors.background - background = ModalTheme.colors.onBackgroundColor - onClick = { navController.popBackStack() } - } else { - tint = ModalTheme.colors.onBackgroundColor - background = ModalTheme.colors.background - onClick = { navController.navigate(Route.Help.path) } - } - CircleButtonWithIcon( - icon = { - Image( - imageVector = ImageVector.vectorResource(id = R.drawable.ic_question_mark), - contentDescription = "QuestionMark", - colorFilter = ColorFilter.tint(tint) - ) - }, - backgroundColor = background, - onClick = onClick - ) -} - -@Composable -internal fun CloseIconButton(onClick: () -> Unit) { - CircleButtonWithIcon( - icon = { - Image( - imageVector = ImageVector.vectorResource(id = R.drawable.ic_close), - contentDescription = "CloseIcon", - colorFilter = ColorFilter.tint(ModalTheme.colors.onBackgroundColor) - ) - }, - backgroundColor = ModalTheme.colors.background, - onClick = onClick - ) -} - -@Preview -@Composable -private fun CircleButtonsPreview() { - ComponentPreview { - CloseIconButton({}) - VerticalSpacer(4.dp) - QuestionMarkIconButton(navController = rememberNavController()) - } -} diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/components/Images.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/components/Images.kt deleted file mode 100644 index 4096f4c73..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/components/Images.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.walletconnect.wcmodal.ui.components - -import androidx.annotation.DrawableRes -import androidx.compose.foundation.Image -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.ColorFilter -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.res.vectorResource -import com.walletconnect.wcmodal.ui.theme.ModalTheme - -@Composable -internal fun ImageWithMainTint( - @DrawableRes icon: Int, - modifier: Modifier = Modifier, - contentDescription: String? = null, -) { - Image( - imageVector = ImageVector.vectorResource(id = icon), - contentDescription = contentDescription, - modifier = modifier, - colorFilter = ColorFilter.tint(ModalTheme.colors.main) - ) -} diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/components/ModalRoot.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/components/ModalRoot.kt deleted file mode 100644 index a30767877..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/components/ModalRoot.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.walletconnect.wcmodal.ui.components - -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.width -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.unit.dp -import androidx.navigation.NavController -import com.walletconnect.modal.ui.components.logo.WalletConnectLogo -import com.walletconnect.wcmodal.ui.theme.ModalTheme -import com.walletconnect.wcmodal.ui.theme.ProvideModalThemeComposition - -@Composable -internal fun ModalRoot( - navController: NavController, - closeModal: () -> Unit, - content: @Composable () -> Unit -) { - Column( - verticalArrangement = Arrangement.Bottom - ) { - ProvideModalThemeComposition { - Column( - modifier = Modifier.background(color = ModalTheme.colors.main) - ) { - Row( - modifier = Modifier - .fillMaxWidth() - .padding(vertical = 12.dp, horizontal = 20.dp), - horizontalArrangement = Arrangement.SpaceBetween - ) { - WalletConnectLogo(modifier = Modifier.weight(1f), color = ModalTheme.colors.onMainColor) - CloseIconButton { closeModal() } - } - Column( - modifier = Modifier - .fillMaxWidth() - .background( - ModalTheme.colors.background, - shape = RoundedCornerShape(topStart = 32.dp, topEnd = 32.dp) - ) - ) { - content() - } - } - } - } -} \ No newline at end of file diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/components/ModalTopBar.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/components/ModalTopBar.kt deleted file mode 100644 index c029304f8..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/components/ModalTopBar.kt +++ /dev/null @@ -1,170 +0,0 @@ -package com.walletconnect.wcmodal.ui.components - -import androidx.compose.foundation.background -import androidx.compose.foundation.border -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.foundation.text.BasicTextField -import androidx.compose.foundation.text.KeyboardActions -import androidx.compose.foundation.text.KeyboardOptions -import androidx.compose.material.Icon -import androidx.compose.material.Text -import androidx.compose.runtime.Composable -import androidx.compose.runtime.collectAsState -import androidx.compose.runtime.getValue -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.SolidColor -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.platform.LocalFocusManager -import androidx.compose.ui.res.vectorResource -import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.input.ImeAction -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -import com.walletconnect.modal.ui.components.common.ClickableImage -import com.walletconnect.modal.ui.components.common.HorizontalSpacer -import com.walletconnect.modal.ui.components.common.VerticalSpacer -import com.walletconnect.modal.ui.model.search.SearchState -import com.walletconnect.wcmodal.R -import com.walletconnect.wcmodal.ui.preview.ComponentPreview -import com.walletconnect.wcmodal.ui.theme.ModalTheme - -@Composable -internal fun ModalTopBar( - title: String, - endIcon: (@Composable () -> Unit)? = null, - onBackPressed: (() -> Unit)? = null -) { - Box( - modifier = Modifier - .height(60.dp) - .fillMaxWidth() - .padding(horizontal = 20.dp) - ) { - Text( - text = title, - style = TextStyle( - color = ModalTheme.colors.textColor, - fontSize = 20.sp - ), - modifier = Modifier.align(Alignment.Center) - ) - onBackPressed?.let { onBackClick -> - ClickableImage( - tint = ModalTheme.colors.main, - imageVector = ImageVector.vectorResource(id = R.drawable.chevron_left), - contentDescription = "BackArrow", - modifier = Modifier.align(Alignment.CenterStart), - onClick = onBackClick - ) - } - endIcon?.let { - Box(modifier = Modifier.align(Alignment.CenterEnd)) { - endIcon() - } - } - } -} - -@Composable -internal fun ModalSearchTopBar( - searchState: SearchState, - onBackPressed: (() -> Unit) -) { - val focusManager = LocalFocusManager.current - val state by searchState.state.collectAsState() - - Box( - modifier = Modifier - .height(60.dp) - .fillMaxWidth() - .padding(horizontal = 20.dp), - ) { - ClickableImage( - tint = ModalTheme.colors.main, - imageVector = ImageVector.vectorResource(id = R.drawable.chevron_left), - contentDescription = "BackArrow", - modifier = Modifier.align(Alignment.CenterStart), - onClick = onBackPressed - ) - BasicTextField( - value = state.searchValue, - onValueChange = searchState::onSearchValueChange, - textStyle = TextStyle(color = ModalTheme.colors.onBackgroundColor), - cursorBrush = SolidColor(ModalTheme.colors.main), - singleLine = true, - modifier = Modifier - .padding(horizontal = 30.dp) - .fillMaxWidth() - .align(Alignment.Center) - .background(ModalTheme.colors.background) - .border(width = 1.dp, color = ModalTheme.colors.main, shape = RoundedCornerShape(16.dp)) - .padding(2.dp), - keyboardActions = KeyboardActions(onSearch = { - searchState.onSearchSubmit() - focusManager.clearFocus(true) } - ), - keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search), - decorationBox = { innerTextField -> - Row( - modifier = Modifier.padding(4.dp), - verticalAlignment = Alignment.CenterVertically - ) { - HorizontalSpacer(width = 4.dp) - Icon( - tint = ModalTheme.colors.secondaryTextColor, - imageVector = ImageVector.vectorResource(id = R.drawable.ic_search), - contentDescription = "lens", - ) - HorizontalSpacer(width = 8.dp) - Box { - if (searchState.searchValue.isBlank()) { - Text(text = "Search wallets", style = TextStyle(color = ModalTheme.colors.secondaryTextColor)) - } - innerTextField() - } - } - }, - ) - - } -} - -@Preview -@Composable -private fun PreviewWeb3TopBar() { - ComponentPreview { - ModalTopBar( - title = "Connect your wallet", - endIcon = { - ImageWithMainTint(icon = R.drawable.ic_scan) - }, - onBackPressed = null - ) - VerticalSpacer(height = 6.dp) - ModalTopBar( - title = "Scan the code", - endIcon = { - ImageWithMainTint(icon = R.drawable.ic_copy) - }, - onBackPressed = {}) - ModalTopBar( - title = "What is wallet?", - onBackPressed = {} - ) - ModalSearchTopBar( - searchState = SearchState(searchPhrase = "", onSearchSubmit = {}, onClearInput = {}), - onBackPressed = {} - ) - ModalSearchTopBar( - searchState = SearchState(searchPhrase = "Metamask", onSearchSubmit = {}, onClearInput = {}), - onBackPressed = {} - ) - } -} diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/components/Wallets.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/components/Wallets.kt deleted file mode 100644 index 4a8bfb548..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/components/Wallets.kt +++ /dev/null @@ -1,122 +0,0 @@ -@file:OptIn(ExperimentalFoundationApi::class) - -package com.walletconnect.wcmodal.ui.components - -import androidx.compose.foundation.ExperimentalFoundationApi -import androidx.compose.foundation.border -import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.BoxWithConstraints -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.lazy.grid.GridCells -import androidx.compose.foundation.lazy.grid.LazyGridItemScope -import androidx.compose.foundation.lazy.grid.LazyGridScope -import androidx.compose.foundation.lazy.grid.LazyVerticalGrid -import androidx.compose.foundation.lazy.grid.itemsIndexed -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip -import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -import coil.compose.AsyncImage -import coil.request.ImageRequest -import com.walletconnect.android.internal.common.modal.data.model.Wallet -import com.walletconnect.wcmodal.ui.theme.ModalTheme -import com.walletconnect.wcmodal.ui.utils.imageHeaders - -@Composable -internal fun WalletsLazyGridView( - modifier: Modifier = Modifier, - content: LazyGridScope.(Int) -> Unit -) { - val walletItemWidth = 90.dp - BoxWithConstraints( - modifier = modifier - ) { - val maxColumnsNumber = maxOf((maxWidth / walletItemWidth).toInt(), 1) - LazyVerticalGrid( - columns = GridCells.Fixed(maxColumnsNumber), - content = { - content(maxColumnsNumber) - } - ) - } -} - -internal fun LazyGridScope.walletsGridItems( - wallets: List, - onWalletItemClick: (Wallet) -> Unit -) { - itemsIndexed( - items = wallets, - key = { _, wallet -> wallet.id } - ) { _, wallet -> - WalletListItem( - wallet = wallet, - onWalletItemClick = onWalletItemClick - ) - } -} - -@Composable -internal fun WalletImage(url: String, modifier: Modifier) { - AsyncImage( - model = ImageRequest.Builder(LocalContext.current) - .data(url) - .crossfade(true) - .imageHeaders() - .build(), - contentDescription = null, - modifier = modifier - ) -} - -@Composable -internal fun LazyGridItemScope.WalletListItem( - wallet: Wallet, - onWalletItemClick: (Wallet) -> Unit -) { - Column( - modifier = Modifier - .animateItemPlacement() - .clip(RoundedCornerShape(20.dp)) - .clickable { onWalletItemClick(wallet) }, - horizontalAlignment = Alignment.CenterHorizontally - ) { - WalletImage( - url = wallet.imageUrl, - modifier = Modifier - .size(80.dp) - .padding(10.dp) - .clip(RoundedCornerShape(14.dp)) - .border(1.dp, color = ModalTheme.colors.border, RoundedCornerShape(14.dp)) - ) - Text( - text = wallet.name, - style = TextStyle(color = ModalTheme.colors.onBackgroundColor, fontSize = 12.sp), - textAlign = TextAlign.Center - ) - Box( - modifier = Modifier.height(16.dp), - contentAlignment = Alignment.Center - ) { - when { - wallet.isRecent -> { - Text(text = "RECENT", style = TextStyle(fontSize = 10.sp, color = ModalTheme.colors.secondaryTextColor, textAlign = TextAlign.Center)) - } - wallet.isWalletInstalled -> { - Text(text = "INSTALLED", style = TextStyle(color = ModalTheme.colors.secondaryTextColor, fontSize = 10.sp)) - } - } - } - } -} diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/navigation/ModalNavGraph.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/navigation/ModalNavGraph.kt deleted file mode 100644 index 68b3b918b..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/navigation/ModalNavGraph.kt +++ /dev/null @@ -1,56 +0,0 @@ -package com.walletconnect.wcmodal.ui.navigation - -import androidx.compose.animation.ExperimentalAnimationApi -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.navigation.NavHostController -import androidx.navigation.NavType -import androidx.navigation.navArgument -import com.google.accompanist.navigation.animation.AnimatedNavHost -import com.google.accompanist.navigation.animation.composable -import com.walletconnect.util.Empty -import com.walletconnect.wcmodal.ui.WalletConnectModalViewModel -import com.walletconnect.wcmodal.ui.routes.all_wallets.AllWalletsRoute -import com.walletconnect.wcmodal.ui.routes.connect_wallet.ConnectYourWalletRoute -import com.walletconnect.wcmodal.ui.routes.get_wallet.GetAWalletRoute -import com.walletconnect.wcmodal.ui.routes.help.HelpRoute -import com.walletconnect.wcmodal.ui.routes.on_hold.RedirectOnHoldScreen -import com.walletconnect.wcmodal.ui.routes.scan_code.ScanQRCodeRoute - -@ExperimentalAnimationApi -@Composable -internal fun ModalNavGraph( - navController: NavHostController, - modifier: Modifier = Modifier, - viewModel: WalletConnectModalViewModel -) { - AnimatedNavHost( - navController = navController, - startDestination = Route.ConnectYourWallet.path, - modifier = modifier, - ) { - composable(route = Route.ConnectYourWallet.path) { - ConnectYourWalletRoute(navController = navController, viewModel = viewModel) - } - composable(route = Route.ScanQRCode.path) { - ScanQRCodeRoute(navController = navController, viewModel = viewModel) - } - composable(route = Route.Help.path) { - HelpRoute(navController = navController) - } - composable(route = Route.AllWallets.path) { - AllWalletsRoute(navController = navController, viewModel = viewModel) - } - composable(route = Route.GetAWallet.path) { - GetAWalletRoute(navController = navController, wallets = viewModel.getNotInstalledWallets()) - } - composable( - route = Route.OnHold.path + "/" + Route.OnHold.walletIdArg, - arguments = listOf(navArgument(Route.OnHold.walletIdKey) { type = NavType.StringType }) - ) { backStackEntry -> - val walletId = backStackEntry.arguments?.getString(Route.OnHold.walletIdKey, String.Empty) - val wallet = viewModel.getWallet(walletId) - wallet?.let { RedirectOnHoldScreen(navController = navController, wallet = wallet, viewModel = viewModel).also { viewModel.saveRecentWallet(wallet) } } - } - } -} diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/navigation/Route.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/navigation/Route.kt deleted file mode 100644 index 3b63adef7..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/navigation/Route.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.walletconnect.wcmodal.ui.navigation - -internal sealed class Route(val path: String) { - - object WalletConnectModalRoot: Route("wc_modal_root") - - object ConnectYourWallet: Route("connect_wallet") - - object ScanQRCode : Route("scan_qr_code") - - object Help : Route("help") - - object GetAWallet : Route("get_a_wallet") - - object AllWallets : Route("all_wallets") - - object OnHold : Route("on_hold") { - const val walletIdKey = "walletId" - const val walletIdArg = "{walletId}" - } -} diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/preview/Preview.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/preview/Preview.kt deleted file mode 100644 index 545092ea4..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/preview/Preview.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.walletconnect.wcmodal.ui.preview - -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.ColumnScope -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.navigation.compose.rememberNavController -import com.walletconnect.wcmodal.ui.components.ModalRoot -import com.walletconnect.wcmodal.ui.theme.ModalTheme -import com.walletconnect.wcmodal.ui.theme.ProvideModalThemeComposition - -@Composable -internal fun ModalPreview( - content: @Composable () -> Unit, -) { - ModalRoot( - navController = rememberNavController(), - closeModal = {} - ) { - content() - } -} - -@Composable -internal fun ComponentPreview( - content: @Composable ColumnScope.() -> Unit -) { - ProvideModalThemeComposition { - Column(modifier = Modifier.background(ModalTheme.colors.background)) { - content() - } - } -} diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/all_wallets/AllWalletsRoute.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/all_wallets/AllWalletsRoute.kt deleted file mode 100644 index b1338bb1c..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/all_wallets/AllWalletsRoute.kt +++ /dev/null @@ -1,202 +0,0 @@ -package com.walletconnect.wcmodal.ui.routes.all_wallets - -import androidx.compose.foundation.background -import androidx.compose.foundation.border -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.fillMaxHeight -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.width -import androidx.compose.foundation.lazy.grid.GridCells -import androidx.compose.foundation.lazy.grid.LazyGridScope -import androidx.compose.foundation.lazy.grid.LazyGridState -import androidx.compose.foundation.lazy.grid.LazyVerticalGrid -import androidx.compose.foundation.lazy.grid.rememberLazyGridState -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.CircularProgressIndicator -import androidx.compose.material.Surface -import androidx.compose.material.Text -import androidx.compose.runtime.Composable -import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.collectAsState -import androidx.compose.runtime.getValue -import androidx.compose.runtime.remember -import androidx.compose.runtime.rememberCoroutineScope -import androidx.compose.runtime.snapshotFlow -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.drawWithContent -import androidx.compose.ui.graphics.BlendMode -import androidx.compose.ui.graphics.Brush -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.graphicsLayer -import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -import androidx.navigation.NavController -import com.walletconnect.android.internal.common.modal.data.model.Wallet -import com.walletconnect.modal.ui.model.LoadingState -import com.walletconnect.modal.ui.model.search.SearchState -import com.walletconnect.wcmodal.ui.components.ModalSearchTopBar -import com.walletconnect.wcmodal.ui.components.walletsGridItems -import com.walletconnect.wcmodal.ui.preview.ModalPreview -import com.walletconnect.wcmodal.ui.theme.ModalTheme -import com.walletconnect.modal.utils.isLandscape -import com.walletconnect.wcmodal.domain.dataStore.WalletsData -import com.walletconnect.wcmodal.ui.WalletConnectModalViewModel -import com.walletconnect.wcmodal.ui.navigation.Route -import kotlinx.coroutines.flow.distinctUntilChanged -import kotlinx.coroutines.flow.filter -import kotlinx.coroutines.launch - -@Composable -internal fun AllWalletsRoute( - navController: NavController, - viewModel: WalletConnectModalViewModel -) { - val walletsState by viewModel.walletsState.collectAsState() - - AllWalletsContent( - walletsData = walletsState, - searchPhrase = viewModel.searchPhrase, - onSearch = { viewModel.search(it) }, - onSearchClear = { viewModel.clearSearch() }, - onFetchNextPage = { viewModel.fetchMoreWallets() }, - onWalletItemClick = { navController.navigate(Route.OnHold.path + "/${it.id}") }, - onBackClick = { navController.popBackStack() } - ) -} - -@Composable -private fun AllWalletsContent( - walletsData: WalletsData, - searchPhrase: String, - onSearch: (String) -> Unit, - onSearchClear: () -> Unit, - onFetchNextPage: () -> Unit, - onWalletItemClick: (Wallet) -> Unit, - onBackClick: () -> Unit, -) { - val gridState = rememberLazyGridState() - val coroutineScope = rememberCoroutineScope() - val scrollToFirstItem = { coroutineScope.launch { gridState.scrollToItem(0) } } - val searchState = remember { - SearchState( - searchPhrase = searchPhrase, - onSearchSubmit = { onSearch(it).also { scrollToFirstItem() } }, - onClearInput = { onSearchClear().also { scrollToFirstItem() } } - ) - } - val gridFraction = if (isLandscape) 1f else .95f - - LaunchedEffect(gridState) { - snapshotFlow { gridState.firstVisibleItemIndex != 0 && !gridState.canScrollForward } - .distinctUntilChanged() - .filter { it } - .collect { onFetchNextPage() } - } - - Column( - modifier = Modifier - .fillMaxHeight(gridFraction) - .padding(horizontal = 4.dp), - ) { - ModalSearchTopBar( - searchState = searchState, - onBackPressed = onBackClick, - ) - if (walletsData.loadingState == LoadingState.REFRESH) { - Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { - CircularProgressIndicator( - strokeWidth = 4.dp, - color = ModalTheme.colors.main, - modifier = Modifier.size(24.dp) - ) - } - } else if (walletsData.wallets.isEmpty()) { - NoWalletsFoundItem() - } else { - WalletsGrid(gridState, walletsData, onWalletItemClick) - } - } -} - -@Composable -fun NoWalletsFoundItem() { - Text( - text = "No wallets found", - style = TextStyle(color = ModalTheme.colors.secondaryTextColor, fontSize = 16.sp), - textAlign = TextAlign.Center, - modifier = Modifier - .fillMaxWidth() - .padding(vertical = 50.dp) - ) -} - -@Composable -private fun WalletsGrid( - gridState: LazyGridState, - walletsData: WalletsData, - onWalletItemClick: (Wallet) -> Unit -) { - val color = ModalTheme.colors.background - Box { - LazyVerticalGrid( - state = gridState, - columns = GridCells.FixedSize(82.dp), - modifier = Modifier - .padding(horizontal = 10.dp) - .graphicsLayer { alpha = 0.99f } - .drawWithContent { - val colors = listOf(Color.Transparent, color) - drawContent() - drawRect( - brush = Brush.verticalGradient(colors, startY = 0f, endY = 40f), - blendMode = BlendMode.DstIn, - ) - }, - verticalArrangement = Arrangement.Center, - horizontalArrangement = Arrangement.SpaceBetween, - ) { - walletsGridItems(walletsData.wallets, onWalletItemClick) - if (walletsData.loadingState == LoadingState.APPEND) { - loadingWalletsItems() - } - } - } -} - -private fun LazyGridScope.loadingWalletsItems() { - items(10) { - Surface( - modifier = Modifier.padding(4.dp), - color = Color.Transparent, - shape = RoundedCornerShape(16.dp) - ) { - Box( - modifier = Modifier - .width(76.dp) - .height(96.dp) - .background(Color.Transparent) - .border(width = 1.dp, color = ModalTheme.colors.secondaryBackgroundColor, shape = RoundedCornerShape(16.dp)) - ) - } - } -} - - -@Preview -@Composable -private fun AllWalletsPreview() { - val walletsData = WalletsData.empty() - ModalPreview { - AllWalletsContent(walletsData, "", {}, {}, {}, {}, {}) - } -} diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/connect_wallet/ConnectYourWalletRoute.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/connect_wallet/ConnectYourWalletRoute.kt deleted file mode 100644 index 087d278f6..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/connect_wallet/ConnectYourWalletRoute.kt +++ /dev/null @@ -1,209 +0,0 @@ -package com.walletconnect.wcmodal.ui.routes.connect_wallet - -import androidx.compose.animation.AnimatedContent -import androidx.compose.animation.fadeIn -import androidx.compose.animation.fadeOut -import androidx.compose.animation.slideInHorizontally -import androidx.compose.animation.togetherWith -import androidx.compose.foundation.background -import androidx.compose.foundation.border -import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.lazy.grid.LazyGridScope -import androidx.compose.foundation.lazy.grid.itemsIndexed -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.Text -import androidx.compose.runtime.Composable -import androidx.compose.runtime.collectAsState -import androidx.compose.runtime.getValue -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.res.vectorResource -import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -import androidx.navigation.NavController -import com.walletconnect.android.internal.common.modal.data.model.Wallet -import com.walletconnect.modal.ui.components.common.ClickableImage -import com.walletconnect.modal.ui.model.UiState -import com.walletconnect.wcmodal.R -import com.walletconnect.wcmodal.ui.components.ModalTopBar -import com.walletconnect.wcmodal.ui.components.WalletImage -import com.walletconnect.wcmodal.ui.components.WalletListItem -import com.walletconnect.wcmodal.ui.components.WalletsLazyGridView -import com.walletconnect.wcmodal.ui.components.walletsGridItems -import com.walletconnect.wcmodal.ui.navigation.Route -import com.walletconnect.wcmodal.ui.preview.ModalPreview -import com.walletconnect.wcmodal.ui.theme.ModalTheme -import com.walletconnect.modal.utils.isLandscape -import com.walletconnect.wcmodal.ui.ErrorModalState -import com.walletconnect.wcmodal.ui.LoadingModalState -import com.walletconnect.wcmodal.ui.WalletConnectModalViewModel - -@Composable -internal fun ConnectYourWalletRoute( - navController: NavController, - viewModel: WalletConnectModalViewModel, -) { - - val uiState by viewModel.uiState.collectAsState() - AnimatedContent( - targetState = uiState, - label = "UiStateBuilder $uiState", - transitionSpec = { fadeIn() + slideInHorizontally { it / 2 } togetherWith fadeOut() } - ) { state -> - when (state) { - is UiState.Error -> ErrorModalState { viewModel.fetchInitialWallets() } - is UiState.Loading -> LoadingModalState() - is UiState.Success -> ConnectYourWalletContent( - wallets = state.data, - onWalletItemClick = { navController.navigate(Route.OnHold.path + "/${it.id}") }, - onViewAllClick = { navController.navigate(Route.AllWallets.path) }, - onScanIconClick = { navController.navigate(Route.ScanQRCode.path) } - ) - } - } -} - -@Composable -private fun ConnectYourWalletContent( - wallets: List, - onWalletItemClick: (Wallet) -> Unit, - onViewAllClick: () -> Unit, - onScanIconClick: () -> Unit, -) { - Column { - ModalTopBar(title = "Connect your wallet", endIcon = { - ClickableImage( - imageVector = ImageVector.vectorResource(id = R.drawable.ic_scan), - tint = ModalTheme.colors.main, - contentDescription = "Scan Icon", - onClick = onScanIconClick - ) - }) - WalletsGrid( - wallets = wallets, - onWalletItemClick = onWalletItemClick, - onViewAllClick = onViewAllClick, - ) - Spacer(modifier = Modifier.height(8.dp)) - } -} - -@Composable -private fun WalletsGrid( - wallets: List, - onWalletItemClick: (Wallet) -> Unit, - onViewAllClick: () -> Unit -) { - val isLandscape = isLandscape - if (wallets.isNotEmpty()) { - WalletsLazyGridView( - modifier = Modifier.fillMaxWidth(), - ) { walletsInColumn -> - if (wallets.size <= walletsInColumn) { - walletsGridItems(wallets, onWalletItemClick) - } else { - walletsGridItemsWithViewAll( - if (isLandscape) walletsInColumn else walletsInColumn * 2, - wallets, - onWalletItemClick, - onViewAllClick - ) - } - } - } else { - NoWalletsFoundItem() - } -} - -@Composable -private fun NoWalletsFoundItem() { - Text( - text = "No wallets found", - style = TextStyle(color = ModalTheme.colors.secondaryTextColor, fontSize = 16.sp), - textAlign = TextAlign.Center, - modifier = Modifier - .fillMaxWidth() - .padding(vertical = 50.dp) - ) -} - -private fun LazyGridScope.walletsGridItemsWithViewAll( - maxGridElementsSize: Int, - wallets: List, - onWalletItemClick: (Wallet) -> Unit, - onViewAllClick: () -> Unit -) { - val walletsSize = maxGridElementsSize - 1 - itemsIndexed( - wallets.take(walletsSize), - key = { _, wallet -> wallet.id } - ) { _, wallet -> - WalletListItem( - wallet = wallet, - onWalletItemClick = onWalletItemClick - ) - } - item { - ViewAllItem(wallets.subList(walletsSize, wallets.size), onViewAllClick) - } -} - -@Composable -private fun ViewAllItem( - wallets: List, - onViewAllClick: () -> Unit -) { - Column( - modifier = Modifier - .clip(RoundedCornerShape(20.dp)) - .clickable { onViewAllClick() }, - horizontalAlignment = Alignment.CenterHorizontally - ) { - Column( - modifier = Modifier - .size(80.dp) - .padding(10.dp) - .background(ModalTheme.colors.secondaryBackgroundColor, shape = RoundedCornerShape(14.dp)) - .border(1.dp, ModalTheme.colors.dividerColor, shape = RoundedCornerShape(14.dp)) - .padding(1.dp), - verticalArrangement = Arrangement.Center, - horizontalAlignment = Alignment.CenterHorizontally - ) { - wallets.chunked(2).forEach { - Row { - it.forEach { item -> - WalletImage( - url = item.imageUrl, Modifier - .size(30.dp) - .padding(5.dp) - .clip(RoundedCornerShape(4.dp)) - ) - } - } - } - - } - Text(text = "View All", style = TextStyle(color = ModalTheme.colors.onBackgroundColor, fontSize = 12.sp)) - } -} - -@Preview -@Composable -private fun ConnectYourWalletPreview() { - ModalPreview { - ConnectYourWalletContent(listOf(), {}, {}, {}) - } -} diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/get_wallet/GetAWalletRoute.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/get_wallet/GetAWalletRoute.kt deleted file mode 100644 index 9efeb3116..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/get_wallet/GetAWalletRoute.kt +++ /dev/null @@ -1,160 +0,0 @@ -package com.walletconnect.wcmodal.ui.routes.get_wallet - -import androidx.compose.foundation.Image -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.width -import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.foundation.lazy.itemsIndexed -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip -import androidx.compose.ui.graphics.ColorFilter -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.platform.LocalUriHandler -import androidx.compose.ui.res.vectorResource -import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -import androidx.navigation.NavController -import coil.compose.AsyncImage -import coil.request.ImageRequest -import com.walletconnect.android.internal.common.modal.data.model.Wallet -import com.walletconnect.modal.utils.openPlayStore -import com.walletconnect.wcmodal.R -import com.walletconnect.wcmodal.ui.components.ModalTopBar -import com.walletconnect.wcmodal.ui.components.RoundedMainButton -import com.walletconnect.wcmodal.ui.theme.ModalTheme -import com.walletconnect.wcmodal.ui.utils.imageHeaders - -@Composable -internal fun GetAWalletRoute( - navController: NavController, - wallets: List, -) { - GetAWalletContent( - wallets = wallets, - onBackPressed = navController::popBackStack, - ) -} - -@Composable -private fun GetAWalletContent( - onBackPressed: () -> Unit, - wallets: List, -) { - val uriHandler = LocalUriHandler.current - - Column { - ModalTopBar(title = "Get a wallet", onBackPressed = onBackPressed) - LazyColumn( - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 20.dp) - ) { - itemsIndexed(wallets.take(6)) { _, wallet -> - WalletListItem(wallet = wallet) - } - item { - Column( - modifier = Modifier - .fillMaxWidth() - .padding(vertical = 12.dp, horizontal = 12.dp), - horizontalAlignment = Alignment.CenterHorizontally - ) { - Text( - text = "Not what you're looking for?", style = TextStyle( - color = ModalTheme.colors.textColor, - textAlign = TextAlign.Center, - fontSize = 18.sp - ) - ) - Spacer(modifier = Modifier.height(4.dp)) - Text( - text = "With hundreds of wallets out there, there’s something for everyone", - style = TextStyle( - color = ModalTheme.colors.secondaryTextColor, - textAlign = TextAlign.Center, - fontSize = 14.sp - ) - ) - Spacer(modifier = Modifier.height(6.dp)) - RoundedMainButton( - text = "Explore Wallets", - onClick = { uriHandler.openUri("https://explorer.walletconnect.com/?type=wallet") }, - endIcon = { - Image( - imageVector = ImageVector.vectorResource(id = R.drawable.ic_external_link), - colorFilter = ColorFilter.tint(ModalTheme.colors.onMainColor), - contentDescription = null, - ) - } - ) - } - } - } - } -} - -@Composable -private fun WalletListItem(wallet: Wallet) { - val uriHandler = LocalUriHandler.current - Column { - Row( - modifier = Modifier - .fillMaxWidth() - .padding(vertical = 6.dp), - verticalAlignment = Alignment.CenterVertically - ) { - AsyncImage( - model = ImageRequest.Builder(LocalContext.current) - .data(wallet.imageUrl) - .crossfade(true) - .imageHeaders() - .build(), - contentDescription = null, - modifier = Modifier - .size(50.dp) - .clip(RoundedCornerShape(10.dp)) - ) - Spacer(modifier = Modifier.width(12.dp)) - Text( - text = wallet.name, - style = TextStyle( - fontSize = 16.sp, - color = ModalTheme.colors.onBackgroundColor, - ), - modifier = Modifier.weight(1f) - ) - RoundedMainButton( - text = "Get", - onClick = { uriHandler.openPlayStore(wallet.playStore) }, - endIcon = { - Image( - imageVector = ImageVector.vectorResource(id = R.drawable.ic_forward_chevron), - colorFilter = ColorFilter.tint(ModalTheme.colors.onMainColor), - contentDescription = null, - ) - } - ) - } - Box( - modifier = Modifier - .height(1.dp) - .fillMaxWidth() - .background(ModalTheme.colors.dividerColor) - ) - } -} diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/help/HelpRoute.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/help/HelpRoute.kt deleted file mode 100644 index 47fe2570f..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/help/HelpRoute.kt +++ /dev/null @@ -1,168 +0,0 @@ -package com.walletconnect.wcmodal.ui.routes.help - -import androidx.compose.foundation.Image -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.material.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.ColorFilter -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.platform.LocalUriHandler -import androidx.compose.ui.res.vectorResource -import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -import androidx.navigation.NavController -import com.walletconnect.modal.ui.components.common.HorizontalSpacer -import com.walletconnect.modal.ui.components.common.VerticalSpacer -import com.walletconnect.wcmodal.R -import com.walletconnect.wcmodal.ui.components.ModalTopBar -import com.walletconnect.wcmodal.ui.components.RoundedMainButton -import com.walletconnect.wcmodal.ui.navigation.Route -import com.walletconnect.wcmodal.ui.preview.ModalPreview -import com.walletconnect.wcmodal.ui.theme.ModalTheme - -@Composable -internal fun HelpRoute( - navController: NavController -) { - HelpContent( - onBackPressed = navController::popBackStack, - onGetWalletClick = { navController.navigate(Route.GetAWallet.path) } - ) -} - -@Composable -private fun HelpContent( - onBackPressed: () -> Unit, - onGetWalletClick: () -> Unit, -) { - Column(modifier = Modifier.padding(horizontal = 20.dp)) { - ModalTopBar( - title = "What is wallet?", - onBackPressed = onBackPressed - ) - Column(modifier = Modifier.padding(horizontal = 32.dp)) { - HelpSection( - title = "A home for your digital assets", - body = "A wallet lets you store, send and receive digital assets like cryptocurrencies and NFTs.", - assets = listOf(R.drawable.defi, R.drawable.nft, R.drawable.eth) - ) - VerticalSpacer(4.dp) - HelpSection( - title = "One login for all of web3", - body = "Log in to any app by connecting your wallet. Say goodbye to countless passwords!", - assets = listOf(R.drawable.login, R.drawable.profile, R.drawable.lock) - ) - VerticalSpacer(4.dp) - HelpSection( - title = "Your gateway to a new web", - body = "With your wallet, you can explore and interact with DeFi, NFTs, DAOs, and much more.", - assets = listOf(R.drawable.browser, R.drawable.noun, R.drawable.dao) - ) - VerticalSpacer(4.dp) - HelpButtonRow(onGetWalletClick) - VerticalSpacer(20.dp) - } - } -} - -@Composable -private fun HelpButtonRow( - onGetWalletClick: () -> Unit, -) { - val uriHandler = LocalUriHandler.current - Row( - modifier = Modifier.fillMaxWidth(), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.Center - ) { - RoundedMainButton( - text = "Get a Wallet", - onClick = onGetWalletClick, - startIcon = { - Image( - imageVector = ImageVector.vectorResource(id = R.drawable.ic_wallet), - contentDescription = "Wallet icon", - modifier = Modifier.size(14.dp), - colorFilter = ColorFilter.tint(color = ModalTheme.colors.onMainColor) - ) - } - ) - HorizontalSpacer(10.dp) - RoundedMainButton( - text = "Learn More", - onClick = { - uriHandler.openUri("https://ethereum.org/en/wallets/") - }, - endIcon = { - Image( - imageVector = ImageVector.vectorResource(id = R.drawable.ic_external_link), - contentDescription = "external link icon", - modifier = Modifier.size(14.dp), - colorFilter = ColorFilter.tint(color = ModalTheme.colors.onMainColor) - ) - } - ) - } -} - -@Composable -private fun HelpSection( - title: String, - body: String, - assets: List -) { - Column( - modifier = Modifier - .fillMaxWidth() - .padding(vertical = 8.dp), - horizontalAlignment = Alignment.CenterHorizontally - ) { - Row { - assets.forEach { vectorRes -> - Image( - imageVector = ImageVector.vectorResource(id = vectorRes), - contentDescription = null, - modifier = Modifier - .padding(horizontal = 5.dp) - .size(60.dp) - ) - } - } - VerticalSpacer(4.dp) - Text( - text = title, - style = TextStyle( - fontSize = 16.sp, - color = ModalTheme.colors.textColor, - textAlign = TextAlign.Center - ) - ) - VerticalSpacer(4.dp) - Text( - text = body, - style = TextStyle( - fontSize = 14.sp, - color = ModalTheme.colors.secondaryTextColor, - textAlign = TextAlign.Center - ) - ) - } -} - -@Composable -@Preview -private fun HelpContentPreview() { - ModalPreview { - HelpContent({}, {}) - } -} \ No newline at end of file diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/on_hold/RedirectOnHoldScreen.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/on_hold/RedirectOnHoldScreen.kt deleted file mode 100644 index a6bbdca83..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/on_hold/RedirectOnHoldScreen.kt +++ /dev/null @@ -1,305 +0,0 @@ -package com.walletconnect.wcmodal.ui.routes.on_hold - -import androidx.compose.animation.core.LinearEasing -import androidx.compose.animation.core.RepeatMode -import androidx.compose.animation.core.animateFloat -import androidx.compose.animation.core.infiniteRepeatable -import androidx.compose.animation.core.rememberInfiniteTransition -import androidx.compose.animation.core.tween -import androidx.compose.foundation.Image -import androidx.compose.foundation.background -import androidx.compose.foundation.border -import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.rememberScrollState -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.foundation.verticalScroll -import androidx.compose.material.Divider -import androidx.compose.material.Text -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.KeyboardArrowRight -import androidx.compose.runtime.Composable -import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip -import androidx.compose.ui.draw.drawBehind -import androidx.compose.ui.geometry.CornerRadius -import androidx.compose.ui.geometry.Offset -import androidx.compose.ui.geometry.Rect -import androidx.compose.ui.geometry.RoundRect -import androidx.compose.ui.graphics.ColorFilter -import androidx.compose.ui.graphics.Path -import androidx.compose.ui.graphics.PathMeasure -import androidx.compose.ui.graphics.drawscope.Stroke -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.platform.LocalUriHandler -import androidx.compose.ui.res.vectorResource -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.tooling.preview.PreviewParameter -import androidx.compose.ui.tooling.preview.PreviewParameterProvider -import androidx.compose.ui.unit.dp -import androidx.navigation.NavController -import com.walletconnect.android.internal.common.modal.data.model.Wallet -import com.walletconnect.modal.ui.components.common.HorizontalSpacer -import com.walletconnect.modal.ui.components.common.VerticalSpacer -import com.walletconnect.modal.ui.components.common.WeightSpacer -import com.walletconnect.modal.utils.goToNativeWallet -import com.walletconnect.modal.utils.openPlayStore -import com.walletconnect.modal.utils.openWebAppLink -import com.walletconnect.wcmodal.R -import com.walletconnect.wcmodal.client.Modal -import com.walletconnect.wcmodal.domain.WalletConnectModalDelegate -import com.walletconnect.wcmodal.ui.WalletConnectModalViewModel -import com.walletconnect.wcmodal.ui.components.ModalTopBar -import com.walletconnect.wcmodal.ui.components.RoundedMainButton -import com.walletconnect.wcmodal.ui.components.WalletImage -import com.walletconnect.wcmodal.ui.preview.ModalPreview -import com.walletconnect.wcmodal.ui.theme.ModalTheme - -@Composable -internal fun RedirectOnHoldScreen( - navController: NavController, - wallet: Wallet, - viewModel: WalletConnectModalViewModel -) { - val uriHandler = LocalUriHandler.current - val redirectState = remember { mutableStateOf(RedirectState.Loading) } - - LaunchedEffect(Unit) { - WalletConnectModalDelegate - .wcEventModels - .collect { - when (it) { - is Modal.Model.RejectedSession -> redirectState.value = RedirectState.Reject - is Modal.Model.ExpiredProposal -> redirectState.value = RedirectState.Expired - else -> Unit - } - } - } - - RedirectOnHoldScreen( - wallet = wallet, - state = redirectState.value, - onBackPressed = navController::popBackStack, - onRetry = { - viewModel.connect { uri -> - redirectState.value = RedirectState.Loading - uriHandler.goToNativeWallet(uri, wallet.mobileLink) - } - }, - onOpenWebLink = { - viewModel.connect { uri -> - uriHandler.openWebAppLink(uri, wallet.webAppLink) - } - }, - onOpenPlayStore = { uriHandler.openPlayStore(wallet.playStore) } - ) - - LaunchedEffect(Unit) { - viewModel.connect { uri -> - uriHandler.goToNativeWallet(uri, wallet.mobileLink) - } - } -} - -@Composable -private fun RedirectOnHoldScreen( - wallet: Wallet, - state: RedirectState, - onBackPressed: () -> Unit, - onRetry: () -> Unit, - onOpenWebLink: () -> Unit, - onOpenPlayStore: () -> Unit -) { - Column( - modifier = Modifier.verticalScroll(rememberScrollState()) - ) { - Column( - verticalArrangement = Arrangement.Center, - horizontalAlignment = Alignment.CenterHorizontally - ) { - ModalTopBar( - title = wallet.name, - onBackPressed = onBackPressed - ) - VerticalSpacer(height = 20.dp) - RedirectStateContent(state = state, wallet = wallet) - VerticalSpacer(height = 20.dp) - } - BottomSection(wallet, onRetry, onOpenWebLink, onOpenPlayStore) - } -} - -@Composable -private fun RedirectStateContent(state: RedirectState, wallet: Wallet) { - when (state) { - RedirectState.Loading -> { - WalletImageWithLoader(wallet.imageUrl) - VerticalSpacer(height = 20.dp) - Text(text = "Continue in ${wallet.name}...", color = ModalTheme.colors.textColor) - } - - RedirectState.Reject -> { - WalletImage( - url = wallet.imageUrl, - modifier = Modifier - .border(1.dp, ModalTheme.colors.errorColor, shape = RoundedCornerShape(22.dp)) - .size(90.dp) - .padding(4.dp) - .clip(RoundedCornerShape(20.dp)) - ) - VerticalSpacer(height = 20.dp) - Text(text = "Connection declined", color = ModalTheme.colors.errorColor) - } - - RedirectState.Expired -> { - WalletImage( - url = wallet.imageUrl, - modifier = Modifier - .border(1.dp, ModalTheme.colors.errorColor, shape = RoundedCornerShape(22.dp)) - .size(90.dp) - .padding(4.dp) - .clip(RoundedCornerShape(20.dp)) - ) - VerticalSpacer(height = 20.dp) - Text(text = "Connection expired", color = ModalTheme.colors.errorColor) - } - } -} - -@Composable -private fun WalletImageWithLoader(imageUrl: String) { - val mainColor = ModalTheme.colors.main - val infiniteTransition = rememberInfiniteTransition() - - val value by infiniteTransition.animateFloat( - initialValue = 100f, targetValue = 0f, animationSpec = infiniteRepeatable( - animation = tween(1500, easing = LinearEasing), - repeatMode = RepeatMode.Restart - ) - ) - val pathWithProgress by remember { mutableStateOf(Path()) } - val pathMeasure by remember { mutableStateOf(PathMeasure()) } - val path = remember { Path() } - - - WalletImage( - url = imageUrl, - modifier = Modifier - .size(90.dp) - .drawBehind { - if (path.isEmpty) { - path.addRoundRect( - RoundRect( - Rect(offset = Offset.Zero, size), - cornerRadius = CornerRadius(20.dp.toPx(), 20.dp.toPx()) - ) - ) - } - pathWithProgress.reset() - pathWithProgress.rewind() - pathMeasure.setPath(path, forceClosed = true) - pathMeasure.getSegment( - startDistance = pathMeasure.length * value / 100, - stopDistance = pathMeasure.length * value / 100 + minOf(250f, value * 10), - pathWithProgress, - startWithMoveTo = true - ) - drawPath( - path = pathWithProgress, - style = Stroke( - 3.dp.toPx() - ), - color = mainColor - ) - } - .padding(4.dp) - .clip(RoundedCornerShape(20.dp)) - ) -} - -@Composable -private fun BottomSection( - wallet: Wallet, - onRetry: () -> Unit, - onOpenUniversalLink: () -> Unit, - onOpenPlayStore: () -> Unit -) { - Column( - modifier = Modifier - .fillMaxWidth() - .background(ModalTheme.colors.secondaryBackgroundColor) - .padding(vertical = 10.dp), - horizontalAlignment = Alignment.CenterHorizontally - ) { - RoundedMainButton( - text = "Retry", - onClick = { onRetry() }, - endIcon = { - Image(imageVector = ImageVector.vectorResource(id = R.drawable.ic_retry), contentDescription = null) - } - ) - VerticalSpacer(height = 10.dp) - if (wallet.webAppLink != null) { - Row(Modifier.padding(horizontal = 20.dp, vertical = 6.dp)) { - Text(text = "Still doesn't work?", color = ModalTheme.colors.secondaryTextColor) - HorizontalSpacer(width = 2.dp) - Text(text = "Try this alternate link", color = ModalTheme.colors.main, modifier = Modifier.clickable { onOpenUniversalLink() }) - } - } - Divider( - modifier = Modifier - .padding(vertical = 10.dp) - .fillMaxWidth(), color = ModalTheme.colors.dividerColor - ) - PlayStoreRow(wallet, onOpenPlayStore) - } -} - -@Composable -private fun PlayStoreRow(wallet: Wallet, onOpenPlayStore: () -> Unit) { - Row( - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 20.dp) - .clickable { onOpenPlayStore() }, - verticalAlignment = Alignment.CenterVertically, - ) { - WalletImage( - url = wallet.imageUrl, - modifier = Modifier - .size(28.dp) - .clip(RoundedCornerShape(4.dp)) - ) - HorizontalSpacer(width = 6.dp) - Text(text = "Get ${wallet.name}", color = ModalTheme.colors.textColor) - WeightSpacer() - Text(text = "Play Store", color = ModalTheme.colors.secondaryTextColor) - Image(imageVector = Icons.Default.KeyboardArrowRight, contentDescription = null, colorFilter = ColorFilter.tint(ModalTheme.colors.secondaryTextColor)) - } -} - -@Preview -@Composable -private fun OnHoldScreenPreview( - @PreviewParameter(RedirectStateProvider::class) state: RedirectState -) { - ModalPreview { - val wallet = Wallet("Id", "Kotlin Wallet", "url", "", "", "", null, "", linkMode = "", false) - RedirectOnHoldScreen(wallet = wallet, state = state, onBackPressed = { }, onRetry = { }, onOpenWebLink = { }, onOpenPlayStore = {}) - } -} - -private class RedirectStateProvider : PreviewParameterProvider { - override val values: Sequence - get() = sequenceOf(RedirectState.Loading, RedirectState.Reject, RedirectState.Expired) -} diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/on_hold/RedirectState.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/on_hold/RedirectState.kt deleted file mode 100644 index c80b124d5..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/on_hold/RedirectState.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.walletconnect.wcmodal.ui.routes.on_hold - -internal sealed class RedirectState { - object Loading : RedirectState() - object Reject : RedirectState() - object Expired: RedirectState() -} \ No newline at end of file diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/scan_code/ScanCodeRoute.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/scan_code/ScanCodeRoute.kt deleted file mode 100644 index a2aac1e76..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/routes/scan_code/ScanCodeRoute.kt +++ /dev/null @@ -1,117 +0,0 @@ -package com.walletconnect.wcmodal.ui.routes.scan_code - -import android.widget.Toast -import androidx.compose.animation.animateContentSize -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding -import androidx.compose.runtime.Composable -import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.platform.ClipboardManager -import androidx.compose.ui.platform.LocalClipboardManager -import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.res.vectorResource -import androidx.compose.ui.text.AnnotatedString -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import androidx.navigation.NavController -import com.walletconnect.modal.ui.components.common.ClickableImage -import com.walletconnect.modal.ui.components.qr.QrCodeType -import com.walletconnect.modal.ui.components.qr.WalletConnectQRCode -import com.walletconnect.modal.utils.isLandscape -import com.walletconnect.wcmodal.R -import com.walletconnect.wcmodal.client.Modal -import com.walletconnect.wcmodal.domain.WalletConnectModalDelegate -import com.walletconnect.wcmodal.ui.LoadingModalState -import com.walletconnect.wcmodal.ui.WalletConnectModalViewModel -import com.walletconnect.wcmodal.ui.components.ModalTopBar -import com.walletconnect.wcmodal.ui.preview.ModalPreview -import com.walletconnect.wcmodal.ui.theme.ModalTheme -import kotlinx.coroutines.flow.filterIsInstance - -@Composable -internal fun ScanQRCodeRoute( - navController: NavController, - viewModel: WalletConnectModalViewModel -) { - val context = LocalContext.current - var uri by remember { mutableStateOf("") } - - LaunchedEffect(Unit) { - WalletConnectModalDelegate - .wcEventModels - .filterIsInstance() - .collect { - Toast.makeText(context, "Declined", Toast.LENGTH_SHORT).show() - viewModel.connect { newUri -> uri = newUri } - } - } - - LaunchedEffect(Unit) { - viewModel.connect { uri = it } - } - - ScanQRCodeContent( - uri = uri, - onBackArrowClick = navController::popBackStack - ) -} - -@Composable -private fun ScanQRCodeContent( - uri: String, - onBackArrowClick: () -> Unit, -) { - val context = LocalContext.current - val clipboardManager: ClipboardManager = LocalClipboardManager.current - val qrCodeModifier = if (isLandscape) Modifier else Modifier.padding(horizontal = 20.dp) - - Column( - horizontalAlignment = Alignment.CenterHorizontally, - modifier = Modifier.animateContentSize() - ) { - ModalTopBar( - title = "Scan the code", - onBackPressed = onBackArrowClick, - endIcon = { - ClickableImage( - imageVector = ImageVector.vectorResource(id = R.drawable.ic_copy), - tint = ModalTheme.colors.main, - contentDescription = "Scan Icon", - onClick = { - Toast.makeText(context, "Link copied", Toast.LENGTH_SHORT).show() - clipboardManager.setText(AnnotatedString(uri)) - } - ) - } - ) - if (uri.isNotBlank()) { - WalletConnectQRCode( - qrData = uri, - primaryColor = ModalTheme.colors.onBackgroundColor, - logoColor = ModalTheme.colors.main, - type = QrCodeType.WCM, - modifier = qrCodeModifier - ) - } else { - LoadingModalState() - } - Spacer(modifier = Modifier.height(8.dp)) - } -} - -@Preview -@Composable -private fun ScanQRCodePreview() { - ModalPreview { - ScanQRCodeContent("47442c19ea7c6a7a836fa3e53af1ddd375438daaeea9acdbf595e989a731b73249a10a7cc0e343ca627e536609", {}) - } -} \ No newline at end of file diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/state/ModalState.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/state/ModalState.kt deleted file mode 100644 index edb9f00cc..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/state/ModalState.kt +++ /dev/null @@ -1,37 +0,0 @@ -@file:OptIn(ExperimentalCoroutinesApi::class) - -package com.walletconnect.wcmodal.ui.state - -import androidx.compose.runtime.Composable -import androidx.compose.runtime.remember -import androidx.navigation.NavController -import androidx.navigation.NavDestination -import com.walletconnect.wcmodal.ui.navigation.Route -import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.flow.mapLatest - -@Composable -fun rememberModalState( - navController: NavController -): ModalState = remember(navController) { - ModalState(navController) -} - -class ModalState( - private val navController: NavController -) { - val isOpen: Boolean - get() = navController.currentDestination.isModal() - - val isOpenFlow - get() = navController.currentBackStackEntryFlow.mapLatest { it.destination.isModal() } - - fun closeModal() { - if(isOpen) { - navController.popBackStack() - } - } - - private fun NavDestination?.isModal() = - this?.route?.startsWith("${Route.WalletConnectModalRoot.path}?") ?: false -} \ No newline at end of file diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/theme/Composition.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/theme/Composition.kt deleted file mode 100644 index 93de5b036..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/theme/Composition.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.walletconnect.wcmodal.ui.theme - -import androidx.compose.runtime.compositionLocalOf -import androidx.compose.ui.graphics.Color - -internal data class CustomizableComposition( - val accentColor: Color = Color(0xFF3496ff), - val onAccentColor: Color = Color.White -) - -internal val LocalCustomComposition = compositionLocalOf { CustomizableComposition() } \ No newline at end of file diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/theme/ModalColors.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/theme/ModalColors.kt deleted file mode 100644 index 03dec0acc..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/theme/ModalColors.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.walletconnect.wcmodal.ui.theme - -import androidx.compose.foundation.isSystemInDarkTheme -import androidx.compose.runtime.Composable -import androidx.compose.ui.graphics.Color - -internal data class ModalColors( - val main: Color, - val onMainColor: Color, - val background: Color, - val onBackgroundColor: Color, - val secondaryBackgroundColor: Color, - val textColor: Color, - val secondaryTextColor: Color, - val dividerColor: Color, - val border: Color, - val errorColor: Color = Color(0xFFF05142) -) - -@Composable -internal fun provideModalColors( - composition: CustomizableComposition -): ModalColors = if (isSystemInDarkTheme()) { - defaultDarkAppKitColors(composition.accentColor, composition.onAccentColor) -} else { - defaultLightAppKitColors(composition.accentColor, composition.onAccentColor) -} - -private fun defaultLightAppKitColors( - mainColor: Color, - onMainColor: Color -) = ModalColors( - main = mainColor, - onMainColor = onMainColor, - onBackgroundColor = Color.Black, - background = Color.White, - textColor = Color.Black, - secondaryTextColor = Color(0xFF798686), - secondaryBackgroundColor = Color(0xFFF1F3F3), - dividerColor = Color(0xFFE4E7E7), - border = Color(0x32062B2B) -) - -private fun defaultDarkAppKitColors( - mainColor: Color, - onMainColor: Color -) = ModalColors( - main = mainColor, - onMainColor = onMainColor, - background = Color.Black, - onBackgroundColor = Color.White, - textColor = Color.White, - secondaryTextColor = Color(0xFF949E9E), - secondaryBackgroundColor = Color(0xFF272A2A), - dividerColor = Color(0xFF3B4040), - border = Color(0x32062B2B) -) diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/theme/Theme.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/theme/Theme.kt deleted file mode 100644 index d6aaaf6a7..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/theme/Theme.kt +++ /dev/null @@ -1,44 +0,0 @@ -package com.walletconnect.wcmodal.ui.theme - -import androidx.compose.runtime.Composable -import androidx.compose.runtime.CompositionLocalProvider -import androidx.compose.runtime.compositionLocalOf -import androidx.compose.ui.graphics.Color - -@Composable -fun WalletConnectModalTheme( - accentColor: Color = Color(0xFF3496ff), - onAccentColor: Color = Color.White, - content: @Composable () -> Unit -) { - val customComposition = CustomizableComposition( - accentColor = accentColor, - onAccentColor = onAccentColor - ) - CompositionLocalProvider( - LocalCustomComposition provides customComposition - ) { - content() - } -} - -@Composable -internal fun ProvideModalThemeComposition(content: @Composable () -> Unit) { - val composition = LocalCustomComposition.current - - val colors = provideModalColors(composition) - CompositionLocalProvider( - LocalColorsComposition provides colors, - content = content - ) -} - -internal object ModalTheme { - val colors: ModalColors - @Composable - get() = LocalColorsComposition.current -} - -private val LocalColorsComposition = compositionLocalOf { - error("No colors provided") -} diff --git a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/utils/Image.kt b/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/utils/Image.kt deleted file mode 100644 index 2799eb8c3..000000000 --- a/product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/ui/utils/Image.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.walletconnect.wcmodal.ui.utils - -import coil.request.ImageRequest -import com.walletconnect.android.BuildConfig -import com.walletconnect.android.internal.common.model.ProjectId -import com.walletconnect.android.internal.common.wcKoinApp - -internal fun ImageRequest.Builder.imageHeaders() = apply { - addHeader("x-project-id", wcKoinApp.koin.get().value) - addHeader("x-sdk-version", BuildConfig.SDK_VERSION) - addHeader("x-sdk-type", "wcm") -} \ No newline at end of file diff --git a/product/walletconnectmodal/src/main/res/drawable/browser.xml b/product/walletconnectmodal/src/main/res/drawable/browser.xml deleted file mode 100644 index a4661bcb0..000000000 --- a/product/walletconnectmodal/src/main/res/drawable/browser.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - diff --git a/product/walletconnectmodal/src/main/res/drawable/chevron_left.xml b/product/walletconnectmodal/src/main/res/drawable/chevron_left.xml deleted file mode 100644 index 755a53eca..000000000 --- a/product/walletconnectmodal/src/main/res/drawable/chevron_left.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/product/walletconnectmodal/src/main/res/drawable/dao.xml b/product/walletconnectmodal/src/main/res/drawable/dao.xml deleted file mode 100644 index 913a02fe6..000000000 --- a/product/walletconnectmodal/src/main/res/drawable/dao.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - diff --git a/product/walletconnectmodal/src/main/res/drawable/defi.xml b/product/walletconnectmodal/src/main/res/drawable/defi.xml deleted file mode 100644 index a4bbed9f8..000000000 --- a/product/walletconnectmodal/src/main/res/drawable/defi.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - diff --git a/product/walletconnectmodal/src/main/res/drawable/eth.xml b/product/walletconnectmodal/src/main/res/drawable/eth.xml deleted file mode 100644 index 0399df475..000000000 --- a/product/walletconnectmodal/src/main/res/drawable/eth.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - diff --git a/product/walletconnectmodal/src/main/res/drawable/ic_close.xml b/product/walletconnectmodal/src/main/res/drawable/ic_close.xml deleted file mode 100644 index ee696aef5..000000000 --- a/product/walletconnectmodal/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/product/walletconnectmodal/src/main/res/drawable/ic_copy.xml b/product/walletconnectmodal/src/main/res/drawable/ic_copy.xml deleted file mode 100644 index 7bafb64c6..000000000 --- a/product/walletconnectmodal/src/main/res/drawable/ic_copy.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/product/walletconnectmodal/src/main/res/drawable/ic_external_link.xml b/product/walletconnectmodal/src/main/res/drawable/ic_external_link.xml deleted file mode 100644 index 33187d09d..000000000 --- a/product/walletconnectmodal/src/main/res/drawable/ic_external_link.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/product/walletconnectmodal/src/main/res/drawable/ic_forward_chevron.xml b/product/walletconnectmodal/src/main/res/drawable/ic_forward_chevron.xml deleted file mode 100644 index 73e54a7cd..000000000 --- a/product/walletconnectmodal/src/main/res/drawable/ic_forward_chevron.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/product/walletconnectmodal/src/main/res/drawable/ic_question_mark.xml b/product/walletconnectmodal/src/main/res/drawable/ic_question_mark.xml deleted file mode 100644 index cd605464b..000000000 --- a/product/walletconnectmodal/src/main/res/drawable/ic_question_mark.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/product/walletconnectmodal/src/main/res/drawable/ic_retry.xml b/product/walletconnectmodal/src/main/res/drawable/ic_retry.xml deleted file mode 100644 index 20b160d63..000000000 --- a/product/walletconnectmodal/src/main/res/drawable/ic_retry.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/product/walletconnectmodal/src/main/res/drawable/ic_scan.xml b/product/walletconnectmodal/src/main/res/drawable/ic_scan.xml deleted file mode 100644 index 89f87391d..000000000 --- a/product/walletconnectmodal/src/main/res/drawable/ic_scan.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - diff --git a/product/walletconnectmodal/src/main/res/drawable/ic_search.xml b/product/walletconnectmodal/src/main/res/drawable/ic_search.xml deleted file mode 100644 index 58b5434e9..000000000 --- a/product/walletconnectmodal/src/main/res/drawable/ic_search.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/product/walletconnectmodal/src/main/res/drawable/ic_wallet.xml b/product/walletconnectmodal/src/main/res/drawable/ic_wallet.xml deleted file mode 100644 index 9bd8e3b41..000000000 --- a/product/walletconnectmodal/src/main/res/drawable/ic_wallet.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/product/walletconnectmodal/src/main/res/drawable/ic_wallet_connect_logo.xml b/product/walletconnectmodal/src/main/res/drawable/ic_wallet_connect_logo.xml deleted file mode 100644 index 22a58f0dd..000000000 --- a/product/walletconnectmodal/src/main/res/drawable/ic_wallet_connect_logo.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/product/walletconnectmodal/src/main/res/drawable/ic_wallet_connect_qr_logo.xml b/product/walletconnectmodal/src/main/res/drawable/ic_wallet_connect_qr_logo.xml deleted file mode 100644 index 4675f0c6a..000000000 --- a/product/walletconnectmodal/src/main/res/drawable/ic_wallet_connect_qr_logo.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/product/walletconnectmodal/src/main/res/drawable/lock.xml b/product/walletconnectmodal/src/main/res/drawable/lock.xml deleted file mode 100644 index 4fe43c0ac..000000000 --- a/product/walletconnectmodal/src/main/res/drawable/lock.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - diff --git a/product/walletconnectmodal/src/main/res/drawable/login.xml b/product/walletconnectmodal/src/main/res/drawable/login.xml deleted file mode 100644 index ad2d723c9..000000000 --- a/product/walletconnectmodal/src/main/res/drawable/login.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - diff --git a/product/walletconnectmodal/src/main/res/drawable/nft.xml b/product/walletconnectmodal/src/main/res/drawable/nft.xml deleted file mode 100644 index 8844c1053..000000000 --- a/product/walletconnectmodal/src/main/res/drawable/nft.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/product/walletconnectmodal/src/main/res/drawable/noun.xml b/product/walletconnectmodal/src/main/res/drawable/noun.xml deleted file mode 100644 index f226c9fd3..000000000 --- a/product/walletconnectmodal/src/main/res/drawable/noun.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - diff --git a/product/walletconnectmodal/src/main/res/drawable/profile.xml b/product/walletconnectmodal/src/main/res/drawable/profile.xml deleted file mode 100644 index aee62b906..000000000 --- a/product/walletconnectmodal/src/main/res/drawable/profile.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - diff --git a/product/walletconnectmodal/src/main/res/values/attrs.xml b/product/walletconnectmodal/src/main/res/values/attrs.xml deleted file mode 100644 index 6b67338e2..000000000 --- a/product/walletconnectmodal/src/main/res/values/attrs.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/product/walletconnectmodal/src/main/res/values/theme.xml b/product/walletconnectmodal/src/main/res/values/theme.xml deleted file mode 100644 index 1fac6090f..000000000 --- a/product/walletconnectmodal/src/main/res/values/theme.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalViewModelTest.kt b/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalViewModelTest.kt deleted file mode 100644 index 4a97b0513..000000000 --- a/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/ui/WalletConnectModalViewModelTest.kt +++ /dev/null @@ -1,100 +0,0 @@ -package com.walletconnect.wcmodal.ui - -import app.cash.turbine.test -import com.walletconnect.android.CoreClient -import com.walletconnect.android.internal.common.modal.data.model.WalletListing -import com.walletconnect.android.internal.common.modal.domain.usecase.GetInstalledWalletsIdsUseCaseInterface -import com.walletconnect.android.internal.common.modal.domain.usecase.GetSampleWalletsUseCaseInterface -import com.walletconnect.android.internal.common.modal.domain.usecase.GetWalletsUseCaseInterface -import com.walletconnect.android.internal.common.wcKoinApp -import com.reown.foundation.util.Logger -import com.walletconnect.modal.ui.model.UiState -import com.walletconnect.wcmodal.client.Modal -import com.walletconnect.wcmodal.client.WalletConnectModal -import com.walletconnect.wcmodal.domain.usecase.GetRecentWalletUseCase -import com.walletconnect.wcmodal.domain.usecase.SaveRecentWalletUseCase -import com.walletconnect.wcmodal.utils.testWallets -import io.mockk.coEvery -import io.mockk.every -import io.mockk.mockk -import io.mockk.mockkStatic -import io.mockk.unmockkObject -import kotlinx.coroutines.test.runTest -import org.junit.After -import org.junit.Assert -import org.junit.Before -import org.junit.Rule -import org.junit.Test -import org.koin.core.Koin -import org.koin.core.KoinApplication - -class WalletConnectModalViewModelTest { - - @get:Rule - val mainDispatcherRule = MainDispatcherRule() - - private val koinApp: KoinApplication = mockk() - private val koin: Koin = mockk() - private val getWalletsUseCase: GetWalletsUseCaseInterface = mockk() - private val getRecentWalletUseCase: GetRecentWalletUseCase = mockk() - private val saveRecentWalletUseCase: SaveRecentWalletUseCase = mockk() - private val getWalletsAppDataUseCase: GetInstalledWalletsIdsUseCaseInterface = mockk() - private val getSampleWalletsUseCaseInterface: GetSampleWalletsUseCaseInterface = mockk() - private val logger: Logger = mockk() - - private val sessionParams = Modal.Params.SessionParams( - mapOf( - Pair("eip155", Modal.Model.Namespace.Proposal(chains = listOf("eip155:1"), methods = listOf(), events = listOf())) - ), - null, - null - ) - - @Before - fun setup() { - mockkStatic("com.walletconnect.android.internal.common.KoinApplicationKt") - every { wcKoinApp } returns koinApp - every { koinApp.koin } returns koin - every { koin.get() } returns getWalletsUseCase - every { koin.get() } returns getRecentWalletUseCase - every { koin.get() } returns saveRecentWalletUseCase - every { koin.get() } returns getWalletsAppDataUseCase - every { koin.get() } returns getSampleWalletsUseCaseInterface - every { koin.get() } returns logger - every { getRecentWalletUseCase() } returns null - - coEvery { getWalletsAppDataUseCase.invoke("wcm") } returns listOf() - WalletConnectModal.setSessionParams(sessionParams) - } - - @After - fun after() { - unmockkObject(CoreClient) - unmockkObject(WalletConnectModal) - } - - @Test - fun `should emit Error state when fetch initial wallets fails`() = runTest { - every { logger.error(any()) } answers {} - every { logger.error(any()) } answers {} - - val viewModel = WalletConnectModalViewModel() - viewModel.uiState.test { - val state = awaitItem() - Assert.assertTrue(state is UiState.Error) - } - } - - @Test - fun `should emit Success state when fetch initial wallets with success`() = runTest { - val response = WalletListing(1, testWallets.size, testWallets) - coEvery { getWalletsUseCase(any(), any(), any(), any(), any()) } returns response - coEvery { getSampleWalletsUseCaseInterface() } returns listOf() - - val viewModel = WalletConnectModalViewModel() - viewModel.uiState.test { - val state = awaitItem() - Assert.assertTrue(state is UiState.Success) - } - } -} diff --git a/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/ui/routes/snapshots/AllWalletsRouteTest.kt b/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/ui/routes/snapshots/AllWalletsRouteTest.kt deleted file mode 100644 index 984d1940d..000000000 --- a/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/ui/routes/snapshots/AllWalletsRouteTest.kt +++ /dev/null @@ -1,76 +0,0 @@ -package com.walletconnect.wcmodal.ui.routes.snapshots - -import androidx.navigation.NavController -import com.walletconnect.android.internal.common.model.ProjectId -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.wcmodal.domain.dataStore.WalletsData -import com.walletconnect.wcmodal.ui.MainDispatcherRule -import com.walletconnect.wcmodal.ui.WalletConnectModalViewModel -import com.walletconnect.wcmodal.ui.routes.all_wallets.AllWalletsRoute -import com.walletconnect.wcmodal.utils.ScreenShotTest -import com.walletconnect.wcmodal.utils.testWallets -import io.mockk.every -import io.mockk.mockk -import io.mockk.mockkStatic -import org.junit.Before -import org.junit.Rule -import org.junit.Test -import org.koin.core.Koin -import org.koin.core.KoinApplication - -class AllWalletsRouteTest: ScreenShotTest() { - - @get:Rule - val mainDispatcherRule = MainDispatcherRule() - - private val navController: NavController = mockk() - private val viewModel: WalletConnectModalViewModel = mockk() - private val koinApp: KoinApplication = mockk() - private val koin: Koin = mockk() - - @Before - fun setup() { - mockkStatic("com.walletconnect.android.internal.common.KoinApplicationKt") - every { wcKoinApp } returns koinApp - every { koinApp.koin } returns koin - every { koin.get() } returns ProjectId("test-projectId") - every { viewModel.fetchInitialWallets() } returns Unit - every { viewModel.searchPhrase } returns "" - } - - @Test - fun `test AllWalletsRoute in LightMode with empty list of wallets`() = runScreenShotTest { - every { viewModel.walletsState.value } returns WalletsData(listOf()) - AllWalletsRoute(navController = navController, viewModel = viewModel) - } - - @Test - fun `test AllWalletsRoute in DarkMode with empty list of wallets`() = runScreenShotTest(isDarkMode = true) { - every { viewModel.walletsState.value } returns WalletsData(listOf()) - AllWalletsRoute(navController = navController, viewModel = viewModel) - } - - @Test - fun `test AllWalletsRoute in LightMode with 3 wallets`() = runScreenShotTest { - every { viewModel.walletsState.value } returns WalletsData(testWallets.take(3)) - AllWalletsRoute(navController = navController, viewModel = viewModel) - } - - @Test - fun `test AllWalletsRoute in DarkMode with 3 wallets`() = runScreenShotTest(isDarkMode = true) { - every { viewModel.walletsState.value } returns WalletsData(testWallets.take(3)) - AllWalletsRoute(navController = navController, viewModel = viewModel) - } - - @Test - fun `test AllWalletsRoute in LightMode whole wallets list`() = runScreenShotTest { - every { viewModel.walletsState.value } returns WalletsData(testWallets) - AllWalletsRoute(navController = navController, viewModel = viewModel) - } - - @Test - fun `test AllWalletsRoute in DarkMode with whole wallets list`() = runScreenShotTest(isDarkMode = true) { - every { viewModel.walletsState.value } returns WalletsData(testWallets) - AllWalletsRoute(navController = navController, viewModel = viewModel) - } -} diff --git a/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/ui/routes/snapshots/ConnectYourWalletRouteTest.kt b/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/ui/routes/snapshots/ConnectYourWalletRouteTest.kt deleted file mode 100644 index 5745505e2..000000000 --- a/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/ui/routes/snapshots/ConnectYourWalletRouteTest.kt +++ /dev/null @@ -1,75 +0,0 @@ -package com.walletconnect.wcmodal.ui.routes.snapshots - -import androidx.navigation.NavController -import com.walletconnect.android.internal.common.model.ProjectId -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.modal.ui.model.UiState -import com.walletconnect.wcmodal.ui.MainDispatcherRule -import com.walletconnect.wcmodal.ui.WalletConnectModalViewModel -import com.walletconnect.wcmodal.ui.routes.connect_wallet.ConnectYourWalletRoute -import com.walletconnect.wcmodal.utils.ScreenShotTest -import com.walletconnect.wcmodal.utils.testWallets -import io.mockk.every -import io.mockk.mockk -import io.mockk.mockkStatic -import org.junit.Before -import org.junit.Rule -import org.junit.Test -import org.koin.core.Koin -import org.koin.core.KoinApplication - -class ConnectYourWalletRouteTest: ScreenShotTest() { - - @get:Rule - val mainDispatcherRule = MainDispatcherRule() - - private val navController: NavController = mockk() - private val viewModel: WalletConnectModalViewModel = mockk() - private val koinApp: KoinApplication = mockk() - private val koin: Koin = mockk() - - @Before - fun setup() { - mockkStatic("com.walletconnect.android.internal.common.KoinApplicationKt") - every { wcKoinApp } returns koinApp - every { koinApp.koin } returns koin - every { koin.get() } returns ProjectId("test-projectId") - every { viewModel.fetchInitialWallets() } returns Unit - } - - @Test - fun `test ConnectYourWalletRoute in LightMode with empty list of wallets`() = runScreenShotTest { - every { viewModel.uiState.value } returns UiState.Success(listOf()) - ConnectYourWalletRoute(navController = navController, viewModel = viewModel) - } - - @Test - fun `test ConnectYourWalletRoute in DarkMode with empty list of wallets`() = runScreenShotTest(isDarkMode = true) { - every { viewModel.uiState.value } returns UiState.Success(listOf()) - ConnectYourWalletRoute(navController = navController, viewModel = viewModel) - } - - @Test - fun `test ConnectYourWalletRoute in LightMode with 3 wallets`() = runScreenShotTest { - every { viewModel.uiState.value } returns UiState.Success(testWallets.take(3)) - ConnectYourWalletRoute(navController = navController, viewModel = viewModel) - } - - @Test - fun `test ConnectYourWalletRoute in DarkMode with 3 wallets`() = runScreenShotTest(isDarkMode = true) { - every { viewModel.uiState.value } returns UiState.Success(testWallets.take(3)) - ConnectYourWalletRoute(navController = navController, viewModel = viewModel) - } - - @Test - fun `test ConnectYourWalletRoute in LightMode with whole wallets`() = runScreenShotTest { - every { viewModel.uiState.value } returns UiState.Success(testWallets) - ConnectYourWalletRoute(navController = navController, viewModel = viewModel) - } - - @Test - fun `test ConnectYourWalletRoute in DarkMode with whole wallets`() = runScreenShotTest(isDarkMode = true) { - every { viewModel.uiState.value } returns UiState.Success(testWallets) - ConnectYourWalletRoute(navController = navController, viewModel = viewModel) - } -} diff --git a/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/ui/routes/snapshots/RedirectOnHoldRouteTest.kt b/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/ui/routes/snapshots/RedirectOnHoldRouteTest.kt deleted file mode 100644 index 1119e3e69..000000000 --- a/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/ui/routes/snapshots/RedirectOnHoldRouteTest.kt +++ /dev/null @@ -1,47 +0,0 @@ -package com.walletconnect.wcmodal.ui.routes.snapshots - -import androidx.navigation.NavController -import com.walletconnect.android.internal.common.model.ProjectId -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.wcmodal.ui.MainDispatcherRule -import com.walletconnect.wcmodal.ui.WalletConnectModalViewModel -import com.walletconnect.wcmodal.ui.routes.on_hold.RedirectOnHoldScreen -import com.walletconnect.wcmodal.utils.ScreenShotTest -import com.walletconnect.wcmodal.utils.testWallets -import io.mockk.every -import io.mockk.mockk -import io.mockk.mockkStatic -import org.junit.Before -import org.junit.Rule -import org.junit.Test -import org.koin.core.Koin -import org.koin.core.KoinApplication - -class RedirectOnHoldRouteTest: ScreenShotTest() { - - @get:Rule - val mainDispatcherRule = MainDispatcherRule() - - private val navController: NavController = mockk() - private val viewModel: WalletConnectModalViewModel = mockk() - private val koinApp: KoinApplication = mockk() - private val koin: Koin = mockk() - - @Before - fun setup() { - mockkStatic("com.walletconnect.android.internal.common.KoinApplicationKt") - every { wcKoinApp } returns koinApp - every { koinApp.koin } returns koin - every { koin.get() } returns ProjectId("test-projectId") - every { viewModel.fetchInitialWallets() } returns Unit - } - @Test - fun `test RedirectOnHoldRoute in LightMode`() = runScreenShotTest { - RedirectOnHoldScreen(navController = navController, wallet = testWallets.first(), viewModel = viewModel) - } - - @Test - fun `test RedirectOnHoldRoute in DarkMode`() = runScreenShotTest(isDarkMode = true) { - RedirectOnHoldScreen(navController = navController, wallet = testWallets.first(), viewModel = viewModel) - } -} \ No newline at end of file diff --git a/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/ui/routes/snapshots/ScanCodeRouteTest.kt b/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/ui/routes/snapshots/ScanCodeRouteTest.kt deleted file mode 100644 index 09546fa9f..000000000 --- a/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/ui/routes/snapshots/ScanCodeRouteTest.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.walletconnect.wcmodal.ui.routes.snapshots - -import androidx.compose.runtime.Composable -import androidx.navigation.NavController -import com.walletconnect.wcmodal.ui.MainDispatcherRule -import com.walletconnect.wcmodal.ui.WalletConnectModalViewModel -import com.walletconnect.wcmodal.ui.routes.scan_code.ScanQRCodeRoute -import com.walletconnect.wcmodal.utils.ScreenShotTest -import io.mockk.every -import io.mockk.mockk -import org.junit.Before -import org.junit.Rule -import org.junit.Test - -class ScanCodeRouteTest : ScreenShotTest() { - - @get:Rule - val mainDispatcherRule = MainDispatcherRule() - - private val navController: NavController = mockk() - private val viewModel: WalletConnectModalViewModel = mockk() - - @Before - fun setup() { - every { viewModel.fetchInitialWallets() } returns Unit - } - - private val content: @Composable () -> Unit = { - ScanQRCodeRoute(navController = navController, viewModel = viewModel) - } - - @Test - fun `test ScanQRCodeRoute in LightMode`() = runScreenShotTest { content() } - - @Test - fun `test ScanQRCodeRoute in DarkMode`() = runScreenShotTest(isDarkMode = true, content = content) -} diff --git a/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/utils/DataProvider.kt b/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/utils/DataProvider.kt deleted file mode 100644 index 469314aaa..000000000 --- a/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/utils/DataProvider.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.walletconnect.wcmodal.utils - -import com.walletconnect.android.internal.common.modal.data.model.Wallet - -private val metaMask: Wallet - get() = Wallet(id = "1", name = "MetaMask", homePage = "", order = "", imageUrl = "", mobileLink = "metamask://", webAppLink = "", playStore = "", linkMode = "") -private val trustWallet: Wallet - get() = Wallet(id = "2", name = "Trust Wallet", homePage = "", order = "", imageUrl = "", mobileLink = "trustwallet://", webAppLink = "", playStore = "", linkMode = "") -private val safe: Wallet - get() = Wallet(id = "3", name = "Safe", homePage = "", order = "", imageUrl = "", mobileLink = "safe://", webAppLink = "", playStore = "", linkMode = "") -private val rainbow: Wallet - get() = Wallet(id = "4", name = "Rainbow", homePage = "", order = "", imageUrl = "", mobileLink = "rainbow://", webAppLink = "", playStore = "", linkMode = "") -private val zerion: Wallet - get() = Wallet(id = "5", name = "Zerion", homePage = "", order = "", imageUrl = "", mobileLink = "zerion://", webAppLink = "", playStore = "", linkMode = "") -private val argent: Wallet - get() = Wallet(id = "6", name = "Argent", homePage = "", order = "", imageUrl = "", mobileLink = "argent://", webAppLink = "", playStore = "", linkMode = "") -private val spot: Wallet - get() = Wallet(id = "7", name = "Spot", homePage = "", order = "", imageUrl = "", mobileLink = "spot://", webAppLink = "", playStore = "", linkMode = "") -private val imToken: Wallet - get() = Wallet(id = "8", name = "imToken", homePage = "", order = "", imageUrl = "", mobileLink = "imtoken://", webAppLink = "", playStore = "", linkMode = "") -private val alphaWallet: Wallet - get() = Wallet(id = "9", name = "AlphaWallet", homePage = "", order = "", imageUrl = "", mobileLink = "alphawallet://", webAppLink = "", playStore = "", linkMode = "") -private val omni: Wallet - get() = Wallet(id = "10", name = "Omni", homePage = "", order = "", imageUrl = "", mobileLink = "omni://", webAppLink = "", playStore = "", linkMode = "") -private val bitkeep: Wallet - get() = Wallet(id = "11", name = "BitKeep", homePage = "", order = "", imageUrl = "", mobileLink = "bitkeep://", webAppLink = "", playStore = "", linkMode = "") -private val tokenPocket: Wallet - get() = Wallet(id = "12", name = "TokePocket", homePage = "", order = "", imageUrl = "", mobileLink = "tokenpocket://", webAppLink = "", playStore = "", linkMode = "") -private val ledgerLive: Wallet - get() = Wallet(id = "13", name = "Ledger Live", homePage = "", order = "", imageUrl = "", mobileLink = "ledgerlive://", webAppLink = "", playStore = "", linkMode = "") -private val frontier: Wallet - get() = Wallet(id = "14", name = "Frontier", homePage = "", order = "", imageUrl = "", mobileLink = "frontier://", webAppLink = "", playStore = "", linkMode = "") -private val safePal: Wallet - get() = Wallet(id = "15", name = "SafePal", homePage = "", order = "", imageUrl = "", mobileLink = "safepal://", webAppLink = "", playStore = "", linkMode = "") - -internal val testWallets: List - get() = listOf(metaMask, trustWallet, safe, rainbow, zerion, argent, spot, imToken, alphaWallet, omni, bitkeep, tokenPocket, ledgerLive, frontier, safePal) diff --git a/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/utils/MainDispatcherRule.kt b/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/utils/MainDispatcherRule.kt deleted file mode 100644 index fdc6e96fe..000000000 --- a/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/utils/MainDispatcherRule.kt +++ /dev/null @@ -1,30 +0,0 @@ -@file:OptIn(ExperimentalCoroutinesApi::class) - -package com.walletconnect.wcmodal.ui - -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.test.TestDispatcher -import kotlinx.coroutines.test.UnconfinedTestDispatcher -import kotlinx.coroutines.test.resetMain -import kotlinx.coroutines.test.setMain -import org.junit.rules.TestWatcher -import org.junit.runner.Description - -/** - * A JUnit [TestRule] that sets the Main dispatcher to [testDispatcher] - * for the duration of the test. - */ -class MainDispatcherRule( - val testDispatcher: TestDispatcher = UnconfinedTestDispatcher() -) : TestWatcher() { - override fun starting(description: Description) { - super.starting(description) - Dispatchers.setMain(testDispatcher) - } - - override fun finished(description: Description) { - super.finished(description) - Dispatchers.resetMain() - } -} \ No newline at end of file diff --git a/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/utils/ScreenShotTest.kt b/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/utils/ScreenShotTest.kt deleted file mode 100644 index c35de04f3..000000000 --- a/product/walletconnectmodal/src/test/kotlin/com/walletconnect/wcmodal/utils/ScreenShotTest.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.walletconnect.wcmodal.utils - -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Box -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import app.cash.paparazzi.DeviceConfig -import app.cash.paparazzi.Paparazzi -import com.android.ide.common.rendering.api.SessionParams -import com.android.resources.NightMode -import com.walletconnect.wcmodal.ui.theme.ModalTheme -import com.walletconnect.wcmodal.ui.theme.ProvideModalThemeComposition -import org.junit.Rule - -abstract class ScreenShotTest { - - @get:Rule - val paparazzi = Paparazzi( - deviceConfig = DeviceConfig.PIXEL_2_XL, - renderingMode = SessionParams.RenderingMode.SHRINK, - ) - - fun runScreenShotTest( - isDarkMode: Boolean = false, - content: @Composable () -> Unit - ) { - val mode = if (isDarkMode) NightMode.NIGHT else NightMode.NOTNIGHT - paparazzi.unsafeUpdateConfig(DeviceConfig(nightMode = mode)) - paparazzi.snapshot { - ProvideModalThemeComposition { - Box(modifier = Modifier.background(ModalTheme.colors.background)) { - content() - } - } - } - } -} diff --git a/sample/dapp/build.gradle.kts b/sample/dapp/build.gradle.kts index 202cee083..24f41755b 100644 --- a/sample/dapp/build.gradle.kts +++ b/sample/dapp/build.gradle.kts @@ -97,15 +97,15 @@ dependencies { implementation(libs.bundles.firebase) debugImplementation(project(":core:android")) - debugImplementation(project(":product:walletconnectmodal")) + debugImplementation(project(":product:web3modal")) debugImplementation(project(":protocol:sign")) internalImplementation(project(":core:android")) - internalImplementation(project(":product:walletconnectmodal")) + internalImplementation(project(":product:web3modal")) internalImplementation(project(":protocol:sign")) releaseImplementation(platform("com.walletconnect:android-bom:$BOM_VERSION")) releaseImplementation("com.walletconnect:android-core") - releaseImplementation("com.walletconnect:walletconnect-modal") + releaseImplementation("com.walletconnect:web3modal") releaseImplementation("com.walletconnect:sign") } diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/DappSampleApp.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/DappSampleApp.kt index b40194d1d..6c05c9a8d 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/DappSampleApp.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/DappSampleApp.kt @@ -7,8 +7,12 @@ import com.google.firebase.ktx.Firebase import com.walletconnect.android.Core import com.walletconnect.android.CoreClient import com.walletconnect.sample.common.tag -import com.walletconnect.wcmodal.client.Modal -import com.walletconnect.wcmodal.client.WalletConnectModal +import com.walletconnect.util.bytesToHex +import com.walletconnect.util.randomBytes +import com.walletconnect.web3.modal.client.AppKit +import com.walletconnect.web3.modal.client.Modal +import com.walletconnect.web3.modal.presets.AppKitChainsPresets +import com.walletconnect.web3.modal.utils.EthUtils import timber.log.Timber import com.walletconnect.sample.common.BuildConfig as CommonBuildConfig @@ -35,12 +39,22 @@ class DappSampleApp : Application() { Firebase.crashlytics.recordException(it.throwable) } - WalletConnectModal.initialize( - Modal.Params.Init(core = CoreClient) - ) { error -> + AppKit.initialize(Modal.Params.Init(core = CoreClient)) { error -> Timber.e(tag(this), error.throwable.stackTraceToString()) } + AppKit.setChains(AppKitChainsPresets.ethChains.values.toList()) + + val authParams = Modal.Model.AuthPayloadParams( + chains = AppKitChainsPresets.ethChains.values.toList().map { it.id }, + domain = "sample.kotlin.modal", + uri = "https://web3inbox.com/all-apps", + nonce = randomBytes(12).bytesToHex(), + statement = "I accept the Terms of Service: https://yourDappDomain.com/", + methods = EthUtils.ethMethods + ) + AppKit.setAuthRequestParams(authParams) + FirebaseAppDistribution.getInstance().updateIfNewReleaseAvailable() } -} +} \ No newline at end of file diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/domain/DappDelegate.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/domain/DappDelegate.kt index 217846e8e..5f4186b9f 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/domain/DappDelegate.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/domain/DappDelegate.kt @@ -3,8 +3,8 @@ package com.walletconnect.sample.dapp.domain import com.walletconnect.android.Core import com.walletconnect.android.CoreClient import com.walletconnect.sample.common.tag -import com.walletconnect.wcmodal.client.Modal -import com.walletconnect.wcmodal.client.WalletConnectModal +import com.walletconnect.web3.modal.client.AppKit +import com.walletconnect.web3.modal.client.Modal import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob @@ -14,7 +14,7 @@ import kotlinx.coroutines.flow.asSharedFlow import kotlinx.coroutines.launch import timber.log.Timber -object DappDelegate : WalletConnectModal.ModalDelegate, CoreClient.CoreDelegate { +object DappDelegate : AppKit.ModalDelegate, CoreClient.CoreDelegate { private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) private val _wcEventModels: MutableSharedFlow = MutableSharedFlow() val wcEventModels: SharedFlow = _wcEventModels.asSharedFlow() @@ -27,7 +27,7 @@ object DappDelegate : WalletConnectModal.ModalDelegate, CoreClient.CoreDelegate private set init { - WalletConnectModal.setDelegate(this) + AppKit.setDelegate(this) CoreClient.setDelegate(this) } @@ -39,7 +39,7 @@ object DappDelegate : WalletConnectModal.ModalDelegate, CoreClient.CoreDelegate } override fun onSessionApproved(approvedSession: Modal.Model.ApprovedSession) { - selectedSessionTopic = approvedSession.topic + selectedSessionTopic = (approvedSession as Modal.Model.ApprovedSession.WalletConnectSession).topic scope.launch { _wcEventModels.emit(approvedSession) diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/DappSampleNavGraph.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/DappSampleNavGraph.kt index 9e4c6272d..53281a656 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/DappSampleNavGraph.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/DappSampleNavGraph.kt @@ -21,7 +21,7 @@ import com.walletconnect.sample.dapp.ui.routes.Route import com.walletconnect.sample.dapp.ui.routes.composable_routes.account.AccountRoute import com.walletconnect.sample.dapp.ui.routes.composable_routes.chain_selection.ChainSelectionRoute import com.walletconnect.sample.dapp.ui.routes.composable_routes.session.SessionRoute -import com.walletconnect.wcmodal.ui.walletConnectModalGraph +import com.walletconnect.web3.modal.ui.appKitGraph @SuppressLint("RestrictedApi") @Composable @@ -53,7 +53,7 @@ fun DappSampleNavGraph( ) { AccountRoute(navController) } - walletConnectModalGraph(navController) + appKitGraph(navController) } } } diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/account/AccountViewModel.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/account/AccountViewModel.kt index 7c7a56b72..ace074728 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/account/AccountViewModel.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/account/AccountViewModel.kt @@ -13,8 +13,10 @@ import com.walletconnect.sample.common.getPersonalSignBody import com.walletconnect.sample.dapp.domain.DappDelegate import com.walletconnect.sample.dapp.ui.DappSampleEvents import com.walletconnect.sample.dapp.ui.accountArg -import com.walletconnect.wcmodal.client.Modal -import com.walletconnect.wcmodal.client.WalletConnectModal +import com.walletconnect.web3.modal.client.AppKit +import com.walletconnect.web3.modal.client.Modal +import com.walletconnect.web3.modal.client.models.Session +import com.walletconnect.web3.modal.client.models.request.Request import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharedFlow @@ -93,21 +95,19 @@ class AccountViewModel( method.equals("eth_signTypedData", true) -> getEthSignTypedData(account) else -> "[]" } - val requestParams = Modal.Params.Request( - sessionTopic = requireNotNull(DappDelegate.selectedSessionTopic), + val requestParams = Request( method = method, params = params, // stringified JSON - chainId = "$parentChain:$chainId" ) - WalletConnectModal.request(requestParams, - onSuccess = { - WalletConnectModal.getActiveSessionByTopic(requestParams.sessionTopic)?.redirect?.toUri()?.let { deepLinkUri -> sendSessionRequestDeepLink(deepLinkUri) } + AppKit.request(requestParams, + onSuccess = { _ -> + (AppKit.getSession() as Session.WalletConnectSession).redirect?.toUri()?.let { deepLinkUri -> sendSessionRequestDeepLink(deepLinkUri) } }, onError = { viewModelScope.launch { _awaitResponse.value = false - _events.emit(DappSampleEvents.RequestError(it.throwable.localizedMessage ?: "Error trying to send request")) + _events.emit(DappSampleEvents.RequestError(it.localizedMessage ?: "Error trying to send request")) } }) } catch (e: Exception) { @@ -126,23 +126,15 @@ class AccountViewModel( } val listOfMethodsByChainId: List = - WalletConnectModal.getListOfActiveSessions() - .filter { session -> session.topic == DappDelegate.selectedSessionTopic } - .flatMap { session -> - session.namespaces - .filter { (namespaceKey, _) -> namespaceKey == chainDetails.chainId } - .flatMap { (_, namespace) -> namespace.methods } - } + (AppKit.getSession() as Session.WalletConnectSession).namespaces + .filter { (namespaceKey, _) -> namespaceKey == chainDetails.chainId } + .flatMap { (_, namespace) -> namespace.methods } - val listOfMethodsByNamespace: List = - WalletConnectModal.getListOfActiveSessions() - .filter { session -> session.topic == DappDelegate.selectedSessionTopic } - .flatMap { session -> - session.namespaces - .filter { (namespaceKey, _) -> namespaceKey == chainDetails.chainNamespace } - .flatMap { (_, namespace) -> namespace.methods } - } + val listOfMethodsByNamespace: List = + (AppKit.getSession() as Session.WalletConnectSession).namespaces + .filter { (namespaceKey, _) -> namespaceKey == chainDetails.chainNamespace } + .flatMap { (_, namespace) -> namespace.methods } viewModelScope.launch { _uiState.value = AccountUi.AccountData( diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt index 514701c56..a28b3269c 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt @@ -1,16 +1,13 @@ package com.walletconnect.sample.dapp.ui.routes.composable_routes.chain_selection import android.content.Context -import android.widget.Toast import android.content.Intent import android.graphics.Bitmap -import android.net.Uri +import android.widget.Toast import androidmads.library.qrgenearator.QRGContents import androidmads.library.qrgenearator.QRGEncoder -import java.net.URLEncoder import androidx.compose.foundation.Image import androidx.compose.foundation.background -import androidx.core.net.toUri import androidx.compose.foundation.border import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -59,6 +56,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.window.Dialog +import androidx.core.net.toUri import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController import com.walletconnect.android.utils.isPackageInstalled @@ -74,16 +72,13 @@ import com.walletconnect.sample.common.ui.toColor import com.walletconnect.sample.dapp.BuildConfig import com.walletconnect.sample.dapp.ui.DappSampleEvents import com.walletconnect.sample.dapp.ui.routes.Route -import com.walletconnect.sign.client.Sign -import com.walletconnect.wcmodal.client.Modal -import com.walletconnect.wcmodal.client.WalletConnectModal -import com.walletconnect.wcmodal.ui.openWalletConnectModal -import com.walletconnect.wcmodal.ui.state.rememberModalState +import com.walletconnect.web3.modal.ui.components.button.rememberAppKitState +import com.walletconnect.web3.modal.ui.openAppKit import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch +import java.net.URLEncoder @Composable fun ChainSelectionRoute(navController: NavController, dispatcher: CoroutineDispatcher = Dispatchers.Main) { @@ -91,7 +86,7 @@ fun ChainSelectionRoute(navController: NavController, dispatcher: CoroutineDispa val composableScope = rememberCoroutineScope() val viewModel: ChainSelectionViewModel = viewModel() val chainsState by viewModel.uiState.collectAsState() - rememberModalState(navController = navController) + rememberAppKitState(navController = navController) val awaitingProposalResponse = viewModel.awaitingSharedFlow.collectAsState(false).value var pairingUri by remember { mutableStateOf(PairingUri(uri = "", isReCaps = false)) } @@ -509,8 +504,7 @@ private fun onConnectClick( context: Context ) { if (viewModel.isAnyChainSelected) { - WalletConnectModal.setSessionParams(viewModel.getSessionParams()) - navController.openWalletConnectModal() + navController.openAppKit() } else { Toast.makeText(context, "Please select a chain", Toast.LENGTH_SHORT).show() } diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt index a541bb5a0..ea1c98fb3 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt @@ -14,8 +14,8 @@ import com.walletconnect.sign.client.Sign import com.walletconnect.sign.client.SignClient import com.walletconnect.util.bytesToHex import com.walletconnect.util.randomBytes -import com.walletconnect.wcmodal.client.Modal -import com.walletconnect.wcmodal.client.WalletConnectModal +import com.walletconnect.web3.modal.client.AppKit +import com.walletconnect.web3.modal.client.Modal import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted @@ -72,12 +72,6 @@ class ChainSelectionViewModel : ViewModel() { } } - fun getSessionParams() = Modal.Params.SessionParams( - requiredNamespaces = getNamespaces(), - optionalNamespaces = getOptionalNamespaces(), - properties = getProperties() - ) - fun authenticate(authenticateParams: Sign.Params.Authenticate, appLink: String = "", onAuthenticateSuccess: (String?) -> Unit, onError: (String) -> Unit = {}) { viewModelScope.launch { _awaitingProposalSharedFlow.emit(true) @@ -125,7 +119,7 @@ class ChainSelectionViewModel : ViewModel() { pairing = pairing ) - WalletConnectModal.connect(connectParams, + AppKit.connect(connectParams, onSuccess = { url -> if (pairingTopicPosition == -1) { viewModelScope.launch { diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/host/DappSampleViewModel.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/host/DappSampleViewModel.kt index 6f760e2ea..ad577968a 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/host/DappSampleViewModel.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/host/DappSampleViewModel.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.walletconnect.sample.dapp.domain.DappDelegate import com.walletconnect.sample.dapp.ui.DappSampleEvents -import com.walletconnect.wcmodal.client.Modal +import com.walletconnect.web3.modal.client.Modal import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.merge From f8bcdac7eec2c882cabb17eea55f24ba2809742f Mon Sep 17 00:00:00 2001 From: kubel Date: Wed, 4 Sep 2024 15:55:07 +0200 Subject: [PATCH 16/51] Migrate android core and modal core package to reown --- core/android/build.gradle.kts | 4 +- .../src/androidTest/AndroidManifest.xml | 2 +- .../android/CacaoTest.kt | 18 ++-- .../android/LinkModeInteractorTests.kt | 24 ++--- .../android/di/OverrideModule.kt | 14 +-- .../android/test/MapperTest.kt | 6 +- .../test/activity/InstrumentedTestActivity.kt | 2 +- .../WCInstrumentedActivityScenario.kt | 8 +- .../KeyserverInstrumentedAndroidTest.kt | 26 ++--- .../android/test/utils/ChainAccounts.kt | 2 +- .../android/test/utils/Common.kt | 4 +- .../android/test/utils/TestClient.kt | 28 +++--- .../android/di/AndroidBuildVariantDITags.kt | 2 +- .../android/di/CoreStorageModule.kt | 8 +- core/android/src/main/AndroidManifest.xml | 2 +- .../{walletconnect => reown}/android/Core.kt | 6 +- .../android/CoreClient.kt | 2 +- .../android/CoreInterface.kt | 18 ++-- .../android/CoreProtocol.kt | 72 +++++++------- .../android/internal/Messages.kt | 2 +- .../android/internal/Proposal.kt | 2 +- .../android/internal/Validator.kt | 10 +- .../ConditionalExponentialBackoffStrategy.kt | 2 +- .../internal/common/JsonRpcResponse.kt | 4 +- .../internal/common/KoinApplication.kt | 2 +- .../internal/common/WalletConnectScope.kt | 2 +- .../internal/common/adapter/ExpiryAdapter.kt | 4 +- .../common/adapter/JsonRpcResultAdapter.kt | 10 +- .../internal/common/adapter/TagsAdapter.kt | 4 +- .../common/connection/ConnectivityState.kt | 2 +- .../connection/DefaultConnectionLifecycle.kt | 2 +- .../connection/ManualConnectionLifecycle.kt | 2 +- .../android/internal/common/crypto/Utils.kt | 2 +- .../common/crypto/codec/ChaChaPolyCodec.kt | 20 ++-- .../internal/common/crypto/codec/Codec.kt | 6 +- .../BouncyCastleKeyManagementRepository.kt | 10 +- .../crypto/kmr/KeyManagementRepository.kt | 6 +- .../internal/common/di/AndroidCommonDITags.kt | 2 +- .../internal/common/di/AppKitModule.kt | 26 ++--- .../internal/common/di/BaseStorageModule.kt | 40 ++++---- .../internal/common/di/CoreCommonModule.kt | 16 ++-- .../internal/common/di/CoreCryptoModule.kt | 16 ++-- .../internal/common/di/CoreJsonRpcModule.kt | 18 ++-- .../internal/common/di/CoreNetworkModule.kt | 18 ++-- .../internal/common/di/CorePairingModule.kt | 8 +- .../internal/common/di/DatabaseConfig.kt | 2 +- .../internal/common/di/ExplorerModule.kt | 10 +- .../internal/common/di/KeyServerModule.kt | 8 +- .../android/internal/common/di/PulseModule.kt | 16 ++-- .../android/internal/common/di/PushModule.kt | 6 +- .../internal/common/di/VerifyModule.kt | 12 +-- .../CommonWalletConnectExceptions.kt | 2 +- .../internal/common/exception/Messages.kt | 2 +- .../internal/common/exception/PeerError.kt | 4 +- .../exception/WalletConnectException.kt | 4 +- .../common/explorer/ExplorerInterface.kt | 4 +- .../common/explorer/ExplorerProtocol.kt | 10 +- .../common/explorer/ExplorerRepository.kt | 62 ++++++------ .../common/explorer/data/model/App.kt | 2 +- .../common/explorer/data/model/Colors.kt | 2 +- .../explorer/data/model/DappListings.kt | 2 +- .../common/explorer/data/model/Desktop.kt | 2 +- .../common/explorer/data/model/ImageUrl.kt | 2 +- .../common/explorer/data/model/Injected.kt | 2 +- .../common/explorer/data/model/Listing.kt | 2 +- .../common/explorer/data/model/Metadata.kt | 2 +- .../common/explorer/data/model/Mobile.kt | 2 +- .../explorer/data/model/NotifyConfig.kt | 2 +- .../common/explorer/data/model/Project.kt | 2 +- .../explorer/data/model/ProjectListing.kt | 2 +- .../explorer/data/model/SupportedStandard.kt | 2 +- .../explorer/data/network/ExplorerService.kt | 10 +- .../explorer/data/network/model/AppDTO.kt | 2 +- .../explorer/data/network/model/ColorsDTO.kt | 2 +- .../data/network/model/DappListingsDTO.kt | 2 +- .../explorer/data/network/model/DesktopDTO.kt | 2 +- .../data/network/model/ImageUrlDTO.kt | 2 +- .../data/network/model/InjectedDTO.kt | 2 +- .../explorer/data/network/model/ListingDTO.kt | 2 +- .../data/network/model/MetadataDTO.kt | 2 +- .../explorer/data/network/model/MobileDTO.kt | 2 +- .../data/network/model/NotifyConfigDTO.kt | 2 +- .../explorer/data/network/model/ProjectDTO.kt | 2 +- .../data/network/model/ProjectListingDTO.kt | 2 +- .../network/model/SupportedStandardDTO.kt | 2 +- .../explorer/data/network/model/WalletDTO.kt | 2 +- .../data/network/model/WalletListingDTO.kt | 2 +- .../domain/usecase/GetNotifyConfigUseCase.kt | 8 ++ .../GetProjectsWithPaginationUseCase.kt | 6 +- .../common/json_rpc/data/JsonRpcSerializer.kt | 10 +- .../link_mode/LinkModeJsonRpcInteractor.kt | 36 +++---- .../domain/relay/RelayJsonRpcInteractor.kt | 64 ++++++------- .../json_rpc/model/JsonRpcHistoryRecord.kt | 4 +- .../common/json_rpc/model/JsonRpcMapper.kt | 18 ++-- .../clientid/ClientIdJwtRepositoryAndroid.kt | 6 +- .../GenerateJwtStoreClientIdUseCase.kt | 6 +- .../common/jwt/did/DidJwtRepository.kt | 4 +- .../jwt/did/EncodeDidJwtPayloadUseCase.kt | 2 +- .../EncodeIdentityKeyDidJwtPayloadUseCase.kt | 4 +- .../common/modal/AppKitApiRepository.kt | 16 ++-- .../common/modal/data/model/Wallet.kt | 2 +- .../common/modal/data/model/WalletAppData.kt | 2 +- .../common/modal/data/model/WalletListing.kt | 2 +- .../modal/data/network/AppKitService.kt | 8 +- .../data/network/model/EnableAnalyticsDTO.kt | 2 +- .../data/network/model/GetAndroidDataDTO.kt | 2 +- .../modal/data/network/model/GetWalletsDTO.kt | 4 +- .../modal/data/network/model/WalletDTO.kt | 2 +- .../modal/data/network/model/WalletDataDTO.kt | 2 +- .../domain/usecase/EnableAnalyticsUseCase.kt | 4 +- .../usecase/GetAndroidDataUseCaseInterface.kt | 4 +- .../GetSamplesWalletsUseCaseInterface.kt | 6 +- .../modal/domain/usecase/GetWalletsUseCase.kt | 6 +- .../internal/common/model/AccountId.kt | 4 +- .../internal/common/model/AppMetaData.kt | 2 +- .../internal/common/model/AppMetaDataType.kt | 5 + .../internal/common/model/ConnectionState.kt | 4 +- .../internal/common/model/CryptoException.kt | 4 +- .../android/internal/common/model/DidJwt.kt | 4 + .../internal/common/model/EnvelopeType.kt | 2 +- .../android/internal/common/model/Expiry.kt | 3 + .../internal/common/model/IrnParams.kt | 2 +- .../internal/common/model/Namespace.kt | 2 +- .../internal/common/model/PackageName.kt | 4 + .../android/internal/common/model/Pairing.kt | 6 +- .../internal/common/model/Participant.kt | 2 +- .../internal/common/model/Participants.kt | 2 +- .../internal/common/model/ProjectId.kt | 3 + .../android/internal/common/model/Redirect.kt | 2 +- .../common/model/RelayProtocolOptions.kt | 2 +- .../android/internal/common/model/SDKError.kt | 5 + .../internal/common/model/SessionProposer.kt | 2 +- .../internal/common/model/SymmetricKey.kt | 2 +- .../android/internal/common/model/Tags.kt | 2 +- .../internal/common/model/TelemetryEnabled.kt | 2 +- .../internal/common/model/TransportType.kt | 6 ++ .../internal/common/model/Validation.kt | 2 +- .../internal/common/model/WCRequest.kt | 4 +- .../internal/common/model/WCResponse.kt | 12 +++ .../internal/common/model/WalletConnectUri.kt | 2 +- .../params/ChatNotifyResponseAuthParams.kt | 4 +- .../common/model/params/CoreChatParams.kt | 4 +- .../common/model/params/CoreNotifyParams.kt | 4 +- .../common/model/params/CoreSignParams.kt | 10 +- .../common/model/sync/ClientJsonRpc.kt | 2 +- .../common/model/type/ClientParams.kt | 3 + .../internal/common/model/type/EngineEvent.kt | 3 + .../internal/common/model/type/Error.kt | 2 +- .../common/model/type/JsonRpcClientSync.kt | 2 +- .../model/type/JsonRpcInteractorInterface.kt | 12 +++ .../type/RelayJsonRpcInteractorInterface.kt | 14 +-- .../internal/common/model/type/Sequence.kt | 9 ++ .../common/model/type/SerializableJsonRpc.kt | 3 + .../internal/common/signing/cacao/Cacao.kt | 8 +- .../common/signing/cacao/CacaoType.kt | 2 +- .../common/signing/cacao/CacaoVerifier.kt | 8 +- .../internal/common/signing/cacao/Issuer.kt | 2 +- .../internal/common/signing/cacao/Utils.kt | 4 +- .../common/signing/eip1271/EIP1271Verifier.kt | 6 +- .../common/signing/eip191/EIP191Signer.kt | 8 +- .../common/signing/eip191/EIP191Verifier.kt | 8 +- .../message/MessageSignatureVerifier.kt | 12 +++ .../common/signing/model/HexString.kt | 4 + .../common/signing/signature/Signature.kt | 12 +-- .../signing/signature/SignatureInterface.kt | 2 +- .../common/signing/signature/SignatureType.kt | 2 +- .../common/storage/events/EventsRepository.kt | 14 +-- .../identity/IdentitiesStorageRepository.kt | 8 +- .../common/storage/key_chain/KeyChain.kt | 2 +- .../common/storage/key_chain/KeyStore.kt | 2 +- .../metadata/MetadataStorageRepository.kt | 10 +- .../MetadataStorageRepositoryInterface.kt | 6 +- .../pairing/PairingStorageRepository.kt | 12 +-- .../PairingStorageRepositoryInterface.kt | 6 +- .../push_messages/PushMessagesRepository.kt | 6 +- .../common/storage/rpc/JsonRpcHistory.kt | 8 +- .../verify/VerifyContextStorageRepository.kt | 8 +- .../android/internal/utils/Context.kt | 4 +- .../android/internal/utils/CoreValidator.kt | 4 +- .../android/internal/utils/Expiration.kt | 2 +- .../android/internal/utils/ObservableMap.kt | 2 +- .../android/internal/utils/Time.kt | 2 +- .../android/internal/utils/UtilFunctions.kt | 6 +- .../data/service/KeyServerService.kt | 6 +- .../keyserver/domain/IdentitiesInteractor.kt | 54 +++++------ .../use_case/RegisterIdentityUseCase.kt | 13 +++ .../domain/use_case/RegisterInviteUseCase.kt | 6 +- .../domain/use_case/ResolveIdentityUseCase.kt | 6 +- .../domain/use_case/ResolveInviteUseCase.kt | 13 +++ .../use_case/UnregisterIdentityUseCase.kt | 6 +- .../use_case/UnregisterInviteUseCase.kt | 6 +- .../keyserver/domain/use_case/Utils.kt | 8 +- .../android/keyserver/model/KeyServerBody.kt | 4 +- .../keyserver/model/KeyServerHttpResponse.kt | 2 +- .../keyserver/model/KeyServerResponse.kt | 4 +- .../pairing/client/PairingInterface.kt | 4 +- .../android/pairing/client/PairingProtocol.kt | 22 ++--- .../pairing/engine/domain/PairingEngine.kt | 96 +++++++++---------- .../android/pairing/engine/model/EngineDO.kt | 4 +- .../pairing/handler/PairingController.kt | 14 +-- .../handler/PairingControllerInterface.kt | 8 +- .../pairing/model/PairingExpiration.kt | 8 ++ .../pairing/model/PairingJsonRpcMethod.kt | 2 +- .../android/pairing/model/PairingParams.kt | 6 +- .../android/pairing/model/PairingRpc.kt | 4 +- .../pairing/model/mapper/PairingMapper.kt | 14 +-- .../android/pulse/data/PulseService.kt | 4 +- .../domain/InsertTelemetryEventUseCase.kt | 6 +- .../pulse/domain/SendBatchEventUseCase.kt | 12 +-- .../android/pulse/domain/SendEventUseCase.kt | 18 ++-- .../android/pulse/model/ConnectionMethod.kt | 2 +- .../android/pulse/model/Direction.kt | 2 +- .../android/pulse/model/Event.kt | 6 +- .../android/pulse/model/EventType.kt | 2 +- .../android/pulse/model/SDKType.kt | 2 +- .../android/pulse/model/Trace.kt | 2 +- .../pulse/model/properties/Properties.kt | 2 +- .../android/pulse/model/properties/Props.kt | 4 +- .../android/push/PushInterface.kt | 2 +- .../android/push/client/PushClient.kt | 18 ++-- .../android/push/network/PushService.kt | 6 +- .../android/push/network/model/PushBody.kt | 2 +- .../push/network/model/PushResponse.kt | 2 +- .../DecryptMessageUseCaseInterface.kt | 4 +- .../notifications/PushMessagingService.kt | 14 +-- .../android/relay/ConnectionState.kt | 2 +- .../android/relay/ConnectionType.kt | 2 +- .../android/relay/NetworkClientTimeout.kt | 2 +- .../android/relay/RelayClient.kt | 22 ++--- .../android/relay/RelayConnectionInterface.kt | 4 +- .../android/utils/Extensions.kt | 16 ++-- .../android/utils/PackageManagerExtensions.kt | 2 +- .../android/utils/Timber.kt | 4 +- .../utils/cacao/CacaoSignerInterface.kt | 14 +-- .../android/verify/client/VerifyClient.kt | 12 +-- .../android/verify/client/VerifyInterface.kt | 4 +- .../android/verify/data/VerifyService.kt | 10 +- .../android/verify/domain/JWTRepository.kt | 4 +- .../domain/ResolveAttestationIdUseCase.kt | 16 ++-- .../VerifyPublicKeyStorageRepository.kt | 4 +- .../android/verify/domain/VerifyRepository.kt | 10 +- .../android/verify/domain/VerifyResult.kt | 9 ++ .../android/verify/domain/VerifyUtils.kt | 4 +- .../android/verify/model/Origin.kt | 2 +- .../verify/model/RegisterAttestationBody.kt | 2 +- .../android/verify/model/VerifyClaims.kt | 2 +- .../android/verify/model/VerifyContext.kt | 4 +- .../verify/model/VerifyServerPublicKey.kt | 2 +- .../verify/model/VerifyServerResponse.kt | 2 +- .../domain/usecase/GetNotifyConfigUseCase.kt | 8 -- .../internal/common/model/AppMetaDataType.kt | 5 - .../android/internal/common/model/DidJwt.kt | 4 - .../android/internal/common/model/Expiry.kt | 3 - .../internal/common/model/PackageName.kt | 4 - .../internal/common/model/ProjectId.kt | 3 - .../android/internal/common/model/SDKError.kt | 5 - .../internal/common/model/TransportType.kt | 6 -- .../internal/common/model/WCResponse.kt | 12 --- .../common/model/type/ClientParams.kt | 3 - .../internal/common/model/type/EngineEvent.kt | 3 - .../model/type/JsonRpcInteractorInterface.kt | 12 --- .../internal/common/model/type/Sequence.kt | 9 -- .../common/model/type/SerializableJsonRpc.kt | 3 - .../message/MessageSignatureVerifier.kt | 12 --- .../common/signing/model/HexString.kt | 4 - .../use_case/RegisterIdentityUseCase.kt | 13 --- .../domain/use_case/ResolveInviteUseCase.kt | 13 --- .../pairing/model/PairingExpiration.kt | 8 -- .../android/verify/domain/VerifyResult.kt | 9 -- .../android/sdk/storage/data/dao/Event.sq | 0 .../sdk/storage/data/dao/Identities.sq | 0 .../sdk/storage/data/dao/JsonRpcHistory.sq | 2 +- .../android/sdk/storage/data/dao/MetaData.sq | 2 +- .../android/sdk/storage/data/dao/Pairing.sq | 0 .../sdk/storage/data/dao/PushMessage.sq | 0 .../sdk/storage/data/dao/VerifyContext.sq | 2 +- .../sdk/storage/data/dao/VerifyPublicKey.sq | 0 .../src/main/sqldelight/migration/2.sqm | 2 +- .../di/AndroidBuildVariantDITags.kt | 2 +- .../di/CoreStorageModule.kt | 12 +-- .../src/test/java/CacaoTestJvmTest.java | 14 +-- core/android/src/test/java/SignatureTest.java | 2 +- .../BouncyCastleCryptoRepositoryTest.kt | 6 +- .../android/internal/ChaChaPolyCodecTest.kt | 18 ++-- .../android/internal/CoreValidatorTest.kt | 8 +- .../android/internal/EventsRepositoryTest.kt | 10 +- .../internal/InsertEventUseCaseTest.kt | 8 +- .../InsertTelemetryEventUseCaseTest.kt | 8 +- .../android/internal/JWTRepositoryTest.kt | 6 +- ...RpcResponseJsonRpcResultJsonAdapterTest.kt | 14 +-- .../android/internal/KeyChainMock.kt | 4 +- .../android/internal/RelayClientTests.kt | 16 ++-- .../internal/ResolveAttestationUseCaseTest.kt | 24 ++--- .../internal/SendBatchEventUseCaseTest.kt | 20 ++-- .../android/internal/SendEventUseCaseTest.kt | 18 ++-- .../android/internal/URLComparisonTest.kt | 2 +- .../android/internal/ValidatorTest.kt | 10 +- .../android/internal/VerifyClientTest.kt | 8 +- .../android/internal/VerifyRepositoryTest.kt | 22 ++--- .../ClientIdJwtRepositoryAndroidTest.kt | 6 +- .../common/adapter/ExpiryAdapterTest.kt | 6 +- .../internal/common/cacao/IssuerTest.kt | 4 +- .../common/cacao/eip191/EIP191SignerTest.kt | 22 ++--- .../model/DappListingsDTOJunit4Test.kt | 2 +- .../internal/domain/RelayerInteractorTest.kt | 36 +++---- .../modal/ui/Preview.kt | 2 +- .../modal/ui/components/common/Images.kt | 2 +- .../modal/ui/components/common/Modifiers.kt | 2 +- .../modal/ui/components/common/Spacers.kt | 2 +- .../ui/components/logo/WalletConnectLogo.kt | 6 +- .../ui/components/qr/WalletConnectQRCode.kt | 4 +- .../modal/ui/model/UiState.kt | 2 +- .../modal/ui/model/search/SearchState.kt | 2 +- .../modal/utils/DeviceUtils.kt | 2 +- .../modal/utils/UriExtensions.kt | 2 +- .../modal/utils/theme/ColorsUtils.kt | 2 +- gradle/consumer-rules/walletconnect-rules.pro | 2 +- .../walletconnect/web3/modal/client/AppKit.kt | 10 +- .../web3/modal/client/ClientMapper.kt | 2 +- .../walletconnect/web3/modal/client/Modal.kt | 8 +- .../web3/modal/client/models/Exceptions.kt | 2 +- .../web3/modal/client/models/Session.kt | 2 +- .../web3/modal/data/BlockchainRepository.kt | 2 +- .../web3/modal/di/BalanceRpcModule.kt | 2 +- .../web3/modal/di/BlockchainApiModule.kt | 2 +- .../web3/modal/di/EngineModule.kt | 2 +- .../web3/modal/di/Web3ModalModule.kt | 2 +- .../modal/domain/delegate/AppKitDelegate.kt | 2 +- .../web3/modal/engine/AppKitEngine.kt | 14 +-- .../modal/engine/coinbase/CoinbaseClient.kt | 6 +- .../web3/modal/ui/AppKitSheet.kt | 2 +- .../web3/modal/ui/AppKitViewModel.kt | 2 +- .../modal/ui/components/button/AppKitState.kt | 10 +- .../ui/components/internal/AppKitStates.kt | 2 +- .../ui/components/internal/commons/Icons.kt | 2 +- .../ui/components/internal/commons/Wallets.kt | 2 +- .../internal/commons/account/AccountName.kt | 2 +- .../internal/commons/inputs/SearchInput.kt | 2 +- .../internal/email/input/EmailInput.kt | 4 +- .../ui/components/internal/root/AppKitRoot.kt | 2 +- .../internal/root/AppKitRootState.kt | 8 +- .../web3/modal/ui/model/UiState.kt | 2 +- .../connection/RedirectNavigation.kt | 2 +- .../web3/modal/ui/previews/PreviewData.kt | 2 +- .../web3/modal/ui/previews/Previews.kt | 4 +- .../ui/routes/account/AccountViewModel.kt | 12 +-- .../ui/routes/connect/ConnectViewModel.kt | 18 ++-- .../ui/routes/connect/ParingController.kt | 6 +- .../ui/routes/connect/WalletDataSource.kt | 12 +-- .../connect/all_wallets/AllWalletsRoute.kt | 6 +- .../connect_wallet/ConnectWalletRoute.kt | 2 +- .../connect/get_wallet/GetAWalletRoute.kt | 4 +- .../connect/redirect/RedirectWalletScreen.kt | 10 +- .../routes/connect/scan_code/ScanCodeRoute.kt | 6 +- .../connect/what_is_wallet/WhatIsWallet.kt | 8 +- .../walletconnect/web3/modal/utils/Image.kt | 6 +- .../web3/modal/utils/SessionUtils.kt | 2 +- .../ui/routes/account/AccountRouteTest.kt | 4 +- .../routes/account/ChangeNetworkRouteTest.kt | 4 +- .../ui/routes/connect/AllWalletsRouteTest.kt | 2 +- .../connect/ConnectYourWalletRouteTest.kt | 4 +- .../web3/modal/utils/PaparazziUtilts.kt | 4 +- .../web3/wallet/client/ClientMapper.kt | 2 +- .../web3/wallet/client/Wallet.kt | 6 +- .../web3/wallet/client/WalletKit.kt | 6 +- .../web3/wallet/utils/CacaoSigner.kt | 6 +- .../walletconnect/notify/di/OverrideModule.kt | 18 ++-- .../ClientInstrumentedActivityScenario.kt | 6 +- .../walletconnect/notify/test/utils/Common.kt | 2 +- .../notify/test/utils/TestClient.kt | 14 +-- .../com/walletconnect/notify/client/Notify.kt | 6 +- .../notify/client/NotifyException.kt | 2 +- .../notify/client/NotifyProtocol.kt | 10 +- .../notify/client/cacao/CacaoSigner.kt | 2 +- .../walletconnect/notify/common/PeerError.kt | 2 +- .../notify/common/UtilFunctions.kt | 4 +- .../CacaoPayloadWithIdentityPrivateKey.kt | 2 +- .../notify/common/model/CreateSubscription.kt | 2 +- .../notify/common/model/DeleteSubscription.kt | 2 +- .../notify/common/model/EngineMapper.kt | 10 +- .../notify/common/model/Error.kt | 2 +- .../common/model/GetNotificationHistory.kt | 2 +- .../notify/common/model/Notification.kt | 4 +- .../notify/common/model/NotifyRpc.kt | 4 +- .../notify/common/model/RegisteredAccount.kt | 2 +- .../notify/common/model/Subscription.kt | 8 +- .../common/model/SubscriptionChanged.kt | 2 +- .../notify/common/model/UpdateSubscription.kt | 2 +- .../delete/EncodeDeleteRequestJwtUseCase.kt | 4 +- ...EncodeGetNotificationsRequestJwtUseCase.kt | 4 +- .../EncodeMessageResponseJwtUseCase.kt | 4 +- .../EncodeSubscriptionRequestJwtUseCase.kt | 4 +- ...eSubscriptionsChangedResponseJwtUseCase.kt | 4 +- .../update/EncodeUpdateRequestJwtUseCase.kt | 4 +- ...codeWatchSubscriptionsRequestJwtUseCase.kt | 4 +- .../storage/RegisteredAccountsRepository.kt | 2 +- .../data/storage/SubscriptionRepository.kt | 6 +- .../com/walletconnect/notify/di/CallModule.kt | 6 +- .../notify/di/NotifyEngineModule.kt | 2 +- .../notify/di/NotifyStorageModule.kt | 4 +- .../walletconnect/notify/di/RequestModule.kt | 2 +- .../walletconnect/notify/di/ResponseModule.kt | 2 +- .../notify/engine/NotifyEngine.kt | 18 ++-- .../calls/DecryptNotifyMessageUseCase.kt | 24 ++--- .../engine/calls/DeleteSubscriptionUseCase.kt | 16 ++-- .../calls/GetActiveSubscriptionsUseCase.kt | 6 +- .../calls/GetAllActiveSubscriptionsUseCase.kt | 4 +- .../calls/GetNotificationHistoryUseCase.kt | 18 ++-- .../calls/GetNotificationTypesUseCase.kt | 2 +- .../engine/calls/IsRegisteredUseCase.kt | 4 +- .../calls/PrepareRegistrationUseCase.kt | 8 +- .../notify/engine/calls/RegisterUseCase.kt | 16 ++-- .../engine/calls/SubscribeToDappUseCase.kt | 30 +++--- .../notify/engine/calls/UnregisterUseCase.kt | 6 +- .../engine/calls/UpdateSubscriptionUseCase.kt | 18 ++-- .../ExtractMetadataFromConfigUseCase.kt | 6 +- .../ExtractPublicKeysFromDidJsonUseCase.kt | 2 +- .../engine/domain/FetchDidJwtInteractor.kt | 10 +- .../FindRequestedSubscriptionUseCase.kt | 4 +- .../GetSelfKeyForWatchSubscriptionUseCase.kt | 6 +- .../domain/SetActiveSubscriptionsUseCase.kt | 20 ++-- .../StopWatchingSubscriptionsUseCase.kt | 4 +- .../domain/WatchSubscriptionsUseCase.kt | 18 ++-- .../engine/requests/OnMessageUseCase.kt | 26 ++--- .../requests/OnSubscriptionsChangedUseCase.kt | 22 ++--- .../responses/OnDeleteResponseUseCase.kt | 14 +-- .../OnGetNotificationsResponseUseCase.kt | 18 ++-- .../responses/OnSubscribeResponseUseCase.kt | 14 +-- .../responses/OnUpdateResponseUseCase.kt | 14 +-- .../OnWatchSubscriptionsResponseUseCase.kt | 12 +-- .../walletconnect/sign/di/OverrideModule.kt | 18 ++-- .../sign/test/CacaoUtilsTests.kt | 8 +- .../test/GenerateAuthPayloadParamsTest.kt | 4 +- .../sign/test/ParseReCapsTest.kt | 4 +- .../HybridAppInstrumentedAndroidTest.kt | 2 +- ...sionAuthenticateInstrumentedAndroidTest.kt | 6 +- .../SignClientInstrumentedAndroidTest.kt | 2 +- .../HybridAppInstrumentedActivityScenario.kt | 2 +- .../SignClientInstrumentedActivityScenario.kt | 2 +- .../walletconnect/sign/test/utils/Common.kt | 2 +- .../sign/test/utils/TestClient.kt | 10 +- .../sign/test/utils/dapp/DappSignClient.kt | 2 +- .../test/utils/hybrid/HybridSignClient.kt | 2 +- .../com/walletconnect/sign/client/Sign.kt | 10 +- .../sign/client/SignInterface.kt | 2 +- .../walletconnect/sign/client/SignProtocol.kt | 20 ++-- .../sign/client/mapper/ClientMapper.kt | 24 ++--- .../sign/client/utils/CacaoSigner.kt | 6 +- .../walletconnect/sign/client/utils/Utils.kt | 16 ++-- .../sign/common/exceptions/PeerError.kt | 2 +- .../sign/common/exceptions/SignExceptions.kt | 2 +- .../sign/common/model/Request.kt | 4 +- .../model/vo/clientsync/common/Requester.kt | 2 +- .../clientsync/common/SessionParticipant.kt | 2 +- .../model/vo/clientsync/session/SignRpc.kt | 2 +- .../clientsync/session/params/SignParams.kt | 8 +- .../common/model/vo/proposal/ProposalVO.kt | 8 +- .../common/model/vo/sequence/SessionVO.kt | 12 +-- .../sign/common/validator/SignValidator.kt | 14 +-- .../com/walletconnect/sign/di/CallsModule.kt | 8 +- .../com/walletconnect/sign/di/EngineModule.kt | 4 +- .../walletconnect/sign/di/RequestsModule.kt | 4 +- .../walletconnect/sign/di/ResponsesModule.kt | 4 +- .../walletconnect/sign/di/StorageModule.kt | 8 +- .../sign/engine/domain/SignEngine.kt | 40 ++++---- .../sign/engine/model/EngineDO.kt | 16 ++-- .../sign/engine/model/mapper/EngineMapper.kt | 28 +++--- .../ApproveSessionAuthenticateUseCase.kt | 70 +++++++------- .../use_case/calls/ApproveSessionUseCase.kt | 38 ++++---- .../calls/DecryptSignMessageUseCase.kt | 26 ++--- .../calls/DisconnectSessionUseCase.kt | 12 +-- .../engine/use_case/calls/EmitEventUseCase.kt | 10 +- .../use_case/calls/ExtendSessionUseCase.kt | 12 +-- .../calls/FormatAuthenticateMessageUseCase.kt | 4 +- .../calls/GetListOfVerifyContextsUseCase.kt | 2 +- .../use_case/calls/GetNamespacesFromReCaps.kt | 4 +- ...GetPairingForSessionAuthenticateUseCase.kt | 4 +- .../use_case/calls/GetPairingsUseCase.kt | 4 +- .../GetPendingAuthenticateRequestUseCase.kt | 4 +- .../calls/GetSessionProposalsUseCase.kt | 2 +- .../use_case/calls/GetSessionsUseCase.kt | 6 +- .../calls/GetVerifyContextByIdUseCase.kt | 2 +- .../sign/engine/use_case/calls/PairUseCase.kt | 4 +- .../sign/engine/use_case/calls/PingUseCase.kt | 12 +-- .../use_case/calls/ProposeSessionUseCase.kt | 20 ++-- .../calls/RejectSessionAuthenticateUseCase.kt | 42 ++++---- .../use_case/calls/RejectSessionUseCase.kt | 18 ++-- .../calls/RespondSessionRequestUseCase.kt | 42 ++++---- .../calls/SessionAuthenticateUseCase.kt | 50 +++++----- .../use_case/calls/SessionRequestUseCase.kt | 44 ++++----- .../use_case/calls/SessionUpdateUseCase.kt | 12 +-- .../engine/use_case/requests/OnPingUseCase.kt | 10 +- .../requests/OnSessionAuthenticateUseCase.kt | 46 ++++----- .../requests/OnSessionDeleteUseCase.kt | 18 ++-- .../requests/OnSessionEventUseCase.kt | 16 ++-- .../requests/OnSessionExtendUseCase.kt | 18 ++-- .../requests/OnSessionProposalUseCase.kt | 38 ++++---- .../requests/OnSessionRequestUseCase.kt | 48 +++++----- .../requests/OnSessionSettleUseCase.kt | 28 +++--- .../requests/OnSessionUpdateUseCase.kt | 16 ++-- .../OnSessionAuthenticateResponseUseCase.kt | 54 +++++------ .../OnSessionProposalResponseUseCase.kt | 20 ++-- .../OnSessionRequestResponseUseCase.kt | 22 ++--- .../OnSessionSettleResponseUseCase.kt | 16 ++-- .../OnSessionUpdateResponseUseCase.kt | 8 +- .../domain/DeleteRequestByIdUseCase.kt | 4 +- ...etPendingJsonRpcHistoryEntryByIdUseCase.kt | 6 +- .../GetPendingRequestsByTopicUseCase.kt | 4 +- .../GetPendingSessionAuthenticateRequest.kt | 6 +- .../GetPendingSessionRequestByTopicUseCase.kt | 8 +- .../domain/GetPendingSessionRequests.kt | 4 +- .../domain/GetSessionAuthenticateRequest.kt | 6 +- .../domain/GetSessionRequestByIdUseCase.kt | 6 +- .../sign/json_rpc/model/JsonRpcMapper.kt | 4 +- .../proposal/ProposalStorageRepository.kt | 6 +- .../sequence/SessionStorageRepository.kt | 6 +- .../storage/data/dao/session/SessionDao.sq | 2 +- .../sign/src/main/sqldelight/migrations/1.sqm | 2 +- .../sign/src/main/sqldelight/migrations/2.sqm | 2 +- .../sign/src/main/sqldelight/migrations/3.sqm | 2 +- .../sign/src/main/sqldelight/migrations/4.sqm | 2 +- .../sign/AttestationIdGenerationTest.kt | 10 +- .../sign/DeleteRequestByIdUseCaseTest.kt | 4 +- .../sign/GetSessionRequestByIdUseCaseTest.kt | 6 +- .../ApproveSessionAuthenticateUseCaseTest.kt | 34 +++---- .../calls/ApproveSessionUseCaseTest.kt | 14 +-- .../calls/DisconnectSessionUseCaseTest.kt | 4 +- .../use_case/calls/EmitEventUseCaseTest.kt | 6 +- .../calls/ExtendSessionUseCaseTest.kt | 6 +- ...airingForSessionAuthenticateUseCaseTest.kt | 8 +- .../calls/ProposeSessionUseCaseTest.kt | 14 +-- .../use_case/calls/ProposeUseCaseTest.kt | 16 ++-- .../RejectSessionAuthenticateUseCaseTest.kt | 20 ++-- .../calls/RespondSessionRequestUseCaseTest.kt | 14 +-- .../calls/SessionAuthenticateUseCaseTest.kt | 24 ++--- .../calls/SessionRequestUseCaseTest.kt | 10 +- .../calls/SessionUpdateUseCaseTest.kt | 4 +- .../sign/mappers/EngineMapperTest.kt | 6 +- .../GenerateApprovedNamespacesUtilsTest.kt | 2 +- .../sign/util/MergeReCapsTest.kt | 2 +- .../sign/validator/ValidatorTest.kt | 14 +-- .../sample/dapp/DappSampleApp.kt | 4 +- .../sample/dapp/domain/DappDelegate.kt | 4 +- .../chain_selection/ChainSelectionRoute.kt | 2 +- .../ChainSelectionViewModel.kt | 4 +- .../walletconnect/sample/modal/AppKitApp.kt | 6 +- .../sample/wallet/WalletKitApplication.kt | 12 +-- .../sample/wallet/Web3WalletMessageService.kt | 8 +- .../wallet/domain/NotificationHandler.kt | 2 +- .../sample/wallet/domain/WCDelegate.kt | 4 +- .../sample/wallet/ui/Web3WalletViewModel.kt | 6 +- .../composable_routes/inbox/InboxViewModel.kt | 6 +- .../settings/SettingsViewModel.kt | 2 +- .../SessionAuthenticateRoute.kt | 2 +- .../SessionAuthenticateViewModel.kt | 6 +- .../session_proposal/SessionProposalRoute.kt | 2 +- .../session_request/SessionRequestRoute.kt | 2 +- .../SessionRequestViewModel.kt | 6 +- .../wallet/domain/EthAccountDelegateTest.kt | 8 +- 559 files changed, 2283 insertions(+), 2283 deletions(-) rename core/android/src/androidTest/kotlin/com/{walletconnect => reown}/android/CacaoTest.kt (88%) rename core/android/src/androidTest/kotlin/com/{walletconnect => reown}/android/LinkModeInteractorTests.kt (90%) rename core/android/src/androidTest/kotlin/com/{walletconnect => reown}/android/di/OverrideModule.kt (63%) rename core/android/src/androidTest/kotlin/com/{walletconnect => reown}/android/test/MapperTest.kt (98%) rename core/android/src/androidTest/kotlin/com/{walletconnect => reown}/android/test/activity/InstrumentedTestActivity.kt (81%) rename core/android/src/androidTest/kotlin/com/{walletconnect => reown}/android/test/activity/WCInstrumentedActivityScenario.kt (95%) rename core/android/src/androidTest/kotlin/com/{walletconnect => reown}/android/test/client/KeyserverInstrumentedAndroidTest.kt (86%) rename core/android/src/androidTest/kotlin/com/{walletconnect => reown}/android/test/utils/ChainAccounts.kt (96%) rename core/android/src/androidTest/kotlin/com/{walletconnect => reown}/android/test/utils/Common.kt (81%) rename core/android/src/androidTest/kotlin/com/{walletconnect => reown}/android/test/utils/TestClient.kt (80%) rename core/android/src/debug/kotlin/com/{walletconnect => reown}/android/di/AndroidBuildVariantDITags.kt (73%) rename core/android/src/debug/kotlin/com/{walletconnect => reown}/android/di/CoreStorageModule.kt (82%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/Core.kt (96%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/CoreClient.kt (77%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/CoreInterface.kt (70%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/CoreProtocol.kt (71%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/Messages.kt (89%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/Proposal.kt (93%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/Validator.kt (87%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/ConditionalExponentialBackoffStrategy.kt (94%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/JsonRpcResponse.kt (84%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/KoinApplication.kt (71%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/WalletConnectScope.kt (82%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/adapter/ExpiryAdapter.kt (87%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/adapter/JsonRpcResultAdapter.kt (95%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/adapter/TagsAdapter.kt (86%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/connection/ConnectivityState.kt (97%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/connection/DefaultConnectionLifecycle.kt (97%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/connection/ManualConnectionLifecycle.kt (93%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/crypto/Utils.kt (85%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/crypto/codec/ChaChaPolyCodec.kt (92%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/crypto/codec/Codec.kt (55%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/crypto/kmr/BouncyCastleKeyManagementRepository.kt (94%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/crypto/kmr/KeyManagementRepository.kt (85%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/di/AndroidCommonDITags.kt (94%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/di/AppKitModule.kt (65%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/di/BaseStorageModule.kt (77%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/di/CoreCommonModule.kt (79%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/di/CoreCryptoModule.kt (84%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/di/CoreJsonRpcModule.kt (68%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/di/CoreNetworkModule.kt (89%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/di/CorePairingModule.kt (74%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/di/DatabaseConfig.kt (94%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/di/ExplorerModule.kt (70%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/di/KeyServerModule.kt (86%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/di/PulseModule.kt (76%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/di/PushModule.kt (81%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/di/VerifyModule.kt (75%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/exception/CommonWalletConnectExceptions.kt (96%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/exception/Messages.kt (75%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/exception/PeerError.kt (88%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/exception/WalletConnectException.kt (89%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/ExplorerInterface.kt (52%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/ExplorerProtocol.kt (64%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/ExplorerRepository.kt (65%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/model/App.kt (80%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/model/Colors.kt (51%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/model/DappListings.kt (58%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/model/Desktop.kt (51%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/model/ImageUrl.kt (53%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/model/Injected.kt (52%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/model/Listing.kt (88%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/model/Metadata.kt (51%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/model/Mobile.kt (51%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/model/NotifyConfig.kt (84%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/model/Project.kt (75%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/model/ProjectListing.kt (53%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/model/SupportedStandard.kt (68%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/network/ExplorerService.kt (72%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/network/model/AppDTO.kt (89%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/network/model/ColorsDTO.kt (75%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/network/model/DappListingsDTO.kt (79%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/network/model/DesktopDTO.kt (75%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/network/model/ImageUrlDTO.kt (76%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/network/model/InjectedDTO.kt (75%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/network/model/ListingDTO.kt (93%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/network/model/MetadataDTO.kt (75%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/network/model/MobileDTO.kt (75%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/network/model/NotifyConfigDTO.kt (92%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/network/model/ProjectDTO.kt (87%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/network/model/ProjectListingDTO.kt (79%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/network/model/SupportedStandardDTO.kt (83%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/network/model/WalletDTO.kt (86%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/network/model/WalletListingDTO.kt (74%) create mode 100644 core/android/src/main/kotlin/com/reown/android/internal/common/explorer/domain/usecase/GetNotifyConfigUseCase.kt rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/domain/usecase/GetProjectsWithPaginationUseCase.kt (61%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/json_rpc/data/JsonRpcSerializer.kt (84%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/json_rpc/domain/link_mode/LinkModeJsonRpcInteractor.kt (83%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt (89%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/json_rpc/model/JsonRpcHistoryRecord.kt (58%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/json_rpc/model/JsonRpcMapper.kt (52%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/jwt/clientid/ClientIdJwtRepositoryAndroid.kt (81%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/jwt/clientid/GenerateJwtStoreClientIdUseCase.kt (76%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/jwt/did/DidJwtRepository.kt (91%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/jwt/did/EncodeDidJwtPayloadUseCase.kt (94%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/jwt/did/EncodeIdentityKeyDidJwtPayloadUseCase.kt (89%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/modal/AppKitApiRepository.kt (78%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/modal/data/model/Wallet.kt (90%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/modal/data/model/WalletAppData.kt (61%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/modal/data/model/WalletListing.kt (60%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/modal/data/network/AppKitService.kt (71%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/modal/data/network/model/EnableAnalyticsDTO.kt (65%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/modal/data/network/model/GetAndroidDataDTO.kt (70%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/modal/data/network/model/GetWalletsDTO.kt (51%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/modal/data/network/model/WalletDTO.kt (90%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/modal/data/network/model/WalletDataDTO.kt (67%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/modal/domain/usecase/EnableAnalyticsUseCase.kt (81%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/modal/domain/usecase/GetAndroidDataUseCaseInterface.kt (76%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/modal/domain/usecase/GetSamplesWalletsUseCaseInterface.kt (95%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/modal/domain/usecase/GetWalletsUseCase.kt (74%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/AccountId.kt (62%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/AppMetaData.kt (89%) create mode 100644 core/android/src/main/kotlin/com/reown/android/internal/common/model/AppMetaDataType.kt rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/ConnectionState.kt (66%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/CryptoException.kt (67%) create mode 100644 core/android/src/main/kotlin/com/reown/android/internal/common/model/DidJwt.kt rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/EnvelopeType.kt (55%) create mode 100644 core/android/src/main/kotlin/com/reown/android/internal/common/model/Expiry.kt rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/IrnParams.kt (69%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/Namespace.kt (94%) create mode 100644 core/android/src/main/kotlin/com/reown/android/internal/common/model/PackageName.kt rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/Pairing.kt (84%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/Participant.kt (81%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/Participants.kt (73%) create mode 100644 core/android/src/main/kotlin/com/reown/android/internal/common/model/ProjectId.kt rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/Redirect.kt (84%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/RelayProtocolOptions.kt (77%) create mode 100644 core/android/src/main/kotlin/com/reown/android/internal/common/model/SDKError.kt rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/SessionProposer.kt (82%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/SymmetricKey.kt (68%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/Tags.kt (96%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/TelemetryEnabled.kt (51%) create mode 100644 core/android/src/main/kotlin/com/reown/android/internal/common/model/TransportType.kt rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/Validation.kt (52%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/WCRequest.kt (75%) create mode 100644 core/android/src/main/kotlin/com/reown/android/internal/common/model/WCResponse.kt rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/WalletConnectUri.kt (93%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/params/ChatNotifyResponseAuthParams.kt (75%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/params/CoreChatParams.kt (67%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/params/CoreNotifyParams.kt (90%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/params/CoreSignParams.kt (68%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/sync/ClientJsonRpc.kt (73%) create mode 100644 core/android/src/main/kotlin/com/reown/android/internal/common/model/type/ClientParams.kt create mode 100644 core/android/src/main/kotlin/com/reown/android/internal/common/model/type/EngineEvent.kt rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/type/Error.kt (50%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/type/JsonRpcClientSync.kt (71%) create mode 100644 core/android/src/main/kotlin/com/reown/android/internal/common/model/type/JsonRpcInteractorInterface.kt rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/model/type/RelayJsonRpcInteractorInterface.kt (85%) create mode 100644 core/android/src/main/kotlin/com/reown/android/internal/common/model/type/Sequence.kt create mode 100644 core/android/src/main/kotlin/com/reown/android/internal/common/model/type/SerializableJsonRpc.kt rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/signing/cacao/Cacao.kt (93%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/signing/cacao/CacaoType.kt (70%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/signing/cacao/CacaoVerifier.kt (74%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/signing/cacao/Issuer.kt (92%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/signing/cacao/Utils.kt (96%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/signing/eip1271/EIP1271Verifier.kt (93%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/signing/eip191/EIP191Signer.kt (76%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/signing/eip191/EIP191Verifier.kt (86%) create mode 100644 core/android/src/main/kotlin/com/reown/android/internal/common/signing/message/MessageSignatureVerifier.kt create mode 100644 core/android/src/main/kotlin/com/reown/android/internal/common/signing/model/HexString.kt rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/signing/signature/Signature.kt (84%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/signing/signature/SignatureInterface.kt (76%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/signing/signature/SignatureType.kt (93%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/storage/events/EventsRepository.kt (86%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/storage/identity/IdentitiesStorageRepository.kt (78%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/storage/key_chain/KeyChain.kt (96%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/storage/key_chain/KeyStore.kt (83%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/storage/metadata/MetadataStorageRepository.kt (87%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/storage/metadata/MetadataStorageRepositoryInterface.kt (76%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/storage/pairing/PairingStorageRepository.kt (88%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/storage/pairing/PairingStorageRepositoryInterface.kt (72%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/storage/push_messages/PushMessagesRepository.kt (87%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/storage/rpc/JsonRpcHistory.kt (91%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/common/storage/verify/VerifyContextStorageRepository.kt (80%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/utils/Context.kt (86%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/utils/CoreValidator.kt (94%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/utils/Expiration.kt (78%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/utils/ObservableMap.kt (90%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/utils/Time.kt (92%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/internal/utils/UtilFunctions.kt (90%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/keyserver/data/service/KeyServerService.kt (86%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/keyserver/domain/IdentitiesInteractor.kt (82%) create mode 100644 core/android/src/main/kotlin/com/reown/android/keyserver/domain/use_case/RegisterIdentityUseCase.kt rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/keyserver/domain/use_case/RegisterInviteUseCase.kt (55%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/keyserver/domain/use_case/ResolveIdentityUseCase.kt (56%) create mode 100644 core/android/src/main/kotlin/com/reown/android/keyserver/domain/use_case/ResolveInviteUseCase.kt rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/keyserver/domain/use_case/UnregisterIdentityUseCase.kt (56%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/keyserver/domain/use_case/UnregisterInviteUseCase.kt (56%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/keyserver/domain/use_case/Utils.kt (75%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/keyserver/model/KeyServerBody.kt (80%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/keyserver/model/KeyServerHttpResponse.kt (97%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/keyserver/model/KeyServerResponse.kt (71%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/pairing/client/PairingInterface.kt (96%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/pairing/client/PairingProtocol.kt (89%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/pairing/engine/domain/PairingEngine.kt (86%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/pairing/engine/model/EngineDO.kt (81%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/pairing/handler/PairingController.kt (86%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/pairing/handler/PairingControllerInterface.kt (78%) create mode 100644 core/android/src/main/kotlin/com/reown/android/pairing/model/PairingExpiration.kt rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/pairing/model/PairingJsonRpcMethod.kt (79%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/pairing/model/PairingParams.kt (70%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/pairing/model/PairingRpc.kt (89%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/pairing/model/mapper/PairingMapper.kt (76%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/pulse/data/PulseService.kt (84%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/pulse/domain/InsertTelemetryEventUseCase.kt (85%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/pulse/domain/SendBatchEventUseCase.kt (84%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/pulse/domain/SendEventUseCase.kt (75%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/pulse/model/ConnectionMethod.kt (84%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/pulse/model/Direction.kt (65%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/pulse/model/Event.kt (69%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/pulse/model/EventType.kt (98%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/pulse/model/SDKType.kt (64%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/pulse/model/Trace.kt (98%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/pulse/model/properties/Properties.kt (93%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/pulse/model/properties/Props.kt (72%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/push/PushInterface.kt (86%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/push/client/PushClient.kt (82%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/push/network/PushService.kt (71%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/push/network/model/PushBody.kt (86%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/push/network/model/PushResponse.kt (93%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/push/notifications/DecryptMessageUseCaseInterface.kt (67%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/push/notifications/PushMessagingService.kt (92%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/relay/ConnectionState.kt (88%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/relay/ConnectionType.kt (56%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/relay/NetworkClientTimeout.kt (95%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/relay/RelayClient.kt (89%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/relay/RelayConnectionInterface.kt (92%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/utils/Extensions.kt (77%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/utils/PackageManagerExtensions.kt (94%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/utils/Timber.kt (89%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/utils/cacao/CacaoSignerInterface.kt (90%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/verify/client/VerifyClient.kt (81%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/verify/client/VerifyInterface.kt (79%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/verify/data/VerifyService.kt (69%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/verify/domain/JWTRepository.kt (96%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/verify/domain/ResolveAttestationIdUseCase.kt (85%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/verify/domain/VerifyPublicKeyStorageRepository.kt (82%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/verify/domain/VerifyRepository.kt (95%) create mode 100644 core/android/src/main/kotlin/com/reown/android/verify/domain/VerifyResult.kt rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/verify/domain/VerifyUtils.kt (62%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/verify/model/Origin.kt (77%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/verify/model/RegisterAttestationBody.kt (76%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/verify/model/VerifyClaims.kt (88%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/verify/model/VerifyContext.kt (57%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/verify/model/VerifyServerPublicKey.kt (92%) rename core/android/src/main/kotlin/com/{walletconnect => reown}/android/verify/model/VerifyServerResponse.kt (94%) delete mode 100644 core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/domain/usecase/GetNotifyConfigUseCase.kt delete mode 100644 core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/AppMetaDataType.kt delete mode 100644 core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/DidJwt.kt delete mode 100644 core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Expiry.kt delete mode 100644 core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/PackageName.kt delete mode 100644 core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/ProjectId.kt delete mode 100644 core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/SDKError.kt delete mode 100644 core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/TransportType.kt delete mode 100644 core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/WCResponse.kt delete mode 100644 core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/ClientParams.kt delete mode 100644 core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/EngineEvent.kt delete mode 100644 core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/JsonRpcInteractorInterface.kt delete mode 100644 core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/Sequence.kt delete mode 100644 core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/SerializableJsonRpc.kt delete mode 100644 core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/message/MessageSignatureVerifier.kt delete mode 100644 core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/model/HexString.kt delete mode 100644 core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/use_case/RegisterIdentityUseCase.kt delete mode 100644 core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/use_case/ResolveInviteUseCase.kt delete mode 100644 core/android/src/main/kotlin/com/walletconnect/android/pairing/model/PairingExpiration.kt delete mode 100644 core/android/src/main/kotlin/com/walletconnect/android/verify/domain/VerifyResult.kt rename core/android/src/main/sqldelight/com/{walletconnect => reown}/android/sdk/storage/data/dao/Event.sq (100%) rename core/android/src/main/sqldelight/com/{walletconnect => reown}/android/sdk/storage/data/dao/Identities.sq (100%) rename core/android/src/main/sqldelight/com/{walletconnect => reown}/android/sdk/storage/data/dao/JsonRpcHistory.sq (94%) rename core/android/src/main/sqldelight/com/{walletconnect => reown}/android/sdk/storage/data/dao/MetaData.sq (94%) rename core/android/src/main/sqldelight/com/{walletconnect => reown}/android/sdk/storage/data/dao/Pairing.sq (100%) rename core/android/src/main/sqldelight/com/{walletconnect => reown}/android/sdk/storage/data/dao/PushMessage.sq (100%) rename core/android/src/main/sqldelight/com/{walletconnect => reown}/android/sdk/storage/data/dao/VerifyContext.sq (90%) rename core/android/src/main/sqldelight/com/{walletconnect => reown}/android/sdk/storage/data/dao/VerifyPublicKey.sq (100%) rename core/android/src/release/kotlin/{com.walletconnect.android => com.reown.android}/di/AndroidBuildVariantDITags.kt (76%) rename core/android/src/release/kotlin/{com.walletconnect.android => com.reown.android}/di/CoreStorageModule.kt (95%) rename core/android/src/test/kotlin/com/{walletconnect => reown}/android/internal/BouncyCastleCryptoRepositoryTest.kt (95%) rename core/android/src/test/kotlin/com/{walletconnect => reown}/android/internal/ChaChaPolyCodecTest.kt (88%) rename core/android/src/test/kotlin/com/{walletconnect => reown}/android/internal/CoreValidatorTest.kt (93%) rename core/android/src/test/kotlin/com/{walletconnect => reown}/android/internal/EventsRepositoryTest.kt (93%) rename core/android/src/test/kotlin/com/{walletconnect => reown}/android/internal/InsertEventUseCaseTest.kt (85%) rename core/android/src/test/kotlin/com/{walletconnect => reown}/android/internal/InsertTelemetryEventUseCaseTest.kt (88%) rename core/android/src/test/kotlin/com/{walletconnect => reown}/android/internal/JWTRepositoryTest.kt (95%) rename core/android/src/test/kotlin/com/{walletconnect => reown}/android/internal/JsonRpcResponseJsonRpcResultJsonAdapterTest.kt (89%) rename core/android/src/test/kotlin/com/{walletconnect => reown}/android/internal/KeyChainMock.kt (92%) rename core/android/src/test/kotlin/com/{walletconnect => reown}/android/internal/RelayClientTests.kt (87%) rename core/android/src/test/kotlin/com/{walletconnect => reown}/android/internal/ResolveAttestationUseCaseTest.kt (91%) rename core/android/src/test/kotlin/com/{walletconnect => reown}/android/internal/SendBatchEventUseCaseTest.kt (92%) rename core/android/src/test/kotlin/com/{walletconnect => reown}/android/internal/SendEventUseCaseTest.kt (92%) rename core/android/src/test/kotlin/com/{walletconnect => reown}/android/internal/URLComparisonTest.kt (96%) rename core/android/src/test/kotlin/com/{walletconnect => reown}/android/internal/ValidatorTest.kt (94%) rename core/android/src/test/kotlin/com/{walletconnect => reown}/android/internal/VerifyClientTest.kt (89%) rename core/android/src/test/kotlin/com/{walletconnect => reown}/android/internal/VerifyRepositoryTest.kt (91%) rename core/android/src/test/kotlin/com/{walletconnect => reown}/android/internal/common/ClientIdJwtRepositoryAndroidTest.kt (90%) rename core/android/src/test/kotlin/com/{walletconnect => reown}/android/internal/common/adapter/ExpiryAdapterTest.kt (65%) rename core/android/src/test/kotlin/com/{walletconnect => reown}/android/internal/common/cacao/IssuerTest.kt (87%) rename core/android/src/test/kotlin/com/{walletconnect => reown}/android/internal/common/cacao/eip191/EIP191SignerTest.kt (85%) rename core/android/src/test/kotlin/com/{walletconnect => reown}/android/internal/common/explorer/data/network/model/DappListingsDTOJunit4Test.kt (96%) rename core/android/src/test/kotlin/com/{walletconnect => reown}/android/internal/domain/RelayerInteractorTest.kt (86%) rename core/modal/src/main/kotlin/com/{walletconnect => reown}/modal/ui/Preview.kt (93%) rename core/modal/src/main/kotlin/com/{walletconnect => reown}/modal/ui/components/common/Images.kt (93%) rename core/modal/src/main/kotlin/com/{walletconnect => reown}/modal/ui/components/common/Modifiers.kt (93%) rename core/modal/src/main/kotlin/com/{walletconnect => reown}/modal/ui/components/common/Spacers.kt (93%) rename core/modal/src/main/kotlin/com/{walletconnect => reown}/modal/ui/components/logo/WalletConnectLogo.kt (89%) rename core/modal/src/main/kotlin/com/{walletconnect => reown}/modal/ui/components/qr/WalletConnectQRCode.kt (98%) rename core/modal/src/main/kotlin/com/{walletconnect => reown}/modal/ui/model/UiState.kt (88%) rename core/modal/src/main/kotlin/com/{walletconnect => reown}/modal/ui/model/search/SearchState.kt (95%) rename core/modal/src/main/kotlin/com/{walletconnect => reown}/modal/utils/DeviceUtils.kt (87%) rename core/modal/src/main/kotlin/com/{walletconnect => reown}/modal/utils/UriExtensions.kt (97%) rename core/modal/src/main/kotlin/com/{walletconnect => reown}/modal/utils/theme/ColorsUtils.kt (92%) diff --git a/core/android/build.gradle.kts b/core/android/build.gradle.kts index af8a69a5c..a41189858 100644 --- a/core/android/build.gradle.kts +++ b/core/android/build.gradle.kts @@ -14,7 +14,7 @@ project.apply { } android { - namespace = "com.walletconnect.android" + namespace = "com.reown.android" compileSdk = COMPILE_SDK defaultConfig { @@ -80,7 +80,7 @@ android { sqldelight { databases { create("AndroidCoreDatabase") { - packageName.set("com.walletconnect.android.sdk.core") + packageName.set("com.reown.android.sdk.core") schemaOutputDirectory.set(file("src/main/sqldelight/databases")) // generateAsync.set(true) // TODO: Enable once all repository methods have been converted to suspend functions verifyMigrations.set(true) diff --git a/core/android/src/androidTest/AndroidManifest.xml b/core/android/src/androidTest/AndroidManifest.xml index 965bfffd7..6fc523c4a 100644 --- a/core/android/src/androidTest/AndroidManifest.xml +++ b/core/android/src/androidTest/AndroidManifest.xml @@ -7,7 +7,7 @@ diff --git a/core/android/src/androidTest/kotlin/com/walletconnect/android/CacaoTest.kt b/core/android/src/androidTest/kotlin/com/reown/android/CacaoTest.kt similarity index 88% rename from core/android/src/androidTest/kotlin/com/walletconnect/android/CacaoTest.kt rename to core/android/src/androidTest/kotlin/com/reown/android/CacaoTest.kt index dd8efa231..c4fe8ad95 100644 --- a/core/android/src/androidTest/kotlin/com/walletconnect/android/CacaoTest.kt +++ b/core/android/src/androidTest/kotlin/com/reown/android/CacaoTest.kt @@ -1,13 +1,13 @@ -package com.walletconnect.android +package com.reown.android -import com.walletconnect.android.cacao.signature.SignatureType -import com.walletconnect.android.internal.common.model.ProjectId -import com.walletconnect.android.internal.common.signing.cacao.Cacao -import com.walletconnect.android.internal.common.signing.cacao.CacaoType -import com.walletconnect.android.internal.common.signing.cacao.CacaoVerifier -import com.walletconnect.android.internal.common.signing.cacao.toCAIP222Message -import com.walletconnect.android.utils.cacao.CacaoSignerInterface -import com.walletconnect.android.utils.cacao.sign +import com.reown.android.cacao.signature.SignatureType +import com.reown.android.internal.common.model.ProjectId +import com.reown.android.internal.common.signing.cacao.Cacao +import com.reown.android.internal.common.signing.cacao.CacaoType +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 org.junit.Assert import org.junit.Ignore diff --git a/core/android/src/androidTest/kotlin/com/walletconnect/android/LinkModeInteractorTests.kt b/core/android/src/androidTest/kotlin/com/reown/android/LinkModeInteractorTests.kt similarity index 90% rename from core/android/src/androidTest/kotlin/com/walletconnect/android/LinkModeInteractorTests.kt rename to core/android/src/androidTest/kotlin/com/reown/android/LinkModeInteractorTests.kt index 0aadda012..ae6571475 100644 --- a/core/android/src/androidTest/kotlin/com/walletconnect/android/LinkModeInteractorTests.kt +++ b/core/android/src/androidTest/kotlin/com/reown/android/LinkModeInteractorTests.kt @@ -1,18 +1,18 @@ -package com.walletconnect.android +package com.reown.android import android.content.Context import androidx.test.core.app.ApplicationProvider -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.crypto.codec.Codec -import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer -import com.walletconnect.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractor -import com.walletconnect.android.internal.common.json_rpc.model.JsonRpcHistoryRecord -import com.walletconnect.android.internal.common.model.EnvelopeType -import com.walletconnect.android.internal.common.model.Participants -import com.walletconnect.android.internal.common.model.sync.ClientJsonRpc -import com.walletconnect.android.internal.common.model.type.JsonRpcClientSync -import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory -import com.walletconnect.android.internal.common.wcKoinApp +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.crypto.codec.Codec +import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer +import com.reown.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractor +import com.reown.android.internal.common.json_rpc.model.JsonRpcHistoryRecord +import com.reown.android.internal.common.model.EnvelopeType +import com.reown.android.internal.common.model.Participants +import com.reown.android.internal.common.model.sync.ClientJsonRpc +import com.reown.android.internal.common.model.type.JsonRpcClientSync +import com.reown.android.internal.common.storage.rpc.JsonRpcHistory +import com.reown.android.internal.common.wcKoinApp import com.reown.foundation.common.model.Topic import io.mockk.coEvery import io.mockk.coVerify diff --git a/core/android/src/androidTest/kotlin/com/walletconnect/android/di/OverrideModule.kt b/core/android/src/androidTest/kotlin/com/reown/android/di/OverrideModule.kt similarity index 63% rename from core/android/src/androidTest/kotlin/com/walletconnect/android/di/OverrideModule.kt rename to core/android/src/androidTest/kotlin/com/reown/android/di/OverrideModule.kt index c01c0a28e..dadd24f77 100644 --- a/core/android/src/androidTest/kotlin/com/walletconnect/android/di/OverrideModule.kt +++ b/core/android/src/androidTest/kotlin/com/reown/android/di/OverrideModule.kt @@ -1,11 +1,11 @@ -package com.walletconnect.android.di +package com.reown.android.di -import com.walletconnect.android.internal.common.di.coreCryptoModule -import com.walletconnect.android.internal.common.di.coreJsonRpcModule -import com.walletconnect.android.internal.common.di.corePairingModule -import com.walletconnect.android.pairing.client.PairingInterface -import com.walletconnect.android.pairing.handler.PairingControllerInterface -import com.walletconnect.android.relay.RelayConnectionInterface +import com.reown.android.internal.common.di.coreCryptoModule +import com.reown.android.internal.common.di.coreJsonRpcModule +import com.reown.android.internal.common.di.corePairingModule +import com.reown.android.pairing.client.PairingInterface +import com.reown.android.pairing.handler.PairingControllerInterface +import com.reown.android.relay.RelayConnectionInterface import org.koin.dsl.module private const val SHARED_PREFS_FILE = "wc_key_store" diff --git a/core/android/src/androidTest/kotlin/com/walletconnect/android/test/MapperTest.kt b/core/android/src/androidTest/kotlin/com/reown/android/test/MapperTest.kt similarity index 98% rename from core/android/src/androidTest/kotlin/com/walletconnect/android/test/MapperTest.kt rename to core/android/src/androidTest/kotlin/com/reown/android/test/MapperTest.kt index 31b87c484..1619fa75f 100644 --- a/core/android/src/androidTest/kotlin/com/walletconnect/android/test/MapperTest.kt +++ b/core/android/src/androidTest/kotlin/com/reown/android/test/MapperTest.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.test +package com.reown.android.test -import com.walletconnect.android.internal.common.signing.cacao.Cacao -import com.walletconnect.android.internal.common.signing.cacao.toCAIP222Message +import com.reown.android.internal.common.signing.cacao.Cacao +import com.reown.android.internal.common.signing.cacao.toCAIP222Message import junit.framework.TestCase.assertEquals import org.junit.Test diff --git a/core/android/src/androidTest/kotlin/com/walletconnect/android/test/activity/InstrumentedTestActivity.kt b/core/android/src/androidTest/kotlin/com/reown/android/test/activity/InstrumentedTestActivity.kt similarity index 81% rename from core/android/src/androidTest/kotlin/com/walletconnect/android/test/activity/InstrumentedTestActivity.kt rename to core/android/src/androidTest/kotlin/com/reown/android/test/activity/InstrumentedTestActivity.kt index df391d064..414fac981 100644 --- a/core/android/src/androidTest/kotlin/com/walletconnect/android/test/activity/InstrumentedTestActivity.kt +++ b/core/android/src/androidTest/kotlin/com/reown/android/test/activity/InstrumentedTestActivity.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.test.activity +package com.reown.android.test.activity import android.app.Activity import android.os.Bundle diff --git a/core/android/src/androidTest/kotlin/com/walletconnect/android/test/activity/WCInstrumentedActivityScenario.kt b/core/android/src/androidTest/kotlin/com/reown/android/test/activity/WCInstrumentedActivityScenario.kt similarity index 95% rename from core/android/src/androidTest/kotlin/com/walletconnect/android/test/activity/WCInstrumentedActivityScenario.kt rename to core/android/src/androidTest/kotlin/com/reown/android/test/activity/WCInstrumentedActivityScenario.kt index 4efbfac66..6d80ddd67 100644 --- a/core/android/src/androidTest/kotlin/com/walletconnect/android/test/activity/WCInstrumentedActivityScenario.kt +++ b/core/android/src/androidTest/kotlin/com/reown/android/test/activity/WCInstrumentedActivityScenario.kt @@ -1,10 +1,10 @@ -package com.walletconnect.android.test.activity +package com.reown.android.test.activity import androidx.lifecycle.Lifecycle import androidx.test.core.app.ActivityScenario -import com.walletconnect.android.BuildConfig -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.test.utils.TestClient +import com.reown.android.BuildConfig +import com.reown.android.internal.common.scope +import com.reown.android.test.utils.TestClient import com.reown.foundation.network.model.Relay import junit.framework.TestCase.assertTrue import junit.framework.TestCase.fail diff --git a/core/android/src/androidTest/kotlin/com/walletconnect/android/test/client/KeyserverInstrumentedAndroidTest.kt b/core/android/src/androidTest/kotlin/com/reown/android/test/client/KeyserverInstrumentedAndroidTest.kt similarity index 86% rename from core/android/src/androidTest/kotlin/com/walletconnect/android/test/client/KeyserverInstrumentedAndroidTest.kt rename to core/android/src/androidTest/kotlin/com/reown/android/test/client/KeyserverInstrumentedAndroidTest.kt index a17fdb70d..0a09b34e8 100644 --- a/core/android/src/androidTest/kotlin/com/walletconnect/android/test/client/KeyserverInstrumentedAndroidTest.kt +++ b/core/android/src/androidTest/kotlin/com/reown/android/test/client/KeyserverInstrumentedAndroidTest.kt @@ -1,17 +1,17 @@ -package com.walletconnect.android.test.client +package com.reown.android.test.client -import com.walletconnect.android.BuildConfig -import com.walletconnect.android.cacao.signature.SignatureType -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.signing.cacao.Cacao -import com.walletconnect.android.test.activity.WCInstrumentedActivityScenario -import com.walletconnect.android.test.utils.BNBAccount -import com.walletconnect.android.test.utils.EthereumAccount -import com.walletconnect.android.test.utils.SolanaAccount -import com.walletconnect.android.test.utils.TestClient -import com.walletconnect.android.test.utils.globalOnError -import com.walletconnect.android.utils.cacao.CacaoSignerInterface -import com.walletconnect.android.utils.cacao.sign +import com.reown.android.BuildConfig +import com.reown.android.cacao.signature.SignatureType +import com.reown.android.internal.common.model.AccountId +import com.reown.android.internal.common.signing.cacao.Cacao +import com.reown.android.test.activity.WCInstrumentedActivityScenario +import com.reown.android.test.utils.BNBAccount +import com.reown.android.test.utils.EthereumAccount +import com.reown.android.test.utils.SolanaAccount +import com.reown.android.test.utils.TestClient +import com.reown.android.test.utils.globalOnError +import com.reown.android.utils.cacao.CacaoSignerInterface +import com.reown.android.utils.cacao.sign import com.reown.foundation.common.model.PrivateKey import com.reown.foundation.util.jwt.encodeEd25519DidKey import org.junit.Rule diff --git a/core/android/src/androidTest/kotlin/com/walletconnect/android/test/utils/ChainAccounts.kt b/core/android/src/androidTest/kotlin/com/reown/android/test/utils/ChainAccounts.kt similarity index 96% rename from core/android/src/androidTest/kotlin/com/walletconnect/android/test/utils/ChainAccounts.kt rename to core/android/src/androidTest/kotlin/com/reown/android/test/utils/ChainAccounts.kt index 89afbf2ae..bee5164b7 100644 --- a/core/android/src/androidTest/kotlin/com/walletconnect/android/test/utils/ChainAccounts.kt +++ b/core/android/src/androidTest/kotlin/com/reown/android/test/utils/ChainAccounts.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.test.utils +package com.reown.android.test.utils import com.reown.foundation.common.model.PublicKey import io.ipfs.multibase.Multibase diff --git a/core/android/src/androidTest/kotlin/com/walletconnect/android/test/utils/Common.kt b/core/android/src/androidTest/kotlin/com/reown/android/test/utils/Common.kt similarity index 81% rename from core/android/src/androidTest/kotlin/com/walletconnect/android/test/utils/Common.kt rename to core/android/src/androidTest/kotlin/com/reown/android/test/utils/Common.kt index 8a2e94682..9f93fed87 100644 --- a/core/android/src/androidTest/kotlin/com/walletconnect/android/test/utils/Common.kt +++ b/core/android/src/androidTest/kotlin/com/reown/android/test/utils/Common.kt @@ -1,6 +1,6 @@ -package com.walletconnect.android.test.utils +package com.reown.android.test.utils -import com.walletconnect.android.Core +import com.reown.android.Core import junit.framework.TestCase.fail import timber.log.Timber diff --git a/core/android/src/androidTest/kotlin/com/walletconnect/android/test/utils/TestClient.kt b/core/android/src/androidTest/kotlin/com/reown/android/test/utils/TestClient.kt similarity index 80% rename from core/android/src/androidTest/kotlin/com/walletconnect/android/test/utils/TestClient.kt rename to core/android/src/androidTest/kotlin/com/reown/android/test/utils/TestClient.kt index 3f43463e6..c408aa672 100644 --- a/core/android/src/androidTest/kotlin/com/walletconnect/android/test/utils/TestClient.kt +++ b/core/android/src/androidTest/kotlin/com/reown/android/test/utils/TestClient.kt @@ -1,20 +1,20 @@ -package com.walletconnect.android.test.utils +package com.reown.android.test.utils import android.app.Application import androidx.test.core.app.ApplicationProvider -import com.walletconnect.android.BuildConfig -import com.walletconnect.android.Core -import com.walletconnect.android.CoreClient -import com.walletconnect.android.CoreProtocol -import com.walletconnect.android.di.overrideModule -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.android.internal.common.model.type.JsonRpcInteractorInterface -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.android.keyserver.domain.IdentitiesInteractor -import com.walletconnect.android.relay.ConnectionType -import com.walletconnect.android.relay.RelayClient +import com.reown.android.BuildConfig +import com.reown.android.Core +import com.reown.android.CoreClient +import com.reown.android.CoreProtocol +import com.reown.android.di.overrideModule +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.di.AndroidCommonDITags +import com.reown.android.internal.common.model.type.JsonRpcInteractorInterface +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.wcKoinApp +import com.reown.android.keyserver.domain.IdentitiesInteractor +import com.reown.android.relay.ConnectionType +import com.reown.android.relay.RelayClient import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import org.koin.core.KoinApplication diff --git a/core/android/src/debug/kotlin/com/walletconnect/android/di/AndroidBuildVariantDITags.kt b/core/android/src/debug/kotlin/com/reown/android/di/AndroidBuildVariantDITags.kt similarity index 73% rename from core/android/src/debug/kotlin/com/walletconnect/android/di/AndroidBuildVariantDITags.kt rename to core/android/src/debug/kotlin/com/reown/android/di/AndroidBuildVariantDITags.kt index af01b3e5c..ae9ce236a 100644 --- a/core/android/src/debug/kotlin/com/walletconnect/android/di/AndroidBuildVariantDITags.kt +++ b/core/android/src/debug/kotlin/com/reown/android/di/AndroidBuildVariantDITags.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.di +package com.reown.android.di enum class AndroidBuildVariantDITags { ANDROID_CORE_DATABASE_DRIVER, diff --git a/core/android/src/debug/kotlin/com/walletconnect/android/di/CoreStorageModule.kt b/core/android/src/debug/kotlin/com/reown/android/di/CoreStorageModule.kt similarity index 82% rename from core/android/src/debug/kotlin/com/walletconnect/android/di/CoreStorageModule.kt rename to core/android/src/debug/kotlin/com/reown/android/di/CoreStorageModule.kt index 53084c3ba..2745adcad 100644 --- a/core/android/src/debug/kotlin/com/walletconnect/android/di/CoreStorageModule.kt +++ b/core/android/src/debug/kotlin/com/reown/android/di/CoreStorageModule.kt @@ -1,12 +1,12 @@ -package com.walletconnect.android.di +package com.reown.android.di import app.cash.sqldelight.db.QueryResult import app.cash.sqldelight.db.SqlDriver import app.cash.sqldelight.db.SqlSchema import app.cash.sqldelight.driver.android.AndroidSqliteDriver -import com.walletconnect.android.internal.common.di.DatabaseConfig -import com.walletconnect.android.internal.common.di.baseStorageModule -import com.walletconnect.android.sdk.core.AndroidCoreDatabase +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 org.koin.android.ext.koin.androidContext import org.koin.core.qualifier.named diff --git a/core/android/src/main/AndroidManifest.xml b/core/android/src/main/AndroidManifest.xml index a6b340077..365b9af23 100644 --- a/core/android/src/main/AndroidManifest.xml +++ b/core/android/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.reown.android"> diff --git a/core/android/src/main/kotlin/com/walletconnect/android/Core.kt b/core/android/src/main/kotlin/com/reown/android/Core.kt similarity index 96% rename from core/android/src/main/kotlin/com/walletconnect/android/Core.kt rename to core/android/src/main/kotlin/com/reown/android/Core.kt index 8927f8c3a..cc07258df 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/Core.kt +++ b/core/android/src/main/kotlin/com/reown/android/Core.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android +package com.reown.android -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.model.Expiry object Core { sealed interface Listeners { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/CoreClient.kt b/core/android/src/main/kotlin/com/reown/android/CoreClient.kt similarity index 77% rename from core/android/src/main/kotlin/com/walletconnect/android/CoreClient.kt rename to core/android/src/main/kotlin/com/reown/android/CoreClient.kt index f6f8c15ef..4f80fc63c 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/CoreClient.kt +++ b/core/android/src/main/kotlin/com/reown/android/CoreClient.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android +package com.reown.android object CoreClient : CoreInterface by CoreProtocol.instance { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/CoreInterface.kt b/core/android/src/main/kotlin/com/reown/android/CoreInterface.kt similarity index 70% rename from core/android/src/main/kotlin/com/walletconnect/android/CoreInterface.kt rename to core/android/src/main/kotlin/com/reown/android/CoreInterface.kt index f80658fae..3a8f6cdc9 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/CoreInterface.kt +++ b/core/android/src/main/kotlin/com/reown/android/CoreInterface.kt @@ -1,14 +1,14 @@ -package com.walletconnect.android +package com.reown.android import android.app.Application -import com.walletconnect.android.internal.common.explorer.ExplorerInterface -import com.walletconnect.android.pairing.client.PairingInterface -import com.walletconnect.android.pairing.handler.PairingControllerInterface -import com.walletconnect.android.push.PushInterface -import com.walletconnect.android.relay.ConnectionType -import com.walletconnect.android.relay.NetworkClientTimeout -import com.walletconnect.android.relay.RelayConnectionInterface -import com.walletconnect.android.verify.client.VerifyInterface +import com.reown.android.internal.common.explorer.ExplorerInterface +import com.reown.android.pairing.client.PairingInterface +import com.reown.android.pairing.handler.PairingControllerInterface +import com.reown.android.push.PushInterface +import com.reown.android.relay.ConnectionType +import com.reown.android.relay.NetworkClientTimeout +import com.reown.android.relay.RelayConnectionInterface +import com.reown.android.verify.client.VerifyInterface interface CoreInterface { val Pairing: PairingInterface diff --git a/core/android/src/main/kotlin/com/walletconnect/android/CoreProtocol.kt b/core/android/src/main/kotlin/com/reown/android/CoreProtocol.kt similarity index 71% rename from core/android/src/main/kotlin/com/walletconnect/android/CoreProtocol.kt rename to core/android/src/main/kotlin/com/reown/android/CoreProtocol.kt index 844ffcb73..4e3996dc0 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/CoreProtocol.kt +++ b/core/android/src/main/kotlin/com/reown/android/CoreProtocol.kt @@ -1,42 +1,42 @@ -package com.walletconnect.android +package com.reown.android import android.app.Application import android.content.SharedPreferences -import com.walletconnect.android.di.coreStorageModule -import com.walletconnect.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.android.internal.common.di.KEY_CLIENT_ID -import com.walletconnect.android.internal.common.di.coreAndroidNetworkModule -import com.walletconnect.android.internal.common.di.coreCommonModule -import com.walletconnect.android.internal.common.di.coreCryptoModule -import com.walletconnect.android.internal.common.di.coreJsonRpcModule -import com.walletconnect.android.internal.common.di.corePairingModule -import com.walletconnect.android.internal.common.di.explorerModule -import com.walletconnect.android.internal.common.di.keyServerModule -import com.walletconnect.android.internal.common.di.pulseModule -import com.walletconnect.android.internal.common.di.pushModule -import com.walletconnect.android.internal.common.di.appKitModule -import com.walletconnect.android.internal.common.explorer.ExplorerInterface -import com.walletconnect.android.internal.common.explorer.ExplorerProtocol -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.ProjectId -import com.walletconnect.android.internal.common.model.Redirect -import com.walletconnect.android.internal.common.model.TelemetryEnabled -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.android.pairing.client.PairingInterface -import com.walletconnect.android.pairing.client.PairingProtocol -import com.walletconnect.android.pairing.handler.PairingController -import com.walletconnect.android.pairing.handler.PairingControllerInterface -import com.walletconnect.android.push.PushInterface -import com.walletconnect.android.push.client.PushClient -import com.walletconnect.android.relay.ConnectionType -import com.walletconnect.android.relay.NetworkClientTimeout -import com.walletconnect.android.relay.RelayClient -import com.walletconnect.android.relay.RelayConnectionInterface -import com.walletconnect.android.utils.isValidRelayServerUrl -import com.walletconnect.android.utils.plantTimber -import com.walletconnect.android.utils.projectId -import com.walletconnect.android.verify.client.VerifyClient -import com.walletconnect.android.verify.client.VerifyInterface +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.coreAndroidNetworkModule +import com.reown.android.internal.common.di.coreCommonModule +import com.reown.android.internal.common.di.coreCryptoModule +import com.reown.android.internal.common.di.coreJsonRpcModule +import com.reown.android.internal.common.di.corePairingModule +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 +import com.reown.android.internal.common.model.ProjectId +import com.reown.android.internal.common.model.Redirect +import com.reown.android.internal.common.model.TelemetryEnabled +import com.reown.android.internal.common.wcKoinApp +import com.reown.android.pairing.client.PairingInterface +import com.reown.android.pairing.client.PairingProtocol +import com.reown.android.pairing.handler.PairingController +import com.reown.android.pairing.handler.PairingControllerInterface +import com.reown.android.push.PushInterface +import com.reown.android.push.client.PushClient +import com.reown.android.relay.ConnectionType +import com.reown.android.relay.NetworkClientTimeout +import com.reown.android.relay.RelayClient +import com.reown.android.relay.RelayConnectionInterface +import com.reown.android.utils.isValidRelayServerUrl +import com.reown.android.utils.plantTimber +import com.reown.android.utils.projectId +import com.reown.android.verify.client.VerifyClient +import com.reown.android.verify.client.VerifyInterface import org.koin.android.ext.koin.androidContext import org.koin.core.KoinApplication import org.koin.core.qualifier.named diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/Messages.kt b/core/android/src/main/kotlin/com/reown/android/internal/Messages.kt similarity index 89% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/Messages.kt rename to core/android/src/main/kotlin/com/reown/android/internal/Messages.kt index abe82265a..705b568be 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/Messages.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/Messages.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal +package com.reown.android.internal @JvmSynthetic internal const val MALFORMED_PAIRING_URI_MESSAGE: String = "Pairing URI string is invalid." diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/Proposal.kt b/core/android/src/main/kotlin/com/reown/android/internal/Proposal.kt similarity index 93% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/Proposal.kt rename to core/android/src/main/kotlin/com/reown/android/internal/Proposal.kt index a2fa6da3d..ddd462d81 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/Proposal.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/Proposal.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal +package com.reown.android.internal import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/Validator.kt b/core/android/src/main/kotlin/com/reown/android/internal/Validator.kt similarity index 87% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/Validator.kt rename to core/android/src/main/kotlin/com/reown/android/internal/Validator.kt index d5ec7d5c8..c2bc808df 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/Validator.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/Validator.kt @@ -1,11 +1,11 @@ @file:JvmSynthetic -package com.walletconnect.android.internal +package com.reown.android.internal -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.RelayProtocolOptions -import com.walletconnect.android.internal.common.model.SymmetricKey -import com.walletconnect.android.internal.common.model.WalletConnectUri +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.RelayProtocolOptions +import com.reown.android.internal.common.model.SymmetricKey +import com.reown.android.internal.common.model.WalletConnectUri import com.reown.foundation.common.model.Topic import java.net.URI import java.net.URISyntaxException diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/ConditionalExponentialBackoffStrategy.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/ConditionalExponentialBackoffStrategy.kt similarity index 94% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/ConditionalExponentialBackoffStrategy.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/ConditionalExponentialBackoffStrategy.kt index 2353efb61..7f071b82b 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/ConditionalExponentialBackoffStrategy.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/ConditionalExponentialBackoffStrategy.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common +package com.reown.android.internal.common import com.tinder.scarlet.retry.BackoffStrategy import kotlin.math.pow diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/JsonRpcResponse.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/JsonRpcResponse.kt similarity index 84% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/JsonRpcResponse.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/JsonRpcResponse.kt index 7287971a6..ed7f23760 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/JsonRpcResponse.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/JsonRpcResponse.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.internal.common +package com.reown.android.internal.common import com.squareup.moshi.JsonClass -import com.walletconnect.android.internal.common.model.type.SerializableJsonRpc +import com.reown.android.internal.common.model.type.SerializableJsonRpc sealed class JsonRpcResponse : SerializableJsonRpc { abstract val id: Long diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/KoinApplication.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/KoinApplication.kt similarity index 71% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/KoinApplication.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/KoinApplication.kt index c70280d9e..c32840a0c 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/KoinApplication.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/KoinApplication.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common +package com.reown.android.internal.common import org.koin.core.KoinApplication diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/WalletConnectScope.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/WalletConnectScope.kt similarity index 82% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/WalletConnectScope.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/WalletConnectScope.kt index d263c4316..bfc0350c9 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/WalletConnectScope.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/WalletConnectScope.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common +package com.reown.android.internal.common import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/adapter/ExpiryAdapter.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/adapter/ExpiryAdapter.kt similarity index 87% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/adapter/ExpiryAdapter.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/adapter/ExpiryAdapter.kt index 6351dcbf5..0c51bd171 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/adapter/ExpiryAdapter.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/adapter/ExpiryAdapter.kt @@ -1,9 +1,9 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.adapter +package com.reown.android.internal.common.adapter import com.squareup.moshi.* -import com.walletconnect.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.Expiry internal object ExpiryAdapter: JsonAdapter() { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/adapter/JsonRpcResultAdapter.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/adapter/JsonRpcResultAdapter.kt similarity index 95% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/adapter/JsonRpcResultAdapter.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/adapter/JsonRpcResultAdapter.kt index 63924e8a5..e68e41cbb 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/adapter/JsonRpcResultAdapter.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/adapter/JsonRpcResultAdapter.kt @@ -1,13 +1,13 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.adapter +package com.reown.android.internal.common.adapter import com.squareup.moshi.* import com.squareup.moshi.internal.Util -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.model.params.ChatNotifyResponseAuthParams -import com.walletconnect.android.internal.common.model.params.CoreNotifyParams -import com.walletconnect.android.internal.common.model.params.CoreSignParams +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.model.params.ChatNotifyResponseAuthParams +import com.reown.android.internal.common.model.params.CoreNotifyParams +import com.reown.android.internal.common.model.params.CoreSignParams import org.json.JSONArray import org.json.JSONObject import java.lang.reflect.Constructor diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/adapter/TagsAdapter.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/adapter/TagsAdapter.kt similarity index 86% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/adapter/TagsAdapter.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/adapter/TagsAdapter.kt index cef3ffa55..11311600d 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/adapter/TagsAdapter.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/adapter/TagsAdapter.kt @@ -1,9 +1,9 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.adapter +package com.reown.android.internal.common.adapter import com.squareup.moshi.* -import com.walletconnect.android.internal.common.model.Tags +import com.reown.android.internal.common.model.Tags internal object TagsAdapter : JsonAdapter() { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/ConnectivityState.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/connection/ConnectivityState.kt similarity index 97% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/ConnectivityState.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/connection/ConnectivityState.kt index faea4a542..9bb775ebb 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/ConnectivityState.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/connection/ConnectivityState.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.connection +package com.reown.android.internal.common.connection import android.annotation.SuppressLint import android.content.Context diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/DefaultConnectionLifecycle.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/connection/DefaultConnectionLifecycle.kt similarity index 97% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/DefaultConnectionLifecycle.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/connection/DefaultConnectionLifecycle.kt index 579dc3a9f..031ed4b72 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/DefaultConnectionLifecycle.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/connection/DefaultConnectionLifecycle.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.connection +package com.reown.android.internal.common.connection import android.app.Activity import android.app.Application diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/ManualConnectionLifecycle.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/connection/ManualConnectionLifecycle.kt similarity index 93% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/ManualConnectionLifecycle.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/connection/ManualConnectionLifecycle.kt index c4ccdca98..0d562dcec 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/connection/ManualConnectionLifecycle.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/connection/ManualConnectionLifecycle.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.connection +package com.reown.android.internal.common.connection import com.tinder.scarlet.Lifecycle import com.tinder.scarlet.lifecycle.LifecycleRegistry diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/Utils.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/crypto/Utils.kt similarity index 85% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/Utils.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/crypto/Utils.kt index a44083c8c..a340f61c8 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/Utils.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/crypto/Utils.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.crypto +package com.reown.android.internal.common.crypto import com.walletconnect.util.bytesToHex import java.security.MessageDigest diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/codec/ChaChaPolyCodec.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/crypto/codec/ChaChaPolyCodec.kt similarity index 92% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/codec/ChaChaPolyCodec.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/crypto/codec/ChaChaPolyCodec.kt index 8e309b656..7a23a2f77 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/codec/ChaChaPolyCodec.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/crypto/codec/ChaChaPolyCodec.kt @@ -1,15 +1,15 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.crypto.codec - -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.model.EnvelopeType -import com.walletconnect.android.internal.common.model.MissingKeyException -import com.walletconnect.android.internal.common.model.MissingParticipantsException -import com.walletconnect.android.internal.common.model.Participants -import com.walletconnect.android.internal.common.model.SymmetricKey -import com.walletconnect.android.internal.common.model.UnknownEnvelopeTypeException -import com.walletconnect.android.internal.utils.getParticipantTag +package com.reown.android.internal.common.crypto.codec + +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.model.EnvelopeType +import com.reown.android.internal.common.model.MissingKeyException +import com.reown.android.internal.common.model.MissingParticipantsException +import com.reown.android.internal.common.model.Participants +import com.reown.android.internal.common.model.SymmetricKey +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 diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/codec/Codec.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/crypto/codec/Codec.kt similarity index 55% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/codec/Codec.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/crypto/codec/Codec.kt index b536a5b4d..936ecb483 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/codec/Codec.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/crypto/codec/Codec.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.internal.common.crypto.codec +package com.reown.android.internal.common.crypto.codec -import com.walletconnect.android.internal.common.model.EnvelopeType -import com.walletconnect.android.internal.common.model.Participants +import com.reown.android.internal.common.model.EnvelopeType +import com.reown.android.internal.common.model.Participants import com.reown.foundation.common.model.Topic interface Codec { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/kmr/BouncyCastleKeyManagementRepository.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/crypto/kmr/BouncyCastleKeyManagementRepository.kt similarity index 94% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/kmr/BouncyCastleKeyManagementRepository.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/crypto/kmr/BouncyCastleKeyManagementRepository.kt index 48f1bd7f4..0a6a5eb6d 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/kmr/BouncyCastleKeyManagementRepository.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/crypto/kmr/BouncyCastleKeyManagementRepository.kt @@ -1,11 +1,11 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.crypto.kmr +package com.reown.android.internal.common.crypto.kmr -import com.walletconnect.android.internal.common.crypto.sha256 -import com.walletconnect.android.internal.common.model.MissingKeyException -import com.walletconnect.android.internal.common.model.SymmetricKey -import com.walletconnect.android.internal.common.storage.key_chain.KeyStore +import com.reown.android.internal.common.crypto.sha256 +import com.reown.android.internal.common.model.MissingKeyException +import com.reown.android.internal.common.model.SymmetricKey +import com.reown.android.internal.common.storage.key_chain.KeyStore import com.reown.foundation.common.model.Key import com.reown.foundation.common.model.PrivateKey import com.reown.foundation.common.model.PublicKey diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/kmr/KeyManagementRepository.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/crypto/kmr/KeyManagementRepository.kt similarity index 85% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/kmr/KeyManagementRepository.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/crypto/kmr/KeyManagementRepository.kt index a4e037351..1bc1c69b4 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/crypto/kmr/KeyManagementRepository.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/crypto/kmr/KeyManagementRepository.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.internal.common.crypto.kmr +package com.reown.android.internal.common.crypto.kmr -import com.walletconnect.android.internal.common.model.MissingKeyException -import com.walletconnect.android.internal.common.model.SymmetricKey +import com.reown.android.internal.common.model.MissingKeyException +import com.reown.android.internal.common.model.SymmetricKey import com.reown.foundation.common.model.Key import com.reown.foundation.common.model.PrivateKey import com.reown.foundation.common.model.PublicKey diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/AndroidCommonDITags.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/di/AndroidCommonDITags.kt similarity index 94% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/AndroidCommonDITags.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/di/AndroidCommonDITags.kt index 77258125f..eb4b4cdca 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/AndroidCommonDITags.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/di/AndroidCommonDITags.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.di +package com.reown.android.internal.common.di enum class AndroidCommonDITags { MOSHI, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/AppKitModule.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/di/AppKitModule.kt similarity index 65% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/AppKitModule.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/di/AppKitModule.kt index 97dfd200c..6e444e15c 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/AppKitModule.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/di/AppKitModule.kt @@ -1,17 +1,17 @@ -package com.walletconnect.android.internal.common.di +package com.reown.android.internal.common.di -import com.walletconnect.android.BuildConfig -import com.walletconnect.android.internal.common.modal.AppKitApiRepository -import com.walletconnect.android.internal.common.modal.data.network.AppKitService -import com.walletconnect.android.internal.common.modal.domain.usecase.EnableAnalyticsUseCase -import com.walletconnect.android.internal.common.modal.domain.usecase.EnableAnalyticsUseCaseInterface -import com.walletconnect.android.internal.common.modal.domain.usecase.GetInstalledWalletsIdsUseCase -import com.walletconnect.android.internal.common.modal.domain.usecase.GetInstalledWalletsIdsUseCaseInterface -import com.walletconnect.android.internal.common.modal.domain.usecase.GetSampleWalletsUseCase -import com.walletconnect.android.internal.common.modal.domain.usecase.GetSampleWalletsUseCaseInterface -import com.walletconnect.android.internal.common.modal.domain.usecase.GetWalletsUseCase -import com.walletconnect.android.internal.common.modal.domain.usecase.GetWalletsUseCaseInterface -import com.walletconnect.android.internal.common.model.ProjectId +import com.reown.android.BuildConfig +import com.reown.android.internal.common.modal.AppKitApiRepository +import com.reown.android.internal.common.modal.data.network.AppKitService +import com.reown.android.internal.common.modal.domain.usecase.EnableAnalyticsUseCase +import com.reown.android.internal.common.modal.domain.usecase.EnableAnalyticsUseCaseInterface +import com.reown.android.internal.common.modal.domain.usecase.GetInstalledWalletsIdsUseCase +import com.reown.android.internal.common.modal.domain.usecase.GetInstalledWalletsIdsUseCaseInterface +import com.reown.android.internal.common.modal.domain.usecase.GetSampleWalletsUseCase +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 okhttp3.Interceptor import okhttp3.OkHttpClient import org.koin.android.ext.koin.androidContext diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/BaseStorageModule.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/di/BaseStorageModule.kt similarity index 77% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/BaseStorageModule.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/di/BaseStorageModule.kt index aefb1ee9a..2dc1adbe9 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/BaseStorageModule.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/di/BaseStorageModule.kt @@ -1,32 +1,32 @@ -package com.walletconnect.android.internal.common.di +package com.reown.android.internal.common.di import app.cash.sqldelight.ColumnAdapter import app.cash.sqldelight.EnumColumnAdapter import com.squareup.moshi.Moshi -import com.walletconnect.android.di.AndroidBuildVariantDITags -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.model.TransportType -import com.walletconnect.android.internal.common.model.Validation -import com.walletconnect.android.internal.common.storage.events.EventsRepository -import com.walletconnect.android.internal.common.storage.identity.IdentitiesStorageRepository -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepository -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.android.internal.common.storage.pairing.PairingStorageRepository -import com.walletconnect.android.internal.common.storage.pairing.PairingStorageRepositoryInterface -import com.walletconnect.android.internal.common.storage.push_messages.PushMessagesRepository -import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory -import com.walletconnect.android.internal.common.storage.verify.VerifyContextStorageRepository -import com.walletconnect.android.sdk.core.AndroidCoreDatabase -import com.walletconnect.android.sdk.storage.data.dao.EventDao -import com.walletconnect.android.sdk.storage.data.dao.JsonRpcHistoryDao -import com.walletconnect.android.sdk.storage.data.dao.MetaData -import com.walletconnect.android.sdk.storage.data.dao.VerifyContext +import com.reown.android.di.AndroidBuildVariantDITags +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.model.TransportType +import com.reown.android.internal.common.model.Validation +import com.reown.android.internal.common.storage.events.EventsRepository +import com.reown.android.internal.common.storage.identity.IdentitiesStorageRepository +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepository +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.common.storage.pairing.PairingStorageRepository +import com.reown.android.internal.common.storage.pairing.PairingStorageRepositoryInterface +import com.reown.android.internal.common.storage.push_messages.PushMessagesRepository +import com.reown.android.internal.common.storage.rpc.JsonRpcHistory +import com.reown.android.internal.common.storage.verify.VerifyContextStorageRepository +import com.reown.android.sdk.core.AndroidCoreDatabase +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 kotlinx.coroutines.launch import org.koin.core.qualifier.named import org.koin.core.scope.Scope import org.koin.dsl.module -import com.walletconnect.android.internal.common.scope as wcScope +import com.reown.android.internal.common.scope as wcScope fun baseStorageModule(storagePrefix: String = String.Empty, bundleId: String) = module { single, String>>(named(AndroidCommonDITags.COLUMN_ADAPTER_LIST)) { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreCommonModule.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreCommonModule.kt similarity index 79% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreCommonModule.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreCommonModule.kt index 9a233329f..40b131652 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreCommonModule.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreCommonModule.kt @@ -1,15 +1,15 @@ -package com.walletconnect.android.internal.common.di +package com.reown.android.internal.common.di import com.squareup.moshi.Moshi import com.squareup.moshi.adapters.PolymorphicJsonAdapterFactory import com.tinder.scarlet.utils.getRawType -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.adapter.ExpiryAdapter -import com.walletconnect.android.internal.common.adapter.JsonRpcResultAdapter -import com.walletconnect.android.internal.common.adapter.TagsAdapter -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.pulse.model.properties.Props +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.adapter.ExpiryAdapter +import com.reown.android.internal.common.adapter.JsonRpcResultAdapter +import com.reown.android.internal.common.adapter.TagsAdapter +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.Tags +import com.reown.android.pulse.model.properties.Props import com.reown.foundation.di.FoundationDITags import com.reown.foundation.di.foundationCommonModule import com.reown.foundation.util.Logger diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreCryptoModule.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreCryptoModule.kt similarity index 84% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreCryptoModule.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreCryptoModule.kt index 585edba22..0de91abc7 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreCryptoModule.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreCryptoModule.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.di +package com.reown.android.internal.common.di import android.content.Context import android.content.SharedPreferences @@ -7,12 +7,12 @@ import android.security.keystore.KeyGenParameterSpec import android.security.keystore.KeyProperties import androidx.security.crypto.EncryptedSharedPreferences import androidx.security.crypto.MasterKey -import com.walletconnect.android.internal.common.crypto.codec.ChaChaPolyCodec -import com.walletconnect.android.internal.common.crypto.codec.Codec -import com.walletconnect.android.internal.common.crypto.kmr.BouncyCastleKeyManagementRepository -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.jwt.clientid.ClientIdJwtRepositoryAndroid -import com.walletconnect.android.internal.common.storage.key_chain.KeyChain +import com.reown.android.internal.common.crypto.codec.ChaChaPolyCodec +import com.reown.android.internal.common.crypto.codec.Codec +import com.reown.android.internal.common.crypto.kmr.BouncyCastleKeyManagementRepository +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.jwt.clientid.ClientIdJwtRepositoryAndroid +import com.reown.android.internal.common.storage.key_chain.KeyChain import com.reown.foundation.crypto.data.repository.ClientIdJwtRepository import com.reown.foundation.util.Logger import org.koin.android.ext.koin.androidContext @@ -21,7 +21,7 @@ import org.koin.core.scope.Scope import org.koin.dsl.module import java.io.File import java.security.KeyStore -import com.walletconnect.android.internal.common.storage.key_chain.KeyStore as WCKeyStore +import com.reown.android.internal.common.storage.key_chain.KeyStore as WCKeyStore private const val ANDROID_KEY_STORE = "AndroidKeyStore" private const val SHARED_PREFS_FILE = "wc_key_store" diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreJsonRpcModule.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreJsonRpcModule.kt similarity index 68% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreJsonRpcModule.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreJsonRpcModule.kt index 688922b84..4c1f62a2c 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreJsonRpcModule.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreJsonRpcModule.kt @@ -1,14 +1,14 @@ -package com.walletconnect.android.internal.common.di +package com.reown.android.internal.common.di import com.squareup.moshi.Moshi -import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer -import com.walletconnect.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractor -import com.walletconnect.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.json_rpc.domain.relay.RelayJsonRpcInteractor -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.model.type.SerializableJsonRpc -import com.walletconnect.android.pairing.model.PairingJsonRpcMethod -import com.walletconnect.android.pairing.model.PairingRpc +import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer +import com.reown.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractor +import com.reown.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface +import com.reown.android.internal.common.json_rpc.domain.relay.RelayJsonRpcInteractor +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +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 diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreNetworkModule.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreNetworkModule.kt similarity index 89% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreNetworkModule.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreNetworkModule.kt index 24b7b3235..a655d9e5a 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CoreNetworkModule.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreNetworkModule.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.di +package com.reown.android.internal.common.di import android.net.Uri import android.os.Build @@ -8,14 +8,14 @@ import com.tinder.scarlet.Lifecycle import com.tinder.scarlet.Scarlet import com.tinder.scarlet.messageadapter.moshi.MoshiMessageAdapter import com.tinder.scarlet.websocket.okhttp.newWebSocketFactory -import com.walletconnect.android.BuildConfig -import com.walletconnect.android.internal.common.ConditionalExponentialBackoffStrategy -import com.walletconnect.android.internal.common.connection.ConnectivityState -import com.walletconnect.android.internal.common.connection.DefaultConnectionLifecycle -import com.walletconnect.android.internal.common.connection.ManualConnectionLifecycle -import com.walletconnect.android.internal.common.jwt.clientid.GenerateJwtStoreClientIdUseCase -import com.walletconnect.android.relay.ConnectionType -import com.walletconnect.android.relay.NetworkClientTimeout +import com.reown.android.BuildConfig +import com.reown.android.internal.common.ConditionalExponentialBackoffStrategy +import com.reown.android.internal.common.connection.ConnectivityState +import com.reown.android.internal.common.connection.DefaultConnectionLifecycle +import com.reown.android.internal.common.connection.ManualConnectionLifecycle +import com.reown.android.internal.common.jwt.clientid.GenerateJwtStoreClientIdUseCase +import com.reown.android.relay.ConnectionType +import com.reown.android.relay.NetworkClientTimeout import com.reown.foundation.network.data.adapter.FlowStreamAdapter import com.reown.foundation.network.data.service.RelayService import okhttp3.Authenticator diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CorePairingModule.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/di/CorePairingModule.kt similarity index 74% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CorePairingModule.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/di/CorePairingModule.kt index 70a73b8d8..5253baa46 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/CorePairingModule.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/di/CorePairingModule.kt @@ -1,8 +1,8 @@ -package com.walletconnect.android.internal.common.di +package com.reown.android.internal.common.di -import com.walletconnect.android.pairing.client.PairingInterface -import com.walletconnect.android.pairing.engine.domain.PairingEngine -import com.walletconnect.android.pairing.handler.PairingControllerInterface +import com.reown.android.pairing.client.PairingInterface +import com.reown.android.pairing.engine.domain.PairingEngine +import com.reown.android.pairing.handler.PairingControllerInterface import org.koin.core.qualifier.named import org.koin.dsl.module diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/DatabaseConfig.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/di/DatabaseConfig.kt similarity index 94% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/DatabaseConfig.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/di/DatabaseConfig.kt index 213b24d12..a472c1f87 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/DatabaseConfig.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/di/DatabaseConfig.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.di +package com.reown.android.internal.common.di import com.walletconnect.utils.Empty import org.koin.android.ext.koin.androidContext diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/ExplorerModule.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/di/ExplorerModule.kt similarity index 70% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/ExplorerModule.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/di/ExplorerModule.kt index 274ed912c..07444932e 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/ExplorerModule.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/di/ExplorerModule.kt @@ -1,11 +1,11 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.di +package com.reown.android.internal.common.di -import com.walletconnect.android.internal.common.explorer.ExplorerRepository -import com.walletconnect.android.internal.common.explorer.data.network.ExplorerService -import com.walletconnect.android.internal.common.explorer.domain.usecase.GetNotifyConfigUseCase -import com.walletconnect.android.internal.common.explorer.domain.usecase.GetProjectsWithPaginationUseCase +import com.reown.android.internal.common.explorer.ExplorerRepository +import com.reown.android.internal.common.explorer.data.network.ExplorerService +import com.reown.android.internal.common.explorer.domain.usecase.GetNotifyConfigUseCase +import com.reown.android.internal.common.explorer.domain.usecase.GetProjectsWithPaginationUseCase import org.koin.core.qualifier.named import org.koin.dsl.module import retrofit2.Retrofit diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/KeyServerModule.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/di/KeyServerModule.kt similarity index 86% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/KeyServerModule.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/di/KeyServerModule.kt index 5203eeb55..0beeff51a 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/KeyServerModule.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/di/KeyServerModule.kt @@ -1,10 +1,10 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.di +package com.reown.android.internal.common.di -import com.walletconnect.android.keyserver.data.service.KeyServerService -import com.walletconnect.android.keyserver.domain.IdentitiesInteractor -import com.walletconnect.android.keyserver.domain.use_case.* +import com.reown.android.keyserver.data.service.KeyServerService +import com.reown.android.keyserver.domain.IdentitiesInteractor +import com.reown.android.keyserver.domain.use_case.* import org.koin.core.qualifier.named import org.koin.dsl.module import retrofit2.Retrofit diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/PulseModule.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/di/PulseModule.kt similarity index 76% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/PulseModule.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/di/PulseModule.kt index 9c88a7fdf..33f9d9226 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/PulseModule.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/di/PulseModule.kt @@ -1,13 +1,13 @@ -package com.walletconnect.android.internal.common.di +package com.reown.android.internal.common.di import com.squareup.moshi.Moshi -import com.walletconnect.android.internal.common.model.TelemetryEnabled -import com.walletconnect.android.pulse.data.PulseService -import com.walletconnect.android.pulse.domain.InsertEventUseCase -import com.walletconnect.android.pulse.domain.InsertTelemetryEventUseCase -import com.walletconnect.android.pulse.domain.SendBatchEventUseCase -import com.walletconnect.android.pulse.domain.SendEventInterface -import com.walletconnect.android.pulse.domain.SendEventUseCase +import com.reown.android.internal.common.model.TelemetryEnabled +import com.reown.android.pulse.data.PulseService +import com.reown.android.pulse.domain.InsertEventUseCase +import com.reown.android.pulse.domain.InsertTelemetryEventUseCase +import com.reown.android.pulse.domain.SendBatchEventUseCase +import com.reown.android.pulse.domain.SendEventInterface +import com.reown.android.pulse.domain.SendEventUseCase import org.koin.core.qualifier.named import org.koin.dsl.module import retrofit2.Retrofit diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/PushModule.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/di/PushModule.kt similarity index 81% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/PushModule.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/di/PushModule.kt index a63776bb4..1a1c5f182 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/PushModule.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/di/PushModule.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.internal.common.di +package com.reown.android.internal.common.di -import com.walletconnect.android.push.network.PushService -import com.walletconnect.android.push.notifications.DecryptMessageUseCaseInterface +import com.reown.android.push.network.PushService +import com.reown.android.push.notifications.DecryptMessageUseCaseInterface import org.koin.core.qualifier.named import org.koin.dsl.module import retrofit2.Retrofit diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/VerifyModule.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/di/VerifyModule.kt similarity index 75% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/VerifyModule.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/di/VerifyModule.kt index 991feea5c..04c55cffd 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/VerifyModule.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/di/VerifyModule.kt @@ -1,10 +1,10 @@ -package com.walletconnect.android.internal.common.di +package com.reown.android.internal.common.di -import com.walletconnect.android.verify.data.VerifyService -import com.walletconnect.android.verify.domain.JWTRepository -import com.walletconnect.android.verify.domain.ResolveAttestationIdUseCase -import com.walletconnect.android.verify.domain.VerifyPublicKeyStorageRepository -import com.walletconnect.android.verify.domain.VerifyRepository +import com.reown.android.verify.data.VerifyService +import com.reown.android.verify.domain.JWTRepository +import com.reown.android.verify.domain.ResolveAttestationIdUseCase +import com.reown.android.verify.domain.VerifyPublicKeyStorageRepository +import com.reown.android.verify.domain.VerifyRepository import org.koin.core.qualifier.named import org.koin.dsl.module import retrofit2.Retrofit diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/exception/CommonWalletConnectExceptions.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/exception/CommonWalletConnectExceptions.kt similarity index 96% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/exception/CommonWalletConnectExceptions.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/exception/CommonWalletConnectExceptions.kt index 01f41dea6..3ecff093e 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/exception/CommonWalletConnectExceptions.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/exception/CommonWalletConnectExceptions.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.exception +package com.reown.android.internal.common.exception class GenericException(override val message: String?) : WalletConnectException(message) diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/exception/Messages.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/exception/Messages.kt similarity index 75% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/exception/Messages.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/exception/Messages.kt index 2679342f3..5be30ace6 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/exception/Messages.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/exception/Messages.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.exception +package com.reown.android.internal.common.exception const val WRONG_CONNECTION_TYPE: String = "Wrong connection type. Please, choose manual connection on initialisation." internal const val DISCONNECT_MESSAGE: String = "User disconnected" \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/exception/PeerError.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/exception/PeerError.kt similarity index 88% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/exception/PeerError.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/exception/PeerError.kt index a220736e8..caa61f289 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/exception/PeerError.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/exception/PeerError.kt @@ -1,6 +1,6 @@ -package com.walletconnect.android.internal.common.exception +package com.reown.android.internal.common.exception -import com.walletconnect.android.internal.common.model.type.Error +import com.reown.android.internal.common.model.type.Error sealed class Uncategorized : Error { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/exception/WalletConnectException.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/exception/WalletConnectException.kt similarity index 89% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/exception/WalletConnectException.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/exception/WalletConnectException.kt index 3a37c940a..cee9991a3 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/exception/WalletConnectException.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/exception/WalletConnectException.kt @@ -1,6 +1,6 @@ -package com.walletconnect.android.internal.common.exception +package com.reown.android.internal.common.exception -import com.walletconnect.android.internal.common.model.AccountId +import com.reown.android.internal.common.model.AccountId abstract class WalletConnectException(override val message: String?) : Exception(message) internal class UnableToExtractDomainException(keyserverUrl: String) : WalletConnectException("Unable to extract domain from: $keyserverUrl") diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/ExplorerInterface.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/ExplorerInterface.kt similarity index 52% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/ExplorerInterface.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/ExplorerInterface.kt index f04b78199..12faa9593 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/ExplorerInterface.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/ExplorerInterface.kt @@ -1,6 +1,6 @@ -package com.walletconnect.android.internal.common.explorer +package com.reown.android.internal.common.explorer -import com.walletconnect.android.internal.common.explorer.data.model.Project +import com.reown.android.internal.common.explorer.data.model.Project interface ExplorerInterface { suspend fun getProjects(page: Int, entries: Int, isVerified: Boolean, isFeatured: Boolean): Result> diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/ExplorerProtocol.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/ExplorerProtocol.kt similarity index 64% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/ExplorerProtocol.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/ExplorerProtocol.kt index e7971e622..e60cceff5 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/ExplorerProtocol.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/ExplorerProtocol.kt @@ -1,9 +1,9 @@ -package com.walletconnect.android.internal.common.explorer +package com.reown.android.internal.common.explorer -import com.walletconnect.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.android.internal.common.explorer.data.model.Project -import com.walletconnect.android.internal.common.explorer.domain.usecase.GetProjectsWithPaginationUseCase -import com.walletconnect.android.internal.common.wcKoinApp +import com.reown.android.internal.common.di.AndroidCommonDITags +import com.reown.android.internal.common.explorer.data.model.Project +import com.reown.android.internal.common.explorer.domain.usecase.GetProjectsWithPaginationUseCase +import com.reown.android.internal.common.wcKoinApp import com.reown.foundation.util.Logger import org.koin.core.KoinApplication import org.koin.core.qualifier.named diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/ExplorerRepository.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/ExplorerRepository.kt similarity index 65% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/ExplorerRepository.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/ExplorerRepository.kt index 9ddf1430d..1cca6fb08 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/ExplorerRepository.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/ExplorerRepository.kt @@ -1,36 +1,36 @@ -package com.walletconnect.android.internal.common.explorer +package com.reown.android.internal.common.explorer import androidx.core.net.toUri -import com.walletconnect.android.internal.common.explorer.data.model.App -import com.walletconnect.android.internal.common.explorer.data.model.Colors -import com.walletconnect.android.internal.common.explorer.data.model.DappListings -import com.walletconnect.android.internal.common.explorer.data.model.Desktop -import com.walletconnect.android.internal.common.explorer.data.model.ImageUrl -import com.walletconnect.android.internal.common.explorer.data.model.Injected -import com.walletconnect.android.internal.common.explorer.data.model.Listing -import com.walletconnect.android.internal.common.explorer.data.model.Metadata -import com.walletconnect.android.internal.common.explorer.data.model.Mobile -import com.walletconnect.android.internal.common.explorer.data.model.NotificationType -import com.walletconnect.android.internal.common.explorer.data.model.NotifyConfig -import com.walletconnect.android.internal.common.explorer.data.model.Project -import com.walletconnect.android.internal.common.explorer.data.model.ProjectListing -import com.walletconnect.android.internal.common.explorer.data.model.SupportedStandard -import com.walletconnect.android.internal.common.explorer.data.network.ExplorerService -import com.walletconnect.android.internal.common.explorer.data.network.model.AppDTO -import com.walletconnect.android.internal.common.explorer.data.network.model.ColorsDTO -import com.walletconnect.android.internal.common.explorer.data.network.model.DappListingsDTO -import com.walletconnect.android.internal.common.explorer.data.network.model.DesktopDTO -import com.walletconnect.android.internal.common.explorer.data.network.model.ImageUrlDTO -import com.walletconnect.android.internal.common.explorer.data.network.model.InjectedDTO -import com.walletconnect.android.internal.common.explorer.data.network.model.ListingDTO -import com.walletconnect.android.internal.common.explorer.data.network.model.MetadataDTO -import com.walletconnect.android.internal.common.explorer.data.network.model.MobileDTO -import com.walletconnect.android.internal.common.explorer.data.network.model.NotificationTypeDTO -import com.walletconnect.android.internal.common.explorer.data.network.model.NotifyConfigDTO -import com.walletconnect.android.internal.common.explorer.data.network.model.ProjectDTO -import com.walletconnect.android.internal.common.explorer.data.network.model.ProjectListingDTO -import com.walletconnect.android.internal.common.explorer.data.network.model.SupportedStandardDTO -import com.walletconnect.android.internal.common.model.ProjectId +import com.reown.android.internal.common.explorer.data.model.App +import com.reown.android.internal.common.explorer.data.model.Colors +import com.reown.android.internal.common.explorer.data.model.DappListings +import com.reown.android.internal.common.explorer.data.model.Desktop +import com.reown.android.internal.common.explorer.data.model.ImageUrl +import com.reown.android.internal.common.explorer.data.model.Injected +import com.reown.android.internal.common.explorer.data.model.Listing +import com.reown.android.internal.common.explorer.data.model.Metadata +import com.reown.android.internal.common.explorer.data.model.Mobile +import com.reown.android.internal.common.explorer.data.model.NotificationType +import com.reown.android.internal.common.explorer.data.model.NotifyConfig +import com.reown.android.internal.common.explorer.data.model.Project +import com.reown.android.internal.common.explorer.data.model.ProjectListing +import com.reown.android.internal.common.explorer.data.model.SupportedStandard +import com.reown.android.internal.common.explorer.data.network.ExplorerService +import com.reown.android.internal.common.explorer.data.network.model.AppDTO +import com.reown.android.internal.common.explorer.data.network.model.ColorsDTO +import com.reown.android.internal.common.explorer.data.network.model.DappListingsDTO +import com.reown.android.internal.common.explorer.data.network.model.DesktopDTO +import com.reown.android.internal.common.explorer.data.network.model.ImageUrlDTO +import com.reown.android.internal.common.explorer.data.network.model.InjectedDTO +import com.reown.android.internal.common.explorer.data.network.model.ListingDTO +import com.reown.android.internal.common.explorer.data.network.model.MetadataDTO +import com.reown.android.internal.common.explorer.data.network.model.MobileDTO +import com.reown.android.internal.common.explorer.data.network.model.NotificationTypeDTO +import com.reown.android.internal.common.explorer.data.network.model.NotifyConfigDTO +import com.reown.android.internal.common.explorer.data.network.model.ProjectDTO +import com.reown.android.internal.common.explorer.data.network.model.ProjectListingDTO +import com.reown.android.internal.common.explorer.data.network.model.SupportedStandardDTO +import com.reown.android.internal.common.model.ProjectId //discuss: Repository could be inside domain class ExplorerRepository( diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/App.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/App.kt similarity index 80% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/App.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/App.kt index 461ba1201..88bf45fa2 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/App.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/App.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.model +package com.reown.android.internal.common.explorer.data.model data class App( val browser: String?, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/Colors.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/Colors.kt similarity index 51% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/Colors.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/Colors.kt index 649dcfdbd..53cce9073 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/Colors.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/Colors.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.model +package com.reown.android.internal.common.explorer.data.model data class Colors( val primary: String?, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/DappListings.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/DappListings.kt similarity index 58% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/DappListings.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/DappListings.kt index d57f7a498..34ea38a8e 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/DappListings.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/DappListings.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.model +package com.reown.android.internal.common.explorer.data.model data class DappListings( val listings: List, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/Desktop.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/Desktop.kt similarity index 51% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/Desktop.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/Desktop.kt index 378cddc60..8186d86de 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/Desktop.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/Desktop.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.model +package com.reown.android.internal.common.explorer.data.model data class Desktop( val native: String, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/ImageUrl.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/ImageUrl.kt similarity index 53% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/ImageUrl.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/ImageUrl.kt index a33236be7..a67b02d31 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/ImageUrl.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/ImageUrl.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.model +package com.reown.android.internal.common.explorer.data.model data class ImageUrl( val sm: String, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/Injected.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/Injected.kt similarity index 52% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/Injected.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/Injected.kt index 2cf581116..ef126b8dc 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/Injected.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/Injected.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.model +package com.reown.android.internal.common.explorer.data.model data class Injected( val namespace: String, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/Listing.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/Listing.kt similarity index 88% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/Listing.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/Listing.kt index 9d80e57e7..247c38fe0 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/Listing.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/Listing.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.model +package com.reown.android.internal.common.explorer.data.model import android.net.Uri diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/Metadata.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/Metadata.kt similarity index 51% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/Metadata.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/Metadata.kt index 69b13ece2..bb945363a 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/Metadata.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/Metadata.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.model +package com.reown.android.internal.common.explorer.data.model data class Metadata( val shortName: String?, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/Mobile.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/Mobile.kt similarity index 51% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/Mobile.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/Mobile.kt index 29215c5ff..07d04ba18 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/Mobile.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/Mobile.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.model +package com.reown.android.internal.common.explorer.data.model data class Mobile( val native: String?, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/NotifyConfig.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/NotifyConfig.kt similarity index 84% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/NotifyConfig.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/NotifyConfig.kt index 4a390d9bf..50edc3161 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/NotifyConfig.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/NotifyConfig.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.explorer.data.model +package com.reown.android.internal.common.explorer.data.model data class NotifyConfig( val dappUrl: String, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/Project.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/Project.kt similarity index 75% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/Project.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/Project.kt index b0517f171..e9878d853 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/Project.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/Project.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.model +package com.reown.android.internal.common.explorer.data.model data class Project( val id: String, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/ProjectListing.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/ProjectListing.kt similarity index 53% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/ProjectListing.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/ProjectListing.kt index 8e9041bf6..890f284fc 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/ProjectListing.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/ProjectListing.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.model +package com.reown.android.internal.common.explorer.data.model data class ProjectListing( val projects: List, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/SupportedStandard.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/SupportedStandard.kt similarity index 68% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/SupportedStandard.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/SupportedStandard.kt index 0ad5058f2..78948ce33 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/model/SupportedStandard.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/model/SupportedStandard.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.model +package com.reown.android.internal.common.explorer.data.model data class SupportedStandard( val id: String, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/ExplorerService.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/ExplorerService.kt similarity index 72% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/ExplorerService.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/ExplorerService.kt index a14f4466d..1b546356f 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/ExplorerService.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/ExplorerService.kt @@ -1,11 +1,11 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.explorer.data.network +package com.reown.android.internal.common.explorer.data.network -import com.walletconnect.android.internal.common.explorer.data.network.model.DappListingsDTO -import com.walletconnect.android.internal.common.explorer.data.network.model.NotifyConfigDTO -import com.walletconnect.android.internal.common.explorer.data.network.model.ProjectListingDTO -import com.walletconnect.android.internal.common.explorer.data.network.model.WalletListingDTO +import com.reown.android.internal.common.explorer.data.network.model.DappListingsDTO +import com.reown.android.internal.common.explorer.data.network.model.NotifyConfigDTO +import com.reown.android.internal.common.explorer.data.network.model.ProjectListingDTO +import com.reown.android.internal.common.explorer.data.network.model.WalletListingDTO import retrofit2.Response import retrofit2.http.GET import retrofit2.http.Query diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/AppDTO.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/AppDTO.kt similarity index 89% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/AppDTO.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/AppDTO.kt index bb7d549cb..0b4845bf1 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/AppDTO.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/AppDTO.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.network.model +package com.reown.android.internal.common.explorer.data.network.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/ColorsDTO.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/ColorsDTO.kt similarity index 75% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/ColorsDTO.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/ColorsDTO.kt index b098cbfc8..f1977e55a 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/ColorsDTO.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/ColorsDTO.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.network.model +package com.reown.android.internal.common.explorer.data.network.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/DappListingsDTO.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/DappListingsDTO.kt similarity index 79% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/DappListingsDTO.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/DappListingsDTO.kt index a3ae31dc7..589ec6b39 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/DappListingsDTO.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/DappListingsDTO.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.network.model +package com.reown.android.internal.common.explorer.data.network.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/DesktopDTO.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/DesktopDTO.kt similarity index 75% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/DesktopDTO.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/DesktopDTO.kt index b8b7cc6aa..0556d4cc5 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/DesktopDTO.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/DesktopDTO.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.network.model +package com.reown.android.internal.common.explorer.data.network.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/ImageUrlDTO.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/ImageUrlDTO.kt similarity index 76% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/ImageUrlDTO.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/ImageUrlDTO.kt index 17db64bed..85561a759 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/ImageUrlDTO.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/ImageUrlDTO.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.network.model +package com.reown.android.internal.common.explorer.data.network.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/InjectedDTO.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/InjectedDTO.kt similarity index 75% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/InjectedDTO.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/InjectedDTO.kt index b6f79704b..240f90d38 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/InjectedDTO.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/InjectedDTO.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.network.model +package com.reown.android.internal.common.explorer.data.network.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/ListingDTO.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/ListingDTO.kt similarity index 93% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/ListingDTO.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/ListingDTO.kt index 9f713c528..fef2517b4 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/ListingDTO.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/ListingDTO.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.network.model +package com.reown.android.internal.common.explorer.data.network.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/MetadataDTO.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/MetadataDTO.kt similarity index 75% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/MetadataDTO.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/MetadataDTO.kt index 0b11262da..b3460080d 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/MetadataDTO.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/MetadataDTO.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.network.model +package com.reown.android.internal.common.explorer.data.network.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/MobileDTO.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/MobileDTO.kt similarity index 75% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/MobileDTO.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/MobileDTO.kt index d73e1cf0b..6ca4c4b6b 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/MobileDTO.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/MobileDTO.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.network.model +package com.reown.android.internal.common.explorer.data.network.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/NotifyConfigDTO.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/NotifyConfigDTO.kt similarity index 92% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/NotifyConfigDTO.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/NotifyConfigDTO.kt index 52c2fa2a8..34e519eee 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/NotifyConfigDTO.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/NotifyConfigDTO.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.explorer.data.network.model +package com.reown.android.internal.common.explorer.data.network.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/ProjectDTO.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/ProjectDTO.kt similarity index 87% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/ProjectDTO.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/ProjectDTO.kt index 85f5c6b13..1cc3e1c80 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/ProjectDTO.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/ProjectDTO.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.network.model +package com.reown.android.internal.common.explorer.data.network.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/ProjectListingDTO.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/ProjectListingDTO.kt similarity index 79% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/ProjectListingDTO.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/ProjectListingDTO.kt index 8675e8a44..c44329289 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/ProjectListingDTO.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/ProjectListingDTO.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.network.model +package com.reown.android.internal.common.explorer.data.network.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/SupportedStandardDTO.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/SupportedStandardDTO.kt similarity index 83% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/SupportedStandardDTO.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/SupportedStandardDTO.kt index a51053380..d0ef7dc39 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/SupportedStandardDTO.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/SupportedStandardDTO.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.network.model +package com.reown.android.internal.common.explorer.data.network.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/WalletDTO.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/WalletDTO.kt similarity index 86% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/WalletDTO.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/WalletDTO.kt index a41105b7f..9ea0171a3 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/WalletDTO.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/WalletDTO.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.network.model +package com.reown.android.internal.common.explorer.data.network.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/WalletListingDTO.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/WalletListingDTO.kt similarity index 74% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/WalletListingDTO.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/WalletListingDTO.kt index 3ddfcc769..4f1881815 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/WalletListingDTO.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/data/network/model/WalletListingDTO.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.network.model +package com.reown.android.internal.common.explorer.data.network.model import com.squareup.moshi.Json diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/domain/usecase/GetNotifyConfigUseCase.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/domain/usecase/GetNotifyConfigUseCase.kt new file mode 100644 index 000000000..afd9a3045 --- /dev/null +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/domain/usecase/GetNotifyConfigUseCase.kt @@ -0,0 +1,8 @@ +package com.reown.android.internal.common.explorer.domain.usecase + +import com.reown.android.internal.common.explorer.ExplorerRepository +import com.reown.android.internal.common.explorer.data.model.NotifyConfig + +class GetNotifyConfigUseCase(private val explorerRepository: ExplorerRepository) { + suspend operator fun invoke(appDomain: String): Result = runCatching { explorerRepository.getNotifyConfig(appDomain) } +} diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/domain/usecase/GetProjectsWithPaginationUseCase.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/domain/usecase/GetProjectsWithPaginationUseCase.kt similarity index 61% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/domain/usecase/GetProjectsWithPaginationUseCase.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/explorer/domain/usecase/GetProjectsWithPaginationUseCase.kt index d8c0f3369..a1ec861fd 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/domain/usecase/GetProjectsWithPaginationUseCase.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/explorer/domain/usecase/GetProjectsWithPaginationUseCase.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.internal.common.explorer.domain.usecase +package com.reown.android.internal.common.explorer.domain.usecase -import com.walletconnect.android.internal.common.explorer.ExplorerRepository -import com.walletconnect.android.internal.common.explorer.data.model.Project +import com.reown.android.internal.common.explorer.ExplorerRepository +import com.reown.android.internal.common.explorer.data.model.Project class GetProjectsWithPaginationUseCase( private val explorerRepository: ExplorerRepository, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/data/JsonRpcSerializer.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/data/JsonRpcSerializer.kt similarity index 84% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/data/JsonRpcSerializer.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/data/JsonRpcSerializer.kt index 2ad32f283..9d6289ce1 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/data/JsonRpcSerializer.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/data/JsonRpcSerializer.kt @@ -1,10 +1,10 @@ -package com.walletconnect.android.internal.common.json_rpc.data +package com.reown.android.internal.common.json_rpc.data import com.squareup.moshi.Moshi -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.model.type.ClientParams -import com.walletconnect.android.internal.common.model.type.JsonRpcClientSync -import com.walletconnect.android.internal.common.model.type.SerializableJsonRpc +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 kotlin.reflect.KClass import kotlin.reflect.safeCast diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/link_mode/LinkModeJsonRpcInteractor.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/domain/link_mode/LinkModeJsonRpcInteractor.kt similarity index 83% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/link_mode/LinkModeJsonRpcInteractor.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/domain/link_mode/LinkModeJsonRpcInteractor.kt index 538dca1fe..12707fc57 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/link_mode/LinkModeJsonRpcInteractor.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/domain/link_mode/LinkModeJsonRpcInteractor.kt @@ -1,26 +1,26 @@ -package com.walletconnect.android.internal.common.json_rpc.domain.link_mode +package com.reown.android.internal.common.json_rpc.domain.link_mode import android.content.Context import android.content.Intent import android.net.Uri import android.util.Base64 -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.crypto.codec.Codec -import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer -import com.walletconnect.android.internal.common.json_rpc.model.toWCResponse -import com.walletconnect.android.internal.common.model.EnvelopeType -import com.walletconnect.android.internal.common.model.Participants -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.TransportType -import com.walletconnect.android.internal.common.model.WCRequest -import com.walletconnect.android.internal.common.model.WCResponse -import com.walletconnect.android.internal.common.model.sync.ClientJsonRpc -import com.walletconnect.android.internal.common.model.type.ClientParams -import com.walletconnect.android.internal.common.model.type.JsonRpcClientSync -import com.walletconnect.android.internal.common.model.type.JsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory -import com.walletconnect.android.internal.common.wcKoinApp +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.crypto.codec.Codec +import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer +import com.reown.android.internal.common.json_rpc.model.toWCResponse +import com.reown.android.internal.common.model.EnvelopeType +import com.reown.android.internal.common.model.Participants +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.model.TransportType +import com.reown.android.internal.common.model.WCRequest +import com.reown.android.internal.common.model.WCResponse +import com.reown.android.internal.common.model.sync.ClientJsonRpc +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.JsonRpcInteractorInterface +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 kotlinx.coroutines.flow.MutableSharedFlow diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt similarity index 89% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt index efd0b14d5..4fb2e7964 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt @@ -1,35 +1,35 @@ -package com.walletconnect.android.internal.common.json_rpc.domain.relay - -import com.walletconnect.android.internal.common.ConditionalExponentialBackoffStrategy -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.crypto.codec.Codec -import com.walletconnect.android.internal.common.crypto.sha256 -import com.walletconnect.android.internal.common.exception.NoConnectivityException -import com.walletconnect.android.internal.common.exception.NoInternetConnectionException -import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer -import com.walletconnect.android.internal.common.json_rpc.model.toRelay -import com.walletconnect.android.internal.common.json_rpc.model.toWCRequest -import com.walletconnect.android.internal.common.json_rpc.model.toWCResponse -import com.walletconnect.android.internal.common.model.EnvelopeType -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Participants -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.TransportType -import com.walletconnect.android.internal.common.model.WCRequest -import com.walletconnect.android.internal.common.model.WCResponse -import com.walletconnect.android.internal.common.model.params.ChatNotifyResponseAuthParams -import com.walletconnect.android.internal.common.model.sync.ClientJsonRpc -import com.walletconnect.android.internal.common.model.type.ClientParams -import com.walletconnect.android.internal.common.model.type.Error -import com.walletconnect.android.internal.common.model.type.JsonRpcClientSync -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.storage.push_messages.PushMessagesRepository -import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.android.internal.utils.ObservableMap -import com.walletconnect.android.relay.RelayConnectionInterface -import com.walletconnect.android.relay.WSSConnectionState +package com.reown.android.internal.common.json_rpc.domain.relay + +import com.reown.android.internal.common.ConditionalExponentialBackoffStrategy +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.crypto.codec.Codec +import com.reown.android.internal.common.crypto.sha256 +import com.reown.android.internal.common.exception.NoConnectivityException +import com.reown.android.internal.common.exception.NoInternetConnectionException +import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer +import com.reown.android.internal.common.json_rpc.model.toRelay +import com.reown.android.internal.common.json_rpc.model.toWCRequest +import com.reown.android.internal.common.json_rpc.model.toWCResponse +import com.reown.android.internal.common.model.EnvelopeType +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.Participants +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.model.TransportType +import com.reown.android.internal.common.model.WCRequest +import com.reown.android.internal.common.model.WCResponse +import com.reown.android.internal.common.model.params.ChatNotifyResponseAuthParams +import com.reown.android.internal.common.model.sync.ClientJsonRpc +import com.reown.android.internal.common.model.type.ClientParams +import com.reown.android.internal.common.model.type.Error +import com.reown.android.internal.common.model.type.JsonRpcClientSync +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.scope +import com.reown.android.internal.common.storage.push_messages.PushMessagesRepository +import com.reown.android.internal.common.storage.rpc.JsonRpcHistory +import com.reown.android.internal.common.wcKoinApp +import com.reown.android.internal.utils.ObservableMap +import com.reown.android.relay.RelayConnectionInterface +import com.reown.android.relay.WSSConnectionState import com.reown.foundation.common.model.SubscriptionId import com.reown.foundation.common.model.Topic import com.reown.foundation.network.model.Relay diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/model/JsonRpcHistoryRecord.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/model/JsonRpcHistoryRecord.kt similarity index 58% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/model/JsonRpcHistoryRecord.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/model/JsonRpcHistoryRecord.kt index 4ac29b721..1a126f245 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/model/JsonRpcHistoryRecord.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/model/JsonRpcHistoryRecord.kt @@ -1,6 +1,6 @@ -package com.walletconnect.android.internal.common.json_rpc.model +package com.reown.android.internal.common.json_rpc.model -import com.walletconnect.android.internal.common.model.TransportType +import com.reown.android.internal.common.model.TransportType data class JsonRpcHistoryRecord( val id: Long, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/model/JsonRpcMapper.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/model/JsonRpcMapper.kt similarity index 52% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/model/JsonRpcMapper.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/model/JsonRpcMapper.kt index e2f0025a6..c73e2a539 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/json_rpc/model/JsonRpcMapper.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/model/JsonRpcMapper.kt @@ -1,15 +1,15 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.json_rpc.model +package com.reown.android.internal.common.json_rpc.model -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.json_rpc.domain.relay.Subscription -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.TransportType -import com.walletconnect.android.internal.common.model.WCRequest -import com.walletconnect.android.internal.common.model.WCResponse -import com.walletconnect.android.internal.common.model.sync.ClientJsonRpc -import com.walletconnect.android.internal.common.model.type.ClientParams +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.json_rpc.domain.relay.Subscription +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.TransportType +import com.reown.android.internal.common.model.WCRequest +import com.reown.android.internal.common.model.WCResponse +import com.reown.android.internal.common.model.sync.ClientJsonRpc +import com.reown.android.internal.common.model.type.ClientParams import com.reown.foundation.common.model.Topic import com.reown.foundation.network.model.Relay diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/clientid/ClientIdJwtRepositoryAndroid.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/jwt/clientid/ClientIdJwtRepositoryAndroid.kt similarity index 81% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/clientid/ClientIdJwtRepositoryAndroid.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/jwt/clientid/ClientIdJwtRepositoryAndroid.kt index b44dd7926..cfdd31d10 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/clientid/ClientIdJwtRepositoryAndroid.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/jwt/clientid/ClientIdJwtRepositoryAndroid.kt @@ -1,9 +1,9 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.jwt.clientid +package com.reown.android.internal.common.jwt.clientid -import com.walletconnect.android.internal.common.exception.CannotFindKeyPairException -import com.walletconnect.android.internal.common.storage.key_chain.KeyStore +import com.reown.android.internal.common.exception.CannotFindKeyPairException +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.crypto.data.repository.BaseClientIdJwtRepository diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/clientid/GenerateJwtStoreClientIdUseCase.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/jwt/clientid/GenerateJwtStoreClientIdUseCase.kt similarity index 76% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/clientid/GenerateJwtStoreClientIdUseCase.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/jwt/clientid/GenerateJwtStoreClientIdUseCase.kt index 944c6908e..5d847d844 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/clientid/GenerateJwtStoreClientIdUseCase.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/jwt/clientid/GenerateJwtStoreClientIdUseCase.kt @@ -1,11 +1,11 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.jwt.clientid +package com.reown.android.internal.common.jwt.clientid import android.content.SharedPreferences import androidx.core.content.edit -import com.walletconnect.android.internal.common.di.KEY_CLIENT_ID -import com.walletconnect.android.utils.strippedUrl +import com.reown.android.internal.common.di.KEY_CLIENT_ID +import com.reown.android.utils.strippedUrl import com.reown.foundation.crypto.data.repository.ClientIdJwtRepository internal class GenerateJwtStoreClientIdUseCase(private val clientIdJwtRepository: ClientIdJwtRepository, private val sharedPreferences: SharedPreferences) { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/did/DidJwtRepository.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/jwt/did/DidJwtRepository.kt similarity index 91% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/did/DidJwtRepository.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/jwt/did/DidJwtRepository.kt index 7b096e8b1..22a8203b2 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/did/DidJwtRepository.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/jwt/did/DidJwtRepository.kt @@ -1,9 +1,9 @@ @file:JvmSynthetic @file:JvmName("DidJwtRepository") -package com.walletconnect.android.internal.common.jwt.did +package com.reown.android.internal.common.jwt.did -import com.walletconnect.android.internal.common.model.DidJwt +import com.reown.android.internal.common.model.DidJwt import com.reown.foundation.common.model.PrivateKey import com.reown.foundation.util.jwt.* diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/did/EncodeDidJwtPayloadUseCase.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/jwt/did/EncodeDidJwtPayloadUseCase.kt similarity index 94% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/did/EncodeDidJwtPayloadUseCase.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/jwt/did/EncodeDidJwtPayloadUseCase.kt index 49ebeb347..743947bb5 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/did/EncodeDidJwtPayloadUseCase.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/jwt/did/EncodeDidJwtPayloadUseCase.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.jwt.did +package com.reown.android.internal.common.jwt.did import com.reown.foundation.common.model.PublicKey import com.reown.foundation.util.jwt.JwtClaims diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/did/EncodeIdentityKeyDidJwtPayloadUseCase.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/jwt/did/EncodeIdentityKeyDidJwtPayloadUseCase.kt similarity index 89% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/did/EncodeIdentityKeyDidJwtPayloadUseCase.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/jwt/did/EncodeIdentityKeyDidJwtPayloadUseCase.kt index 2166d9dfb..6362459fd 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/jwt/did/EncodeIdentityKeyDidJwtPayloadUseCase.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/jwt/did/EncodeIdentityKeyDidJwtPayloadUseCase.kt @@ -1,8 +1,8 @@ -package com.walletconnect.android.internal.common.jwt.did +package com.reown.android.internal.common.jwt.did import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.android.internal.common.model.AccountId +import com.reown.android.internal.common.model.AccountId import com.reown.foundation.util.jwt.JwtClaims import com.reown.foundation.util.jwt.encodeDidPkh diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/AppKitApiRepository.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/AppKitApiRepository.kt similarity index 78% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/AppKitApiRepository.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/modal/AppKitApiRepository.kt index 87820f9a9..c1516246c 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/AppKitApiRepository.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/AppKitApiRepository.kt @@ -1,13 +1,13 @@ -package com.walletconnect.android.internal.common.modal +package com.reown.android.internal.common.modal import android.content.Context -import com.walletconnect.android.internal.common.modal.data.model.Wallet -import com.walletconnect.android.internal.common.modal.data.model.WalletAppData -import com.walletconnect.android.internal.common.modal.data.model.WalletListing -import com.walletconnect.android.internal.common.modal.data.network.AppKitService -import com.walletconnect.android.internal.common.modal.data.network.model.WalletDTO -import com.walletconnect.android.internal.common.modal.data.network.model.WalletDataDTO -import com.walletconnect.android.utils.isWalletInstalled +import com.reown.android.internal.common.modal.data.model.Wallet +import com.reown.android.internal.common.modal.data.model.WalletAppData +import com.reown.android.internal.common.modal.data.model.WalletListing +import com.reown.android.internal.common.modal.data.network.AppKitService +import com.reown.android.internal.common.modal.data.network.model.WalletDTO +import com.reown.android.internal.common.modal.data.network.model.WalletDataDTO +import com.reown.android.utils.isWalletInstalled internal class AppKitApiRepository( private val context: Context, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/model/Wallet.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/model/Wallet.kt similarity index 90% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/model/Wallet.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/model/Wallet.kt index 9348d8d40..22e7a330d 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/model/Wallet.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/model/Wallet.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.modal.data.model +package com.reown.android.internal.common.modal.data.model import android.net.Uri diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/model/WalletAppData.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/model/WalletAppData.kt similarity index 61% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/model/WalletAppData.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/model/WalletAppData.kt index 525729aa3..f5e01394d 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/model/WalletAppData.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/model/WalletAppData.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.modal.data.model +package com.reown.android.internal.common.modal.data.model data class WalletAppData( val id: String, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/model/WalletListing.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/model/WalletListing.kt similarity index 60% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/model/WalletListing.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/model/WalletListing.kt index 0f999a408..92ae096a5 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/model/WalletListing.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/model/WalletListing.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.modal.data.model +package com.reown.android.internal.common.modal.data.model data class WalletListing( val page: Int, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/network/AppKitService.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/network/AppKitService.kt similarity index 71% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/network/AppKitService.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/network/AppKitService.kt index e7b500816..7ec558311 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/network/AppKitService.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/network/AppKitService.kt @@ -1,8 +1,8 @@ -package com.walletconnect.android.internal.common.modal.data.network +package com.reown.android.internal.common.modal.data.network -import com.walletconnect.android.internal.common.modal.data.network.model.EnableAnalyticsDTO -import com.walletconnect.android.internal.common.modal.data.network.model.GetAndroidDataDTO -import com.walletconnect.android.internal.common.modal.data.network.model.GetWalletsDTO +import com.reown.android.internal.common.modal.data.network.model.EnableAnalyticsDTO +import com.reown.android.internal.common.modal.data.network.model.GetAndroidDataDTO +import com.reown.android.internal.common.modal.data.network.model.GetWalletsDTO import retrofit2.Response import retrofit2.http.GET import retrofit2.http.Header diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/network/model/EnableAnalyticsDTO.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/network/model/EnableAnalyticsDTO.kt similarity index 65% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/network/model/EnableAnalyticsDTO.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/network/model/EnableAnalyticsDTO.kt index ccb7dfe0b..c84068d08 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/network/model/EnableAnalyticsDTO.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/network/model/EnableAnalyticsDTO.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.modal.data.network.model +package com.reown.android.internal.common.modal.data.network.model import com.squareup.moshi.Json diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/network/model/GetAndroidDataDTO.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/network/model/GetAndroidDataDTO.kt similarity index 70% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/network/model/GetAndroidDataDTO.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/network/model/GetAndroidDataDTO.kt index dba03eb3b..8b835064b 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/network/model/GetAndroidDataDTO.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/network/model/GetAndroidDataDTO.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.modal.data.network.model +package com.reown.android.internal.common.modal.data.network.model import com.squareup.moshi.Json diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/network/model/GetWalletsDTO.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/network/model/GetWalletsDTO.kt similarity index 51% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/network/model/GetWalletsDTO.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/network/model/GetWalletsDTO.kt index e24428afe..3c049c985 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/network/model/GetWalletsDTO.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/network/model/GetWalletsDTO.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.internal.common.modal.data.network.model +package com.reown.android.internal.common.modal.data.network.model import com.squareup.moshi.Json -import com.walletconnect.android.internal.common.modal.data.network.model.WalletDTO +import com.reown.android.internal.common.modal.data.network.model.WalletDTO internal data class GetWalletsDTO( @Json(name = "count") diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/network/model/WalletDTO.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/network/model/WalletDTO.kt similarity index 90% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/network/model/WalletDTO.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/network/model/WalletDTO.kt index a9b846684..93f216ea2 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/network/model/WalletDTO.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/network/model/WalletDTO.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.modal.data.network.model +package com.reown.android.internal.common.modal.data.network.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/network/model/WalletDataDTO.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/network/model/WalletDataDTO.kt similarity index 67% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/network/model/WalletDataDTO.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/network/model/WalletDataDTO.kt index 8b61c7e89..b13cabdda 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/data/network/model/WalletDataDTO.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/data/network/model/WalletDataDTO.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.modal.data.network.model +package com.reown.android.internal.common.modal.data.network.model import com.squareup.moshi.Json diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/domain/usecase/EnableAnalyticsUseCase.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/domain/usecase/EnableAnalyticsUseCase.kt similarity index 81% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/domain/usecase/EnableAnalyticsUseCase.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/modal/domain/usecase/EnableAnalyticsUseCase.kt index 9745c1632..15708a053 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/domain/usecase/EnableAnalyticsUseCase.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/domain/usecase/EnableAnalyticsUseCase.kt @@ -1,6 +1,6 @@ -package com.walletconnect.android.internal.common.modal.domain.usecase +package com.reown.android.internal.common.modal.domain.usecase -import com.walletconnect.android.internal.common.modal.AppKitApiRepository +import com.reown.android.internal.common.modal.AppKitApiRepository import kotlinx.coroutines.runBlocking interface EnableAnalyticsUseCaseInterface { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/domain/usecase/GetAndroidDataUseCaseInterface.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/domain/usecase/GetAndroidDataUseCaseInterface.kt similarity index 76% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/domain/usecase/GetAndroidDataUseCaseInterface.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/modal/domain/usecase/GetAndroidDataUseCaseInterface.kt index 548155f81..2e53d0bc2 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/domain/usecase/GetAndroidDataUseCaseInterface.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/domain/usecase/GetAndroidDataUseCaseInterface.kt @@ -1,6 +1,6 @@ -package com.walletconnect.android.internal.common.modal.domain.usecase +package com.reown.android.internal.common.modal.domain.usecase -import com.walletconnect.android.internal.common.modal.AppKitApiRepository +import com.reown.android.internal.common.modal.AppKitApiRepository interface GetInstalledWalletsIdsUseCaseInterface { suspend operator fun invoke( diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/domain/usecase/GetSamplesWalletsUseCaseInterface.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/domain/usecase/GetSamplesWalletsUseCaseInterface.kt similarity index 95% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/domain/usecase/GetSamplesWalletsUseCaseInterface.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/modal/domain/usecase/GetSamplesWalletsUseCaseInterface.kt index 9682efef9..31c2275fe 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/domain/usecase/GetSamplesWalletsUseCaseInterface.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/domain/usecase/GetSamplesWalletsUseCaseInterface.kt @@ -1,8 +1,8 @@ -package com.walletconnect.android.internal.common.modal.domain.usecase +package com.reown.android.internal.common.modal.domain.usecase import android.content.Context -import com.walletconnect.android.internal.common.modal.data.model.Wallet -import com.walletconnect.android.utils.isWalletInstalled +import com.reown.android.internal.common.modal.data.model.Wallet +import com.reown.android.utils.isWalletInstalled interface GetSampleWalletsUseCaseInterface { suspend operator fun invoke(): List diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/domain/usecase/GetWalletsUseCase.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/domain/usecase/GetWalletsUseCase.kt similarity index 74% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/domain/usecase/GetWalletsUseCase.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/modal/domain/usecase/GetWalletsUseCase.kt index ef63705b7..dceb160ac 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/modal/domain/usecase/GetWalletsUseCase.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/domain/usecase/GetWalletsUseCase.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.internal.common.modal.domain.usecase +package com.reown.android.internal.common.modal.domain.usecase -import com.walletconnect.android.internal.common.modal.AppKitApiRepository -import com.walletconnect.android.internal.common.modal.data.model.WalletListing +import com.reown.android.internal.common.modal.AppKitApiRepository +import com.reown.android.internal.common.modal.data.model.WalletListing interface GetWalletsUseCaseInterface { suspend operator fun invoke( diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/AccountId.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/AccountId.kt similarity index 62% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/AccountId.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/AccountId.kt index 1e88e2f14..a0fa4a5d8 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/AccountId.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/AccountId.kt @@ -1,8 +1,8 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.model +package com.reown.android.internal.common.model -import com.walletconnect.android.internal.utils.CoreValidator +import com.reown.android.internal.utils.CoreValidator @JvmInline diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/AppMetaData.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/AppMetaData.kt similarity index 89% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/AppMetaData.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/AppMetaData.kt index 77725cd81..73edf3cc1 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/AppMetaData.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/AppMetaData.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.model +package com.reown.android.internal.common.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/model/AppMetaDataType.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/AppMetaDataType.kt new file mode 100644 index 000000000..2ac5a593e --- /dev/null +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/AppMetaDataType.kt @@ -0,0 +1,5 @@ +package com.reown.android.internal.common.model + +enum class AppMetaDataType { + SELF, PEER +} \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/ConnectionState.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/ConnectionState.kt similarity index 66% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/ConnectionState.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/ConnectionState.kt index 54815a640..ca360d602 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/ConnectionState.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/ConnectionState.kt @@ -1,6 +1,6 @@ -package com.walletconnect.android.internal.common.model +package com.reown.android.internal.common.model -import com.walletconnect.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.EngineEvent data class ConnectionState(val isAvailable: Boolean, val reason: Reason? = null) : EngineEvent { sealed class Reason { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/CryptoException.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/CryptoException.kt similarity index 67% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/CryptoException.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/CryptoException.kt index d1a253259..cace4f3f3 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/CryptoException.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/CryptoException.kt @@ -1,6 +1,6 @@ -package com.walletconnect.android.internal.common.model +package com.reown.android.internal.common.model -import com.walletconnect.android.internal.common.exception.WalletConnectException +import com.reown.android.internal.common.exception.WalletConnectException class UnknownEnvelopeTypeException(override val message: String?) : WalletConnectException(message) class MissingParticipantsException(override val message: String?) : WalletConnectException(message) diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/model/DidJwt.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/DidJwt.kt new file mode 100644 index 000000000..c27605fb6 --- /dev/null +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/DidJwt.kt @@ -0,0 +1,4 @@ +package com.reown.android.internal.common.model + +@JvmInline +value class DidJwt(val value: String) \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/EnvelopeType.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/EnvelopeType.kt similarity index 55% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/EnvelopeType.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/EnvelopeType.kt index bbf3fdafa..e7fb281b9 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/EnvelopeType.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/EnvelopeType.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.model +package com.reown.android.internal.common.model enum class EnvelopeType(val id: Byte) { ZERO(0), ONE(1), TWO(2) diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/model/Expiry.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/Expiry.kt new file mode 100644 index 000000000..12f893e89 --- /dev/null +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/Expiry.kt @@ -0,0 +1,3 @@ +package com.reown.android.internal.common.model + +data class Expiry(val seconds: Long) \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/IrnParams.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/IrnParams.kt similarity index 69% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/IrnParams.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/IrnParams.kt index b903e2780..a06bb6a41 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/IrnParams.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/IrnParams.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.model +package com.reown.android.internal.common.model import com.reown.foundation.common.model.Ttl diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Namespace.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/Namespace.kt similarity index 94% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Namespace.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/Namespace.kt index b9be227a0..cd2f4a263 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Namespace.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/Namespace.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.model +package com.reown.android.internal.common.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/model/PackageName.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/PackageName.kt new file mode 100644 index 000000000..5cb0bbfaa --- /dev/null +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/PackageName.kt @@ -0,0 +1,4 @@ +package com.reown.android.internal.common.model + +@JvmInline +value class PackageName(val value: String) diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Pairing.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/Pairing.kt similarity index 84% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Pairing.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/Pairing.kt index bf96df3db..3dae354c1 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Pairing.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/Pairing.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.internal.common.model +package com.reown.android.internal.common.model -import com.walletconnect.android.internal.common.model.type.Sequence -import com.walletconnect.android.pairing.model.pairingExpiry +import com.reown.android.internal.common.model.type.Sequence +import com.reown.android.pairing.model.pairingExpiry import com.reown.foundation.common.model.Topic data class Pairing( diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Participant.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/Participant.kt similarity index 81% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Participant.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/Participant.kt index 07948c160..251346545 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Participant.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/Participant.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.model +package com.reown.android.internal.common.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Participants.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/Participants.kt similarity index 73% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Participants.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/Participants.kt index bd3c8991f..115d0fa7a 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Participants.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/Participants.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.model +package com.reown.android.internal.common.model import com.reown.foundation.common.model.PublicKey diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/model/ProjectId.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/ProjectId.kt new file mode 100644 index 000000000..47a3f1f09 --- /dev/null +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/ProjectId.kt @@ -0,0 +1,3 @@ +package com.reown.android.internal.common.model + +data class ProjectId(val value: String) \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Redirect.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/Redirect.kt similarity index 84% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Redirect.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/Redirect.kt index 0be1bbc2c..3267a52ef 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Redirect.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/Redirect.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.model +package com.reown.android.internal.common.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/RelayProtocolOptions.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/RelayProtocolOptions.kt similarity index 77% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/RelayProtocolOptions.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/RelayProtocolOptions.kt index fe51849f8..eede7e5f4 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/RelayProtocolOptions.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/RelayProtocolOptions.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.model +package com.reown.android.internal.common.model import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/model/SDKError.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/SDKError.kt new file mode 100644 index 000000000..799c537f5 --- /dev/null +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/SDKError.kt @@ -0,0 +1,5 @@ +package com.reown.android.internal.common.model + +import com.reown.android.internal.common.model.type.EngineEvent + +class SDKError(val exception: Throwable) : EngineEvent \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/SessionProposer.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/SessionProposer.kt similarity index 82% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/SessionProposer.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/SessionProposer.kt index 58968e639..41202afce 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/SessionProposer.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/SessionProposer.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.model +package com.reown.android.internal.common.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/SymmetricKey.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/SymmetricKey.kt similarity index 68% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/SymmetricKey.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/SymmetricKey.kt index f7297dfd1..dddb03542 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/SymmetricKey.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/SymmetricKey.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.model +package com.reown.android.internal.common.model import com.reown.foundation.common.model.Key diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Tags.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/Tags.kt similarity index 96% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Tags.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/Tags.kt index b92bd67ee..55c569737 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Tags.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/Tags.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.model +package com.reown.android.internal.common.model enum class Tags(val id: Int) { UNSUPPORTED_METHOD(0), diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/TelemetryEnabled.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/TelemetryEnabled.kt similarity index 51% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/TelemetryEnabled.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/TelemetryEnabled.kt index 344463576..ce108d5a7 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/TelemetryEnabled.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/TelemetryEnabled.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.model +package com.reown.android.internal.common.model @JvmInline value class TelemetryEnabled(val value: Boolean) \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/model/TransportType.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/TransportType.kt new file mode 100644 index 000000000..a70451c1d --- /dev/null +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/TransportType.kt @@ -0,0 +1,6 @@ +package com.reown.android.internal.common.model + +enum class TransportType { + RELAY, + LINK_MODE +} \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Validation.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/Validation.kt similarity index 52% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Validation.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/Validation.kt index 25aeefc7b..1201fd63b 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Validation.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/Validation.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.model +package com.reown.android.internal.common.model enum class Validation { VALID, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/WCRequest.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/WCRequest.kt similarity index 75% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/WCRequest.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/WCRequest.kt index d085a4dcd..e451eca88 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/WCRequest.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/WCRequest.kt @@ -1,6 +1,6 @@ -package com.walletconnect.android.internal.common.model +package com.reown.android.internal.common.model -import com.walletconnect.android.internal.common.model.type.ClientParams +import com.reown.android.internal.common.model.type.ClientParams import com.reown.foundation.common.model.Topic import com.walletconnect.utils.Empty diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/model/WCResponse.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/WCResponse.kt new file mode 100644 index 000000000..34aa97096 --- /dev/null +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/WCResponse.kt @@ -0,0 +1,12 @@ +package com.reown.android.internal.common.model + +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.model.type.ClientParams +import com.reown.foundation.common.model.Topic + +data class WCResponse( + val topic: Topic, + val method: String, + val response: JsonRpcResponse, + val params: ClientParams, +) \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/WalletConnectUri.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/WalletConnectUri.kt similarity index 93% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/WalletConnectUri.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/WalletConnectUri.kt index 5e7156cef..53664a5d5 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/WalletConnectUri.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/WalletConnectUri.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.model +package com.reown.android.internal.common.model import com.reown.foundation.common.model.Topic diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/params/ChatNotifyResponseAuthParams.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/params/ChatNotifyResponseAuthParams.kt similarity index 75% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/params/ChatNotifyResponseAuthParams.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/params/ChatNotifyResponseAuthParams.kt index f953c8171..0855010de 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/params/ChatNotifyResponseAuthParams.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/params/ChatNotifyResponseAuthParams.kt @@ -1,8 +1,8 @@ -package com.walletconnect.android.internal.common.model.params +package com.reown.android.internal.common.model.params import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.android.internal.common.model.type.ClientParams +import com.reown.android.internal.common.model.type.ClientParams interface ChatNotifyResponseAuthParams { @JsonClass(generateAdapter = true) diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/params/CoreChatParams.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/params/CoreChatParams.kt similarity index 67% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/params/CoreChatParams.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/params/CoreChatParams.kt index ac91196b3..5dd77eef3 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/params/CoreChatParams.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/params/CoreChatParams.kt @@ -1,8 +1,8 @@ -package com.walletconnect.android.internal.common.model.params +package com.reown.android.internal.common.model.params import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.android.internal.common.model.type.ClientParams +import com.reown.android.internal.common.model.type.ClientParams sealed interface CoreChatParams : ClientParams { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/params/CoreNotifyParams.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/params/CoreNotifyParams.kt similarity index 90% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/params/CoreNotifyParams.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/params/CoreNotifyParams.kt index 79d251b23..d398ba472 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/params/CoreNotifyParams.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/params/CoreNotifyParams.kt @@ -1,10 +1,10 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.model.params +package com.reown.android.internal.common.model.params import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.android.internal.common.model.type.ClientParams +import com.reown.android.internal.common.model.type.ClientParams sealed interface CoreNotifyParams : ClientParams { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/params/CoreSignParams.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/params/CoreSignParams.kt similarity index 68% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/params/CoreSignParams.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/params/CoreSignParams.kt index ca951a95a..541d0d26f 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/params/CoreSignParams.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/params/CoreSignParams.kt @@ -1,11 +1,11 @@ -package com.walletconnect.android.internal.common.model.params +package com.reown.android.internal.common.model.params import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.android.internal.common.model.Participant -import com.walletconnect.android.internal.common.model.RelayProtocolOptions -import com.walletconnect.android.internal.common.model.type.ClientParams -import com.walletconnect.android.internal.common.signing.cacao.Cacao +import com.reown.android.internal.common.model.Participant +import com.reown.android.internal.common.model.RelayProtocolOptions +import com.reown.android.internal.common.model.type.ClientParams +import com.reown.android.internal.common.signing.cacao.Cacao open class CoreSignParams : ClientParams { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/sync/ClientJsonRpc.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/sync/ClientJsonRpc.kt similarity index 73% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/sync/ClientJsonRpc.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/sync/ClientJsonRpc.kt index 950919b02..5104e2aca 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/sync/ClientJsonRpc.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/sync/ClientJsonRpc.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.model.sync +package com.reown.android.internal.common.model.sync import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/model/type/ClientParams.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/type/ClientParams.kt new file mode 100644 index 000000000..3b7caa934 --- /dev/null +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/type/ClientParams.kt @@ -0,0 +1,3 @@ +package com.reown.android.internal.common.model.type + +interface ClientParams : SerializableJsonRpc \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/model/type/EngineEvent.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/type/EngineEvent.kt new file mode 100644 index 000000000..5ac871e7d --- /dev/null +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/type/EngineEvent.kt @@ -0,0 +1,3 @@ +package com.reown.android.internal.common.model.type + +interface EngineEvent \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/Error.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/type/Error.kt similarity index 50% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/Error.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/type/Error.kt index 73e921926..440f171b8 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/Error.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/type/Error.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.model.type +package com.reown.android.internal.common.model.type interface Error { val message: String diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/JsonRpcClientSync.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/type/JsonRpcClientSync.kt similarity index 71% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/JsonRpcClientSync.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/type/JsonRpcClientSync.kt index c4e4e80b9..5979a501c 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/JsonRpcClientSync.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/type/JsonRpcClientSync.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.model.type +package com.reown.android.internal.common.model.type interface JsonRpcClientSync : SerializableJsonRpc { val id: Long diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/model/type/JsonRpcInteractorInterface.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/type/JsonRpcInteractorInterface.kt new file mode 100644 index 000000000..61f127050 --- /dev/null +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/type/JsonRpcInteractorInterface.kt @@ -0,0 +1,12 @@ +package com.reown.android.internal.common.model.type + +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.model.WCRequest +import com.reown.android.internal.common.model.WCResponse +import kotlinx.coroutines.flow.SharedFlow + +interface JsonRpcInteractorInterface { + val clientSyncJsonRpc: SharedFlow + val peerResponse: SharedFlow + val internalErrors: SharedFlow +} \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/RelayJsonRpcInteractorInterface.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/type/RelayJsonRpcInteractorInterface.kt similarity index 85% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/RelayJsonRpcInteractorInterface.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/model/type/RelayJsonRpcInteractorInterface.kt index 3522c7171..4d4c0ad6b 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/RelayJsonRpcInteractorInterface.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/type/RelayJsonRpcInteractorInterface.kt @@ -1,11 +1,11 @@ -package com.walletconnect.android.internal.common.model.type +package com.reown.android.internal.common.model.type -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.model.EnvelopeType -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Participants -import com.walletconnect.android.internal.common.model.WCRequest -import com.walletconnect.android.relay.WSSConnectionState +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.model.EnvelopeType +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.Participants +import com.reown.android.internal.common.model.WCRequest +import com.reown.android.relay.WSSConnectionState import com.reown.foundation.common.model.Topic import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.StateFlow diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/model/type/Sequence.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/type/Sequence.kt new file mode 100644 index 000000000..7eb769a2d --- /dev/null +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/type/Sequence.kt @@ -0,0 +1,9 @@ +package com.reown.android.internal.common.model.type + +import com.reown.android.internal.common.model.Expiry +import com.reown.foundation.common.model.Topic + +interface Sequence { + val topic: Topic + val expiry: Expiry +} \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/model/type/SerializableJsonRpc.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/type/SerializableJsonRpc.kt new file mode 100644 index 000000000..8bbffb4c4 --- /dev/null +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/model/type/SerializableJsonRpc.kt @@ -0,0 +1,3 @@ +package com.reown.android.internal.common.model.type + +interface SerializableJsonRpc \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/cacao/Cacao.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/cacao/Cacao.kt similarity index 93% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/cacao/Cacao.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/signing/cacao/Cacao.kt index 6d0bd1069..b2cf5fa77 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/cacao/Cacao.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/cacao/Cacao.kt @@ -1,11 +1,11 @@ -package com.walletconnect.android.internal.common.signing.cacao +package com.reown.android.internal.common.signing.cacao import androidx.annotation.Keep import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.android.cacao.SignatureInterface -import com.walletconnect.android.internal.common.signing.cacao.Cacao.Payload.Companion.RECAPS_PREFIX -import com.walletconnect.android.internal.common.signing.signature.Signature +import com.reown.android.cacao.SignatureInterface +import com.reown.android.internal.common.signing.cacao.Cacao.Payload.Companion.RECAPS_PREFIX +import com.reown.android.internal.common.signing.signature.Signature @JsonClass(generateAdapter = true) data class Cacao( diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/cacao/CacaoType.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/cacao/CacaoType.kt similarity index 70% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/cacao/CacaoType.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/signing/cacao/CacaoType.kt index 0e11bf544..d9e72e64f 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/cacao/CacaoType.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/cacao/CacaoType.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.signing.cacao +package com.reown.android.internal.common.signing.cacao enum class CacaoType(val header: String) { EIP4361("eip4361"), diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/cacao/CacaoVerifier.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/cacao/CacaoVerifier.kt similarity index 74% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/cacao/CacaoVerifier.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/signing/cacao/CacaoVerifier.kt index fed197f50..6b4778e7e 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/cacao/CacaoVerifier.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/cacao/CacaoVerifier.kt @@ -1,8 +1,8 @@ -package com.walletconnect.android.internal.common.signing.cacao +package com.reown.android.internal.common.signing.cacao -import com.walletconnect.android.cacao.signature.SignatureType -import com.walletconnect.android.internal.common.model.ProjectId -import com.walletconnect.android.internal.common.signing.signature.verify +import com.reown.android.cacao.signature.SignatureType +import com.reown.android.internal.common.model.ProjectId +import com.reown.android.internal.common.signing.signature.verify import org.web3j.utils.Numeric class CacaoVerifier(private val projectId: ProjectId) { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/cacao/Issuer.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/cacao/Issuer.kt similarity index 92% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/cacao/Issuer.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/signing/cacao/Issuer.kt index 230fea701..e74a6abf1 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/cacao/Issuer.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/cacao/Issuer.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.signing.cacao +package com.reown.android.internal.common.signing.cacao data class Issuer(val value: String) { val chainId diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/cacao/Utils.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/cacao/Utils.kt similarity index 96% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/cacao/Utils.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/signing/cacao/Utils.kt index 7446a822e..b3f15f35a 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/cacao/Utils.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/cacao/Utils.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.internal.common.signing.cacao +package com.reown.android.internal.common.signing.cacao import android.util.Base64 -import com.walletconnect.android.internal.common.signing.cacao.Cacao.Payload.Companion.RECAPS_PREFIX +import com.reown.android.internal.common.signing.cacao.Cacao.Payload.Companion.RECAPS_PREFIX import com.walletconnect.utils.HexPrefix import org.json.JSONArray import org.json.JSONObject diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/eip1271/EIP1271Verifier.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/eip1271/EIP1271Verifier.kt similarity index 93% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/eip1271/EIP1271Verifier.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/signing/eip1271/EIP1271Verifier.kt index 6341cf6c9..787c6f559 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/eip1271/EIP1271Verifier.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/eip1271/EIP1271Verifier.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.internal.common.signing.eip1271 +package com.reown.android.internal.common.signing.eip1271 -import com.walletconnect.android.internal.common.signing.signature.Signature -import com.walletconnect.android.internal.common.signing.signature.toCacaoSignature +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 okhttp3.MediaType diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/eip191/EIP191Signer.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/eip191/EIP191Signer.kt similarity index 76% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/eip191/EIP191Signer.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/signing/eip191/EIP191Signer.kt index a0ce9f60d..b0171634e 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/eip191/EIP191Signer.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/eip191/EIP191Signer.kt @@ -1,8 +1,8 @@ -package com.walletconnect.android.internal.common.signing.eip191 +package com.reown.android.internal.common.signing.eip191 -import com.walletconnect.android.internal.common.signing.model.HexString -import com.walletconnect.android.internal.common.signing.signature.Signature -import com.walletconnect.android.internal.common.signing.signature.toSignature +import com.reown.android.internal.common.signing.model.HexString +import com.reown.android.internal.common.signing.signature.Signature +import com.reown.android.internal.common.signing.signature.toSignature import org.web3j.crypto.ECKeyPair import org.web3j.crypto.Sign import org.web3j.utils.Numeric.hexStringToByteArray diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/eip191/EIP191Verifier.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/eip191/EIP191Verifier.kt similarity index 86% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/eip191/EIP191Verifier.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/signing/eip191/EIP191Verifier.kt index ab0e010df..3a1c5d02c 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/eip191/EIP191Verifier.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/eip191/EIP191Verifier.kt @@ -1,8 +1,8 @@ -package com.walletconnect.android.internal.common.signing.eip191 +package com.reown.android.internal.common.signing.eip191 -import com.walletconnect.android.internal.common.signing.cacao.guaranteeNoHexPrefix -import com.walletconnect.android.internal.common.signing.signature.Signature -import com.walletconnect.android.internal.common.signing.signature.toSignatureData +import com.reown.android.internal.common.signing.cacao.guaranteeNoHexPrefix +import com.reown.android.internal.common.signing.signature.Signature +import com.reown.android.internal.common.signing.signature.toSignatureData import org.web3j.crypto.Keys import org.web3j.crypto.Sign import org.web3j.utils.Numeric.hexStringToByteArray diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/signing/message/MessageSignatureVerifier.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/message/MessageSignatureVerifier.kt new file mode 100644 index 000000000..dbe91e17d --- /dev/null +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/message/MessageSignatureVerifier.kt @@ -0,0 +1,12 @@ +package com.reown.android.internal.common.signing.message + +import com.reown.android.cacao.signature.SignatureType +import com.reown.android.internal.common.model.ProjectId +import com.reown.android.internal.common.signing.signature.Signature +import com.reown.android.internal.common.signing.signature.verify + + +class MessageSignatureVerifier(private val projectId: ProjectId) { + fun verify(signature: String, originalMessage: String, address: String, type: SignatureType): Boolean = + Signature.fromString(signature).verify(originalMessage, address, type.header, projectId) +} \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/signing/model/HexString.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/model/HexString.kt new file mode 100644 index 000000000..97a51c631 --- /dev/null +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/model/HexString.kt @@ -0,0 +1,4 @@ +package com.reown.android.internal.common.signing.model + +@JvmInline +value class HexString(val value: String) \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/signature/Signature.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/signature/Signature.kt similarity index 84% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/signature/Signature.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/signing/signature/Signature.kt index b408b3dd8..de7100890 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/signature/Signature.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/signature/Signature.kt @@ -1,12 +1,12 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.signing.signature +package com.reown.android.internal.common.signing.signature -import com.walletconnect.android.cacao.signature.SignatureType -import com.walletconnect.android.internal.common.model.ProjectId -import com.walletconnect.android.internal.common.signing.cacao.guaranteeNoHexPrefix -import com.walletconnect.android.internal.common.signing.eip1271.EIP1271Verifier -import com.walletconnect.android.internal.common.signing.eip191.EIP191Verifier +import com.reown.android.cacao.signature.SignatureType +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 diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/signature/SignatureInterface.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/signature/SignatureInterface.kt similarity index 76% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/signature/SignatureInterface.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/signing/signature/SignatureInterface.kt index af19cdcc8..2170a1f24 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/signature/SignatureInterface.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/signature/SignatureInterface.kt @@ -1,6 +1,6 @@ @file:Suppress("PackageDirectoryMismatch") -package com.walletconnect.android.cacao +package com.reown.android.cacao interface SignatureInterface { val t: String diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/signature/SignatureType.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/signature/SignatureType.kt similarity index 93% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/signature/SignatureType.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/signing/signature/SignatureType.kt index f86ed1d1c..37fb685df 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/signature/SignatureType.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/signature/SignatureType.kt @@ -1,5 +1,5 @@ @file:Suppress("PackageDirectoryMismatch") -package com.walletconnect.android.cacao.signature +package com.reown.android.cacao.signature // Note: Szymon - Only added to have backwards compatibility. This ties SignatureTypes from android-core to sdks specific implementations. When we decide to remove deprecated sdk specific diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/events/EventsRepository.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/events/EventsRepository.kt similarity index 86% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/events/EventsRepository.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/storage/events/EventsRepository.kt index 6d824430f..b48c9ffe8 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/events/EventsRepository.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/events/EventsRepository.kt @@ -1,13 +1,13 @@ -package com.walletconnect.android.internal.common.storage.events +package com.reown.android.internal.common.storage.events import android.database.sqlite.SQLiteException import app.cash.sqldelight.async.coroutines.awaitAsList -import com.walletconnect.android.internal.common.model.TelemetryEnabled -import com.walletconnect.android.pulse.model.Event -import com.walletconnect.android.pulse.model.properties.Properties -import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.android.sdk.storage.data.dao.EventDao -import com.walletconnect.android.sdk.storage.data.dao.EventQueries +import com.reown.android.internal.common.model.TelemetryEnabled +import com.reown.android.pulse.model.Event +import com.reown.android.pulse.model.properties.Properties +import com.reown.android.pulse.model.properties.Props +import com.reown.android.sdk.storage.data.dao.EventDao +import com.reown.android.sdk.storage.data.dao.EventQueries import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/identity/IdentitiesStorageRepository.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/identity/IdentitiesStorageRepository.kt similarity index 78% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/identity/IdentitiesStorageRepository.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/storage/identity/IdentitiesStorageRepository.kt index 27aa81e34..e0dde327d 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/identity/IdentitiesStorageRepository.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/identity/IdentitiesStorageRepository.kt @@ -1,9 +1,9 @@ -package com.walletconnect.android.internal.common.storage.identity +package com.reown.android.internal.common.storage.identity import com.squareup.moshi.Moshi -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.signing.cacao.Cacao -import com.walletconnect.android.sdk.storage.data.dao.IdentitiesQueries +import com.reown.android.internal.common.model.AccountId +import com.reown.android.internal.common.signing.cacao.Cacao +import com.reown.android.sdk.storage.data.dao.IdentitiesQueries class IdentitiesStorageRepository(private val identities: IdentitiesQueries, moshiBuilder: Moshi.Builder) { private val moshi = moshiBuilder.build() diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/key_chain/KeyChain.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/key_chain/KeyChain.kt similarity index 96% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/key_chain/KeyChain.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/storage/key_chain/KeyChain.kt index b1b75c655..9e5574e4f 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/key_chain/KeyChain.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/key_chain/KeyChain.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.storage.key_chain +package com.reown.android.internal.common.storage.key_chain import android.content.SharedPreferences import com.reown.foundation.common.model.Key diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/key_chain/KeyStore.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/key_chain/KeyStore.kt similarity index 83% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/key_chain/KeyStore.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/storage/key_chain/KeyStore.kt index cc6a0979e..ddc56a9d7 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/key_chain/KeyStore.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/key_chain/KeyStore.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.storage.key_chain +package com.reown.android.internal.common.storage.key_chain import com.reown.foundation.common.model.Key diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/metadata/MetadataStorageRepository.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/metadata/MetadataStorageRepository.kt similarity index 87% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/metadata/MetadataStorageRepository.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/storage/metadata/MetadataStorageRepository.kt index 845953e86..56b8de819 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/metadata/MetadataStorageRepository.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/metadata/MetadataStorageRepository.kt @@ -1,12 +1,12 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.storage.metadata +package com.reown.android.internal.common.storage.metadata import android.database.sqlite.SQLiteException -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.model.Redirect -import com.walletconnect.android.sdk.storage.data.dao.MetaDataQueries +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.model.Redirect +import com.reown.android.sdk.storage.data.dao.MetaDataQueries import com.reown.foundation.common.model.Topic internal class MetadataStorageRepository(private val metaDataQueries: MetaDataQueries) : MetadataStorageRepositoryInterface { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/metadata/MetadataStorageRepositoryInterface.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/metadata/MetadataStorageRepositoryInterface.kt similarity index 76% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/metadata/MetadataStorageRepositoryInterface.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/storage/metadata/MetadataStorageRepositoryInterface.kt index d1628353f..1c1ab8277 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/metadata/MetadataStorageRepositoryInterface.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/metadata/MetadataStorageRepositoryInterface.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.internal.common.storage.metadata +package com.reown.android.internal.common.storage.metadata -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.AppMetaDataType import com.reown.foundation.common.model.Topic interface MetadataStorageRepositoryInterface { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/pairing/PairingStorageRepository.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/pairing/PairingStorageRepository.kt similarity index 88% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/pairing/PairingStorageRepository.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/storage/pairing/PairingStorageRepository.kt index 6d196be7f..1c082ea6d 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/pairing/PairingStorageRepository.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/pairing/PairingStorageRepository.kt @@ -1,12 +1,12 @@ -package com.walletconnect.android.internal.common.storage.pairing +package com.reown.android.internal.common.storage.pairing import android.database.sqlite.SQLiteException import app.cash.sqldelight.async.coroutines.awaitAsList -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.Pairing -import com.walletconnect.android.internal.common.model.Redirect -import com.walletconnect.android.sdk.storage.data.dao.PairingQueries +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.Expiry +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 diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/pairing/PairingStorageRepositoryInterface.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/pairing/PairingStorageRepositoryInterface.kt similarity index 72% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/pairing/PairingStorageRepositoryInterface.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/storage/pairing/PairingStorageRepositoryInterface.kt index 2842249f0..2f2039b25 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/pairing/PairingStorageRepositoryInterface.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/pairing/PairingStorageRepositoryInterface.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.internal.common.storage.pairing +package com.reown.android.internal.common.storage.pairing -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.Pairing +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.Pairing import com.reown.foundation.common.model.Topic interface PairingStorageRepositoryInterface { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/push_messages/PushMessagesRepository.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/push_messages/PushMessagesRepository.kt similarity index 87% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/push_messages/PushMessagesRepository.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/storage/push_messages/PushMessagesRepository.kt index 1add21d79..b946747c1 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/push_messages/PushMessagesRepository.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/push_messages/PushMessagesRepository.kt @@ -1,10 +1,10 @@ @file:JvmSynthetic -package com.walletconnect.android.internal.common.storage.push_messages +package com.reown.android.internal.common.storage.push_messages import android.database.sqlite.SQLiteException -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.sdk.storage.data.dao.PushMessageQueries +import com.reown.android.internal.common.model.Tags +import com.reown.android.sdk.storage.data.dao.PushMessageQueries import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/rpc/JsonRpcHistory.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/rpc/JsonRpcHistory.kt similarity index 91% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/rpc/JsonRpcHistory.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/storage/rpc/JsonRpcHistory.kt index f297ff2e4..85f286a19 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/rpc/JsonRpcHistory.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/rpc/JsonRpcHistory.kt @@ -1,8 +1,8 @@ -package com.walletconnect.android.internal.common.storage.rpc +package com.reown.android.internal.common.storage.rpc -import com.walletconnect.android.internal.common.json_rpc.model.JsonRpcHistoryRecord -import com.walletconnect.android.internal.common.model.TransportType -import com.walletconnect.android.sdk.storage.data.dao.JsonRpcHistoryQueries +import com.reown.android.internal.common.json_rpc.model.JsonRpcHistoryRecord +import com.reown.android.internal.common.model.TransportType +import com.reown.android.sdk.storage.data.dao.JsonRpcHistoryQueries import com.reown.foundation.common.model.Topic import com.reown.foundation.util.Logger diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/verify/VerifyContextStorageRepository.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/verify/VerifyContextStorageRepository.kt similarity index 80% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/verify/VerifyContextStorageRepository.kt rename to core/android/src/main/kotlin/com/reown/android/internal/common/storage/verify/VerifyContextStorageRepository.kt index 279d66daf..5d7709d92 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/storage/verify/VerifyContextStorageRepository.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/verify/VerifyContextStorageRepository.kt @@ -1,9 +1,9 @@ -package com.walletconnect.android.internal.common.storage.verify +package com.reown.android.internal.common.storage.verify import android.database.sqlite.SQLiteException -import com.walletconnect.android.internal.common.model.Validation -import com.walletconnect.android.sdk.storage.data.dao.VerifyContextQueries -import com.walletconnect.android.verify.model.VerifyContext +import com.reown.android.internal.common.model.Validation +import com.reown.android.sdk.storage.data.dao.VerifyContextQueries +import com.reown.android.verify.model.VerifyContext class VerifyContextStorageRepository(private val verifyContextQueries: VerifyContextQueries) { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/utils/Context.kt b/core/android/src/main/kotlin/com/reown/android/internal/utils/Context.kt similarity index 86% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/utils/Context.kt rename to core/android/src/main/kotlin/com/reown/android/internal/utils/Context.kt index fe2e61253..905d69c56 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/utils/Context.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/utils/Context.kt @@ -1,6 +1,6 @@ -package com.walletconnect.android.internal.utils +package com.reown.android.internal.utils -import com.walletconnect.android.internal.common.model.AccountId +import com.reown.android.internal.common.model.AccountId import com.reown.foundation.common.model.Topic private const val SELF_PARTICIPANT_CONTEXT = "self_participant/" diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/utils/CoreValidator.kt b/core/android/src/main/kotlin/com/reown/android/internal/utils/CoreValidator.kt similarity index 94% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/utils/CoreValidator.kt rename to core/android/src/main/kotlin/com/reown/android/internal/utils/CoreValidator.kt index 1e5360ace..3b0775c97 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/utils/CoreValidator.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/utils/CoreValidator.kt @@ -1,6 +1,6 @@ -package com.walletconnect.android.internal.utils +package com.reown.android.internal.utils -import com.walletconnect.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.Expiry object CoreValidator { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/utils/Expiration.kt b/core/android/src/main/kotlin/com/reown/android/internal/utils/Expiration.kt similarity index 78% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/utils/Expiration.kt rename to core/android/src/main/kotlin/com/reown/android/internal/utils/Expiration.kt index 0933f9e52..b1acf97e2 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/utils/Expiration.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/utils/Expiration.kt @@ -1,6 +1,6 @@ @file:JvmName("Expiration") -package com.walletconnect.android.internal.utils +package com.reown.android.internal.utils val PROPOSAL_EXPIRY: Long get() = currentTimeInSeconds + fiveMinutesInSeconds val ACTIVE_SESSION: Long get() = currentTimeInSeconds + weekInSeconds \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/utils/ObservableMap.kt b/core/android/src/main/kotlin/com/reown/android/internal/utils/ObservableMap.kt similarity index 90% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/utils/ObservableMap.kt rename to core/android/src/main/kotlin/com/reown/android/internal/utils/ObservableMap.kt index c492a723c..5322c15b0 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/utils/ObservableMap.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/utils/ObservableMap.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.utils +package com.reown.android.internal.utils class ObservableMap( private val map: MutableMap = mutableMapOf(), diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/utils/Time.kt b/core/android/src/main/kotlin/com/reown/android/internal/utils/Time.kt similarity index 92% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/utils/Time.kt rename to core/android/src/main/kotlin/com/reown/android/internal/utils/Time.kt index 95f9cdc10..c3138e7b9 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/utils/Time.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/utils/Time.kt @@ -1,6 +1,6 @@ @file:JvmName("Time") -package com.walletconnect.android.internal.utils +package com.reown.android.internal.utils import java.util.concurrent.TimeUnit diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/utils/UtilFunctions.kt b/core/android/src/main/kotlin/com/reown/android/internal/utils/UtilFunctions.kt similarity index 90% rename from core/android/src/main/kotlin/com/walletconnect/android/internal/utils/UtilFunctions.kt rename to core/android/src/main/kotlin/com/reown/android/internal/utils/UtilFunctions.kt index 38e2029a2..ff956bf36 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/utils/UtilFunctions.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/utils/UtilFunctions.kt @@ -4,9 +4,9 @@ package com.walletconnect.utils import com.squareup.moshi.JsonAdapter import com.squareup.moshi.Moshi -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.type.SerializableJsonRpc -import com.walletconnect.android.internal.utils.currentTimeInSeconds +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.type.SerializableJsonRpc +import com.reown.android.internal.utils.currentTimeInSeconds import org.koin.core.definition.KoinDefinition import org.koin.core.module.Module import org.koin.core.qualifier.named diff --git a/core/android/src/main/kotlin/com/walletconnect/android/keyserver/data/service/KeyServerService.kt b/core/android/src/main/kotlin/com/reown/android/keyserver/data/service/KeyServerService.kt similarity index 86% rename from core/android/src/main/kotlin/com/walletconnect/android/keyserver/data/service/KeyServerService.kt rename to core/android/src/main/kotlin/com/reown/android/keyserver/data/service/KeyServerService.kt index d9404e9a8..522f6f0fa 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/keyserver/data/service/KeyServerService.kt +++ b/core/android/src/main/kotlin/com/reown/android/keyserver/data/service/KeyServerService.kt @@ -1,10 +1,10 @@ @file:JvmSynthetic -package com.walletconnect.android.keyserver.data.service +package com.reown.android.keyserver.data.service -import com.walletconnect.android.keyserver.model.KeyServerBody -import com.walletconnect.android.keyserver.model.KeyServerHttpResponse +import com.reown.android.keyserver.model.KeyServerBody +import com.reown.android.keyserver.model.KeyServerHttpResponse import retrofit2.Response import retrofit2.http.* diff --git a/core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/IdentitiesInteractor.kt b/core/android/src/main/kotlin/com/reown/android/keyserver/domain/IdentitiesInteractor.kt similarity index 82% rename from core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/IdentitiesInteractor.kt rename to core/android/src/main/kotlin/com/reown/android/keyserver/domain/IdentitiesInteractor.kt index 287a84abf..191ba1d36 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/IdentitiesInteractor.kt +++ b/core/android/src/main/kotlin/com/reown/android/keyserver/domain/IdentitiesInteractor.kt @@ -1,30 +1,30 @@ -package com.walletconnect.android.keyserver.domain - -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.exception.AccountHasDifferentStatementStored -import com.walletconnect.android.internal.common.exception.AccountHasNoCacaoPayloadStored -import com.walletconnect.android.internal.common.exception.AccountHasNoIdentityStored -import com.walletconnect.android.internal.common.exception.InvalidAccountIdException -import com.walletconnect.android.internal.common.exception.InvalidIdentityCacao -import com.walletconnect.android.internal.common.exception.UserRejectedSigning -import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase -import com.walletconnect.android.internal.common.jwt.did.EncodeIdentityKeyDidJwtPayloadUseCase -import com.walletconnect.android.internal.common.jwt.did.encodeDidJwt -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.model.DidJwt -import com.walletconnect.android.internal.common.model.MissingKeyException -import com.walletconnect.android.internal.common.model.ProjectId -import com.walletconnect.android.internal.common.signing.cacao.Cacao -import com.walletconnect.android.internal.common.signing.cacao.CacaoType -import com.walletconnect.android.internal.common.signing.cacao.CacaoVerifier -import com.walletconnect.android.internal.common.signing.cacao.Issuer -import com.walletconnect.android.internal.common.signing.cacao.getStatement -import com.walletconnect.android.internal.common.signing.cacao.toCAIP222Message -import com.walletconnect.android.internal.common.storage.identity.IdentitiesStorageRepository -import com.walletconnect.android.internal.utils.getIdentityTag -import com.walletconnect.android.keyserver.domain.use_case.RegisterIdentityUseCase -import com.walletconnect.android.keyserver.domain.use_case.ResolveIdentityUseCase -import com.walletconnect.android.keyserver.domain.use_case.UnregisterIdentityUseCase +package com.reown.android.keyserver.domain + +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.exception.AccountHasDifferentStatementStored +import com.reown.android.internal.common.exception.AccountHasNoCacaoPayloadStored +import com.reown.android.internal.common.exception.AccountHasNoIdentityStored +import com.reown.android.internal.common.exception.InvalidAccountIdException +import com.reown.android.internal.common.exception.InvalidIdentityCacao +import com.reown.android.internal.common.exception.UserRejectedSigning +import com.reown.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase +import com.reown.android.internal.common.jwt.did.EncodeIdentityKeyDidJwtPayloadUseCase +import com.reown.android.internal.common.jwt.did.encodeDidJwt +import com.reown.android.internal.common.model.AccountId +import com.reown.android.internal.common.model.DidJwt +import com.reown.android.internal.common.model.MissingKeyException +import com.reown.android.internal.common.model.ProjectId +import com.reown.android.internal.common.signing.cacao.Cacao +import com.reown.android.internal.common.signing.cacao.CacaoType +import com.reown.android.internal.common.signing.cacao.CacaoVerifier +import com.reown.android.internal.common.signing.cacao.Issuer +import com.reown.android.internal.common.signing.cacao.getStatement +import com.reown.android.internal.common.signing.cacao.toCAIP222Message +import com.reown.android.internal.common.storage.identity.IdentitiesStorageRepository +import com.reown.android.internal.utils.getIdentityTag +import com.reown.android.keyserver.domain.use_case.RegisterIdentityUseCase +import com.reown.android.keyserver.domain.use_case.ResolveIdentityUseCase +import com.reown.android.keyserver.domain.use_case.UnregisterIdentityUseCase import com.reown.foundation.common.model.PrivateKey import com.reown.foundation.common.model.PublicKey import com.reown.foundation.util.Logger diff --git a/core/android/src/main/kotlin/com/reown/android/keyserver/domain/use_case/RegisterIdentityUseCase.kt b/core/android/src/main/kotlin/com/reown/android/keyserver/domain/use_case/RegisterIdentityUseCase.kt new file mode 100644 index 000000000..6c0daaaf8 --- /dev/null +++ b/core/android/src/main/kotlin/com/reown/android/keyserver/domain/use_case/RegisterIdentityUseCase.kt @@ -0,0 +1,13 @@ +package com.reown.android.keyserver.domain.use_case + +import com.reown.android.internal.common.signing.cacao.Cacao +import com.reown.android.keyserver.data.service.KeyServerService +import com.reown.android.keyserver.model.KeyServerBody + +class RegisterIdentityUseCase( + private val service: KeyServerService, +) { + suspend operator fun invoke(cacao: Cacao): Result = runCatching { + service.registerIdentity(KeyServerBody.RegisterIdentity(cacao)).unwrapUnit() + } +} \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/use_case/RegisterInviteUseCase.kt b/core/android/src/main/kotlin/com/reown/android/keyserver/domain/use_case/RegisterInviteUseCase.kt similarity index 55% rename from core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/use_case/RegisterInviteUseCase.kt rename to core/android/src/main/kotlin/com/reown/android/keyserver/domain/use_case/RegisterInviteUseCase.kt index 5437f43aa..945167670 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/use_case/RegisterInviteUseCase.kt +++ b/core/android/src/main/kotlin/com/reown/android/keyserver/domain/use_case/RegisterInviteUseCase.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.keyserver.domain.use_case +package com.reown.android.keyserver.domain.use_case -import com.walletconnect.android.keyserver.data.service.KeyServerService -import com.walletconnect.android.keyserver.model.KeyServerBody +import com.reown.android.keyserver.data.service.KeyServerService +import com.reown.android.keyserver.model.KeyServerBody class RegisterInviteUseCase( private val service: KeyServerService, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/use_case/ResolveIdentityUseCase.kt b/core/android/src/main/kotlin/com/reown/android/keyserver/domain/use_case/ResolveIdentityUseCase.kt similarity index 56% rename from core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/use_case/ResolveIdentityUseCase.kt rename to core/android/src/main/kotlin/com/reown/android/keyserver/domain/use_case/ResolveIdentityUseCase.kt index 9a9f69a0c..eed67fba1 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/use_case/ResolveIdentityUseCase.kt +++ b/core/android/src/main/kotlin/com/reown/android/keyserver/domain/use_case/ResolveIdentityUseCase.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.keyserver.domain.use_case +package com.reown.android.keyserver.domain.use_case -import com.walletconnect.android.keyserver.data.service.KeyServerService -import com.walletconnect.android.keyserver.model.KeyServerResponse +import com.reown.android.keyserver.data.service.KeyServerService +import com.reown.android.keyserver.model.KeyServerResponse class ResolveIdentityUseCase( private val service: KeyServerService, diff --git a/core/android/src/main/kotlin/com/reown/android/keyserver/domain/use_case/ResolveInviteUseCase.kt b/core/android/src/main/kotlin/com/reown/android/keyserver/domain/use_case/ResolveInviteUseCase.kt new file mode 100644 index 000000000..e377f8bc7 --- /dev/null +++ b/core/android/src/main/kotlin/com/reown/android/keyserver/domain/use_case/ResolveInviteUseCase.kt @@ -0,0 +1,13 @@ +package com.reown.android.keyserver.domain.use_case + +import com.reown.android.internal.common.model.AccountId +import com.reown.android.keyserver.data.service.KeyServerService +import com.reown.android.keyserver.model.KeyServerResponse + +class ResolveInviteUseCase( + private val service: KeyServerService +) { + suspend operator fun invoke(accountId: AccountId): Result = runCatching { + service.resolveInvite(accountId.value).unwrapValue() + } +} \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/use_case/UnregisterIdentityUseCase.kt b/core/android/src/main/kotlin/com/reown/android/keyserver/domain/use_case/UnregisterIdentityUseCase.kt similarity index 56% rename from core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/use_case/UnregisterIdentityUseCase.kt rename to core/android/src/main/kotlin/com/reown/android/keyserver/domain/use_case/UnregisterIdentityUseCase.kt index 4e6b81dda..a02e34ce9 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/use_case/UnregisterIdentityUseCase.kt +++ b/core/android/src/main/kotlin/com/reown/android/keyserver/domain/use_case/UnregisterIdentityUseCase.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.keyserver.domain.use_case +package com.reown.android.keyserver.domain.use_case -import com.walletconnect.android.keyserver.data.service.KeyServerService -import com.walletconnect.android.keyserver.model.KeyServerBody +import com.reown.android.keyserver.data.service.KeyServerService +import com.reown.android.keyserver.model.KeyServerBody class UnregisterIdentityUseCase( private val service: KeyServerService, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/use_case/UnregisterInviteUseCase.kt b/core/android/src/main/kotlin/com/reown/android/keyserver/domain/use_case/UnregisterInviteUseCase.kt similarity index 56% rename from core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/use_case/UnregisterInviteUseCase.kt rename to core/android/src/main/kotlin/com/reown/android/keyserver/domain/use_case/UnregisterInviteUseCase.kt index d8a50b7bc..c8a264d9b 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/use_case/UnregisterInviteUseCase.kt +++ b/core/android/src/main/kotlin/com/reown/android/keyserver/domain/use_case/UnregisterInviteUseCase.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.keyserver.domain.use_case +package com.reown.android.keyserver.domain.use_case -import com.walletconnect.android.keyserver.data.service.KeyServerService -import com.walletconnect.android.keyserver.model.KeyServerBody +import com.reown.android.keyserver.data.service.KeyServerService +import com.reown.android.keyserver.model.KeyServerBody class UnregisterInviteUseCase( private val service: KeyServerService, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/use_case/Utils.kt b/core/android/src/main/kotlin/com/reown/android/keyserver/domain/use_case/Utils.kt similarity index 75% rename from core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/use_case/Utils.kt rename to core/android/src/main/kotlin/com/reown/android/keyserver/domain/use_case/Utils.kt index cc7f4cc51..e0b4715ce 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/use_case/Utils.kt +++ b/core/android/src/main/kotlin/com/reown/android/keyserver/domain/use_case/Utils.kt @@ -1,8 +1,8 @@ -package com.walletconnect.android.keyserver.domain.use_case +package com.reown.android.keyserver.domain.use_case -import com.walletconnect.android.keyserver.model.KeyServerHttpResponse -import com.walletconnect.android.keyserver.model.KeyServerHttpResponse.Companion.SUCCESS_STATUS -import com.walletconnect.android.keyserver.model.KeyServerResponse +import com.reown.android.keyserver.model.KeyServerHttpResponse +import com.reown.android.keyserver.model.KeyServerHttpResponse.Companion.SUCCESS_STATUS +import com.reown.android.keyserver.model.KeyServerResponse import retrofit2.Response @JvmSynthetic diff --git a/core/android/src/main/kotlin/com/walletconnect/android/keyserver/model/KeyServerBody.kt b/core/android/src/main/kotlin/com/reown/android/keyserver/model/KeyServerBody.kt similarity index 80% rename from core/android/src/main/kotlin/com/walletconnect/android/keyserver/model/KeyServerBody.kt rename to core/android/src/main/kotlin/com/reown/android/keyserver/model/KeyServerBody.kt index 9fe149557..0e8083ff9 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/keyserver/model/KeyServerBody.kt +++ b/core/android/src/main/kotlin/com/reown/android/keyserver/model/KeyServerBody.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.keyserver.model +package com.reown.android.keyserver.model import com.squareup.moshi.JsonClass -import com.walletconnect.android.internal.common.signing.cacao.Cacao +import com.reown.android.internal.common.signing.cacao.Cacao sealed class KeyServerBody { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/keyserver/model/KeyServerHttpResponse.kt b/core/android/src/main/kotlin/com/reown/android/keyserver/model/KeyServerHttpResponse.kt similarity index 97% rename from core/android/src/main/kotlin/com/walletconnect/android/keyserver/model/KeyServerHttpResponse.kt rename to core/android/src/main/kotlin/com/reown/android/keyserver/model/KeyServerHttpResponse.kt index 140a5006e..32c0e2ef7 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/keyserver/model/KeyServerHttpResponse.kt +++ b/core/android/src/main/kotlin/com/reown/android/keyserver/model/KeyServerHttpResponse.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.keyserver.model +package com.reown.android.keyserver.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/keyserver/model/KeyServerResponse.kt b/core/android/src/main/kotlin/com/reown/android/keyserver/model/KeyServerResponse.kt similarity index 71% rename from core/android/src/main/kotlin/com/walletconnect/android/keyserver/model/KeyServerResponse.kt rename to core/android/src/main/kotlin/com/reown/android/keyserver/model/KeyServerResponse.kt index a61825dca..7a0eabcd3 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/keyserver/model/KeyServerResponse.kt +++ b/core/android/src/main/kotlin/com/reown/android/keyserver/model/KeyServerResponse.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.keyserver.model +package com.reown.android.keyserver.model import com.squareup.moshi.JsonClass -import com.walletconnect.android.internal.common.signing.cacao.Cacao +import com.reown.android.internal.common.signing.cacao.Cacao sealed class KeyServerResponse { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingInterface.kt b/core/android/src/main/kotlin/com/reown/android/pairing/client/PairingInterface.kt similarity index 96% rename from core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingInterface.kt rename to core/android/src/main/kotlin/com/reown/android/pairing/client/PairingInterface.kt index e56a86deb..65c89e80f 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingInterface.kt +++ b/core/android/src/main/kotlin/com/reown/android/pairing/client/PairingInterface.kt @@ -1,6 +1,6 @@ -package com.walletconnect.android.pairing.client +package com.reown.android.pairing.client -import com.walletconnect.android.Core +import com.reown.android.Core interface PairingInterface { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingProtocol.kt b/core/android/src/main/kotlin/com/reown/android/pairing/client/PairingProtocol.kt similarity index 89% rename from core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingProtocol.kt rename to core/android/src/main/kotlin/com/reown/android/pairing/client/PairingProtocol.kt index 0a11a648f..1a9deebec 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pairing/client/PairingProtocol.kt +++ b/core/android/src/main/kotlin/com/reown/android/pairing/client/PairingProtocol.kt @@ -1,16 +1,16 @@ @file:JvmSynthetic -package com.walletconnect.android.pairing.client - -import com.walletconnect.android.Core -import com.walletconnect.android.internal.Validator -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.android.pairing.engine.domain.PairingEngine -import com.walletconnect.android.pairing.engine.model.EngineDO -import com.walletconnect.android.pairing.model.mapper.toCore -import com.walletconnect.android.pulse.domain.InsertTelemetryEventUseCase -import com.walletconnect.android.relay.RelayConnectionInterface +package com.reown.android.pairing.client + +import com.reown.android.Core +import com.reown.android.internal.Validator +import com.reown.android.internal.common.scope +import com.reown.android.internal.common.wcKoinApp +import com.reown.android.pairing.engine.domain.PairingEngine +import com.reown.android.pairing.engine.model.EngineDO +import com.reown.android.pairing.model.mapper.toCore +import com.reown.android.pulse.domain.InsertTelemetryEventUseCase +import com.reown.android.relay.RelayConnectionInterface import com.reown.foundation.util.Logger import kotlinx.coroutines.flow.* import org.koin.core.KoinApplication diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pairing/engine/domain/PairingEngine.kt b/core/android/src/main/kotlin/com/reown/android/pairing/engine/domain/PairingEngine.kt similarity index 86% rename from core/android/src/main/kotlin/com/walletconnect/android/pairing/engine/domain/PairingEngine.kt rename to core/android/src/main/kotlin/com/reown/android/pairing/engine/domain/PairingEngine.kt index 0e21f67e4..380061733 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pairing/engine/domain/PairingEngine.kt +++ b/core/android/src/main/kotlin/com/reown/android/pairing/engine/domain/PairingEngine.kt @@ -1,51 +1,51 @@ -package com.walletconnect.android.pairing.engine.domain - -import com.walletconnect.android.Core -import com.walletconnect.android.internal.MALFORMED_PAIRING_URI_MESSAGE -import com.walletconnect.android.internal.NO_SEQUENCE_FOR_TOPIC_MESSAGE -import com.walletconnect.android.internal.Validator -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.exception.CannotFindSequenceForTopic -import com.walletconnect.android.internal.common.exception.ExpiredPairingException -import com.walletconnect.android.internal.common.exception.ExpiredPairingURIException -import com.walletconnect.android.internal.common.exception.Invalid -import com.walletconnect.android.internal.common.exception.MalformedWalletConnectUri -import com.walletconnect.android.internal.common.exception.NoInternetConnectionException -import com.walletconnect.android.internal.common.exception.NoRelayConnectionException -import com.walletconnect.android.internal.common.exception.Uncategorized -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Pairing -import com.walletconnect.android.internal.common.model.RelayProtocolOptions -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.SymmetricKey -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.WCRequest -import com.walletconnect.android.internal.common.model.WalletConnectUri -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.android.internal.common.storage.pairing.PairingStorageRepositoryInterface -import com.walletconnect.android.internal.utils.CoreValidator.isExpired -import com.walletconnect.android.internal.utils.currentTimeInSeconds -import com.walletconnect.android.internal.utils.dayInSeconds -import com.walletconnect.android.internal.utils.thirtySeconds -import com.walletconnect.android.pairing.engine.model.EngineDO -import com.walletconnect.android.pairing.model.PairingJsonRpcMethod -import com.walletconnect.android.pairing.model.PairingParams -import com.walletconnect.android.pairing.model.PairingRpc -import com.walletconnect.android.pairing.model.mapper.toCore -import com.walletconnect.android.pairing.model.pairingExpiry -import com.walletconnect.android.pulse.domain.InsertEventUseCase -import com.walletconnect.android.pulse.domain.InsertTelemetryEventUseCase -import com.walletconnect.android.pulse.domain.SendBatchEventUseCase -import com.walletconnect.android.pulse.model.EventType -import com.walletconnect.android.pulse.model.Trace -import com.walletconnect.android.pulse.model.properties.Properties -import com.walletconnect.android.pulse.model.properties.Props +package com.reown.android.pairing.engine.domain + +import com.reown.android.Core +import com.reown.android.internal.MALFORMED_PAIRING_URI_MESSAGE +import com.reown.android.internal.NO_SEQUENCE_FOR_TOPIC_MESSAGE +import com.reown.android.internal.Validator +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.exception.CannotFindSequenceForTopic +import com.reown.android.internal.common.exception.ExpiredPairingException +import com.reown.android.internal.common.exception.ExpiredPairingURIException +import com.reown.android.internal.common.exception.Invalid +import com.reown.android.internal.common.exception.MalformedWalletConnectUri +import com.reown.android.internal.common.exception.NoInternetConnectionException +import com.reown.android.internal.common.exception.NoRelayConnectionException +import com.reown.android.internal.common.exception.Uncategorized +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.Pairing +import com.reown.android.internal.common.model.RelayProtocolOptions +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.model.SymmetricKey +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.WCRequest +import com.reown.android.internal.common.model.WalletConnectUri +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.scope +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.common.storage.pairing.PairingStorageRepositoryInterface +import com.reown.android.internal.utils.CoreValidator.isExpired +import com.reown.android.internal.utils.currentTimeInSeconds +import com.reown.android.internal.utils.dayInSeconds +import com.reown.android.internal.utils.thirtySeconds +import com.reown.android.pairing.engine.model.EngineDO +import com.reown.android.pairing.model.PairingJsonRpcMethod +import com.reown.android.pairing.model.PairingParams +import com.reown.android.pairing.model.PairingRpc +import com.reown.android.pairing.model.mapper.toCore +import com.reown.android.pairing.model.pairingExpiry +import com.reown.android.pulse.domain.InsertEventUseCase +import com.reown.android.pulse.domain.InsertTelemetryEventUseCase +import com.reown.android.pulse.domain.SendBatchEventUseCase +import com.reown.android.pulse.model.EventType +import com.reown.android.pulse.model.Trace +import com.reown.android.pulse.model.properties.Properties +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 diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pairing/engine/model/EngineDO.kt b/core/android/src/main/kotlin/com/reown/android/pairing/engine/model/EngineDO.kt similarity index 81% rename from core/android/src/main/kotlin/com/walletconnect/android/pairing/engine/model/EngineDO.kt rename to core/android/src/main/kotlin/com/reown/android/pairing/engine/model/EngineDO.kt index cb0834760..68d3d8c57 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pairing/engine/model/EngineDO.kt +++ b/core/android/src/main/kotlin/com/reown/android/pairing/engine/model/EngineDO.kt @@ -1,8 +1,8 @@ @file:JvmSynthetic -package com.walletconnect.android.pairing.engine.model +package com.reown.android.pairing.engine.model -import com.walletconnect.android.internal.common.model.Pairing +import com.reown.android.internal.common.model.Pairing internal sealed class EngineDO { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pairing/handler/PairingController.kt b/core/android/src/main/kotlin/com/reown/android/pairing/handler/PairingController.kt similarity index 86% rename from core/android/src/main/kotlin/com/walletconnect/android/pairing/handler/PairingController.kt rename to core/android/src/main/kotlin/com/reown/android/pairing/handler/PairingController.kt index 1f44d1622..09b34f22c 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pairing/handler/PairingController.kt +++ b/core/android/src/main/kotlin/com/reown/android/pairing/handler/PairingController.kt @@ -1,11 +1,11 @@ -package com.walletconnect.android.pairing.handler +package com.reown.android.pairing.handler -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.model.Pairing -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.android.pairing.engine.domain.PairingEngine -import com.walletconnect.android.pairing.model.mapper.toAppMetaData +import com.reown.android.Core +import com.reown.android.internal.common.model.Pairing +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.wcKoinApp +import com.reown.android.pairing.engine.domain.PairingEngine +import com.reown.android.pairing.model.mapper.toAppMetaData import com.reown.foundation.common.model.Topic import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.SharedFlow diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pairing/handler/PairingControllerInterface.kt b/core/android/src/main/kotlin/com/reown/android/pairing/handler/PairingControllerInterface.kt similarity index 78% rename from core/android/src/main/kotlin/com/walletconnect/android/pairing/handler/PairingControllerInterface.kt rename to core/android/src/main/kotlin/com/reown/android/pairing/handler/PairingControllerInterface.kt index 676c1fb9a..42ac8802c 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pairing/handler/PairingControllerInterface.kt +++ b/core/android/src/main/kotlin/com/reown/android/pairing/handler/PairingControllerInterface.kt @@ -1,8 +1,8 @@ -package com.walletconnect.android.pairing.handler +package com.reown.android.pairing.handler -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.model.Pairing -import com.walletconnect.android.internal.common.model.SDKError +import com.reown.android.Core +import com.reown.android.internal.common.model.Pairing +import com.reown.android.internal.common.model.SDKError import com.reown.foundation.common.model.Topic import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.SharedFlow diff --git a/core/android/src/main/kotlin/com/reown/android/pairing/model/PairingExpiration.kt b/core/android/src/main/kotlin/com/reown/android/pairing/model/PairingExpiration.kt new file mode 100644 index 000000000..f913075d9 --- /dev/null +++ b/core/android/src/main/kotlin/com/reown/android/pairing/model/PairingExpiration.kt @@ -0,0 +1,8 @@ +@file:JvmName("Expiration") + +package com.reown.android.pairing.model + +import com.reown.android.internal.utils.currentTimeInSeconds +import com.reown.android.internal.utils.fiveMinutesInSeconds + +val pairingExpiry: Long get() = currentTimeInSeconds + fiveMinutesInSeconds \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pairing/model/PairingJsonRpcMethod.kt b/core/android/src/main/kotlin/com/reown/android/pairing/model/PairingJsonRpcMethod.kt similarity index 79% rename from core/android/src/main/kotlin/com/walletconnect/android/pairing/model/PairingJsonRpcMethod.kt rename to core/android/src/main/kotlin/com/reown/android/pairing/model/PairingJsonRpcMethod.kt index e4cd81520..c2369f32d 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pairing/model/PairingJsonRpcMethod.kt +++ b/core/android/src/main/kotlin/com/reown/android/pairing/model/PairingJsonRpcMethod.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.pairing.model +package com.reown.android.pairing.model object PairingJsonRpcMethod { @JvmSynthetic diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pairing/model/PairingParams.kt b/core/android/src/main/kotlin/com/reown/android/pairing/model/PairingParams.kt similarity index 70% rename from core/android/src/main/kotlin/com/walletconnect/android/pairing/model/PairingParams.kt rename to core/android/src/main/kotlin/com/reown/android/pairing/model/PairingParams.kt index 6f0f4603e..2594c19d5 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pairing/model/PairingParams.kt +++ b/core/android/src/main/kotlin/com/reown/android/pairing/model/PairingParams.kt @@ -1,9 +1,9 @@ -package com.walletconnect.android.pairing.model +package com.reown.android.pairing.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.android.internal.common.model.type.ClientParams -import com.walletconnect.android.utils.DefaultId +import com.reown.android.internal.common.model.type.ClientParams +import com.reown.android.utils.DefaultId sealed class PairingParams : ClientParams { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pairing/model/PairingRpc.kt b/core/android/src/main/kotlin/com/reown/android/pairing/model/PairingRpc.kt similarity index 89% rename from core/android/src/main/kotlin/com/walletconnect/android/pairing/model/PairingRpc.kt rename to core/android/src/main/kotlin/com/reown/android/pairing/model/PairingRpc.kt index 64608acdc..b7044a33d 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pairing/model/PairingRpc.kt +++ b/core/android/src/main/kotlin/com/reown/android/pairing/model/PairingRpc.kt @@ -1,8 +1,8 @@ -package com.walletconnect.android.pairing.model +package com.reown.android.pairing.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.android.internal.common.model.type.JsonRpcClientSync +import com.reown.android.internal.common.model.type.JsonRpcClientSync import com.walletconnect.util.generateId internal sealed class PairingRpc : JsonRpcClientSync { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pairing/model/mapper/PairingMapper.kt b/core/android/src/main/kotlin/com/reown/android/pairing/model/mapper/PairingMapper.kt similarity index 76% rename from core/android/src/main/kotlin/com/walletconnect/android/pairing/model/mapper/PairingMapper.kt rename to core/android/src/main/kotlin/com/reown/android/pairing/model/mapper/PairingMapper.kt index 5e00de231..4c6d04e33 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pairing/model/mapper/PairingMapper.kt +++ b/core/android/src/main/kotlin/com/reown/android/pairing/model/mapper/PairingMapper.kt @@ -1,11 +1,11 @@ -package com.walletconnect.android.pairing.model.mapper +package com.reown.android.pairing.model.mapper -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.Pairing -import com.walletconnect.android.internal.common.model.Redirect -import com.walletconnect.android.pairing.engine.model.EngineDO +import com.reown.android.Core +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.Expiry +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 diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pulse/data/PulseService.kt b/core/android/src/main/kotlin/com/reown/android/pulse/data/PulseService.kt similarity index 84% rename from core/android/src/main/kotlin/com/walletconnect/android/pulse/data/PulseService.kt rename to core/android/src/main/kotlin/com/reown/android/pulse/data/PulseService.kt index d3e13c666..d9bf4557d 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pulse/data/PulseService.kt +++ b/core/android/src/main/kotlin/com/reown/android/pulse/data/PulseService.kt @@ -1,8 +1,8 @@ @file:JvmSynthetic -package com.walletconnect.android.pulse.data +package com.reown.android.pulse.data -import com.walletconnect.android.pulse.model.Event +import com.reown.android.pulse.model.Event import retrofit2.Response import retrofit2.http.Body import retrofit2.http.Header diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pulse/domain/InsertTelemetryEventUseCase.kt b/core/android/src/main/kotlin/com/reown/android/pulse/domain/InsertTelemetryEventUseCase.kt similarity index 85% rename from core/android/src/main/kotlin/com/walletconnect/android/pulse/domain/InsertTelemetryEventUseCase.kt rename to core/android/src/main/kotlin/com/reown/android/pulse/domain/InsertTelemetryEventUseCase.kt index c73ddf52f..99530dfde 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pulse/domain/InsertTelemetryEventUseCase.kt +++ b/core/android/src/main/kotlin/com/reown/android/pulse/domain/InsertTelemetryEventUseCase.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.pulse.domain +package com.reown.android.pulse.domain -import com.walletconnect.android.internal.common.storage.events.EventsRepository -import com.walletconnect.android.pulse.model.properties.Props +import com.reown.android.internal.common.storage.events.EventsRepository +import com.reown.android.pulse.model.properties.Props import com.reown.foundation.util.Logger import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pulse/domain/SendBatchEventUseCase.kt b/core/android/src/main/kotlin/com/reown/android/pulse/domain/SendBatchEventUseCase.kt similarity index 84% rename from core/android/src/main/kotlin/com/walletconnect/android/pulse/domain/SendBatchEventUseCase.kt rename to core/android/src/main/kotlin/com/reown/android/pulse/domain/SendBatchEventUseCase.kt index 21d7c555c..1b31f6e7a 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pulse/domain/SendBatchEventUseCase.kt +++ b/core/android/src/main/kotlin/com/reown/android/pulse/domain/SendBatchEventUseCase.kt @@ -1,10 +1,10 @@ -package com.walletconnect.android.pulse.domain +package com.reown.android.pulse.domain -import com.walletconnect.android.internal.common.model.TelemetryEnabled -import com.walletconnect.android.internal.common.storage.events.EventsRepository -import com.walletconnect.android.pulse.data.PulseService -import com.walletconnect.android.pulse.model.Event -import com.walletconnect.android.pulse.model.SDKType +import com.reown.android.internal.common.model.TelemetryEnabled +import com.reown.android.internal.common.storage.events.EventsRepository +import com.reown.android.pulse.data.PulseService +import com.reown.android.pulse.model.Event +import com.reown.android.pulse.model.SDKType import com.reown.foundation.util.Logger import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pulse/domain/SendEventUseCase.kt b/core/android/src/main/kotlin/com/reown/android/pulse/domain/SendEventUseCase.kt similarity index 75% rename from core/android/src/main/kotlin/com/walletconnect/android/pulse/domain/SendEventUseCase.kt rename to core/android/src/main/kotlin/com/reown/android/pulse/domain/SendEventUseCase.kt index c11faf446..af58a9e26 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pulse/domain/SendEventUseCase.kt +++ b/core/android/src/main/kotlin/com/reown/android/pulse/domain/SendEventUseCase.kt @@ -1,13 +1,13 @@ -package com.walletconnect.android.pulse.domain +package com.reown.android.pulse.domain -import com.walletconnect.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.android.internal.utils.currentTimeInSeconds -import com.walletconnect.android.pulse.data.PulseService -import com.walletconnect.android.pulse.model.Event -import com.walletconnect.android.pulse.model.SDKType -import com.walletconnect.android.pulse.model.properties.Props +import com.reown.android.internal.common.di.AndroidCommonDITags +import com.reown.android.internal.common.scope +import com.reown.android.internal.common.wcKoinApp +import com.reown.android.internal.utils.currentTimeInSeconds +import com.reown.android.pulse.data.PulseService +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 kotlinx.coroutines.launch diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/ConnectionMethod.kt b/core/android/src/main/kotlin/com/reown/android/pulse/model/ConnectionMethod.kt similarity index 84% rename from core/android/src/main/kotlin/com/walletconnect/android/pulse/model/ConnectionMethod.kt rename to core/android/src/main/kotlin/com/reown/android/pulse/model/ConnectionMethod.kt index 273614418..542ad7593 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/ConnectionMethod.kt +++ b/core/android/src/main/kotlin/com/reown/android/pulse/model/ConnectionMethod.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.pulse.model +package com.reown.android.pulse.model object ConnectionMethod { @get:JvmSynthetic diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/Direction.kt b/core/android/src/main/kotlin/com/reown/android/pulse/model/Direction.kt similarity index 65% rename from core/android/src/main/kotlin/com/walletconnect/android/pulse/model/Direction.kt rename to core/android/src/main/kotlin/com/reown/android/pulse/model/Direction.kt index d48f524dd..607b84cb0 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/Direction.kt +++ b/core/android/src/main/kotlin/com/reown/android/pulse/model/Direction.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.pulse.model +package com.reown.android.pulse.model enum class Direction(val state: String) { SENT("sent"), diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/Event.kt b/core/android/src/main/kotlin/com/reown/android/pulse/model/Event.kt similarity index 69% rename from core/android/src/main/kotlin/com/walletconnect/android/pulse/model/Event.kt rename to core/android/src/main/kotlin/com/reown/android/pulse/model/Event.kt index 9c1fbeb70..b37525279 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/Event.kt +++ b/core/android/src/main/kotlin/com/reown/android/pulse/model/Event.kt @@ -1,9 +1,9 @@ -package com.walletconnect.android.pulse.model +package com.reown.android.pulse.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.android.internal.utils.currentTimeInSeconds -import com.walletconnect.android.pulse.model.properties.Props +import com.reown.android.internal.utils.currentTimeInSeconds +import com.reown.android.pulse.model.properties.Props import com.walletconnect.util.generateId @JsonClass(generateAdapter = true) diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/EventType.kt b/core/android/src/main/kotlin/com/reown/android/pulse/model/EventType.kt similarity index 98% rename from core/android/src/main/kotlin/com/walletconnect/android/pulse/model/EventType.kt rename to core/android/src/main/kotlin/com/reown/android/pulse/model/EventType.kt index 1ec63f6f5..badf13d78 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/EventType.kt +++ b/core/android/src/main/kotlin/com/reown/android/pulse/model/EventType.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.pulse.model +package com.reown.android.pulse.model object EventType { @get:JvmSynthetic diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/SDKType.kt b/core/android/src/main/kotlin/com/reown/android/pulse/model/SDKType.kt similarity index 64% rename from core/android/src/main/kotlin/com/walletconnect/android/pulse/model/SDKType.kt rename to core/android/src/main/kotlin/com/reown/android/pulse/model/SDKType.kt index fe28f0800..3114ceb3a 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/SDKType.kt +++ b/core/android/src/main/kotlin/com/reown/android/pulse/model/SDKType.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.pulse.model +package com.reown.android.pulse.model enum class SDKType(val type: String) { APPKIT("appkit"), diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/Trace.kt b/core/android/src/main/kotlin/com/reown/android/pulse/model/Trace.kt similarity index 98% rename from core/android/src/main/kotlin/com/walletconnect/android/pulse/model/Trace.kt rename to core/android/src/main/kotlin/com/reown/android/pulse/model/Trace.kt index 2bc43be10..ff5eae201 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/Trace.kt +++ b/core/android/src/main/kotlin/com/reown/android/pulse/model/Trace.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.pulse.model +package com.reown.android.pulse.model object Trace { object Pairing { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/properties/Properties.kt b/core/android/src/main/kotlin/com/reown/android/pulse/model/properties/Properties.kt similarity index 93% rename from core/android/src/main/kotlin/com/walletconnect/android/pulse/model/properties/Properties.kt rename to core/android/src/main/kotlin/com/reown/android/pulse/model/properties/Properties.kt index fceb0c53e..9ac29f82d 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/properties/Properties.kt +++ b/core/android/src/main/kotlin/com/reown/android/pulse/model/properties/Properties.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.pulse.model.properties +package com.reown.android.pulse.model.properties import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/properties/Props.kt b/core/android/src/main/kotlin/com/reown/android/pulse/model/properties/Props.kt similarity index 72% rename from core/android/src/main/kotlin/com/walletconnect/android/pulse/model/properties/Props.kt rename to core/android/src/main/kotlin/com/reown/android/pulse/model/properties/Props.kt index d7d006144..c2512286d 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/pulse/model/properties/Props.kt +++ b/core/android/src/main/kotlin/com/reown/android/pulse/model/properties/Props.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.pulse.model.properties +package com.reown.android.pulse.model.properties import com.squareup.moshi.Json -import com.walletconnect.android.pulse.model.EventType +import com.reown.android.pulse.model.EventType import com.walletconnect.utils.Empty data class Props( diff --git a/core/android/src/main/kotlin/com/walletconnect/android/push/PushInterface.kt b/core/android/src/main/kotlin/com/reown/android/push/PushInterface.kt similarity index 86% rename from core/android/src/main/kotlin/com/walletconnect/android/push/PushInterface.kt rename to core/android/src/main/kotlin/com/reown/android/push/PushInterface.kt index 42a9fe661..1a9153c0b 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/push/PushInterface.kt +++ b/core/android/src/main/kotlin/com/reown/android/push/PushInterface.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.push +package com.reown.android.push interface PushInterface { val clientId: String diff --git a/core/android/src/main/kotlin/com/walletconnect/android/push/client/PushClient.kt b/core/android/src/main/kotlin/com/reown/android/push/client/PushClient.kt similarity index 82% rename from core/android/src/main/kotlin/com/walletconnect/android/push/client/PushClient.kt rename to core/android/src/main/kotlin/com/reown/android/push/client/PushClient.kt index cd0e71ef9..957750e4f 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/push/client/PushClient.kt +++ b/core/android/src/main/kotlin/com/reown/android/push/client/PushClient.kt @@ -1,15 +1,15 @@ @file:JvmSynthetic -package com.walletconnect.android.push.client +package com.reown.android.push.client -import com.walletconnect.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.android.internal.common.model.ProjectId -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.storage.push_messages.PushMessagesRepository -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.android.push.PushInterface -import com.walletconnect.android.push.network.PushService -import com.walletconnect.android.push.network.model.PushBody +import com.reown.android.internal.common.di.AndroidCommonDITags +import com.reown.android.internal.common.model.ProjectId +import com.reown.android.internal.common.scope +import com.reown.android.internal.common.storage.push_messages.PushMessagesRepository +import com.reown.android.internal.common.wcKoinApp +import com.reown.android.push.PushInterface +import com.reown.android.push.network.PushService +import com.reown.android.push.network.model.PushBody import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.supervisorScope diff --git a/core/android/src/main/kotlin/com/walletconnect/android/push/network/PushService.kt b/core/android/src/main/kotlin/com/reown/android/push/network/PushService.kt similarity index 71% rename from core/android/src/main/kotlin/com/walletconnect/android/push/network/PushService.kt rename to core/android/src/main/kotlin/com/reown/android/push/network/PushService.kt index f672bab7a..f18c9b121 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/push/network/PushService.kt +++ b/core/android/src/main/kotlin/com/reown/android/push/network/PushService.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.push.network +package com.reown.android.push.network -import com.walletconnect.android.push.network.model.PushBody -import com.walletconnect.android.push.network.model.PushResponse +import com.reown.android.push.network.model.PushBody +import com.reown.android.push.network.model.PushResponse import retrofit2.Response import retrofit2.http.* diff --git a/core/android/src/main/kotlin/com/walletconnect/android/push/network/model/PushBody.kt b/core/android/src/main/kotlin/com/reown/android/push/network/model/PushBody.kt similarity index 86% rename from core/android/src/main/kotlin/com/walletconnect/android/push/network/model/PushBody.kt rename to core/android/src/main/kotlin/com/reown/android/push/network/model/PushBody.kt index ea2e5502d..3600ce580 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/push/network/model/PushBody.kt +++ b/core/android/src/main/kotlin/com/reown/android/push/network/model/PushBody.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.push.network.model +package com.reown.android.push.network.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/push/network/model/PushResponse.kt b/core/android/src/main/kotlin/com/reown/android/push/network/model/PushResponse.kt similarity index 93% rename from core/android/src/main/kotlin/com/walletconnect/android/push/network/model/PushResponse.kt rename to core/android/src/main/kotlin/com/reown/android/push/network/model/PushResponse.kt index 201c75ca3..1fa5328cd 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/push/network/model/PushResponse.kt +++ b/core/android/src/main/kotlin/com/reown/android/push/network/model/PushResponse.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.push.network.model +package com.reown.android.push.network.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/push/notifications/DecryptMessageUseCaseInterface.kt b/core/android/src/main/kotlin/com/reown/android/push/notifications/DecryptMessageUseCaseInterface.kt similarity index 67% rename from core/android/src/main/kotlin/com/walletconnect/android/push/notifications/DecryptMessageUseCaseInterface.kt rename to core/android/src/main/kotlin/com/reown/android/push/notifications/DecryptMessageUseCaseInterface.kt index 26473418c..501cb1e77 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/push/notifications/DecryptMessageUseCaseInterface.kt +++ b/core/android/src/main/kotlin/com/reown/android/push/notifications/DecryptMessageUseCaseInterface.kt @@ -1,6 +1,6 @@ -package com.walletconnect.android.push.notifications +package com.reown.android.push.notifications -import com.walletconnect.android.Core +import com.reown.android.Core interface DecryptMessageUseCaseInterface { suspend fun decryptNotification(topic: String, message: String, onSuccess: (Core.Model.Message) -> Unit, onFailure: (Throwable) -> Unit) diff --git a/core/android/src/main/kotlin/com/walletconnect/android/push/notifications/PushMessagingService.kt b/core/android/src/main/kotlin/com/reown/android/push/notifications/PushMessagingService.kt similarity index 92% rename from core/android/src/main/kotlin/com/walletconnect/android/push/notifications/PushMessagingService.kt rename to core/android/src/main/kotlin/com/reown/android/push/notifications/PushMessagingService.kt index 34f4395f3..2160a9569 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/push/notifications/PushMessagingService.kt +++ b/core/android/src/main/kotlin/com/reown/android/push/notifications/PushMessagingService.kt @@ -1,13 +1,13 @@ -package com.walletconnect.android.push.notifications +package com.reown.android.push.notifications import com.google.firebase.messaging.FirebaseMessagingService import com.google.firebase.messaging.RemoteMessage -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.storage.push_messages.PushMessagesRepository -import com.walletconnect.android.internal.common.wcKoinApp +import com.reown.android.Core +import com.reown.android.internal.common.di.AndroidCommonDITags +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.scope +import com.reown.android.internal.common.storage.push_messages.PushMessagesRepository +import com.reown.android.internal.common.wcKoinApp import kotlinx.coroutines.launch import kotlinx.coroutines.supervisorScope import org.bouncycastle.util.encoders.Base64 diff --git a/core/android/src/main/kotlin/com/walletconnect/android/relay/ConnectionState.kt b/core/android/src/main/kotlin/com/reown/android/relay/ConnectionState.kt similarity index 88% rename from core/android/src/main/kotlin/com/walletconnect/android/relay/ConnectionState.kt rename to core/android/src/main/kotlin/com/reown/android/relay/ConnectionState.kt index 14d84e097..1a7d6a3da 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/relay/ConnectionState.kt +++ b/core/android/src/main/kotlin/com/reown/android/relay/ConnectionState.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.android.relay +package com.reown.android.relay sealed class WSSConnectionState { data object Connected : WSSConnectionState() diff --git a/core/android/src/main/kotlin/com/walletconnect/android/relay/ConnectionType.kt b/core/android/src/main/kotlin/com/reown/android/relay/ConnectionType.kt similarity index 56% rename from core/android/src/main/kotlin/com/walletconnect/android/relay/ConnectionType.kt rename to core/android/src/main/kotlin/com/reown/android/relay/ConnectionType.kt index 526004ec9..f2b285d0f 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/relay/ConnectionType.kt +++ b/core/android/src/main/kotlin/com/reown/android/relay/ConnectionType.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.relay +package com.reown.android.relay enum class ConnectionType { AUTOMATIC, MANUAL diff --git a/core/android/src/main/kotlin/com/walletconnect/android/relay/NetworkClientTimeout.kt b/core/android/src/main/kotlin/com/reown/android/relay/NetworkClientTimeout.kt similarity index 95% rename from core/android/src/main/kotlin/com/walletconnect/android/relay/NetworkClientTimeout.kt rename to core/android/src/main/kotlin/com/reown/android/relay/NetworkClientTimeout.kt index 7ee752147..e420d565c 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/relay/NetworkClientTimeout.kt +++ b/core/android/src/main/kotlin/com/reown/android/relay/NetworkClientTimeout.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.relay +package com.reown.android.relay import java.util.concurrent.TimeUnit diff --git a/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayClient.kt b/core/android/src/main/kotlin/com/reown/android/relay/RelayClient.kt similarity index 89% rename from core/android/src/main/kotlin/com/walletconnect/android/relay/RelayClient.kt rename to core/android/src/main/kotlin/com/reown/android/relay/RelayClient.kt index 017fe3cd7..0b521b21c 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayClient.kt +++ b/core/android/src/main/kotlin/com/reown/android/relay/RelayClient.kt @@ -1,16 +1,16 @@ @file:JvmSynthetic -package com.walletconnect.android.relay - -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.connection.ConnectivityState -import com.walletconnect.android.internal.common.connection.DefaultConnectionLifecycle -import com.walletconnect.android.internal.common.connection.ManualConnectionLifecycle -import com.walletconnect.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.android.internal.common.exception.WRONG_CONNECTION_TYPE -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.android.utils.toWalletConnectException +package com.reown.android.relay + +import com.reown.android.Core +import com.reown.android.internal.common.connection.ConnectivityState +import com.reown.android.internal.common.connection.DefaultConnectionLifecycle +import com.reown.android.internal.common.connection.ManualConnectionLifecycle +import com.reown.android.internal.common.di.AndroidCommonDITags +import com.reown.android.internal.common.exception.WRONG_CONNECTION_TYPE +import com.reown.android.internal.common.scope +import com.reown.android.internal.common.wcKoinApp +import com.reown.android.utils.toWalletConnectException import com.reown.foundation.network.BaseRelayClient import com.reown.foundation.network.model.Relay import kotlinx.coroutines.flow.Flow diff --git a/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayConnectionInterface.kt b/core/android/src/main/kotlin/com/reown/android/relay/RelayConnectionInterface.kt similarity index 92% rename from core/android/src/main/kotlin/com/walletconnect/android/relay/RelayConnectionInterface.kt rename to core/android/src/main/kotlin/com/reown/android/relay/RelayConnectionInterface.kt index 2527d3875..71bd5f3ac 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/relay/RelayConnectionInterface.kt +++ b/core/android/src/main/kotlin/com/reown/android/relay/RelayConnectionInterface.kt @@ -1,6 +1,6 @@ -package com.walletconnect.android.relay +package com.reown.android.relay -import com.walletconnect.android.Core +import com.reown.android.Core import com.reown.foundation.network.RelayInterface import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.StateFlow diff --git a/core/android/src/main/kotlin/com/walletconnect/android/utils/Extensions.kt b/core/android/src/main/kotlin/com/reown/android/utils/Extensions.kt similarity index 77% rename from core/android/src/main/kotlin/com/walletconnect/android/utils/Extensions.kt rename to core/android/src/main/kotlin/com/reown/android/utils/Extensions.kt index d87b71e43..280871e1d 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/utils/Extensions.kt +++ b/core/android/src/main/kotlin/com/reown/android/utils/Extensions.kt @@ -1,15 +1,15 @@ @file:JvmSynthetic -package com.walletconnect.android.utils +package com.reown.android.utils import android.net.Uri -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.exception.GenericException -import com.walletconnect.android.internal.common.exception.InvalidProjectIdException -import com.walletconnect.android.internal.common.exception.ProjectIdDoesNotExistException -import com.walletconnect.android.internal.common.exception.UnableToConnectToWebsocketException -import com.walletconnect.android.internal.common.exception.WalletConnectException -import com.walletconnect.android.internal.common.model.AppMetaData +import com.reown.android.Core +import com.reown.android.internal.common.exception.GenericException +import com.reown.android.internal.common.exception.InvalidProjectIdException +import com.reown.android.internal.common.exception.ProjectIdDoesNotExistException +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 java.net.HttpURLConnection diff --git a/core/android/src/main/kotlin/com/walletconnect/android/utils/PackageManagerExtensions.kt b/core/android/src/main/kotlin/com/reown/android/utils/PackageManagerExtensions.kt similarity index 94% rename from core/android/src/main/kotlin/com/walletconnect/android/utils/PackageManagerExtensions.kt rename to core/android/src/main/kotlin/com/reown/android/utils/PackageManagerExtensions.kt index 0aef4116e..0d49fcef4 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/utils/PackageManagerExtensions.kt +++ b/core/android/src/main/kotlin/com/reown/android/utils/PackageManagerExtensions.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.utils +package com.reown.android.utils import android.content.pm.PackageManager import android.os.Build diff --git a/core/android/src/main/kotlin/com/walletconnect/android/utils/Timber.kt b/core/android/src/main/kotlin/com/reown/android/utils/Timber.kt similarity index 89% rename from core/android/src/main/kotlin/com/walletconnect/android/utils/Timber.kt rename to core/android/src/main/kotlin/com/reown/android/utils/Timber.kt index 72cf2f907..4e14cb32b 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/utils/Timber.kt +++ b/core/android/src/main/kotlin/com/reown/android/utils/Timber.kt @@ -1,6 +1,6 @@ -package com.walletconnect.android.utils +package com.reown.android.utils -import com.walletconnect.android.BuildConfig +import com.reown.android.BuildConfig import timber.log.Timber internal fun plantTimber() { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/utils/cacao/CacaoSignerInterface.kt b/core/android/src/main/kotlin/com/reown/android/utils/cacao/CacaoSignerInterface.kt similarity index 90% rename from core/android/src/main/kotlin/com/walletconnect/android/utils/cacao/CacaoSignerInterface.kt rename to core/android/src/main/kotlin/com/reown/android/utils/cacao/CacaoSignerInterface.kt index 00958c2af..bed97f267 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/utils/cacao/CacaoSignerInterface.kt +++ b/core/android/src/main/kotlin/com/reown/android/utils/cacao/CacaoSignerInterface.kt @@ -1,14 +1,14 @@ @file:JvmName("CacaoSignerUtil") @file:Suppress("PackageDirectoryMismatch", "UNCHECKED_CAST") // Added to dismiss confusion. Cast to `T` always succeeds as Cacao.Signature implements ISignature. -package com.walletconnect.android.utils.cacao +package com.reown.android.utils.cacao -import com.walletconnect.android.cacao.SignatureInterface -import com.walletconnect.android.cacao.signature.ISignatureType -import com.walletconnect.android.cacao.signature.SignatureType -import com.walletconnect.android.internal.common.signing.cacao.Cacao -import com.walletconnect.android.internal.common.signing.eip191.EIP191Signer -import com.walletconnect.android.internal.common.signing.signature.toCacaoSignature +import com.reown.android.cacao.SignatureInterface +import com.reown.android.cacao.signature.ISignatureType +import com.reown.android.cacao.signature.SignatureType +import com.reown.android.internal.common.signing.cacao.Cacao +import com.reown.android.internal.common.signing.eip191.EIP191Signer +import com.reown.android.internal.common.signing.signature.toCacaoSignature import org.web3j.utils.Numeric.hexStringToByteArray import kotlin.reflect.KFunction import kotlin.reflect.full.createType diff --git a/core/android/src/main/kotlin/com/walletconnect/android/verify/client/VerifyClient.kt b/core/android/src/main/kotlin/com/reown/android/verify/client/VerifyClient.kt similarity index 81% rename from core/android/src/main/kotlin/com/walletconnect/android/verify/client/VerifyClient.kt rename to core/android/src/main/kotlin/com/reown/android/verify/client/VerifyClient.kt index a66799206..e9201c61b 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/verify/client/VerifyClient.kt +++ b/core/android/src/main/kotlin/com/reown/android/verify/client/VerifyClient.kt @@ -1,10 +1,10 @@ -package com.walletconnect.android.verify.client +package com.reown.android.verify.client -import com.walletconnect.android.internal.common.di.verifyModule -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.android.pairing.handler.PairingControllerInterface -import com.walletconnect.android.verify.domain.VerifyRepository -import com.walletconnect.android.verify.domain.VerifyResult +import com.reown.android.internal.common.di.verifyModule +import com.reown.android.internal.common.wcKoinApp +import com.reown.android.pairing.handler.PairingControllerInterface +import com.reown.android.verify.domain.VerifyRepository +import com.reown.android.verify.domain.VerifyResult import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/core/android/src/main/kotlin/com/walletconnect/android/verify/client/VerifyInterface.kt b/core/android/src/main/kotlin/com/reown/android/verify/client/VerifyInterface.kt similarity index 79% rename from core/android/src/main/kotlin/com/walletconnect/android/verify/client/VerifyInterface.kt rename to core/android/src/main/kotlin/com/reown/android/verify/client/VerifyInterface.kt index b179c5d6f..7b880e3d8 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/verify/client/VerifyInterface.kt +++ b/core/android/src/main/kotlin/com/reown/android/verify/client/VerifyInterface.kt @@ -1,6 +1,6 @@ -package com.walletconnect.android.verify.client +package com.reown.android.verify.client -import com.walletconnect.android.verify.domain.VerifyResult +import com.reown.android.verify.domain.VerifyResult interface VerifyInterface { fun initialize() diff --git a/core/android/src/main/kotlin/com/walletconnect/android/verify/data/VerifyService.kt b/core/android/src/main/kotlin/com/reown/android/verify/data/VerifyService.kt similarity index 69% rename from core/android/src/main/kotlin/com/walletconnect/android/verify/data/VerifyService.kt rename to core/android/src/main/kotlin/com/reown/android/verify/data/VerifyService.kt index c1be73770..63afaf132 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/verify/data/VerifyService.kt +++ b/core/android/src/main/kotlin/com/reown/android/verify/data/VerifyService.kt @@ -1,9 +1,9 @@ -package com.walletconnect.android.verify.data +package com.reown.android.verify.data -import com.walletconnect.android.verify.model.Origin -import com.walletconnect.android.verify.model.RegisterAttestationBody -import com.walletconnect.android.verify.model.VerifyServerPublicKey -import com.walletconnect.android.verify.model.VerifyServerResponse +import com.reown.android.verify.model.Origin +import com.reown.android.verify.model.RegisterAttestationBody +import com.reown.android.verify.model.VerifyServerPublicKey +import com.reown.android.verify.model.VerifyServerResponse import retrofit2.Response import retrofit2.http.Body import retrofit2.http.GET diff --git a/core/android/src/main/kotlin/com/walletconnect/android/verify/domain/JWTRepository.kt b/core/android/src/main/kotlin/com/reown/android/verify/domain/JWTRepository.kt similarity index 96% rename from core/android/src/main/kotlin/com/walletconnect/android/verify/domain/JWTRepository.kt rename to core/android/src/main/kotlin/com/reown/android/verify/domain/JWTRepository.kt index ccd86b3d9..af7d1ad9b 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/verify/domain/JWTRepository.kt +++ b/core/android/src/main/kotlin/com/reown/android/verify/domain/JWTRepository.kt @@ -1,6 +1,6 @@ -package com.walletconnect.android.verify.domain +package com.reown.android.verify.domain -import com.walletconnect.android.verify.model.JWK +import com.reown.android.verify.model.JWK import com.reown.foundation.util.jwt.JWT_DELIMITER import com.walletconnect.util.bytesToHex import org.bouncycastle.crypto.digests.SHA256Digest diff --git a/core/android/src/main/kotlin/com/walletconnect/android/verify/domain/ResolveAttestationIdUseCase.kt b/core/android/src/main/kotlin/com/reown/android/verify/domain/ResolveAttestationIdUseCase.kt similarity index 85% rename from core/android/src/main/kotlin/com/walletconnect/android/verify/domain/ResolveAttestationIdUseCase.kt rename to core/android/src/main/kotlin/com/reown/android/verify/domain/ResolveAttestationIdUseCase.kt index 9ad879eb0..3fd255fd0 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/verify/domain/ResolveAttestationIdUseCase.kt +++ b/core/android/src/main/kotlin/com/reown/android/verify/domain/ResolveAttestationIdUseCase.kt @@ -1,12 +1,12 @@ -package com.walletconnect.android.verify.domain +package com.reown.android.verify.domain -import com.walletconnect.android.internal.common.crypto.sha256 -import com.walletconnect.android.internal.common.model.Validation -import com.walletconnect.android.internal.common.model.WCRequest -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.storage.verify.VerifyContextStorageRepository -import com.walletconnect.android.verify.client.VerifyInterface -import com.walletconnect.android.verify.model.VerifyContext +import com.reown.android.internal.common.crypto.sha256 +import com.reown.android.internal.common.model.Validation +import com.reown.android.internal.common.model.WCRequest +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 kotlinx.coroutines.launch import kotlinx.coroutines.supervisorScope diff --git a/core/android/src/main/kotlin/com/walletconnect/android/verify/domain/VerifyPublicKeyStorageRepository.kt b/core/android/src/main/kotlin/com/reown/android/verify/domain/VerifyPublicKeyStorageRepository.kt similarity index 82% rename from core/android/src/main/kotlin/com/walletconnect/android/verify/domain/VerifyPublicKeyStorageRepository.kt rename to core/android/src/main/kotlin/com/reown/android/verify/domain/VerifyPublicKeyStorageRepository.kt index da1456544..aeb88f0c8 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/verify/domain/VerifyPublicKeyStorageRepository.kt +++ b/core/android/src/main/kotlin/com/reown/android/verify/domain/VerifyPublicKeyStorageRepository.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.verify.domain +package com.reown.android.verify.domain import android.database.sqlite.SQLiteException -import com.walletconnect.android.sdk.storage.data.dao.VerifyPublicKeyQueries +import com.reown.android.sdk.storage.data.dao.VerifyPublicKeyQueries class VerifyPublicKeyStorageRepository(private val queries: VerifyPublicKeyQueries) { diff --git a/core/android/src/main/kotlin/com/walletconnect/android/verify/domain/VerifyRepository.kt b/core/android/src/main/kotlin/com/reown/android/verify/domain/VerifyRepository.kt similarity index 95% rename from core/android/src/main/kotlin/com/walletconnect/android/verify/domain/VerifyRepository.kt rename to core/android/src/main/kotlin/com/reown/android/verify/domain/VerifyRepository.kt index 157eb82b1..a1d0fd1d7 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/verify/domain/VerifyRepository.kt +++ b/core/android/src/main/kotlin/com/reown/android/verify/domain/VerifyRepository.kt @@ -1,10 +1,10 @@ -package com.walletconnect.android.verify.domain +package com.reown.android.verify.domain import com.squareup.moshi.Moshi -import com.walletconnect.android.internal.common.model.Validation -import com.walletconnect.android.internal.utils.currentTimeInSeconds -import com.walletconnect.android.verify.data.VerifyService -import com.walletconnect.android.verify.model.VerifyClaims +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 kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/core/android/src/main/kotlin/com/reown/android/verify/domain/VerifyResult.kt b/core/android/src/main/kotlin/com/reown/android/verify/domain/VerifyResult.kt new file mode 100644 index 000000000..48df0ff35 --- /dev/null +++ b/core/android/src/main/kotlin/com/reown/android/verify/domain/VerifyResult.kt @@ -0,0 +1,9 @@ +package com.reown.android.verify.domain + +import com.reown.android.internal.common.model.Validation + +data class VerifyResult( + val validation: Validation, + val isScam: Boolean?, + val origin: String +) \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/verify/domain/VerifyUtils.kt b/core/android/src/main/kotlin/com/reown/android/verify/domain/VerifyUtils.kt similarity index 62% rename from core/android/src/main/kotlin/com/walletconnect/android/verify/domain/VerifyUtils.kt rename to core/android/src/main/kotlin/com/reown/android/verify/domain/VerifyUtils.kt index fae14b1e7..5ea6559b4 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/verify/domain/VerifyUtils.kt +++ b/core/android/src/main/kotlin/com/reown/android/verify/domain/VerifyUtils.kt @@ -1,6 +1,6 @@ -package com.walletconnect.android.verify.domain +package com.reown.android.verify.domain -import com.walletconnect.android.internal.common.model.Validation +import com.reown.android.internal.common.model.Validation import com.walletconnect.utils.compareDomains fun getValidation(metadataUrl: String, origin: String) = if (compareDomains(metadataUrl, origin)) Validation.VALID else Validation.INVALID \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/verify/model/Origin.kt b/core/android/src/main/kotlin/com/reown/android/verify/model/Origin.kt similarity index 77% rename from core/android/src/main/kotlin/com/walletconnect/android/verify/model/Origin.kt rename to core/android/src/main/kotlin/com/reown/android/verify/model/Origin.kt index 13e0ad569..d72e85f78 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/verify/model/Origin.kt +++ b/core/android/src/main/kotlin/com/reown/android/verify/model/Origin.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.verify.model +package com.reown.android.verify.model import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/verify/model/RegisterAttestationBody.kt b/core/android/src/main/kotlin/com/reown/android/verify/model/RegisterAttestationBody.kt similarity index 76% rename from core/android/src/main/kotlin/com/walletconnect/android/verify/model/RegisterAttestationBody.kt rename to core/android/src/main/kotlin/com/reown/android/verify/model/RegisterAttestationBody.kt index 76d9cf3dd..21f71cd99 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/verify/model/RegisterAttestationBody.kt +++ b/core/android/src/main/kotlin/com/reown/android/verify/model/RegisterAttestationBody.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.verify.model +package com.reown.android.verify.model import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/verify/model/VerifyClaims.kt b/core/android/src/main/kotlin/com/reown/android/verify/model/VerifyClaims.kt similarity index 88% rename from core/android/src/main/kotlin/com/walletconnect/android/verify/model/VerifyClaims.kt rename to core/android/src/main/kotlin/com/reown/android/verify/model/VerifyClaims.kt index be094aea4..c6fd81c9e 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/verify/model/VerifyClaims.kt +++ b/core/android/src/main/kotlin/com/reown/android/verify/model/VerifyClaims.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.verify.model +package com.reown.android.verify.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/verify/model/VerifyContext.kt b/core/android/src/main/kotlin/com/reown/android/verify/model/VerifyContext.kt similarity index 57% rename from core/android/src/main/kotlin/com/walletconnect/android/verify/model/VerifyContext.kt rename to core/android/src/main/kotlin/com/reown/android/verify/model/VerifyContext.kt index 9d664ea00..3392440a9 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/verify/model/VerifyContext.kt +++ b/core/android/src/main/kotlin/com/reown/android/verify/model/VerifyContext.kt @@ -1,6 +1,6 @@ -package com.walletconnect.android.verify.model +package com.reown.android.verify.model -import com.walletconnect.android.internal.common.model.Validation +import com.reown.android.internal.common.model.Validation data class VerifyContext( val id: Long, diff --git a/core/android/src/main/kotlin/com/walletconnect/android/verify/model/VerifyServerPublicKey.kt b/core/android/src/main/kotlin/com/reown/android/verify/model/VerifyServerPublicKey.kt similarity index 92% rename from core/android/src/main/kotlin/com/walletconnect/android/verify/model/VerifyServerPublicKey.kt rename to core/android/src/main/kotlin/com/reown/android/verify/model/VerifyServerPublicKey.kt index 6ad0608cb..8ee1d3c98 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/verify/model/VerifyServerPublicKey.kt +++ b/core/android/src/main/kotlin/com/reown/android/verify/model/VerifyServerPublicKey.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.verify.model +package com.reown.android.verify.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/verify/model/VerifyServerResponse.kt b/core/android/src/main/kotlin/com/reown/android/verify/model/VerifyServerResponse.kt similarity index 94% rename from core/android/src/main/kotlin/com/walletconnect/android/verify/model/VerifyServerResponse.kt rename to core/android/src/main/kotlin/com/reown/android/verify/model/VerifyServerResponse.kt index a27f87f69..ecf03e570 100644 --- a/core/android/src/main/kotlin/com/walletconnect/android/verify/model/VerifyServerResponse.kt +++ b/core/android/src/main/kotlin/com/reown/android/verify/model/VerifyServerResponse.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.verify.model +package com.reown.android.verify.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/domain/usecase/GetNotifyConfigUseCase.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/domain/usecase/GetNotifyConfigUseCase.kt deleted file mode 100644 index e5bd7a639..000000000 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/domain/usecase/GetNotifyConfigUseCase.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.walletconnect.android.internal.common.explorer.domain.usecase - -import com.walletconnect.android.internal.common.explorer.ExplorerRepository -import com.walletconnect.android.internal.common.explorer.data.model.NotifyConfig - -class GetNotifyConfigUseCase(private val explorerRepository: ExplorerRepository) { - suspend operator fun invoke(appDomain: String): Result = runCatching { explorerRepository.getNotifyConfig(appDomain) } -} diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/AppMetaDataType.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/AppMetaDataType.kt deleted file mode 100644 index 315276940..000000000 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/AppMetaDataType.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.walletconnect.android.internal.common.model - -enum class AppMetaDataType { - SELF, PEER -} \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/DidJwt.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/DidJwt.kt deleted file mode 100644 index 08cf1fd94..000000000 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/DidJwt.kt +++ /dev/null @@ -1,4 +0,0 @@ -package com.walletconnect.android.internal.common.model - -@JvmInline -value class DidJwt(val value: String) \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Expiry.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Expiry.kt deleted file mode 100644 index 9f8b0b905..000000000 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/Expiry.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.walletconnect.android.internal.common.model - -data class Expiry(val seconds: Long) \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/PackageName.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/PackageName.kt deleted file mode 100644 index c2d556464..000000000 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/PackageName.kt +++ /dev/null @@ -1,4 +0,0 @@ -package com.walletconnect.android.internal.common.model - -@JvmInline -value class PackageName(val value: String) diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/ProjectId.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/ProjectId.kt deleted file mode 100644 index ae5160127..000000000 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/ProjectId.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.walletconnect.android.internal.common.model - -data class ProjectId(val value: String) \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/SDKError.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/SDKError.kt deleted file mode 100644 index 82d9d3085..000000000 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/SDKError.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.walletconnect.android.internal.common.model - -import com.walletconnect.android.internal.common.model.type.EngineEvent - -class SDKError(val exception: Throwable) : EngineEvent \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/TransportType.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/TransportType.kt deleted file mode 100644 index 83247fd8a..000000000 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/TransportType.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.walletconnect.android.internal.common.model - -enum class TransportType { - RELAY, - LINK_MODE -} \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/WCResponse.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/WCResponse.kt deleted file mode 100644 index ad4b7bf88..000000000 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/WCResponse.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.walletconnect.android.internal.common.model - -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.model.type.ClientParams -import com.reown.foundation.common.model.Topic - -data class WCResponse( - val topic: Topic, - val method: String, - val response: JsonRpcResponse, - val params: ClientParams, -) \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/ClientParams.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/ClientParams.kt deleted file mode 100644 index 328e6c97a..000000000 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/ClientParams.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.walletconnect.android.internal.common.model.type - -interface ClientParams : SerializableJsonRpc \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/EngineEvent.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/EngineEvent.kt deleted file mode 100644 index 5560a815d..000000000 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/EngineEvent.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.walletconnect.android.internal.common.model.type - -interface EngineEvent \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/JsonRpcInteractorInterface.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/JsonRpcInteractorInterface.kt deleted file mode 100644 index 178e6cbea..000000000 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/JsonRpcInteractorInterface.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.walletconnect.android.internal.common.model.type - -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.WCRequest -import com.walletconnect.android.internal.common.model.WCResponse -import kotlinx.coroutines.flow.SharedFlow - -interface JsonRpcInteractorInterface { - val clientSyncJsonRpc: SharedFlow - val peerResponse: SharedFlow - val internalErrors: SharedFlow -} \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/Sequence.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/Sequence.kt deleted file mode 100644 index 0258c61c4..000000000 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/Sequence.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.walletconnect.android.internal.common.model.type - -import com.walletconnect.android.internal.common.model.Expiry -import com.reown.foundation.common.model.Topic - -interface Sequence { - val topic: Topic - val expiry: Expiry -} \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/SerializableJsonRpc.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/SerializableJsonRpc.kt deleted file mode 100644 index b3aa3df0e..000000000 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/model/type/SerializableJsonRpc.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.walletconnect.android.internal.common.model.type - -interface SerializableJsonRpc \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/message/MessageSignatureVerifier.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/message/MessageSignatureVerifier.kt deleted file mode 100644 index f46ad42c9..000000000 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/message/MessageSignatureVerifier.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.walletconnect.android.internal.common.signing.message - -import com.walletconnect.android.cacao.signature.SignatureType -import com.walletconnect.android.internal.common.model.ProjectId -import com.walletconnect.android.internal.common.signing.signature.Signature -import com.walletconnect.android.internal.common.signing.signature.verify - - -class MessageSignatureVerifier(private val projectId: ProjectId) { - fun verify(signature: String, originalMessage: String, address: String, type: SignatureType): Boolean = - Signature.fromString(signature).verify(originalMessage, address, type.header, projectId) -} \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/model/HexString.kt b/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/model/HexString.kt deleted file mode 100644 index d26a43a84..000000000 --- a/core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/model/HexString.kt +++ /dev/null @@ -1,4 +0,0 @@ -package com.walletconnect.android.internal.common.signing.model - -@JvmInline -value class HexString(val value: String) \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/use_case/RegisterIdentityUseCase.kt b/core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/use_case/RegisterIdentityUseCase.kt deleted file mode 100644 index 7b45fc395..000000000 --- a/core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/use_case/RegisterIdentityUseCase.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.walletconnect.android.keyserver.domain.use_case - -import com.walletconnect.android.internal.common.signing.cacao.Cacao -import com.walletconnect.android.keyserver.data.service.KeyServerService -import com.walletconnect.android.keyserver.model.KeyServerBody - -class RegisterIdentityUseCase( - private val service: KeyServerService, -) { - suspend operator fun invoke(cacao: Cacao): Result = runCatching { - service.registerIdentity(KeyServerBody.RegisterIdentity(cacao)).unwrapUnit() - } -} \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/use_case/ResolveInviteUseCase.kt b/core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/use_case/ResolveInviteUseCase.kt deleted file mode 100644 index 3b90665b6..000000000 --- a/core/android/src/main/kotlin/com/walletconnect/android/keyserver/domain/use_case/ResolveInviteUseCase.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.walletconnect.android.keyserver.domain.use_case - -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.keyserver.data.service.KeyServerService -import com.walletconnect.android.keyserver.model.KeyServerResponse - -class ResolveInviteUseCase( - private val service: KeyServerService -) { - suspend operator fun invoke(accountId: AccountId): Result = runCatching { - service.resolveInvite(accountId.value).unwrapValue() - } -} \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/pairing/model/PairingExpiration.kt b/core/android/src/main/kotlin/com/walletconnect/android/pairing/model/PairingExpiration.kt deleted file mode 100644 index 542124e64..000000000 --- a/core/android/src/main/kotlin/com/walletconnect/android/pairing/model/PairingExpiration.kt +++ /dev/null @@ -1,8 +0,0 @@ -@file:JvmName("Expiration") - -package com.walletconnect.android.pairing.model - -import com.walletconnect.android.internal.utils.currentTimeInSeconds -import com.walletconnect.android.internal.utils.fiveMinutesInSeconds - -val pairingExpiry: Long get() = currentTimeInSeconds + fiveMinutesInSeconds \ No newline at end of file diff --git a/core/android/src/main/kotlin/com/walletconnect/android/verify/domain/VerifyResult.kt b/core/android/src/main/kotlin/com/walletconnect/android/verify/domain/VerifyResult.kt deleted file mode 100644 index 141e113c7..000000000 --- a/core/android/src/main/kotlin/com/walletconnect/android/verify/domain/VerifyResult.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.walletconnect.android.verify.domain - -import com.walletconnect.android.internal.common.model.Validation - -data class VerifyResult( - val validation: Validation, - val isScam: Boolean?, - val origin: String -) \ No newline at end of file diff --git a/core/android/src/main/sqldelight/com/walletconnect/android/sdk/storage/data/dao/Event.sq b/core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/Event.sq similarity index 100% rename from core/android/src/main/sqldelight/com/walletconnect/android/sdk/storage/data/dao/Event.sq rename to core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/Event.sq diff --git a/core/android/src/main/sqldelight/com/walletconnect/android/sdk/storage/data/dao/Identities.sq b/core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/Identities.sq similarity index 100% rename from core/android/src/main/sqldelight/com/walletconnect/android/sdk/storage/data/dao/Identities.sq rename to core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/Identities.sq diff --git a/core/android/src/main/sqldelight/com/walletconnect/android/sdk/storage/data/dao/JsonRpcHistory.sq b/core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/JsonRpcHistory.sq similarity index 94% rename from core/android/src/main/sqldelight/com/walletconnect/android/sdk/storage/data/dao/JsonRpcHistory.sq rename to core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/JsonRpcHistory.sq index d200c4374..e9e199f48 100644 --- a/core/android/src/main/sqldelight/com/walletconnect/android/sdk/storage/data/dao/JsonRpcHistory.sq +++ b/core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/JsonRpcHistory.sq @@ -1,4 +1,4 @@ -import com.walletconnect.android.internal.common.model.TransportType; +import com.reown.android.internal.common.model.TransportType; import kotlin.String; CREATE TABLE JsonRpcHistoryDao( diff --git a/core/android/src/main/sqldelight/com/walletconnect/android/sdk/storage/data/dao/MetaData.sq b/core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/MetaData.sq similarity index 94% rename from core/android/src/main/sqldelight/com/walletconnect/android/sdk/storage/data/dao/MetaData.sq rename to core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/MetaData.sq index d36ed4d2b..347f86868 100644 --- a/core/android/src/main/sqldelight/com/walletconnect/android/sdk/storage/data/dao/MetaData.sq +++ b/core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/MetaData.sq @@ -1,4 +1,4 @@ -import com.walletconnect.android.internal.common.model.AppMetaDataType; +import com.reown.android.internal.common.model.AppMetaDataType; import kotlin.Boolean; import kotlin.String; import kotlin.collections.List; diff --git a/core/android/src/main/sqldelight/com/walletconnect/android/sdk/storage/data/dao/Pairing.sq b/core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/Pairing.sq similarity index 100% rename from core/android/src/main/sqldelight/com/walletconnect/android/sdk/storage/data/dao/Pairing.sq rename to core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/Pairing.sq diff --git a/core/android/src/main/sqldelight/com/walletconnect/android/sdk/storage/data/dao/PushMessage.sq b/core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/PushMessage.sq similarity index 100% rename from core/android/src/main/sqldelight/com/walletconnect/android/sdk/storage/data/dao/PushMessage.sq rename to core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/PushMessage.sq diff --git a/core/android/src/main/sqldelight/com/walletconnect/android/sdk/storage/data/dao/VerifyContext.sq b/core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/VerifyContext.sq similarity index 90% rename from core/android/src/main/sqldelight/com/walletconnect/android/sdk/storage/data/dao/VerifyContext.sq rename to core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/VerifyContext.sq index f48cf8e86..546b4b71d 100644 --- a/core/android/src/main/sqldelight/com/walletconnect/android/sdk/storage/data/dao/VerifyContext.sq +++ b/core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/VerifyContext.sq @@ -1,4 +1,4 @@ -import com.walletconnect.android.internal.common.model.Validation; +import com.reown.android.internal.common.model.Validation; import kotlin.Boolean; CREATE TABLE VerifyContext ( diff --git a/core/android/src/main/sqldelight/com/walletconnect/android/sdk/storage/data/dao/VerifyPublicKey.sq b/core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/VerifyPublicKey.sq similarity index 100% rename from core/android/src/main/sqldelight/com/walletconnect/android/sdk/storage/data/dao/VerifyPublicKey.sq rename to core/android/src/main/sqldelight/com/reown/android/sdk/storage/data/dao/VerifyPublicKey.sq diff --git a/core/android/src/main/sqldelight/migration/2.sqm b/core/android/src/main/sqldelight/migration/2.sqm index 3532537d9..7a6c7e8dc 100644 --- a/core/android/src/main/sqldelight/migration/2.sqm +++ b/core/android/src/main/sqldelight/migration/2.sqm @@ -1,4 +1,4 @@ -import com.walletconnect.android.internal.common.model.Validation; +import com.reown.android.internal.common.model.Validation; -- migration from 2.db to 3.db diff --git a/core/android/src/release/kotlin/com.walletconnect.android/di/AndroidBuildVariantDITags.kt b/core/android/src/release/kotlin/com.reown.android/di/AndroidBuildVariantDITags.kt similarity index 76% rename from core/android/src/release/kotlin/com.walletconnect.android/di/AndroidBuildVariantDITags.kt rename to core/android/src/release/kotlin/com.reown.android/di/AndroidBuildVariantDITags.kt index 1d05a6a72..bf23225c4 100644 --- a/core/android/src/release/kotlin/com.walletconnect.android/di/AndroidBuildVariantDITags.kt +++ b/core/android/src/release/kotlin/com.reown.android/di/AndroidBuildVariantDITags.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.di +package com.reown.android.di enum class AndroidBuildVariantDITags { DB_PASSPHRASE, diff --git a/core/android/src/release/kotlin/com.walletconnect.android/di/CoreStorageModule.kt b/core/android/src/release/kotlin/com.reown.android/di/CoreStorageModule.kt similarity index 95% rename from core/android/src/release/kotlin/com.walletconnect.android/di/CoreStorageModule.kt rename to core/android/src/release/kotlin/com.reown.android/di/CoreStorageModule.kt index 9f1c96988..40aedfc4b 100644 --- a/core/android/src/release/kotlin/com.walletconnect.android/di/CoreStorageModule.kt +++ b/core/android/src/release/kotlin/com.reown.android/di/CoreStorageModule.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.di +package com.reown.android.di import android.annotation.SuppressLint import android.content.Context @@ -14,11 +14,11 @@ import app.cash.sqldelight.db.SqlDriver import app.cash.sqldelight.db.SqlSchema import app.cash.sqldelight.driver.android.AndroidSqliteDriver import com.getkeepsafe.relinker.ReLinker -import com.walletconnect.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.android.internal.common.di.DatabaseConfig -import com.walletconnect.android.internal.common.di.baseStorageModule -import com.walletconnect.android.internal.common.di.deleteDatabases -import com.walletconnect.android.sdk.core.AndroidCoreDatabase +import com.reown.android.internal.common.di.AndroidCommonDITags +import com.reown.android.internal.common.di.DatabaseConfig +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 diff --git a/core/android/src/test/java/CacaoTestJvmTest.java b/core/android/src/test/java/CacaoTestJvmTest.java index fb5713b70..5072d2133 100644 --- a/core/android/src/test/java/CacaoTestJvmTest.java +++ b/core/android/src/test/java/CacaoTestJvmTest.java @@ -1,10 +1,10 @@ -import com.walletconnect.android.cacao.signature.SignatureType; -import com.walletconnect.android.internal.common.model.ProjectId; -import com.walletconnect.android.internal.common.signing.cacao.Cacao; -import com.walletconnect.android.internal.common.signing.cacao.CacaoKt; -import com.walletconnect.android.internal.common.signing.cacao.CacaoType; -import com.walletconnect.android.internal.common.signing.cacao.CacaoVerifier; -import com.walletconnect.android.utils.cacao.CacaoSignerUtil; +import com.reown.android.cacao.signature.SignatureType; +import com.reown.android.internal.common.model.ProjectId; +import com.reown.android.internal.common.signing.cacao.Cacao; +import com.reown.android.internal.common.signing.cacao.CacaoKt; +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 org.junit.Assert; diff --git a/core/android/src/test/java/SignatureTest.java b/core/android/src/test/java/SignatureTest.java index 8d7263bf1..ebcdb0109 100644 --- a/core/android/src/test/java/SignatureTest.java +++ b/core/android/src/test/java/SignatureTest.java @@ -1,4 +1,4 @@ -import com.walletconnect.android.cacao.SignatureInterface; +import com.reown.android.cacao.SignatureInterface; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/BouncyCastleCryptoRepositoryTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/BouncyCastleCryptoRepositoryTest.kt similarity index 95% rename from core/android/src/test/kotlin/com/walletconnect/android/internal/BouncyCastleCryptoRepositoryTest.kt rename to core/android/src/test/kotlin/com/reown/android/internal/BouncyCastleCryptoRepositoryTest.kt index fa2031bf5..14ef08920 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/BouncyCastleCryptoRepositoryTest.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/BouncyCastleCryptoRepositoryTest.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.internal +package com.reown.android.internal -import com.walletconnect.android.internal.common.crypto.kmr.BouncyCastleKeyManagementRepository -import com.walletconnect.android.internal.common.storage.key_chain.KeyStore +import com.reown.android.internal.common.crypto.kmr.BouncyCastleKeyManagementRepository +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 diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/ChaChaPolyCodecTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/ChaChaPolyCodecTest.kt similarity index 88% rename from core/android/src/test/kotlin/com/walletconnect/android/internal/ChaChaPolyCodecTest.kt rename to core/android/src/test/kotlin/com/reown/android/internal/ChaChaPolyCodecTest.kt index 86cd2e567..2f896bad5 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/ChaChaPolyCodecTest.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/ChaChaPolyCodecTest.kt @@ -1,13 +1,13 @@ -package com.walletconnect.android.internal +package com.reown.android.internal -import com.walletconnect.android.internal.common.crypto.codec.ChaChaPolyCodec -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.model.MissingKeyException -import com.walletconnect.android.internal.common.model.MissingParticipantsException -import com.walletconnect.android.internal.common.model.Participants -import com.walletconnect.android.internal.common.model.SymmetricKey -import com.walletconnect.android.internal.common.model.EnvelopeType -import com.walletconnect.android.internal.utils.getParticipantTag +import com.reown.android.internal.common.crypto.codec.ChaChaPolyCodec +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.model.MissingKeyException +import com.reown.android.internal.common.model.MissingParticipantsException +import com.reown.android.internal.common.model.Participants +import com.reown.android.internal.common.model.SymmetricKey +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 diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/CoreValidatorTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/CoreValidatorTest.kt similarity index 93% rename from core/android/src/test/kotlin/com/walletconnect/android/internal/CoreValidatorTest.kt rename to core/android/src/test/kotlin/com/reown/android/internal/CoreValidatorTest.kt index abf042a36..699ea1aab 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/CoreValidatorTest.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/CoreValidatorTest.kt @@ -1,8 +1,8 @@ -package com.walletconnect.android.internal +package com.reown.android.internal -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.utils.currentTimeInSeconds -import com.walletconnect.android.internal.utils.CoreValidator +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.utils.currentTimeInSeconds +import com.reown.android.internal.utils.CoreValidator import junit.framework.TestCase.assertEquals import junit.framework.TestCase.assertFalse import junit.framework.TestCase.assertTrue diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/EventsRepositoryTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/EventsRepositoryTest.kt similarity index 93% rename from core/android/src/test/kotlin/com/walletconnect/android/internal/EventsRepositoryTest.kt rename to core/android/src/test/kotlin/com/reown/android/internal/EventsRepositoryTest.kt index e509ac1bd..dc60c212f 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/EventsRepositoryTest.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/EventsRepositoryTest.kt @@ -1,10 +1,10 @@ -package com.walletconnect.android.internal +package com.reown.android.internal import android.database.sqlite.SQLiteException -import com.walletconnect.android.internal.common.model.TelemetryEnabled -import com.walletconnect.android.internal.common.storage.events.EventsRepository -import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.android.sdk.storage.data.dao.EventQueries +import com.reown.android.internal.common.model.TelemetryEnabled +import com.reown.android.internal.common.storage.events.EventsRepository +import com.reown.android.pulse.model.properties.Props +import com.reown.android.sdk.storage.data.dao.EventQueries import io.mockk.Runs import io.mockk.coEvery import io.mockk.coVerify diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/InsertEventUseCaseTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/InsertEventUseCaseTest.kt similarity index 85% rename from core/android/src/test/kotlin/com/walletconnect/android/internal/InsertEventUseCaseTest.kt rename to core/android/src/test/kotlin/com/reown/android/internal/InsertEventUseCaseTest.kt index 9db278775..fe2e71ffd 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/InsertEventUseCaseTest.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/InsertEventUseCaseTest.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.internal -import com.walletconnect.android.internal.common.storage.events.EventsRepository -import com.walletconnect.android.pulse.domain.InsertEventUseCase -import com.walletconnect.android.pulse.model.properties.Props +package com.reown.android.internal +import com.reown.android.internal.common.storage.events.EventsRepository +import com.reown.android.pulse.domain.InsertEventUseCase +import com.reown.android.pulse.model.properties.Props import com.reown.foundation.util.Logger import io.mockk.coEvery import io.mockk.coVerify diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/InsertTelemetryEventUseCaseTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/InsertTelemetryEventUseCaseTest.kt similarity index 88% rename from core/android/src/test/kotlin/com/walletconnect/android/internal/InsertTelemetryEventUseCaseTest.kt rename to core/android/src/test/kotlin/com/reown/android/internal/InsertTelemetryEventUseCaseTest.kt index bb2aacd65..465914915 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/InsertTelemetryEventUseCaseTest.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/InsertTelemetryEventUseCaseTest.kt @@ -1,8 +1,8 @@ -package com.walletconnect.android.internal +package com.reown.android.internal -import com.walletconnect.android.internal.common.storage.events.EventsRepository -import com.walletconnect.android.pulse.domain.InsertTelemetryEventUseCase -import com.walletconnect.android.pulse.model.properties.Props +import com.reown.android.internal.common.storage.events.EventsRepository +import com.reown.android.pulse.domain.InsertTelemetryEventUseCase +import com.reown.android.pulse.model.properties.Props import com.reown.foundation.util.Logger import io.mockk.Runs import io.mockk.coEvery diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/JWTRepositoryTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/JWTRepositoryTest.kt similarity index 95% rename from core/android/src/test/kotlin/com/walletconnect/android/internal/JWTRepositoryTest.kt rename to core/android/src/test/kotlin/com/reown/android/internal/JWTRepositoryTest.kt index 7cff344af..19d6c3323 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/JWTRepositoryTest.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/JWTRepositoryTest.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.internal +package com.reown.android.internal -import com.walletconnect.android.verify.domain.JWTRepository -import com.walletconnect.android.verify.model.JWK +import com.reown.android.verify.domain.JWTRepository +import com.reown.android.verify.model.JWK import com.walletconnect.util.hexToBytes import io.mockk.spyk import junit.framework.TestCase.assertEquals diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/JsonRpcResponseJsonRpcResultJsonAdapterTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/JsonRpcResponseJsonRpcResultJsonAdapterTest.kt similarity index 89% rename from core/android/src/test/kotlin/com/walletconnect/android/internal/JsonRpcResponseJsonRpcResultJsonAdapterTest.kt rename to core/android/src/test/kotlin/com/reown/android/internal/JsonRpcResponseJsonRpcResultJsonAdapterTest.kt index 3d3eb2c18..d547333df 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/JsonRpcResponseJsonRpcResultJsonAdapterTest.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/JsonRpcResponseJsonRpcResultJsonAdapterTest.kt @@ -1,13 +1,13 @@ -package com.walletconnect.android.internal +package com.reown.android.internal import com.squareup.moshi.Moshi import com.tinder.scarlet.utils.getRawType -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.adapter.JsonRpcResultAdapter -import com.walletconnect.android.internal.common.model.RelayProtocolOptions -import com.walletconnect.android.internal.common.model.params.ChatNotifyResponseAuthParams -import com.walletconnect.android.internal.common.model.params.CoreSignParams -import com.walletconnect.android.internal.common.signing.cacao.Cacao +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.adapter.JsonRpcResultAdapter +import com.reown.android.internal.common.model.RelayProtocolOptions +import com.reown.android.internal.common.model.params.ChatNotifyResponseAuthParams +import com.reown.android.internal.common.model.params.CoreSignParams +import com.reown.android.internal.common.signing.cacao.Cacao import org.junit.Test import kotlin.reflect.jvm.jvmName diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/KeyChainMock.kt b/core/android/src/test/kotlin/com/reown/android/internal/KeyChainMock.kt similarity index 92% rename from core/android/src/test/kotlin/com/walletconnect/android/internal/KeyChainMock.kt rename to core/android/src/test/kotlin/com/reown/android/internal/KeyChainMock.kt index 3ef2b2de9..8c7541abd 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/KeyChainMock.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/KeyChainMock.kt @@ -1,6 +1,6 @@ -package com.walletconnect.android.internal +package com.reown.android.internal -import com.walletconnect.android.internal.common.storage.key_chain.KeyStore +import com.reown.android.internal.common.storage.key_chain.KeyStore import com.reown.foundation.common.model.Key import com.walletconnect.util.bytesToHex import com.walletconnect.util.hexToBytes diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/RelayClientTests.kt b/core/android/src/test/kotlin/com/reown/android/internal/RelayClientTests.kt similarity index 87% rename from core/android/src/test/kotlin/com/walletconnect/android/internal/RelayClientTests.kt rename to core/android/src/test/kotlin/com/reown/android/internal/RelayClientTests.kt index a2c9e3071..c2b151773 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/RelayClientTests.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/RelayClientTests.kt @@ -1,13 +1,13 @@ -package com.walletconnect.android.internal +package com.reown.android.internal import com.tinder.scarlet.WebSocket -import com.walletconnect.android.internal.common.connection.ConnectivityState -import com.walletconnect.android.internal.common.connection.DefaultConnectionLifecycle -import com.walletconnect.android.internal.common.connection.ManualConnectionLifecycle -import com.walletconnect.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.relay.ConnectionType -import com.walletconnect.android.relay.RelayClient +import com.reown.android.internal.common.connection.ConnectivityState +import com.reown.android.internal.common.connection.DefaultConnectionLifecycle +import com.reown.android.internal.common.connection.ManualConnectionLifecycle +import com.reown.android.internal.common.di.AndroidCommonDITags +import com.reown.android.internal.common.scope +import com.reown.android.relay.ConnectionType +import com.reown.android.relay.RelayClient import com.reown.foundation.network.data.service.RelayService import com.reown.foundation.util.Logger import io.mockk.clearAllMocks diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/ResolveAttestationUseCaseTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/ResolveAttestationUseCaseTest.kt similarity index 91% rename from core/android/src/test/kotlin/com/walletconnect/android/internal/ResolveAttestationUseCaseTest.kt rename to core/android/src/test/kotlin/com/reown/android/internal/ResolveAttestationUseCaseTest.kt index 05d9acadd..769862857 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/ResolveAttestationUseCaseTest.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/ResolveAttestationUseCaseTest.kt @@ -1,15 +1,15 @@ -package com.walletconnect.android.internal - -import com.walletconnect.android.internal.common.crypto.sha256 -import com.walletconnect.android.internal.common.model.TransportType -import com.walletconnect.android.internal.common.model.Validation -import com.walletconnect.android.internal.common.model.WCRequest -import com.walletconnect.android.internal.common.model.type.ClientParams -import com.walletconnect.android.internal.common.storage.verify.VerifyContextStorageRepository -import com.walletconnect.android.verify.client.VerifyInterface -import com.walletconnect.android.verify.domain.ResolveAttestationIdUseCase -import com.walletconnect.android.verify.domain.VerifyResult -import com.walletconnect.android.verify.model.VerifyContext +package com.reown.android.internal + +import com.reown.android.internal.common.crypto.sha256 +import com.reown.android.internal.common.model.TransportType +import com.reown.android.internal.common.model.Validation +import com.reown.android.internal.common.model.WCRequest +import com.reown.android.internal.common.model.type.ClientParams +import com.reown.android.internal.common.storage.verify.VerifyContextStorageRepository +import com.reown.android.verify.client.VerifyInterface +import com.reown.android.verify.domain.ResolveAttestationIdUseCase +import com.reown.android.verify.domain.VerifyResult +import com.reown.android.verify.model.VerifyContext import com.reown.foundation.common.model.Topic import com.walletconnect.utils.Empty import io.mockk.Runs diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/SendBatchEventUseCaseTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/SendBatchEventUseCaseTest.kt similarity index 92% rename from core/android/src/test/kotlin/com/walletconnect/android/internal/SendBatchEventUseCaseTest.kt rename to core/android/src/test/kotlin/com/reown/android/internal/SendBatchEventUseCaseTest.kt index 9332bb303..e91d15c42 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/SendBatchEventUseCaseTest.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/SendBatchEventUseCaseTest.kt @@ -1,13 +1,13 @@ -package com.walletconnect.android.internal - -import com.walletconnect.android.internal.common.model.TelemetryEnabled -import com.walletconnect.android.internal.common.storage.events.EventsRepository -import com.walletconnect.android.pulse.data.PulseService -import com.walletconnect.android.pulse.domain.SendBatchEventUseCase -import com.walletconnect.android.pulse.model.Event -import com.walletconnect.android.pulse.model.SDKType -import com.walletconnect.android.pulse.model.properties.Properties -import com.walletconnect.android.pulse.model.properties.Props +package com.reown.android.internal + +import com.reown.android.internal.common.model.TelemetryEnabled +import com.reown.android.internal.common.storage.events.EventsRepository +import com.reown.android.pulse.data.PulseService +import com.reown.android.pulse.domain.SendBatchEventUseCase +import com.reown.android.pulse.model.Event +import com.reown.android.pulse.model.SDKType +import com.reown.android.pulse.model.properties.Properties +import com.reown.android.pulse.model.properties.Props import com.reown.foundation.util.Logger import io.mockk.Runs import io.mockk.coEvery diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/SendEventUseCaseTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/SendEventUseCaseTest.kt similarity index 92% rename from core/android/src/test/kotlin/com/walletconnect/android/internal/SendEventUseCaseTest.kt rename to core/android/src/test/kotlin/com/reown/android/internal/SendEventUseCaseTest.kt index add5656ed..def4cf8dc 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/SendEventUseCaseTest.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/SendEventUseCaseTest.kt @@ -1,12 +1,12 @@ -package com.walletconnect.android.internal - -import com.walletconnect.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.android.pulse.data.PulseService -import com.walletconnect.android.pulse.domain.SendEventUseCase -import com.walletconnect.android.pulse.model.Event -import com.walletconnect.android.pulse.model.SDKType -import com.walletconnect.android.pulse.model.properties.Props +package com.reown.android.internal + +import com.reown.android.internal.common.di.AndroidCommonDITags +import com.reown.android.internal.common.wcKoinApp +import com.reown.android.pulse.data.PulseService +import com.reown.android.pulse.domain.SendEventUseCase +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 io.mockk.Runs import io.mockk.coEvery diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/URLComparisonTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/URLComparisonTest.kt similarity index 96% rename from core/android/src/test/kotlin/com/walletconnect/android/internal/URLComparisonTest.kt rename to core/android/src/test/kotlin/com/reown/android/internal/URLComparisonTest.kt index 805d039f5..5e8d6c053 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/URLComparisonTest.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/URLComparisonTest.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal +package com.reown.android.internal import com.google.common.net.InternetDomainName import com.walletconnect.utils.compareDomains diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/ValidatorTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/ValidatorTest.kt similarity index 94% rename from core/android/src/test/kotlin/com/walletconnect/android/internal/ValidatorTest.kt rename to core/android/src/test/kotlin/com/reown/android/internal/ValidatorTest.kt index 2e7156199..d0defa648 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/ValidatorTest.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/ValidatorTest.kt @@ -1,9 +1,9 @@ -package com.walletconnect.android.internal +package com.reown.android.internal -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.RelayProtocolOptions -import com.walletconnect.android.internal.common.model.SymmetricKey -import com.walletconnect.android.internal.common.model.WalletConnectUri +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.RelayProtocolOptions +import com.reown.android.internal.common.model.SymmetricKey +import com.reown.android.internal.common.model.WalletConnectUri import com.reown.foundation.common.model.Topic import junit.framework.TestCase.assertEquals import junit.framework.TestCase.assertNotNull diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/VerifyClientTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/VerifyClientTest.kt similarity index 89% rename from core/android/src/test/kotlin/com/walletconnect/android/internal/VerifyClientTest.kt rename to core/android/src/test/kotlin/com/reown/android/internal/VerifyClientTest.kt index f08129915..78401cc26 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/VerifyClientTest.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/VerifyClientTest.kt @@ -1,8 +1,8 @@ -package com.walletconnect.android.internal +package com.reown.android.internal -import com.walletconnect.android.verify.client.VerifyClient -import com.walletconnect.android.verify.domain.VerifyRepository -import com.walletconnect.android.verify.domain.VerifyResult +import com.reown.android.verify.client.VerifyClient +import com.reown.android.verify.domain.VerifyRepository +import com.reown.android.verify.domain.VerifyResult import io.mockk.coVerify import io.mockk.mockk import kotlinx.coroutines.test.StandardTestDispatcher diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/VerifyRepositoryTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/VerifyRepositoryTest.kt similarity index 91% rename from core/android/src/test/kotlin/com/walletconnect/android/internal/VerifyRepositoryTest.kt rename to core/android/src/test/kotlin/com/reown/android/internal/VerifyRepositoryTest.kt index 693cfc692..8dc5b75c2 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/VerifyRepositoryTest.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/VerifyRepositoryTest.kt @@ -1,16 +1,16 @@ -package com.walletconnect.android.internal +package com.reown.android.internal import com.squareup.moshi.Moshi -import com.walletconnect.android.internal.common.model.Validation -import com.walletconnect.android.internal.utils.currentTimeInSeconds -import com.walletconnect.android.verify.data.VerifyService -import com.walletconnect.android.verify.domain.JWTRepository -import com.walletconnect.android.verify.domain.VerifyPublicKeyStorageRepository -import com.walletconnect.android.verify.domain.VerifyRepository -import com.walletconnect.android.verify.domain.VerifyResult -import com.walletconnect.android.verify.model.JWK -import com.walletconnect.android.verify.model.Origin -import com.walletconnect.android.verify.model.VerifyServerPublicKey +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.domain.JWTRepository +import com.reown.android.verify.domain.VerifyPublicKeyStorageRepository +import com.reown.android.verify.domain.VerifyRepository +import com.reown.android.verify.domain.VerifyResult +import com.reown.android.verify.model.JWK +import com.reown.android.verify.model.Origin +import com.reown.android.verify.model.VerifyServerPublicKey import io.mockk.Runs import io.mockk.coEvery import io.mockk.coVerify diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/common/ClientIdJwtRepositoryAndroidTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/common/ClientIdJwtRepositoryAndroidTest.kt similarity index 90% rename from core/android/src/test/kotlin/com/walletconnect/android/internal/common/ClientIdJwtRepositoryAndroidTest.kt rename to core/android/src/test/kotlin/com/reown/android/internal/common/ClientIdJwtRepositoryAndroidTest.kt index d00e536aa..3bad3b9f3 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/common/ClientIdJwtRepositoryAndroidTest.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/common/ClientIdJwtRepositoryAndroidTest.kt @@ -1,7 +1,7 @@ -package com.walletconnect.android.internal.common +package com.reown.android.internal.common -import com.walletconnect.android.internal.KeyChainMock -import com.walletconnect.android.internal.common.jwt.clientid.ClientIdJwtRepositoryAndroid +import com.reown.android.internal.KeyChainMock +import com.reown.android.internal.common.jwt.clientid.ClientIdJwtRepositoryAndroid import com.reown.foundation.common.model.PrivateKey import com.reown.foundation.common.model.PublicKey import com.reown.foundation.util.jwt.jwtIatAndExp diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/common/adapter/ExpiryAdapterTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/common/adapter/ExpiryAdapterTest.kt similarity index 65% rename from core/android/src/test/kotlin/com/walletconnect/android/internal/common/adapter/ExpiryAdapterTest.kt rename to core/android/src/test/kotlin/com/reown/android/internal/common/adapter/ExpiryAdapterTest.kt index ef4bbf18d..dff7891ef 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/common/adapter/ExpiryAdapterTest.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/common/adapter/ExpiryAdapterTest.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.adapter +package com.reown.android.internal.common.adapter import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory @@ -15,10 +15,10 @@ internal class ExpiryAdapterTest { @Test fun toJson() { - val expiry = com.walletconnect.android.internal.common.model.Expiry(100L) + val expiry = com.reown.android.internal.common.model.Expiry(100L) val expected = """"${expiry.seconds}"""" - val expiryJson = moshi.adapter(com.walletconnect.android.internal.common.model.Expiry::class.java).toJson(expiry) + val expiryJson = moshi.adapter(com.reown.android.internal.common.model.Expiry::class.java).toJson(expiry) assertEquals(expected, """"$expiryJson"""") } diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/common/cacao/IssuerTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/common/cacao/IssuerTest.kt similarity index 87% rename from core/android/src/test/kotlin/com/walletconnect/android/internal/common/cacao/IssuerTest.kt rename to core/android/src/test/kotlin/com/reown/android/internal/common/cacao/IssuerTest.kt index edf4aea91..809353333 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/common/cacao/IssuerTest.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/common/cacao/IssuerTest.kt @@ -1,6 +1,6 @@ -package com.walletconnect.android.internal.common.cacao +package com.reown.android.internal.common.cacao -import com.walletconnect.android.internal.common.signing.cacao.Issuer +import com.reown.android.internal.common.signing.cacao.Issuer import junit.framework.TestCase.assertEquals import org.junit.Assert.assertThrows import org.junit.Test diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/common/cacao/eip191/EIP191SignerTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/common/cacao/eip191/EIP191SignerTest.kt similarity index 85% rename from core/android/src/test/kotlin/com/walletconnect/android/internal/common/cacao/eip191/EIP191SignerTest.kt rename to core/android/src/test/kotlin/com/reown/android/internal/common/cacao/eip191/EIP191SignerTest.kt index fd1b502b9..8c88e6b3d 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/common/cacao/eip191/EIP191SignerTest.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/common/cacao/eip191/EIP191SignerTest.kt @@ -1,17 +1,17 @@ -package com.walletconnect.android.internal.common.cacao.eip191 +package com.reown.android.internal.common.cacao.eip191 import com.squareup.moshi.JsonAdapter import com.squareup.moshi.Moshi -import com.walletconnect.android.cacao.signature.SignatureType -import com.walletconnect.android.internal.common.signing.cacao.Cacao -import com.walletconnect.android.internal.common.signing.cacao.toCAIP222Message -import com.walletconnect.android.internal.common.signing.cacao.toSignature -import com.walletconnect.android.internal.common.signing.eip191.EIP191Signer -import com.walletconnect.android.internal.common.signing.eip191.EIP191Verifier -import com.walletconnect.android.internal.common.signing.model.HexString -import com.walletconnect.android.internal.common.signing.signature.Signature -import com.walletconnect.android.utils.cacao.CacaoSignerInterface -import com.walletconnect.android.utils.cacao.sign +import com.reown.android.cacao.signature.SignatureType +import com.reown.android.internal.common.signing.cacao.Cacao +import com.reown.android.internal.common.signing.cacao.toCAIP222Message +import com.reown.android.internal.common.signing.cacao.toSignature +import com.reown.android.internal.common.signing.eip191.EIP191Signer +import com.reown.android.internal.common.signing.eip191.EIP191Verifier +import com.reown.android.internal.common.signing.model.HexString +import com.reown.android.internal.common.signing.signature.Signature +import com.reown.android.utils.cacao.CacaoSignerInterface +import com.reown.android.utils.cacao.sign import com.walletconnect.util.bytesToHex import com.walletconnect.util.hexToBytes import junit.framework.TestCase.assertFalse diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/DappListingsDTOJunit4Test.kt b/core/android/src/test/kotlin/com/reown/android/internal/common/explorer/data/network/model/DappListingsDTOJunit4Test.kt similarity index 96% rename from core/android/src/test/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/DappListingsDTOJunit4Test.kt rename to core/android/src/test/kotlin/com/reown/android/internal/common/explorer/data/network/model/DappListingsDTOJunit4Test.kt index ed5c17a62..cabeb846c 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/common/explorer/data/network/model/DappListingsDTOJunit4Test.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/common/explorer/data/network/model/DappListingsDTOJunit4Test.kt @@ -1,4 +1,4 @@ -package com.walletconnect.android.internal.common.explorer.data.network.model +package com.reown.android.internal.common.explorer.data.network.model import androidx.core.net.toUri import com.squareup.moshi.Moshi diff --git a/core/android/src/test/kotlin/com/walletconnect/android/internal/domain/RelayerInteractorTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/domain/RelayerInteractorTest.kt similarity index 86% rename from core/android/src/test/kotlin/com/walletconnect/android/internal/domain/RelayerInteractorTest.kt rename to core/android/src/test/kotlin/com/reown/android/internal/domain/RelayerInteractorTest.kt index 1662700b9..006134566 100644 --- a/core/android/src/test/kotlin/com/walletconnect/android/internal/domain/RelayerInteractorTest.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/domain/RelayerInteractorTest.kt @@ -1,21 +1,21 @@ -package com.walletconnect.android.internal.domain - -import com.walletconnect.android.internal.common.ConditionalExponentialBackoffStrategy -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.crypto.codec.Codec -import com.walletconnect.android.internal.common.exception.WalletConnectException -import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer -import com.walletconnect.android.internal.common.json_rpc.domain.relay.RelayJsonRpcInteractor -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.WCRequest -import com.walletconnect.android.internal.common.model.type.ClientParams -import com.walletconnect.android.internal.common.model.type.Error -import com.walletconnect.android.internal.common.model.type.JsonRpcClientSync -import com.walletconnect.android.internal.common.storage.push_messages.PushMessagesRepository -import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.android.relay.RelayConnectionInterface +package com.reown.android.internal.domain + +import com.reown.android.internal.common.ConditionalExponentialBackoffStrategy +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.crypto.codec.Codec +import com.reown.android.internal.common.exception.WalletConnectException +import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer +import com.reown.android.internal.common.json_rpc.domain.relay.RelayJsonRpcInteractor +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.WCRequest +import com.reown.android.internal.common.model.type.ClientParams +import com.reown.android.internal.common.model.type.Error +import com.reown.android.internal.common.model.type.JsonRpcClientSync +import com.reown.android.internal.common.storage.push_messages.PushMessagesRepository +import com.reown.android.internal.common.storage.rpc.JsonRpcHistory +import com.reown.android.internal.common.wcKoinApp +import com.reown.android.relay.RelayConnectionInterface import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl import com.reown.foundation.network.model.Relay diff --git a/core/modal/src/main/kotlin/com/walletconnect/modal/ui/Preview.kt b/core/modal/src/main/kotlin/com/reown/modal/ui/Preview.kt similarity index 93% rename from core/modal/src/main/kotlin/com/walletconnect/modal/ui/Preview.kt rename to core/modal/src/main/kotlin/com/reown/modal/ui/Preview.kt index b66c299b3..3b56bd1cf 100644 --- a/core/modal/src/main/kotlin/com/walletconnect/modal/ui/Preview.kt +++ b/core/modal/src/main/kotlin/com/reown/modal/ui/Preview.kt @@ -1,4 +1,4 @@ -package com.walletconnect.modal.ui +package com.reown.modal.ui import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column diff --git a/core/modal/src/main/kotlin/com/walletconnect/modal/ui/components/common/Images.kt b/core/modal/src/main/kotlin/com/reown/modal/ui/components/common/Images.kt similarity index 93% rename from core/modal/src/main/kotlin/com/walletconnect/modal/ui/components/common/Images.kt rename to core/modal/src/main/kotlin/com/reown/modal/ui/components/common/Images.kt index 1c8ae2894..b3e3387ce 100644 --- a/core/modal/src/main/kotlin/com/walletconnect/modal/ui/components/common/Images.kt +++ b/core/modal/src/main/kotlin/com/reown/modal/ui/components/common/Images.kt @@ -1,4 +1,4 @@ -package com.walletconnect.modal.ui.components.common +package com.reown.modal.ui.components.common import androidx.compose.foundation.Image import androidx.compose.foundation.layout.padding diff --git a/core/modal/src/main/kotlin/com/walletconnect/modal/ui/components/common/Modifiers.kt b/core/modal/src/main/kotlin/com/reown/modal/ui/components/common/Modifiers.kt similarity index 93% rename from core/modal/src/main/kotlin/com/walletconnect/modal/ui/components/common/Modifiers.kt rename to core/modal/src/main/kotlin/com/reown/modal/ui/components/common/Modifiers.kt index 730c3540f..3859a46e9 100644 --- a/core/modal/src/main/kotlin/com/walletconnect/modal/ui/components/common/Modifiers.kt +++ b/core/modal/src/main/kotlin/com/reown/modal/ui/components/common/Modifiers.kt @@ -1,4 +1,4 @@ -package com.walletconnect.modal.ui.components.common +package com.reown.modal.ui.components.common import android.annotation.SuppressLint import androidx.compose.foundation.clickable diff --git a/core/modal/src/main/kotlin/com/walletconnect/modal/ui/components/common/Spacers.kt b/core/modal/src/main/kotlin/com/reown/modal/ui/components/common/Spacers.kt similarity index 93% rename from core/modal/src/main/kotlin/com/walletconnect/modal/ui/components/common/Spacers.kt rename to core/modal/src/main/kotlin/com/reown/modal/ui/components/common/Spacers.kt index 4181e051e..1f625ef24 100644 --- a/core/modal/src/main/kotlin/com/walletconnect/modal/ui/components/common/Spacers.kt +++ b/core/modal/src/main/kotlin/com/reown/modal/ui/components/common/Spacers.kt @@ -1,4 +1,4 @@ -package com.walletconnect.modal.ui.components.common +package com.reown.modal.ui.components.common import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.RowScope diff --git a/core/modal/src/main/kotlin/com/walletconnect/modal/ui/components/logo/WalletConnectLogo.kt b/core/modal/src/main/kotlin/com/reown/modal/ui/components/logo/WalletConnectLogo.kt similarity index 89% rename from core/modal/src/main/kotlin/com/walletconnect/modal/ui/components/logo/WalletConnectLogo.kt rename to core/modal/src/main/kotlin/com/reown/modal/ui/components/logo/WalletConnectLogo.kt index 400538cae..6c87800ed 100644 --- a/core/modal/src/main/kotlin/com/walletconnect/modal/ui/components/logo/WalletConnectLogo.kt +++ b/core/modal/src/main/kotlin/com/reown/modal/ui/components/logo/WalletConnectLogo.kt @@ -1,4 +1,4 @@ -package com.walletconnect.modal.ui.components.logo +package com.reown.modal.ui.components.logo import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Row @@ -15,8 +15,8 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.walletconnect.modal.ui.ComponentPreview -import com.walletconnect.modal.ui.components.common.HorizontalSpacer +import com.reown.modal.ui.ComponentPreview +import com.reown.modal.ui.components.common.HorizontalSpacer import com.walletconnect.modalcore.R @Composable diff --git a/core/modal/src/main/kotlin/com/walletconnect/modal/ui/components/qr/WalletConnectQRCode.kt b/core/modal/src/main/kotlin/com/reown/modal/ui/components/qr/WalletConnectQRCode.kt similarity index 98% rename from core/modal/src/main/kotlin/com/walletconnect/modal/ui/components/qr/WalletConnectQRCode.kt rename to core/modal/src/main/kotlin/com/reown/modal/ui/components/qr/WalletConnectQRCode.kt index 63e9f2dd2..cd076ffa6 100644 --- a/core/modal/src/main/kotlin/com/walletconnect/modal/ui/components/qr/WalletConnectQRCode.kt +++ b/core/modal/src/main/kotlin/com/reown/modal/ui/components/qr/WalletConnectQRCode.kt @@ -1,4 +1,4 @@ -package com.walletconnect.modal.ui.components.qr +package com.reown.modal.ui.components.qr import android.content.Context import android.graphics.Path @@ -25,7 +25,7 @@ import com.github.alexzhirkevich.customqrgenerator.vector.style.QrVectorFrameSha import com.github.alexzhirkevich.customqrgenerator.vector.style.QrVectorLogoPadding import com.github.alexzhirkevich.customqrgenerator.vector.style.QrVectorPixelShape import com.google.accompanist.drawablepainter.rememberDrawablePainter -import com.walletconnect.modal.ui.ComponentPreview +import com.reown.modal.ui.ComponentPreview import com.walletconnect.modalcore.R import androidx.compose.ui.graphics.Color as ComposeColor diff --git a/core/modal/src/main/kotlin/com/walletconnect/modal/ui/model/UiState.kt b/core/modal/src/main/kotlin/com/reown/modal/ui/model/UiState.kt similarity index 88% rename from core/modal/src/main/kotlin/com/walletconnect/modal/ui/model/UiState.kt rename to core/modal/src/main/kotlin/com/reown/modal/ui/model/UiState.kt index db6564d3a..0465e66ad 100644 --- a/core/modal/src/main/kotlin/com/walletconnect/modal/ui/model/UiState.kt +++ b/core/modal/src/main/kotlin/com/reown/modal/ui/model/UiState.kt @@ -1,4 +1,4 @@ -package com.walletconnect.modal.ui.model +package com.reown.modal.ui.model sealed class UiState { data class Success(val data: T) : UiState() diff --git a/core/modal/src/main/kotlin/com/walletconnect/modal/ui/model/search/SearchState.kt b/core/modal/src/main/kotlin/com/reown/modal/ui/model/search/SearchState.kt similarity index 95% rename from core/modal/src/main/kotlin/com/walletconnect/modal/ui/model/search/SearchState.kt rename to core/modal/src/main/kotlin/com/reown/modal/ui/model/search/SearchState.kt index 7e763c49e..fa999f3fb 100644 --- a/core/modal/src/main/kotlin/com/walletconnect/modal/ui/model/search/SearchState.kt +++ b/core/modal/src/main/kotlin/com/reown/modal/ui/model/search/SearchState.kt @@ -1,4 +1,4 @@ -package com.walletconnect.modal.ui.model.search +package com.reown.modal.ui.model.search import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/core/modal/src/main/kotlin/com/walletconnect/modal/utils/DeviceUtils.kt b/core/modal/src/main/kotlin/com/reown/modal/utils/DeviceUtils.kt similarity index 87% rename from core/modal/src/main/kotlin/com/walletconnect/modal/utils/DeviceUtils.kt rename to core/modal/src/main/kotlin/com/reown/modal/utils/DeviceUtils.kt index 5e23435da..7649dc4e8 100644 --- a/core/modal/src/main/kotlin/com/walletconnect/modal/utils/DeviceUtils.kt +++ b/core/modal/src/main/kotlin/com/reown/modal/utils/DeviceUtils.kt @@ -1,4 +1,4 @@ -package com.walletconnect.modal.utils +package com.reown.modal.utils import android.content.res.Configuration import androidx.compose.runtime.Composable diff --git a/core/modal/src/main/kotlin/com/walletconnect/modal/utils/UriExtensions.kt b/core/modal/src/main/kotlin/com/reown/modal/utils/UriExtensions.kt similarity index 97% rename from core/modal/src/main/kotlin/com/walletconnect/modal/utils/UriExtensions.kt rename to core/modal/src/main/kotlin/com/reown/modal/utils/UriExtensions.kt index e7f6fbb20..5b6d529ab 100644 --- a/core/modal/src/main/kotlin/com/walletconnect/modal/utils/UriExtensions.kt +++ b/core/modal/src/main/kotlin/com/reown/modal/utils/UriExtensions.kt @@ -1,4 +1,4 @@ -package com.walletconnect.modal.utils +package com.reown.modal.utils import androidx.compose.ui.platform.UriHandler import timber.log.Timber diff --git a/core/modal/src/main/kotlin/com/walletconnect/modal/utils/theme/ColorsUtils.kt b/core/modal/src/main/kotlin/com/reown/modal/utils/theme/ColorsUtils.kt similarity index 92% rename from core/modal/src/main/kotlin/com/walletconnect/modal/utils/theme/ColorsUtils.kt rename to core/modal/src/main/kotlin/com/reown/modal/utils/theme/ColorsUtils.kt index 0be406db9..535cfa862 100644 --- a/core/modal/src/main/kotlin/com/walletconnect/modal/utils/theme/ColorsUtils.kt +++ b/core/modal/src/main/kotlin/com/reown/modal/utils/theme/ColorsUtils.kt @@ -1,4 +1,4 @@ -package com.walletconnect.modal.utils.theme +package com.reown.modal.utils.theme import android.annotation.SuppressLint import android.content.Context diff --git a/gradle/consumer-rules/walletconnect-rules.pro b/gradle/consumer-rules/walletconnect-rules.pro index 7e37a83b3..2f04d34d9 100644 --- a/gradle/consumer-rules/walletconnect-rules.pro +++ b/gradle/consumer-rules/walletconnect-rules.pro @@ -1,4 +1,4 @@ --keep class com.walletconnect.android.** { *; } +-keep class com.reown.android.** { *; } -keep interface com.walletconnect.** { *; } -keep class kotlinx.coroutines.** { *; } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/AppKit.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/AppKit.kt index db15fab5a..bc1c5ca0b 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/AppKit.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/AppKit.kt @@ -1,11 +1,11 @@ package com.walletconnect.web3.modal.client import androidx.activity.ComponentActivity -import com.walletconnect.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.android.pulse.model.EventType -import com.walletconnect.android.pulse.model.properties.Props +import com.reown.android.internal.common.di.AndroidCommonDITags +import com.reown.android.internal.common.scope +import com.reown.android.internal.common.wcKoinApp +import com.reown.android.pulse.model.EventType +import com.reown.android.pulse.model.properties.Props import com.walletconnect.sign.client.Sign import com.walletconnect.sign.client.SignClient import com.walletconnect.sign.common.exceptions.SignClientAlreadyInitializedException diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/ClientMapper.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/ClientMapper.kt index 0826a2119..7002c3b8d 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/ClientMapper.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/ClientMapper.kt @@ -1,6 +1,6 @@ package com.walletconnect.web3.modal.client -import com.walletconnect.android.internal.common.signing.cacao.Cacao +import com.reown.android.internal.common.signing.cacao.Cacao import com.walletconnect.sign.client.Sign import com.walletconnect.web3.modal.client.models.Account import com.walletconnect.web3.modal.client.models.Session diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/Modal.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/Modal.kt index 950a1f73f..51545041a 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/Modal.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/Modal.kt @@ -2,10 +2,10 @@ package com.walletconnect.web3.modal.client import androidx.annotation.DrawableRes import androidx.annotation.Keep -import com.walletconnect.android.Core -import com.walletconnect.android.CoreInterface -import com.walletconnect.android.cacao.SignatureInterface -import com.walletconnect.android.internal.common.signing.cacao.Issuer +import com.reown.android.Core +import com.reown.android.CoreInterface +import com.reown.android.cacao.SignatureInterface +import com.reown.android.internal.common.signing.cacao.Issuer object Modal { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Exceptions.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Exceptions.kt index e9ecf76ed..878185a34 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Exceptions.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Exceptions.kt @@ -1,6 +1,6 @@ package com.walletconnect.web3.modal.client.models -import com.walletconnect.android.internal.common.exception.WalletConnectException +import com.reown.android.internal.common.exception.WalletConnectException class AppKitClientAlreadyInitializedException : WalletConnectException("AppKit already initialized") class CoinbaseClientAlreadyInitializedException : WalletConnectException("Coinbase already initialized") \ No newline at end of file diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Session.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Session.kt index 7eaefc2e0..2b7bb3a1b 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Session.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Session.kt @@ -1,6 +1,6 @@ package com.walletconnect.web3.modal.client.models -import com.walletconnect.android.Core +import com.reown.android.Core import com.walletconnect.web3.modal.client.Modal sealed class Session { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/BlockchainRepository.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/BlockchainRepository.kt index 67455f44e..37b49776e 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/BlockchainRepository.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/BlockchainRepository.kt @@ -1,6 +1,6 @@ package com.walletconnect.web3.modal.data -import com.walletconnect.android.internal.common.model.ProjectId +import com.reown.android.internal.common.model.ProjectId import com.walletconnect.web3.modal.data.model.IdentityDTO import com.walletconnect.web3.modal.data.network.BlockchainService import com.walletconnect.web3.modal.domain.model.Identity diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BalanceRpcModule.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BalanceRpcModule.kt index 683b42659..ba42e566f 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BalanceRpcModule.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BalanceRpcModule.kt @@ -1,6 +1,6 @@ package com.walletconnect.web3.modal.di -import com.walletconnect.android.internal.common.di.AndroidCommonDITags +import com.reown.android.internal.common.di.AndroidCommonDITags import com.walletconnect.web3.modal.data.BalanceRpcRepository import com.walletconnect.web3.modal.data.network.BalanceService import com.walletconnect.web3.modal.domain.usecase.GetEthBalanceUseCase diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BlockchainApiModule.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BlockchainApiModule.kt index c22179080..97343f215 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BlockchainApiModule.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BlockchainApiModule.kt @@ -1,6 +1,6 @@ package com.walletconnect.web3.modal.di -import com.walletconnect.android.internal.common.di.AndroidCommonDITags +import com.reown.android.internal.common.di.AndroidCommonDITags import com.walletconnect.web3.modal.data.BlockchainRepository import com.walletconnect.web3.modal.data.network.BlockchainService import com.walletconnect.web3.modal.domain.usecase.GetIdentityUseCase diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/EngineModule.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/EngineModule.kt index cc6ff9acb..b26f4560e 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/EngineModule.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/EngineModule.kt @@ -1,7 +1,7 @@ package com.walletconnect.web3.modal.di import android.content.Context -import com.walletconnect.android.internal.common.di.AndroidCommonDITags +import com.reown.android.internal.common.di.AndroidCommonDITags import com.walletconnect.web3.modal.domain.usecase.ConnectionEventRepository import com.walletconnect.web3.modal.engine.AppKitEngine import com.walletconnect.web3.modal.engine.coinbase.CoinbaseClient diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/Web3ModalModule.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/Web3ModalModule.kt index f3ad1b638..24f249621 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/Web3ModalModule.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/Web3ModalModule.kt @@ -6,7 +6,7 @@ import androidx.datastore.preferences.core.Preferences import androidx.datastore.preferences.preferencesDataStore import com.squareup.moshi.Moshi import com.squareup.moshi.adapters.PolymorphicJsonAdapterFactory -import com.walletconnect.android.internal.common.di.AndroidCommonDITags +import com.reown.android.internal.common.di.AndroidCommonDITags import com.walletconnect.web3.modal.domain.RecentWalletsRepository import com.walletconnect.web3.modal.domain.SessionRepository import com.walletconnect.web3.modal.domain.model.Session diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/delegate/AppKitDelegate.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/delegate/AppKitDelegate.kt index a50cc0535..cda5e0a80 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/delegate/AppKitDelegate.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/delegate/AppKitDelegate.kt @@ -1,6 +1,6 @@ package com.walletconnect.web3.modal.domain.delegate -import com.walletconnect.android.internal.common.wcKoinApp +import com.reown.android.internal.common.wcKoinApp import com.walletconnect.web3.modal.client.Modal import com.walletconnect.web3.modal.client.AppKit import com.walletconnect.web3.modal.domain.model.Session diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/AppKitEngine.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/AppKitEngine.kt index 51ee6dd0b..2449f8fdd 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/AppKitEngine.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/AppKitEngine.kt @@ -5,13 +5,13 @@ import android.content.Intent import android.net.Uri import androidx.activity.ComponentActivity import androidx.activity.result.contract.ActivityResultContracts -import com.walletconnect.android.internal.common.modal.domain.usecase.EnableAnalyticsUseCaseInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.android.pulse.domain.SendEventInterface -import com.walletconnect.android.pulse.model.EventType -import com.walletconnect.android.pulse.model.properties.Properties -import com.walletconnect.android.pulse.model.properties.Props +import com.reown.android.internal.common.modal.domain.usecase.EnableAnalyticsUseCaseInterface +import com.reown.android.internal.common.scope +import com.reown.android.internal.common.wcKoinApp +import com.reown.android.pulse.domain.SendEventInterface +import com.reown.android.pulse.model.EventType +import com.reown.android.pulse.model.properties.Properties +import com.reown.android.pulse.model.properties.Props import com.reown.foundation.util.Logger import com.walletconnect.sign.client.Sign import com.walletconnect.sign.client.SignClient diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/coinbase/CoinbaseClient.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/coinbase/CoinbaseClient.kt index e348ff13c..ac05192f5 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/coinbase/CoinbaseClient.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/coinbase/CoinbaseClient.kt @@ -19,9 +19,9 @@ import com.coinbase.android.nativesdk.message.request.WALLET_WATCH_ASSET import com.coinbase.android.nativesdk.message.request.Web3JsonRPC import com.coinbase.android.nativesdk.message.response.ActionResult import com.coinbase.android.nativesdk.message.response.ResponseResult -import com.walletconnect.android.internal.common.modal.data.model.Wallet -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.wcKoinApp +import com.reown.android.internal.common.modal.data.model.Wallet +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.wcKoinApp import com.walletconnect.util.Empty import com.walletconnect.web3.modal.client.Modal import com.walletconnect.web3.modal.client.models.Account diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitSheet.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitSheet.kt index 94c2f7b2e..551ae2e82 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitSheet.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitSheet.kt @@ -28,7 +28,7 @@ import androidx.navigation.NavHostController import com.google.accompanist.navigation.animation.rememberAnimatedNavController import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialogFragment -import com.walletconnect.modal.utils.theme.toComposeColor +import com.reown.modal.utils.theme.toComposeColor import com.walletconnect.web3.modal.R import com.walletconnect.web3.modal.ui.components.internal.AppKitComponent import com.walletconnect.web3.modal.ui.theme.ColorPalette diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitViewModel.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitViewModel.kt index 5333aad46..08f248e14 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitViewModel.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitViewModel.kt @@ -2,7 +2,7 @@ package com.walletconnect.web3.modal.ui import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.walletconnect.android.internal.common.wcKoinApp +import com.reown.android.internal.common.wcKoinApp import com.walletconnect.web3.modal.client.AppKit import com.walletconnect.web3.modal.engine.AppKitEngine import kotlinx.coroutines.flow.MutableStateFlow diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AppKitState.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AppKitState.kt index 114f32dbe..2ce94091e 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AppKitState.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AppKitState.kt @@ -4,11 +4,11 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.navigation.NavController -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.android.pulse.domain.SendEventInterface -import com.walletconnect.android.pulse.model.EventType -import com.walletconnect.android.pulse.model.properties.Properties -import com.walletconnect.android.pulse.model.properties.Props +import com.reown.android.internal.common.wcKoinApp +import com.reown.android.pulse.domain.SendEventInterface +import com.reown.android.pulse.model.EventType +import com.reown.android.pulse.model.properties.Properties +import com.reown.android.pulse.model.properties.Props import com.reown.foundation.util.Logger import com.walletconnect.web3.modal.client.Modal import com.walletconnect.web3.modal.client.AppKit diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitStates.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitStates.kt index 15bed94e7..1694226e8 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitStates.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitStates.kt @@ -10,7 +10,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import com.walletconnect.modal.ui.components.common.VerticalSpacer +import com.reown.modal.ui.components.common.VerticalSpacer import com.walletconnect.web3.modal.ui.components.internal.commons.LoadingSpinner import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonSize import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonStyle diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Icons.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Icons.kt index 39368ddbb..07b28de8d 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Icons.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Icons.kt @@ -14,7 +14,7 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.vectorResource import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import com.walletconnect.modal.ui.components.common.roundedClickable +import com.reown.modal.ui.components.common.roundedClickable import com.walletconnect.web3.modal.R import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Wallets.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Wallets.kt index ffa582f92..598818904 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Wallets.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Wallets.kt @@ -31,7 +31,7 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import coil.compose.AsyncImage import coil.request.ImageRequest -import com.walletconnect.android.internal.common.modal.data.model.Wallet +import com.reown.android.internal.common.modal.data.model.Wallet import com.walletconnect.web3.modal.R import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/account/AccountName.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/account/AccountName.kt index 9616d2da8..55e22e975 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/account/AccountName.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/account/AccountName.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.platform.ClipboardManager import androidx.compose.ui.platform.LocalClipboardManager import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.unit.dp -import com.walletconnect.modal.ui.components.common.roundedClickable +import com.reown.modal.ui.components.common.roundedClickable import com.walletconnect.web3.modal.domain.model.AccountData import com.walletconnect.web3.modal.domain.model.Identity import com.walletconnect.web3.modal.ui.components.internal.commons.CopyIcon diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/SearchInput.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/SearchInput.kt index e0aac8c80..1c9bc18de 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/SearchInput.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/SearchInput.kt @@ -31,7 +31,7 @@ import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.tooling.preview.PreviewParameterProvider import androidx.compose.ui.unit.dp -import com.walletconnect.modal.ui.components.common.HorizontalSpacer +import com.reown.modal.ui.components.common.HorizontalSpacer import com.walletconnect.util.Empty import com.walletconnect.web3.modal.R import com.walletconnect.web3.modal.ui.components.internal.commons.ContentDescription diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/input/EmailInput.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/input/EmailInput.kt index 0c6cd4db2..e64f9efad 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/input/EmailInput.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/input/EmailInput.kt @@ -16,8 +16,8 @@ import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.dp -import com.walletconnect.modal.ui.components.common.HorizontalSpacer -import com.walletconnect.modal.ui.components.common.roundedClickable +import com.reown.modal.ui.components.common.HorizontalSpacer +import com.reown.modal.ui.components.common.roundedClickable import com.walletconnect.web3.modal.R import com.walletconnect.web3.modal.ui.components.internal.commons.ContentDescription import com.walletconnect.web3.modal.ui.components.internal.commons.LoadingSpinner diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRoot.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRoot.kt index 5ddb60fe3..81a2da04a 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRoot.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRoot.kt @@ -20,7 +20,7 @@ import androidx.compose.ui.platform.LocalSoftwareKeyboardController import androidx.compose.ui.unit.dp import androidx.navigation.NavHostController import androidx.navigation.compose.rememberNavController -import com.walletconnect.modal.ui.components.common.roundedClickable +import com.reown.modal.ui.components.common.roundedClickable import com.walletconnect.web3.modal.client.Modal import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate import com.walletconnect.web3.modal.ui.components.internal.AppKitTopBar diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootState.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootState.kt index 37a186ec7..2945c8dd7 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootState.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootState.kt @@ -5,10 +5,10 @@ import androidx.compose.runtime.remember import androidx.navigation.NavBackStackEntry import androidx.navigation.NavController import androidx.navigation.NavDestination -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.android.pulse.domain.SendEventInterface -import com.walletconnect.android.pulse.model.EventType -import com.walletconnect.android.pulse.model.properties.Props +import com.reown.android.internal.common.wcKoinApp +import com.reown.android.pulse.domain.SendEventInterface +import com.reown.android.pulse.model.EventType +import com.reown.android.pulse.model.properties.Props import com.walletconnect.web3.modal.ui.navigation.Route import com.walletconnect.web3.modal.ui.navigation.getTitleArg import kotlinx.coroutines.CoroutineScope diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/model/UiState.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/model/UiState.kt index e399c1019..225793f1d 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/model/UiState.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/model/UiState.kt @@ -8,7 +8,7 @@ import androidx.compose.animation.togetherWith import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue -import com.walletconnect.modal.ui.model.UiState +import com.reown.modal.ui.model.UiState import com.walletconnect.web3.modal.ui.components.internal.ErrorModalState import com.walletconnect.web3.modal.ui.components.internal.LoadingModalState import kotlinx.coroutines.flow.StateFlow diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/connection/RedirectNavigation.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/connection/RedirectNavigation.kt index 287035a2a..071a96af2 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/connection/RedirectNavigation.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/connection/RedirectNavigation.kt @@ -7,7 +7,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavType import androidx.navigation.navArgument import com.google.accompanist.navigation.animation.composable -import com.walletconnect.android.internal.common.modal.data.model.Wallet +import com.reown.android.internal.common.modal.data.model.Wallet import com.walletconnect.util.Empty import com.walletconnect.web3.modal.ui.navigation.Route import com.walletconnect.web3.modal.ui.navigation.addTitleArg diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/previews/PreviewData.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/previews/PreviewData.kt index 05488191c..12a285c4d 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/previews/PreviewData.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/previews/PreviewData.kt @@ -1,7 +1,7 @@ package com.walletconnect.web3.modal.ui.previews import androidx.compose.ui.tooling.preview.PreviewParameterProvider -import com.walletconnect.android.internal.common.modal.data.model.Wallet +import com.reown.android.internal.common.modal.data.model.Wallet import com.walletconnect.web3.modal.client.Modal import com.walletconnect.web3.modal.domain.model.AccountData diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/previews/Previews.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/previews/Previews.kt index a8d38d63a..96c4205e3 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/previews/Previews.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/previews/Previews.kt @@ -12,8 +12,8 @@ import androidx.compose.ui.tooling.preview.Devices import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.navigation.compose.rememberNavController -import com.walletconnect.android.internal.common.model.ProjectId -import com.walletconnect.android.internal.common.wcKoinApp +import com.reown.android.internal.common.model.ProjectId +import com.reown.android.internal.common.wcKoinApp import com.walletconnect.web3.modal.ui.components.internal.root.AppKitRoot import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer import com.walletconnect.web3.modal.ui.components.internal.root.rememberAppKitRootState diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountViewModel.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountViewModel.kt index 01c90160e..79255105e 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountViewModel.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountViewModel.kt @@ -2,13 +2,13 @@ package com.walletconnect.web3.modal.ui.routes.account import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.android.pulse.domain.SendEventInterface -import com.walletconnect.android.pulse.model.EventType -import com.walletconnect.android.pulse.model.properties.Properties -import com.walletconnect.android.pulse.model.properties.Props +import com.reown.android.internal.common.wcKoinApp +import com.reown.android.pulse.domain.SendEventInterface +import com.reown.android.pulse.model.EventType +import com.reown.android.pulse.model.properties.Properties +import com.reown.android.pulse.model.properties.Props import com.reown.foundation.util.Logger -import com.walletconnect.modal.ui.model.UiState +import com.reown.modal.ui.model.UiState import com.walletconnect.web3.modal.client.Modal import com.walletconnect.web3.modal.client.models.request.Request import com.walletconnect.web3.modal.client.models.request.SentRequestResult diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectViewModel.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectViewModel.kt index 81a9487ff..ccc6ee4cc 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectViewModel.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectViewModel.kt @@ -2,16 +2,16 @@ package com.walletconnect.web3.modal.ui.routes.connect import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.walletconnect.android.internal.common.modal.data.model.Wallet -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.android.pulse.domain.SendEventInterface -import com.walletconnect.android.pulse.model.ConnectionMethod -import com.walletconnect.android.pulse.model.EventType -import com.walletconnect.android.pulse.model.properties.Properties -import com.walletconnect.android.pulse.model.properties.Props +import com.reown.android.internal.common.modal.data.model.Wallet +import com.reown.android.internal.common.wcKoinApp +import com.reown.android.pulse.domain.SendEventInterface +import com.reown.android.pulse.model.ConnectionMethod +import com.reown.android.pulse.model.EventType +import com.reown.android.pulse.model.properties.Properties +import com.reown.android.pulse.model.properties.Props import com.reown.foundation.util.Logger -import com.walletconnect.modal.ui.model.LoadingState -import com.walletconnect.modal.ui.model.UiState +import com.reown.modal.ui.model.LoadingState +import com.reown.modal.ui.model.UiState import com.walletconnect.web3.modal.client.Modal import com.walletconnect.web3.modal.client.AppKit import com.walletconnect.web3.modal.client.models.request.Request diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ParingController.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ParingController.kt index 4c2a9d810..0d3931177 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ParingController.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ParingController.kt @@ -1,8 +1,8 @@ package com.walletconnect.web3.modal.ui.routes.connect -import com.walletconnect.android.Core -import com.walletconnect.android.CoreClient -import com.walletconnect.android.internal.common.wcKoinApp +import com.reown.android.Core +import com.reown.android.CoreClient +import com.reown.android.internal.common.wcKoinApp import com.walletconnect.web3.modal.client.Modal import com.walletconnect.web3.modal.client.toModel import com.walletconnect.web3.modal.engine.AppKitEngine diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/WalletDataSource.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/WalletDataSource.kt index 5f94e6f27..6ed044c4c 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/WalletDataSource.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/WalletDataSource.kt @@ -1,15 +1,15 @@ package com.walletconnect.web3.modal.ui.routes.connect -import com.walletconnect.android.internal.common.modal.data.model.Wallet -import com.walletconnect.android.internal.common.modal.domain.usecase.GetInstalledWalletsIdsUseCaseInterface -import com.walletconnect.android.internal.common.modal.domain.usecase.GetSampleWalletsUseCaseInterface -import com.walletconnect.android.internal.common.modal.domain.usecase.GetWalletsUseCaseInterface -import com.walletconnect.android.internal.common.wcKoinApp +import com.reown.android.internal.common.modal.data.model.Wallet +import com.reown.android.internal.common.modal.domain.usecase.GetInstalledWalletsIdsUseCaseInterface +import com.reown.android.internal.common.modal.domain.usecase.GetSampleWalletsUseCaseInterface +import com.reown.android.internal.common.modal.domain.usecase.GetWalletsUseCaseInterface +import com.reown.android.internal.common.wcKoinApp import com.walletconnect.util.Empty import com.walletconnect.web3.modal.domain.usecase.GetRecentWalletUseCase import com.walletconnect.web3.modal.engine.AppKitEngine import com.walletconnect.web3.modal.engine.coinbase.COINBASE_WALLET_ID -import com.walletconnect.modal.ui.model.LoadingState +import com.reown.modal.ui.model.LoadingState import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.combine diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/all_wallets/AllWalletsRoute.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/all_wallets/AllWalletsRoute.kt index d78bacb62..5706b3f41 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/all_wallets/AllWalletsRoute.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/all_wallets/AllWalletsRoute.kt @@ -48,8 +48,8 @@ import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.walletconnect.android.internal.common.modal.data.model.Wallet -import com.walletconnect.modal.utils.isLandscape +import com.reown.android.internal.common.modal.data.model.Wallet +import com.reown.modal.utils.isLandscape import com.walletconnect.util.Empty import com.walletconnect.web3.modal.R import com.walletconnect.web3.modal.ui.components.internal.commons.ContentDescription @@ -62,7 +62,7 @@ import com.walletconnect.web3.modal.ui.components.internal.commons.inputs.Search import com.walletconnect.web3.modal.ui.components.internal.commons.inputs.SearchState import com.walletconnect.web3.modal.ui.components.internal.commons.inputs.SearchStatePreviewProvider import com.walletconnect.web3.modal.ui.components.internal.commons.walletsGridItems -import com.walletconnect.modal.ui.model.LoadingState +import com.reown.modal.ui.model.LoadingState import com.walletconnect.web3.modal.ui.previews.ComponentPreview import com.walletconnect.web3.modal.ui.previews.UiModePreview import com.walletconnect.web3.modal.ui.previews.AppKitPreview diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/connect_wallet/ConnectWalletRoute.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/connect_wallet/ConnectWalletRoute.kt index dc26403ef..fb5c556f1 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/connect_wallet/ConnectWalletRoute.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/connect_wallet/ConnectWalletRoute.kt @@ -10,7 +10,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp -import com.walletconnect.android.internal.common.modal.data.model.Wallet +import com.reown.android.internal.common.modal.data.model.Wallet import com.walletconnect.web3.modal.ui.components.internal.ErrorModalState import com.walletconnect.web3.modal.ui.components.internal.commons.InstalledWalletIcon import com.walletconnect.web3.modal.ui.components.internal.commons.ListSelectRow diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/get_wallet/GetAWalletRoute.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/get_wallet/GetAWalletRoute.kt index dca69f4da..75e5a00e6 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/get_wallet/GetAWalletRoute.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/get_wallet/GetAWalletRoute.kt @@ -12,8 +12,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.unit.dp -import com.walletconnect.android.internal.common.modal.data.model.Wallet -import com.walletconnect.modal.utils.openPlayStore +import com.reown.android.internal.common.modal.data.model.Wallet +import com.reown.modal.utils.openPlayStore import com.walletconnect.web3.modal.ui.components.internal.commons.AllWalletsIcon import com.walletconnect.web3.modal.ui.components.internal.commons.ExternalIcon import com.walletconnect.web3.modal.ui.components.internal.commons.ListSelectRow diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/redirect/RedirectWalletScreen.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/redirect/RedirectWalletScreen.kt index bba922d5c..8d15e2a4d 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/redirect/RedirectWalletScreen.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/redirect/RedirectWalletScreen.kt @@ -29,11 +29,11 @@ import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import com.walletconnect.android.internal.common.modal.data.model.Wallet -import com.walletconnect.android.pulse.model.ConnectionMethod -import com.walletconnect.modal.utils.openMobileLink -import com.walletconnect.modal.utils.openPlayStore -import com.walletconnect.modal.utils.openWebAppLink +import com.reown.android.internal.common.modal.data.model.Wallet +import com.reown.android.pulse.model.ConnectionMethod +import com.reown.modal.utils.openMobileLink +import com.reown.modal.utils.openPlayStore +import com.reown.modal.utils.openWebAppLink import com.walletconnect.util.Empty import com.walletconnect.web3.modal.client.Modal import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/scan_code/ScanCodeRoute.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/scan_code/ScanCodeRoute.kt index c2d76dda5..818f8ebba 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/scan_code/ScanCodeRoute.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/scan_code/ScanCodeRoute.kt @@ -26,9 +26,9 @@ import androidx.compose.ui.platform.LocalClipboardManager import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import com.walletconnect.android.pulse.model.ConnectionMethod -import com.walletconnect.modal.ui.components.qr.QrCodeType -import com.walletconnect.modal.ui.components.qr.WalletConnectQRCode +import com.reown.android.pulse.model.ConnectionMethod +import com.reown.modal.ui.components.qr.QrCodeType +import com.reown.modal.ui.components.qr.WalletConnectQRCode import com.walletconnect.web3.modal.client.Modal import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate import com.walletconnect.web3.modal.ui.components.internal.OrientationBox diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/what_is_wallet/WhatIsWallet.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/what_is_wallet/WhatIsWallet.kt index 3ef985a5f..f06cf0847 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/what_is_wallet/WhatIsWallet.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/what_is_wallet/WhatIsWallet.kt @@ -10,10 +10,10 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.navigation.NavController -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.android.pulse.domain.SendEventInterface -import com.walletconnect.android.pulse.model.EventType -import com.walletconnect.android.pulse.model.properties.Props +import com.reown.android.internal.common.wcKoinApp +import com.reown.android.pulse.domain.SendEventInterface +import com.reown.android.pulse.model.EventType +import com.reown.android.pulse.model.properties.Props import com.walletconnect.web3.modal.R import com.walletconnect.web3.modal.ui.components.internal.commons.HelpSection import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/Image.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/Image.kt index 2fa1dd1d6..e25b3700c 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/Image.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/Image.kt @@ -3,9 +3,9 @@ package com.walletconnect.web3.modal.utils import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.ColorMatrix import coil.request.ImageRequest -import com.walletconnect.android.BuildConfig -import com.walletconnect.android.internal.common.model.ProjectId -import com.walletconnect.android.internal.common.wcKoinApp +import com.reown.android.BuildConfig +import com.reown.android.internal.common.model.ProjectId +import com.reown.android.internal.common.wcKoinApp internal fun ImageRequest.Builder.imageHeaders() = apply { addHeader("x-project-id", wcKoinApp.koin.get().value) diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/SessionUtils.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/SessionUtils.kt index 6e38759c9..4ccd66d90 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/SessionUtils.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/SessionUtils.kt @@ -1,6 +1,6 @@ package com.walletconnect.web3.modal.utils -import com.walletconnect.android.internal.utils.CoreValidator +import com.reown.android.internal.utils.CoreValidator import com.walletconnect.sign.client.Sign import com.walletconnect.util.Empty import com.walletconnect.web3.modal.client.Modal diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountRouteTest.kt b/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountRouteTest.kt index a5cf37a69..121f66d65 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountRouteTest.kt +++ b/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountRouteTest.kt @@ -3,8 +3,8 @@ package com.walletconnect.web3.modal.ui.routes.account import androidx.navigation.NavController import com.android.resources.NightMode import com.android.resources.ScreenOrientation -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.modal.ui.model.UiState +import com.reown.android.internal.common.wcKoinApp +import com.reown.modal.ui.model.UiState import com.walletconnect.web3.modal.client.Modal import com.walletconnect.web3.modal.client.AppKit import com.walletconnect.web3.modal.domain.model.AccountData diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/ChangeNetworkRouteTest.kt b/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/ChangeNetworkRouteTest.kt index c6bf9cb8a..e14f6c4c0 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/ChangeNetworkRouteTest.kt +++ b/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/ChangeNetworkRouteTest.kt @@ -2,8 +2,8 @@ package com.walletconnect.web3.modal.ui.routes.account import com.android.resources.NightMode import com.android.resources.ScreenOrientation -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.modal.ui.model.UiState +import com.reown.android.internal.common.wcKoinApp +import com.reown.modal.ui.model.UiState import com.walletconnect.web3.modal.client.Modal import com.walletconnect.web3.modal.client.AppKit import com.walletconnect.web3.modal.domain.model.AccountData diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/AllWalletsRouteTest.kt b/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/AllWalletsRouteTest.kt index da02864cd..dd8d3be51 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/AllWalletsRouteTest.kt +++ b/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/AllWalletsRouteTest.kt @@ -2,7 +2,7 @@ package com.walletconnect.web3.modal.ui.routes.connect import com.android.resources.NightMode import com.android.resources.ScreenOrientation -import com.walletconnect.modal.ui.model.LoadingState +import com.reown.modal.ui.model.LoadingState import com.walletconnect.util.Empty import com.walletconnect.web3.modal.ui.navigation.Route import com.walletconnect.web3.modal.ui.previews.testWallets diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectYourWalletRouteTest.kt b/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectYourWalletRouteTest.kt index ce68d58c2..217504191 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectYourWalletRouteTest.kt +++ b/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectYourWalletRouteTest.kt @@ -1,8 +1,8 @@ package com.walletconnect.web3.modal.ui.routes.connect import com.android.resources.NightMode -import com.walletconnect.android.internal.common.modal.data.model.Wallet -import com.walletconnect.modal.ui.model.UiState +import com.reown.android.internal.common.modal.data.model.Wallet +import com.reown.modal.ui.model.UiState import com.walletconnect.web3.modal.ui.navigation.Route import com.walletconnect.web3.modal.ui.previews.testWallets import com.walletconnect.web3.modal.ui.routes.connect.connect_wallet.ConnectWalletRoute diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/utils/PaparazziUtilts.kt b/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/utils/PaparazziUtilts.kt index 8bb01a8d2..34f07bfb6 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/utils/PaparazziUtilts.kt +++ b/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/utils/PaparazziUtilts.kt @@ -23,8 +23,8 @@ import com.android.ide.common.rendering.api.SessionParams import com.android.resources.KeyboardState import com.android.resources.NightMode import com.android.resources.ScreenOrientation -import com.walletconnect.android.internal.common.model.ProjectId -import com.walletconnect.android.internal.common.wcKoinApp +import com.reown.android.internal.common.model.ProjectId +import com.reown.android.internal.common.wcKoinApp import com.walletconnect.web3.modal.ui.components.internal.root.AppKitRoot import com.walletconnect.web3.modal.ui.components.internal.root.rememberAppKitRootState import com.walletconnect.web3.modal.ui.components.internal.snackbar.rememberSnackBarState diff --git a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/ClientMapper.kt b/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/ClientMapper.kt index 976b7cbab..3ea60cebc 100644 --- a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/ClientMapper.kt +++ b/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/ClientMapper.kt @@ -1,6 +1,6 @@ package com.walletconnect.web3.wallet.client -import com.walletconnect.android.internal.common.signing.cacao.CacaoType +import com.reown.android.internal.common.signing.cacao.CacaoType import com.walletconnect.sign.client.Sign @JvmSynthetic diff --git a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/Wallet.kt b/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/Wallet.kt index 57277b980..16fa58858 100644 --- a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/Wallet.kt +++ b/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/Wallet.kt @@ -1,9 +1,9 @@ package com.walletconnect.web3.wallet.client import androidx.annotation.Keep -import com.walletconnect.android.Core -import com.walletconnect.android.CoreInterface -import com.walletconnect.android.cacao.SignatureInterface +import com.reown.android.Core +import com.reown.android.CoreInterface +import com.reown.android.cacao.SignatureInterface import java.net.URI import kotlin.time.Duration import kotlin.time.Duration.Companion.seconds diff --git a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/WalletKit.kt b/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/WalletKit.kt index 134db6c57..5d0692fa2 100644 --- a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/WalletKit.kt +++ b/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/WalletKit.kt @@ -1,8 +1,8 @@ package com.walletconnect.web3.wallet.client -import com.walletconnect.android.Core -import com.walletconnect.android.CoreInterface -import com.walletconnect.android.internal.common.scope +import com.reown.android.Core +import com.reown.android.CoreInterface +import com.reown.android.internal.common.scope import com.walletconnect.sign.client.Sign import com.walletconnect.sign.client.SignClient import com.walletconnect.sign.common.exceptions.SignClientAlreadyInitializedException diff --git a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/utils/CacaoSigner.kt b/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/utils/CacaoSigner.kt index bbeae4e86..3976c335f 100644 --- a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/utils/CacaoSigner.kt +++ b/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/utils/CacaoSigner.kt @@ -2,13 +2,13 @@ package com.walletconnect.web3.wallet.utils -import com.walletconnect.android.cacao.signature.ISignatureType -import com.walletconnect.android.utils.cacao.CacaoSignerInterface +import com.reown.android.cacao.signature.ISignatureType +import com.reown.android.utils.cacao.CacaoSignerInterface import com.walletconnect.web3.wallet.client.Wallet /// Only added to have backwards compatibility. Newer SDKs should only add CacaoSigner object below. -@Deprecated("Moved to android-core module, as other SDKs also need CACAO.", ReplaceWith("com.walletconnect.android.internal.common.cacao.signature.SignatureType")) +@Deprecated("Moved to android-core module, as other SDKs also need CACAO.", ReplaceWith("com.reown.android.internal.common.cacao.signature.SignatureType")) enum class SignatureType(override val header: String) : ISignatureType { EIP191("eip191"), EIP1271("eip1271"); } diff --git a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/di/OverrideModule.kt b/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/di/OverrideModule.kt index 1aec2d573..73a62b546 100644 --- a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/di/OverrideModule.kt +++ b/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/di/OverrideModule.kt @@ -1,14 +1,14 @@ package com.walletconnect.notify.di -import com.walletconnect.android.di.coreStorageModule -import com.walletconnect.android.internal.common.di.coreAndroidNetworkModule -import com.walletconnect.android.internal.common.di.coreCryptoModule -import com.walletconnect.android.internal.common.di.coreJsonRpcModule -import com.walletconnect.android.internal.common.di.corePairingModule -import com.walletconnect.android.pairing.client.PairingInterface -import com.walletconnect.android.pairing.handler.PairingControllerInterface -import com.walletconnect.android.relay.ConnectionType -import com.walletconnect.android.relay.RelayConnectionInterface +import com.reown.android.di.coreStorageModule +import com.reown.android.internal.common.di.coreAndroidNetworkModule +import com.reown.android.internal.common.di.coreCryptoModule +import com.reown.android.internal.common.di.coreJsonRpcModule +import com.reown.android.internal.common.di.corePairingModule +import com.reown.android.pairing.client.PairingInterface +import com.reown.android.pairing.handler.PairingControllerInterface +import com.reown.android.relay.ConnectionType +import com.reown.android.relay.RelayConnectionInterface import org.koin.dsl.module private const val SHARED_PREFS_FILE = "wc_key_store" diff --git a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/scenario/ClientInstrumentedActivityScenario.kt b/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/scenario/ClientInstrumentedActivityScenario.kt index ad271761b..fcc47b2fd 100644 --- a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/scenario/ClientInstrumentedActivityScenario.kt +++ b/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/scenario/ClientInstrumentedActivityScenario.kt @@ -1,8 +1,8 @@ package com.walletconnect.notify.test.scenario -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.relay.WSSConnectionState +import com.reown.android.Core +import com.reown.android.internal.common.scope +import com.reown.android.relay.WSSConnectionState import com.reown.foundation.network.model.Relay import com.walletconnect.notify.client.Notify import com.walletconnect.notify.test.BuildConfig diff --git a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/Common.kt b/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/Common.kt index 207b6e169..99d3204ba 100644 --- a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/Common.kt +++ b/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/Common.kt @@ -1,6 +1,6 @@ package com.walletconnect.notify.test.utils -import com.walletconnect.android.Core +import com.reown.android.Core import com.walletconnect.notify.client.Notify import junit.framework.TestCase.fail import timber.log.Timber diff --git a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/TestClient.kt b/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/TestClient.kt index a27cb69df..6c1878c6e 100644 --- a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/TestClient.kt +++ b/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/TestClient.kt @@ -2,13 +2,13 @@ package com.walletconnect.notify.test.utils import android.app.Application import androidx.test.core.app.ApplicationProvider -import com.walletconnect.android.Core -import com.walletconnect.android.CoreClient -import com.walletconnect.android.CoreProtocol -import com.walletconnect.android.cacao.signature.SignatureType -import com.walletconnect.android.relay.ConnectionType -import com.walletconnect.android.relay.RelayClient -import com.walletconnect.android.utils.cacao.sign +import com.reown.android.Core +import com.reown.android.CoreClient +import com.reown.android.CoreProtocol +import com.reown.android.cacao.signature.SignatureType +import com.reown.android.relay.ConnectionType +import com.reown.android.relay.RelayClient +import com.reown.android.utils.cacao.sign import com.reown.foundation.common.model.PrivateKey import com.walletconnect.notify.client.Notify import com.walletconnect.notify.client.NotifyClient diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/Notify.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/Notify.kt index 231b07285..4c4419ac1 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/Notify.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/Notify.kt @@ -2,9 +2,9 @@ package com.walletconnect.notify.client import android.net.Uri import androidx.annotation.Keep -import com.walletconnect.android.Core -import com.walletconnect.android.CoreInterface -import com.walletconnect.android.cacao.SignatureInterface +import com.reown.android.Core +import com.reown.android.CoreInterface +import com.reown.android.cacao.SignatureInterface import com.reown.foundation.common.model.PrivateKey import kotlin.time.Duration diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/NotifyException.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/NotifyException.kt index edd3b3aa4..1af95649a 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/NotifyException.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/NotifyException.kt @@ -1,6 +1,6 @@ package com.walletconnect.notify.client -import com.walletconnect.android.internal.common.exception.WalletConnectException +import com.reown.android.internal.common.exception.WalletConnectException class InvalidDidJsonFileException(override val message: String?) : WalletConnectException(message) class AccountIsNotRegisteredException(val account: String) : WalletConnectException("Account: $account is not registered") diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/NotifyProtocol.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/NotifyProtocol.kt index 469fef6de..667b64f84 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/NotifyProtocol.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/NotifyProtocol.kt @@ -1,10 +1,10 @@ package com.walletconnect.notify.client -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.di.DatabaseConfig -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.wcKoinApp +import com.reown.android.Core +import com.reown.android.internal.common.di.DatabaseConfig +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.scope +import com.reown.android.internal.common.wcKoinApp import com.walletconnect.notify.common.model.Notification import com.walletconnect.notify.common.model.SubscriptionChanged import com.walletconnect.notify.common.model.toClient diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/cacao/CacaoSigner.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/cacao/CacaoSigner.kt index e6454e2e9..8944dec48 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/cacao/CacaoSigner.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/cacao/CacaoSigner.kt @@ -1,6 +1,6 @@ package com.walletconnect.notify.client.cacao -import com.walletconnect.android.utils.cacao.CacaoSignerInterface +import com.reown.android.utils.cacao.CacaoSignerInterface import com.walletconnect.notify.client.Notify object CacaoSigner : CacaoSignerInterface \ No newline at end of file diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/PeerError.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/PeerError.kt index 5c92ca1af..94e08c6b4 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/PeerError.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/PeerError.kt @@ -2,7 +2,7 @@ package com.walletconnect.notify.common -import com.walletconnect.android.internal.common.model.type.Error +import com.reown.android.internal.common.model.type.Error // Documentation: https://github.com/WalletConnect/walletconnect-docs/blob/main/docs/specs/clients/notify/error-codes.md internal sealed class PeerError : Error { diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/UtilFunctions.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/UtilFunctions.kt index 44892c7a9..92351027a 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/UtilFunctions.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/UtilFunctions.kt @@ -2,8 +2,8 @@ package com.walletconnect.notify.common -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.utils.monthInSeconds +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.utils.monthInSeconds import java.nio.charset.Charset import java.util.concurrent.TimeUnit diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/CacaoPayloadWithIdentityPrivateKey.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/CacaoPayloadWithIdentityPrivateKey.kt index 22cf6bc9b..d16b3ee91 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/CacaoPayloadWithIdentityPrivateKey.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/CacaoPayloadWithIdentityPrivateKey.kt @@ -1,6 +1,6 @@ package com.walletconnect.notify.common.model -import com.walletconnect.android.internal.common.signing.cacao.Cacao +import com.reown.android.internal.common.signing.cacao.Cacao import com.reown.foundation.common.model.PrivateKey internal data class CacaoPayloadWithIdentityPrivateKey(val payload: Cacao.Payload, val key: PrivateKey) diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/CreateSubscription.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/CreateSubscription.kt index 2fb39dc4b..d53f0224d 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/CreateSubscription.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/CreateSubscription.kt @@ -2,7 +2,7 @@ package com.walletconnect.notify.common.model -import com.walletconnect.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.EngineEvent internal sealed class CreateSubscription : EngineEvent { diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/DeleteSubscription.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/DeleteSubscription.kt index 4cb821dcb..ebfd382c7 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/DeleteSubscription.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/DeleteSubscription.kt @@ -2,7 +2,7 @@ package com.walletconnect.notify.common.model -import com.walletconnect.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.EngineEvent internal sealed class DeleteSubscription : EngineEvent { diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/EngineMapper.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/EngineMapper.kt index d59b52576..e6c64c8a5 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/EngineMapper.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/EngineMapper.kt @@ -2,11 +2,11 @@ package com.walletconnect.notify.common.model -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.model.RelayProtocolOptions -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.signing.cacao.Cacao -import com.walletconnect.android.utils.toClient +import com.reown.android.Core +import com.reown.android.internal.common.model.RelayProtocolOptions +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.signing.cacao.Cacao +import com.reown.android.utils.toClient import com.walletconnect.notify.client.Notify @JvmSynthetic diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Error.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Error.kt index 033e64fdf..3930eb383 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Error.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Error.kt @@ -2,7 +2,7 @@ package com.walletconnect.notify.common.model -import com.walletconnect.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.EngineEvent internal data class Error( val requestId: Long, diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/GetNotificationHistory.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/GetNotificationHistory.kt index 18613615c..f1b1cc7fa 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/GetNotificationHistory.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/GetNotificationHistory.kt @@ -2,7 +2,7 @@ package com.walletconnect.notify.common.model -import com.walletconnect.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.EngineEvent internal sealed class GetNotificationHistory : EngineEvent { diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Notification.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Notification.kt index 8f1b4a769..7415c0ec1 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Notification.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Notification.kt @@ -2,8 +2,8 @@ package com.walletconnect.notify.common.model -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.type.EngineEvent internal data class Notification( val id: String, diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/NotifyRpc.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/NotifyRpc.kt index f9c7380c0..8a85098ab 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/NotifyRpc.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/NotifyRpc.kt @@ -4,8 +4,8 @@ package com.walletconnect.notify.common.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.android.internal.common.model.params.CoreNotifyParams -import com.walletconnect.android.internal.common.model.type.JsonRpcClientSync +import com.reown.android.internal.common.model.params.CoreNotifyParams +import com.reown.android.internal.common.model.type.JsonRpcClientSync import com.walletconnect.notify.common.JsonRpcMethod import com.walletconnect.util.generateId diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/RegisteredAccount.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/RegisteredAccount.kt index 9fc8539ed..cda82a9f2 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/RegisteredAccount.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/RegisteredAccount.kt @@ -1,6 +1,6 @@ package com.walletconnect.notify.common.model -import com.walletconnect.android.internal.common.model.AccountId +import com.reown.android.internal.common.model.AccountId import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Subscription.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Subscription.kt index 53109d3d5..2a7054785 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Subscription.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Subscription.kt @@ -2,10 +2,10 @@ package com.walletconnect.notify.common.model -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.RelayProtocolOptions +import com.reown.android.internal.common.model.AccountId +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.RelayProtocolOptions import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/SubscriptionChanged.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/SubscriptionChanged.kt index 2d7e7b5e0..b59a2ad56 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/SubscriptionChanged.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/SubscriptionChanged.kt @@ -1,6 +1,6 @@ package com.walletconnect.notify.common.model -import com.walletconnect.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.EngineEvent internal data class SubscriptionChanged( val subscriptions: List, diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/UpdateSubscription.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/UpdateSubscription.kt index 1463cdc51..d11d785f7 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/UpdateSubscription.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/UpdateSubscription.kt @@ -2,7 +2,7 @@ package com.walletconnect.notify.common.model -import com.walletconnect.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.EngineEvent internal sealed class UpdateSubscription : EngineEvent { diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/delete/EncodeDeleteRequestJwtUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/delete/EncodeDeleteRequestJwtUseCase.kt index 8e179b880..22641b3e7 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/delete/EncodeDeleteRequestJwtUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/delete/EncodeDeleteRequestJwtUseCase.kt @@ -2,8 +2,8 @@ package com.walletconnect.notify.data.jwt.delete -import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase -import com.walletconnect.android.internal.common.model.AccountId +import com.reown.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase +import com.reown.android.internal.common.model.AccountId import com.reown.foundation.common.model.PublicKey import com.reown.foundation.util.jwt.encodeDidPkh import com.reown.foundation.util.jwt.encodeDidWeb diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/getNotifications/EncodeGetNotificationsRequestJwtUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/getNotifications/EncodeGetNotificationsRequestJwtUseCase.kt index f906c6bae..3fb3e5500 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/getNotifications/EncodeGetNotificationsRequestJwtUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/getNotifications/EncodeGetNotificationsRequestJwtUseCase.kt @@ -2,8 +2,8 @@ package com.walletconnect.notify.data.jwt.getNotifications -import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase -import com.walletconnect.android.internal.common.model.AccountId +import com.reown.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase +import com.reown.android.internal.common.model.AccountId import com.reown.foundation.common.model.PublicKey import com.reown.foundation.util.jwt.encodeDidPkh import com.reown.foundation.util.jwt.encodeDidWeb diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/message/EncodeMessageResponseJwtUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/message/EncodeMessageResponseJwtUseCase.kt index 5fb32c3c6..d460b4847 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/message/EncodeMessageResponseJwtUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/message/EncodeMessageResponseJwtUseCase.kt @@ -2,8 +2,8 @@ package com.walletconnect.notify.data.jwt.message -import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase -import com.walletconnect.android.internal.common.model.AccountId +import com.reown.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase +import com.reown.android.internal.common.model.AccountId import com.reown.foundation.common.model.PublicKey import com.reown.foundation.util.jwt.encodeDidPkh import com.reown.foundation.util.jwt.encodeDidWeb diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscription/EncodeSubscriptionRequestJwtUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscription/EncodeSubscriptionRequestJwtUseCase.kt index 3f4bd0a95..f9742aadc 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscription/EncodeSubscriptionRequestJwtUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscription/EncodeSubscriptionRequestJwtUseCase.kt @@ -2,8 +2,8 @@ package com.walletconnect.notify.data.jwt.subscription -import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase -import com.walletconnect.android.internal.common.model.AccountId +import com.reown.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase +import com.reown.android.internal.common.model.AccountId import com.reown.foundation.common.model.PublicKey import com.reown.foundation.util.jwt.encodeDidPkh import com.reown.foundation.util.jwt.encodeDidWeb diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscriptionsChanged/EncodeSubscriptionsChangedResponseJwtUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscriptionsChanged/EncodeSubscriptionsChangedResponseJwtUseCase.kt index a92411648..5b0c55a1b 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscriptionsChanged/EncodeSubscriptionsChangedResponseJwtUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscriptionsChanged/EncodeSubscriptionsChangedResponseJwtUseCase.kt @@ -2,8 +2,8 @@ package com.walletconnect.notify.data.jwt.subscriptionsChanged -import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase -import com.walletconnect.android.internal.common.model.AccountId +import com.reown.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase +import com.reown.android.internal.common.model.AccountId import com.reown.foundation.common.model.PublicKey import com.reown.foundation.util.jwt.encodeDidPkh import com.reown.foundation.util.jwt.encodeEd25519DidKey diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/update/EncodeUpdateRequestJwtUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/update/EncodeUpdateRequestJwtUseCase.kt index 8e1526a2e..3a49103f5 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/update/EncodeUpdateRequestJwtUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/update/EncodeUpdateRequestJwtUseCase.kt @@ -2,8 +2,8 @@ package com.walletconnect.notify.data.jwt.update -import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase -import com.walletconnect.android.internal.common.model.AccountId +import com.reown.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase +import com.reown.android.internal.common.model.AccountId import com.reown.foundation.common.model.PublicKey import com.reown.foundation.util.jwt.encodeDidPkh import com.reown.foundation.util.jwt.encodeDidWeb diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/watchSubscriptions/EncodeWatchSubscriptionsRequestJwtUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/watchSubscriptions/EncodeWatchSubscriptionsRequestJwtUseCase.kt index a50752e0a..b0f2c1bc8 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/watchSubscriptions/EncodeWatchSubscriptionsRequestJwtUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/watchSubscriptions/EncodeWatchSubscriptionsRequestJwtUseCase.kt @@ -2,8 +2,8 @@ package com.walletconnect.notify.data.jwt.watchSubscriptions -import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase -import com.walletconnect.android.internal.common.model.AccountId +import com.reown.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase +import com.reown.android.internal.common.model.AccountId import com.reown.foundation.common.model.PublicKey import com.reown.foundation.util.jwt.encodeDidPkh import com.reown.foundation.util.jwt.encodeDidWeb diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/storage/RegisteredAccountsRepository.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/storage/RegisteredAccountsRepository.kt index ddc7cf9d9..98d9a535d 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/storage/RegisteredAccountsRepository.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/storage/RegisteredAccountsRepository.kt @@ -2,7 +2,7 @@ package com.walletconnect.notify.data.storage -import com.walletconnect.android.internal.common.model.AccountId +import com.reown.android.internal.common.model.AccountId import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.walletconnect.notify.common.model.RegisteredAccount diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/storage/SubscriptionRepository.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/storage/SubscriptionRepository.kt index 0123b640b..83c61a2a4 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/storage/SubscriptionRepository.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/storage/SubscriptionRepository.kt @@ -2,9 +2,9 @@ package com.walletconnect.notify.data.storage -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.RelayProtocolOptions +import com.reown.android.internal.common.model.AccountId +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.RelayProtocolOptions import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.walletconnect.notify.common.model.Scope diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/CallModule.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/CallModule.kt index c129d0a5c..48d9c801d 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/CallModule.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/CallModule.kt @@ -2,9 +2,9 @@ package com.walletconnect.notify.di -import com.walletconnect.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.push.notifications.DecryptMessageUseCaseInterface +import com.reown.android.internal.common.di.AndroidCommonDITags +import com.reown.android.internal.common.model.Tags +import com.reown.android.push.notifications.DecryptMessageUseCaseInterface import com.walletconnect.notify.engine.calls.DecryptNotifyMessageUseCase import com.walletconnect.notify.engine.calls.DeleteSubscriptionUseCase import com.walletconnect.notify.engine.calls.DeleteSubscriptionUseCaseInterface diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/NotifyEngineModule.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/NotifyEngineModule.kt index bf5a0091b..8127021d7 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/NotifyEngineModule.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/NotifyEngineModule.kt @@ -2,7 +2,7 @@ package com.walletconnect.notify.di -import com.walletconnect.android.internal.common.di.AndroidCommonDITags +import com.reown.android.internal.common.di.AndroidCommonDITags import com.walletconnect.notify.common.NotifyServerUrl import com.walletconnect.notify.engine.NotifyEngine import com.walletconnect.notify.engine.calls.GetAllActiveSubscriptionsUseCase diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/NotifyStorageModule.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/NotifyStorageModule.kt index 431fb11c0..bf62ff31c 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/NotifyStorageModule.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/NotifyStorageModule.kt @@ -3,8 +3,8 @@ package com.walletconnect.notify.di import app.cash.sqldelight.ColumnAdapter -import com.walletconnect.android.di.sdkBaseStorageModule -import com.walletconnect.android.internal.common.di.deleteDatabase +import com.reown.android.di.sdkBaseStorageModule +import com.reown.android.internal.common.di.deleteDatabase import com.walletconnect.notify.NotifyDatabase import com.walletconnect.notify.common.storage.data.dao.ActiveSubscriptions import com.walletconnect.notify.data.storage.NotificationsRepository diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/RequestModule.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/RequestModule.kt index d2a5c1ad4..7eb408897 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/RequestModule.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/RequestModule.kt @@ -2,7 +2,7 @@ package com.walletconnect.notify.di -import com.walletconnect.android.internal.common.di.AndroidCommonDITags +import com.reown.android.internal.common.di.AndroidCommonDITags import com.walletconnect.notify.engine.requests.OnMessageUseCase import com.walletconnect.notify.engine.requests.OnSubscriptionsChangedUseCase import org.koin.core.qualifier.named diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/ResponseModule.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/ResponseModule.kt index ca50eedcc..c3c65bc72 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/ResponseModule.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/ResponseModule.kt @@ -2,7 +2,7 @@ package com.walletconnect.notify.di -import com.walletconnect.android.internal.common.di.AndroidCommonDITags +import com.reown.android.internal.common.di.AndroidCommonDITags import com.walletconnect.notify.engine.responses.OnDeleteResponseUseCase import com.walletconnect.notify.engine.responses.OnGetNotificationsResponseUseCase import com.walletconnect.notify.engine.responses.OnSubscribeResponseUseCase diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/NotifyEngine.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/NotifyEngine.kt index 0a0405891..81bfe239a 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/NotifyEngine.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/NotifyEngine.kt @@ -2,15 +2,15 @@ package com.walletconnect.notify.engine -import com.walletconnect.android.internal.common.model.ConnectionState -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.params.CoreNotifyParams -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.pairing.handler.PairingControllerInterface -import com.walletconnect.android.push.notifications.DecryptMessageUseCaseInterface -import com.walletconnect.android.relay.WSSConnectionState +import com.reown.android.internal.common.model.ConnectionState +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.model.params.CoreNotifyParams +import com.reown.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.scope +import com.reown.android.pairing.handler.PairingControllerInterface +import com.reown.android.push.notifications.DecryptMessageUseCaseInterface +import com.reown.android.relay.WSSConnectionState import com.walletconnect.notify.common.JsonRpcMethod import com.walletconnect.notify.engine.calls.DeleteSubscriptionUseCaseInterface import com.walletconnect.notify.engine.calls.GetActiveSubscriptionsUseCaseInterface diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/DecryptNotifyMessageUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/DecryptNotifyMessageUseCase.kt index 50f89ce67..2f3248e29 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/DecryptNotifyMessageUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/DecryptNotifyMessageUseCase.kt @@ -2,18 +2,18 @@ package com.walletconnect.notify.engine.calls -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.crypto.codec.Codec -import com.walletconnect.android.internal.common.crypto.sha256 -import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer -import com.walletconnect.android.internal.common.jwt.did.extractVerifiedDidJwtClaims -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.model.params.CoreNotifyParams -import com.walletconnect.android.internal.common.model.sync.ClientJsonRpc -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory -import com.walletconnect.android.push.notifications.DecryptMessageUseCaseInterface +import com.reown.android.Core +import com.reown.android.internal.common.crypto.codec.Codec +import com.reown.android.internal.common.crypto.sha256 +import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer +import com.reown.android.internal.common.jwt.did.extractVerifiedDidJwtClaims +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.model.params.CoreNotifyParams +import com.reown.android.internal.common.model.sync.ClientJsonRpc +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.common.storage.rpc.JsonRpcHistory +import com.reown.android.push.notifications.DecryptMessageUseCaseInterface import com.reown.foundation.common.model.Topic import com.reown.foundation.util.Logger import com.walletconnect.notify.common.model.Notification diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/DeleteSubscriptionUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/DeleteSubscriptionUseCase.kt index 9decc4f46..5e1eaedff 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/DeleteSubscriptionUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/DeleteSubscriptionUseCase.kt @@ -2,14 +2,14 @@ package com.walletconnect.notify.engine.calls -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.params.CoreNotifyParams -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.android.internal.utils.monthInSeconds +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.params.CoreNotifyParams +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.scope +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.utils.monthInSeconds import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl import com.walletconnect.notify.common.model.DeleteSubscription diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetActiveSubscriptionsUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetActiveSubscriptionsUseCase.kt index b3b516294..7cedb57e6 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetActiveSubscriptionsUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetActiveSubscriptionsUseCase.kt @@ -2,9 +2,9 @@ package com.walletconnect.notify.engine.calls -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.common.model.AccountId +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface import com.walletconnect.notify.common.model.Subscription import com.walletconnect.notify.data.storage.SubscriptionRepository import com.walletconnect.notify.engine.validateTimeout diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetAllActiveSubscriptionsUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetAllActiveSubscriptionsUseCase.kt index d1432807b..c9b64160b 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetAllActiveSubscriptionsUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetAllActiveSubscriptionsUseCase.kt @@ -2,8 +2,8 @@ package com.walletconnect.notify.engine.calls -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface import com.walletconnect.notify.common.model.Subscription import com.walletconnect.notify.data.storage.SubscriptionRepository diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetNotificationHistoryUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetNotificationHistoryUseCase.kt index 71a09fe26..42115cc7b 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetNotificationHistoryUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetNotificationHistoryUseCase.kt @@ -2,15 +2,15 @@ package com.walletconnect.notify.engine.calls -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.params.CoreNotifyParams -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.android.internal.utils.fiveMinutesInSeconds +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.params.CoreNotifyParams +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.scope +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.utils.fiveMinutesInSeconds import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetNotificationTypesUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetNotificationTypesUseCase.kt index 138aa149f..2588da90d 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetNotificationTypesUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetNotificationTypesUseCase.kt @@ -2,7 +2,7 @@ package com.walletconnect.notify.engine.calls -import com.walletconnect.android.internal.common.explorer.domain.usecase.GetNotifyConfigUseCase +import com.reown.android.internal.common.explorer.domain.usecase.GetNotifyConfigUseCase import com.walletconnect.notify.common.model.NotificationType import com.walletconnect.notify.engine.validateTimeout import kotlinx.coroutines.TimeoutCancellationException diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/IsRegisteredUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/IsRegisteredUseCase.kt index f9aca3207..6ae4e4595 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/IsRegisteredUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/IsRegisteredUseCase.kt @@ -2,8 +2,8 @@ package com.walletconnect.notify.engine.calls -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.keyserver.domain.IdentitiesInteractor +import com.reown.android.internal.common.model.AccountId +import com.reown.android.keyserver.domain.IdentitiesInteractor import com.walletconnect.notify.data.storage.RegisteredAccountsRepository import com.walletconnect.notify.engine.domain.createAuthorizationReCaps diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/PrepareRegistrationUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/PrepareRegistrationUseCase.kt index dcf7d20f8..a56ed4f21 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/PrepareRegistrationUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/PrepareRegistrationUseCase.kt @@ -2,10 +2,10 @@ package com.walletconnect.notify.engine.calls -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.signing.cacao.toCAIP222Message -import com.walletconnect.android.keyserver.domain.IdentitiesInteractor +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.model.AccountId +import com.reown.android.internal.common.signing.cacao.toCAIP222Message +import com.reown.android.keyserver.domain.IdentitiesInteractor import com.reown.foundation.util.Logger import com.walletconnect.notify.common.model.CacaoPayloadWithIdentityPrivateKey import com.walletconnect.notify.engine.domain.createAuthorizationReCaps diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/RegisterUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/RegisterUseCase.kt index d06268b11..2428e0ee7 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/RegisterUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/RegisterUseCase.kt @@ -2,14 +2,14 @@ package com.walletconnect.notify.engine.calls -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.model.ProjectId -import com.walletconnect.android.internal.common.signing.cacao.Cacao -import com.walletconnect.android.internal.common.signing.cacao.CacaoType -import com.walletconnect.android.internal.common.signing.cacao.CacaoVerifier -import com.walletconnect.android.internal.common.signing.cacao.Issuer -import com.walletconnect.android.keyserver.domain.IdentitiesInteractor +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.model.AccountId +import com.reown.android.internal.common.model.ProjectId +import com.reown.android.internal.common.signing.cacao.Cacao +import com.reown.android.internal.common.signing.cacao.CacaoType +import com.reown.android.internal.common.signing.cacao.CacaoVerifier +import com.reown.android.internal.common.signing.cacao.Issuer +import com.reown.android.keyserver.domain.IdentitiesInteractor import com.walletconnect.notify.common.model.CacaoPayloadWithIdentityPrivateKey import com.walletconnect.notify.data.storage.RegisteredAccountsRepository import com.walletconnect.notify.engine.domain.WatchSubscriptionsUseCase diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/SubscribeToDappUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/SubscribeToDappUseCase.kt index a1e378fb8..8bdece618 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/SubscribeToDappUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/SubscribeToDappUseCase.kt @@ -3,21 +3,21 @@ package com.walletconnect.notify.engine.calls import android.net.Uri -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.crypto.sha256 -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.model.EnvelopeType -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Participants -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.params.CoreNotifyParams -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.android.internal.utils.monthInSeconds -import com.walletconnect.android.internal.utils.thirtySeconds +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.crypto.sha256 +import com.reown.android.internal.common.model.AccountId +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.model.EnvelopeType +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.Participants +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.params.CoreNotifyParams +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.scope +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.utils.monthInSeconds +import com.reown.android.internal.utils.thirtySeconds import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/UnregisterUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/UnregisterUseCase.kt index 46fd68d60..b0567433e 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/UnregisterUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/UnregisterUseCase.kt @@ -2,9 +2,9 @@ package com.walletconnect.notify.engine.calls -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.keyserver.domain.IdentitiesInteractor +import com.reown.android.internal.common.model.AccountId +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.keyserver.domain.IdentitiesInteractor import com.reown.foundation.common.model.Topic import com.walletconnect.notify.data.storage.NotificationsRepository import com.walletconnect.notify.data.storage.RegisteredAccountsRepository diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/UpdateSubscriptionUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/UpdateSubscriptionUseCase.kt index bf529a0a1..8e6b3c74a 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/UpdateSubscriptionUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/UpdateSubscriptionUseCase.kt @@ -2,15 +2,15 @@ package com.walletconnect.notify.engine.calls -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.params.CoreNotifyParams -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.android.internal.utils.thirtySeconds +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.params.CoreNotifyParams +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.scope +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.utils.thirtySeconds import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl import com.walletconnect.notify.common.model.NotifyRpc diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/ExtractMetadataFromConfigUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/ExtractMetadataFromConfigUseCase.kt index 0ba1d19ca..6120f4395 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/ExtractMetadataFromConfigUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/ExtractMetadataFromConfigUseCase.kt @@ -3,9 +3,9 @@ package com.walletconnect.notify.engine.domain import android.net.Uri -import com.walletconnect.android.internal.common.explorer.data.model.ImageUrl -import com.walletconnect.android.internal.common.explorer.domain.usecase.GetNotifyConfigUseCase -import com.walletconnect.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.explorer.data.model.ImageUrl +import com.reown.android.internal.common.explorer.domain.usecase.GetNotifyConfigUseCase +import com.reown.android.internal.common.model.AppMetaData import com.walletconnect.notify.common.model.Scope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/ExtractPublicKeysFromDidJsonUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/ExtractPublicKeysFromDidJsonUseCase.kt index e206fdc60..fdf776073 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/ExtractPublicKeysFromDidJsonUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/ExtractPublicKeysFromDidJsonUseCase.kt @@ -4,7 +4,7 @@ package com.walletconnect.notify.engine.domain import android.net.Uri import android.util.Base64 -import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer +import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer import com.reown.foundation.common.model.PublicKey import com.walletconnect.notify.client.InvalidDidJsonFileException import com.walletconnect.notify.data.wellknown.did.DidJsonDTO diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/FetchDidJwtInteractor.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/FetchDidJwtInteractor.kt index f1027ac2b..b55305fa5 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/FetchDidJwtInteractor.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/FetchDidJwtInteractor.kt @@ -2,11 +2,11 @@ package com.walletconnect.notify.engine.domain -import com.walletconnect.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase -import com.walletconnect.android.internal.common.jwt.did.encodeDidJwt -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.model.DidJwt -import com.walletconnect.android.keyserver.domain.IdentitiesInteractor +import com.reown.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase +import com.reown.android.internal.common.jwt.did.encodeDidJwt +import com.reown.android.internal.common.model.AccountId +import com.reown.android.internal.common.model.DidJwt +import com.reown.android.keyserver.domain.IdentitiesInteractor import com.reown.foundation.common.model.PrivateKey import com.reown.foundation.common.model.PublicKey import com.walletconnect.notify.data.jwt.delete.EncodeDeleteRequestJwtUseCase diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/FindRequestedSubscriptionUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/FindRequestedSubscriptionUseCase.kt index 10a53090e..ad72b6497 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/FindRequestedSubscriptionUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/FindRequestedSubscriptionUseCase.kt @@ -1,7 +1,7 @@ package com.walletconnect.notify.engine.domain -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface import com.reown.foundation.util.jwt.encodeEd25519DidKey import com.walletconnect.notify.common.model.Subscription import kotlinx.coroutines.supervisorScope diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/GetSelfKeyForWatchSubscriptionUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/GetSelfKeyForWatchSubscriptionUseCase.kt index b034aeffb..8f22fa44b 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/GetSelfKeyForWatchSubscriptionUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/GetSelfKeyForWatchSubscriptionUseCase.kt @@ -2,9 +2,9 @@ package com.walletconnect.notify.engine.domain -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.utils.getPeerTag +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.model.AccountId +import com.reown.android.internal.utils.getPeerTag import com.reown.foundation.common.model.Topic internal class GetSelfKeyForWatchSubscriptionUseCase( diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/SetActiveSubscriptionsUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/SetActiveSubscriptionsUseCase.kt index 5f8ebfdcb..c634ea69b 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/SetActiveSubscriptionsUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/SetActiveSubscriptionsUseCase.kt @@ -1,16 +1,16 @@ package com.walletconnect.notify.engine.domain import androidx.core.net.toUri -import com.walletconnect.android.internal.common.crypto.sha256 -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.SymmetricKey -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.storage.key_chain.KeyStore -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.common.crypto.sha256 +import com.reown.android.internal.common.model.AccountId +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.model.SymmetricKey +import com.reown.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.storage.key_chain.KeyStore +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface import com.reown.foundation.common.model.Topic import com.reown.foundation.util.jwt.decodeEd25519DidKey import com.walletconnect.notify.common.model.Scope diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/StopWatchingSubscriptionsUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/StopWatchingSubscriptionsUseCase.kt index 65dae3126..9e63b5d60 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/StopWatchingSubscriptionsUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/StopWatchingSubscriptionsUseCase.kt @@ -2,8 +2,8 @@ package com.walletconnect.notify.engine.domain -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.model.AccountId +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.walletconnect.notify.data.storage.RegisteredAccountsRepository import kotlinx.coroutines.supervisorScope diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/WatchSubscriptionsUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/WatchSubscriptionsUseCase.kt index 0f2cf3d1e..c132ea63c 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/WatchSubscriptionsUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/WatchSubscriptionsUseCase.kt @@ -2,15 +2,15 @@ package com.walletconnect.notify.engine.domain -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.model.EnvelopeType -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Participants -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.params.CoreNotifyParams -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.utils.thirtySeconds +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.model.AccountId +import com.reown.android.internal.common.model.EnvelopeType +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.Participants +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.params.CoreNotifyParams +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.utils.thirtySeconds import com.reown.foundation.common.model.Ttl import com.walletconnect.notify.common.NotifyServerUrl import com.walletconnect.notify.common.model.NotifyRpc diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/requests/OnMessageUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/requests/OnMessageUseCase.kt index d4e1a4916..73259b609 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/requests/OnMessageUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/requests/OnMessageUseCase.kt @@ -2,19 +2,19 @@ package com.walletconnect.notify.engine.requests -import com.walletconnect.android.internal.common.jwt.did.extractVerifiedDidJwtClaims -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.WCRequest -import com.walletconnect.android.internal.common.model.params.ChatNotifyResponseAuthParams -import com.walletconnect.android.internal.common.model.params.CoreNotifyParams -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.android.internal.utils.monthInSeconds +import com.reown.android.internal.common.jwt.did.extractVerifiedDidJwtClaims +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.WCRequest +import com.reown.android.internal.common.model.params.ChatNotifyResponseAuthParams +import com.reown.android.internal.common.model.params.CoreNotifyParams +import com.reown.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.utils.monthInSeconds import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger import com.reown.foundation.util.jwt.decodeDidWeb diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/requests/OnSubscriptionsChangedUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/requests/OnSubscriptionsChangedUseCase.kt index afd5c142a..6c8a5a896 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/requests/OnSubscriptionsChangedUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/requests/OnSubscriptionsChangedUseCase.kt @@ -2,17 +2,17 @@ package com.walletconnect.notify.engine.requests -import com.walletconnect.android.internal.common.jwt.did.extractVerifiedDidJwtClaims -import com.walletconnect.android.internal.common.model.AccountId -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.WCRequest -import com.walletconnect.android.internal.common.model.params.ChatNotifyResponseAuthParams -import com.walletconnect.android.internal.common.model.params.CoreNotifyParams -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.utils.fiveMinutesInSeconds +import com.reown.android.internal.common.jwt.did.extractVerifiedDidJwtClaims +import com.reown.android.internal.common.model.AccountId +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.WCRequest +import com.reown.android.internal.common.model.params.ChatNotifyResponseAuthParams +import com.reown.android.internal.common.model.params.CoreNotifyParams +import com.reown.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.utils.fiveMinutesInSeconds import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger import com.reown.foundation.util.jwt.decodeDidPkh diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnDeleteResponseUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnDeleteResponseUseCase.kt index 1628cdc30..514defb28 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnDeleteResponseUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnDeleteResponseUseCase.kt @@ -2,13 +2,13 @@ package com.walletconnect.notify.engine.responses -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.jwt.did.extractVerifiedDidJwtClaims -import com.walletconnect.android.internal.common.model.WCResponse -import com.walletconnect.android.internal.common.model.params.ChatNotifyResponseAuthParams -import com.walletconnect.android.internal.common.model.params.CoreNotifyParams -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.jwt.did.extractVerifiedDidJwtClaims +import com.reown.android.internal.common.model.WCResponse +import com.reown.android.internal.common.model.params.ChatNotifyResponseAuthParams +import com.reown.android.internal.common.model.params.CoreNotifyParams +import com.reown.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.reown.foundation.util.Logger import com.reown.foundation.util.jwt.decodeDidPkh import com.walletconnect.notify.common.model.DeleteSubscription diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnGetNotificationsResponseUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnGetNotificationsResponseUseCase.kt index e263d6f68..5c3394f53 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnGetNotificationsResponseUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnGetNotificationsResponseUseCase.kt @@ -2,15 +2,15 @@ package com.walletconnect.notify.engine.responses -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.jwt.did.extractVerifiedDidJwtClaims -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.model.WCResponse -import com.walletconnect.android.internal.common.model.params.ChatNotifyResponseAuthParams -import com.walletconnect.android.internal.common.model.params.CoreNotifyParams -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.jwt.did.extractVerifiedDidJwtClaims +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.model.WCResponse +import com.reown.android.internal.common.model.params.ChatNotifyResponseAuthParams +import com.reown.android.internal.common.model.params.CoreNotifyParams +import com.reown.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface import com.reown.foundation.util.Logger import com.walletconnect.notify.common.convertToUTF8 import com.walletconnect.notify.common.model.GetNotificationHistory diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnSubscribeResponseUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnSubscribeResponseUseCase.kt index fc5776fae..47b0e00a0 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnSubscribeResponseUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnSubscribeResponseUseCase.kt @@ -2,13 +2,13 @@ package com.walletconnect.notify.engine.responses -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.jwt.did.extractVerifiedDidJwtClaims -import com.walletconnect.android.internal.common.model.WCResponse -import com.walletconnect.android.internal.common.model.params.ChatNotifyResponseAuthParams -import com.walletconnect.android.internal.common.model.params.CoreNotifyParams -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.jwt.did.extractVerifiedDidJwtClaims +import com.reown.android.internal.common.model.WCResponse +import com.reown.android.internal.common.model.params.ChatNotifyResponseAuthParams +import com.reown.android.internal.common.model.params.CoreNotifyParams +import com.reown.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.reown.foundation.common.model.Topic import com.reown.foundation.util.Logger import com.reown.foundation.util.jwt.decodeDidPkh diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnUpdateResponseUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnUpdateResponseUseCase.kt index 5a4e580cb..b1e0bce3c 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnUpdateResponseUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnUpdateResponseUseCase.kt @@ -2,13 +2,13 @@ package com.walletconnect.notify.engine.responses -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.jwt.did.extractVerifiedDidJwtClaims -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.WCResponse -import com.walletconnect.android.internal.common.model.params.ChatNotifyResponseAuthParams -import com.walletconnect.android.internal.common.model.params.CoreNotifyParams -import com.walletconnect.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.jwt.did.extractVerifiedDidJwtClaims +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.model.WCResponse +import com.reown.android.internal.common.model.params.ChatNotifyResponseAuthParams +import com.reown.android.internal.common.model.params.CoreNotifyParams +import com.reown.android.internal.common.model.type.EngineEvent import com.reown.foundation.util.Logger import com.reown.foundation.util.jwt.decodeDidPkh import com.walletconnect.notify.common.model.CreateSubscription diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnWatchSubscriptionsResponseUseCase.kt b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnWatchSubscriptionsResponseUseCase.kt index ca5de1e68..7c11164a0 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnWatchSubscriptionsResponseUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnWatchSubscriptionsResponseUseCase.kt @@ -2,12 +2,12 @@ package com.walletconnect.notify.engine.responses -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.jwt.did.extractVerifiedDidJwtClaims -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.WCResponse -import com.walletconnect.android.internal.common.model.params.ChatNotifyResponseAuthParams -import com.walletconnect.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.jwt.did.extractVerifiedDidJwtClaims +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.model.WCResponse +import com.reown.android.internal.common.model.params.ChatNotifyResponseAuthParams +import com.reown.android.internal.common.model.type.EngineEvent import com.reown.foundation.util.Logger import com.reown.foundation.util.jwt.decodeDidPkh import com.reown.foundation.util.jwt.decodeEd25519DidKey diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/di/OverrideModule.kt b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/di/OverrideModule.kt index c41335440..bf68fff08 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/di/OverrideModule.kt +++ b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/di/OverrideModule.kt @@ -1,14 +1,14 @@ package com.walletconnect.sign.di -import com.walletconnect.android.di.coreStorageModule -import com.walletconnect.android.internal.common.di.coreAndroidNetworkModule -import com.walletconnect.android.internal.common.di.coreCryptoModule -import com.walletconnect.android.internal.common.di.coreJsonRpcModule -import com.walletconnect.android.internal.common.di.corePairingModule -import com.walletconnect.android.pairing.client.PairingInterface -import com.walletconnect.android.pairing.handler.PairingControllerInterface -import com.walletconnect.android.relay.ConnectionType -import com.walletconnect.android.relay.RelayConnectionInterface +import com.reown.android.di.coreStorageModule +import com.reown.android.internal.common.di.coreAndroidNetworkModule +import com.reown.android.internal.common.di.coreCryptoModule +import com.reown.android.internal.common.di.coreJsonRpcModule +import com.reown.android.internal.common.di.corePairingModule +import com.reown.android.pairing.client.PairingInterface +import com.reown.android.pairing.handler.PairingControllerInterface +import com.reown.android.relay.ConnectionType +import com.reown.android.relay.RelayConnectionInterface import org.koin.dsl.module private const val SHARED_PREFS_FILE = "wc_key_store" diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/CacaoUtilsTests.kt b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/CacaoUtilsTests.kt index 1bdf4e112..77e6df245 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/CacaoUtilsTests.kt +++ b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/CacaoUtilsTests.kt @@ -1,9 +1,9 @@ package com.walletconnect.sign.test -import com.walletconnect.android.internal.common.signing.cacao.decodeReCaps -import com.walletconnect.android.internal.common.signing.cacao.getChains -import com.walletconnect.android.internal.common.signing.cacao.getMethods -import com.walletconnect.android.internal.common.signing.cacao.parseReCaps +import com.reown.android.internal.common.signing.cacao.decodeReCaps +import com.reown.android.internal.common.signing.cacao.getChains +import com.reown.android.internal.common.signing.cacao.getMethods +import com.reown.android.internal.common.signing.cacao.parseReCaps import org.junit.Test class CacaoUtilsTests { diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/GenerateAuthPayloadParamsTest.kt b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/GenerateAuthPayloadParamsTest.kt index 77d7afd1e..6232e3b35 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/GenerateAuthPayloadParamsTest.kt +++ b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/GenerateAuthPayloadParamsTest.kt @@ -1,7 +1,7 @@ package com.walletconnect.sign.test -import com.walletconnect.android.internal.common.signing.cacao.getChains -import com.walletconnect.android.internal.common.signing.cacao.getMethods +import com.reown.android.internal.common.signing.cacao.getChains +import com.reown.android.internal.common.signing.cacao.getMethods import com.walletconnect.sign.client.Sign import com.walletconnect.sign.client.utils.generateAuthPayloadParams import org.junit.Test diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/ParseReCapsTest.kt b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/ParseReCapsTest.kt index 0b3f4510d..54d47613c 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/ParseReCapsTest.kt +++ b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/ParseReCapsTest.kt @@ -1,7 +1,7 @@ package com.walletconnect.sign.test -import com.walletconnect.android.internal.common.signing.cacao.getChains -import com.walletconnect.android.internal.common.signing.cacao.getMethods +import com.reown.android.internal.common.signing.cacao.getChains +import com.reown.android.internal.common.signing.cacao.getMethods import org.bouncycastle.util.encoders.Base64 import org.junit.Test diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/client/HybridAppInstrumentedAndroidTest.kt b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/client/HybridAppInstrumentedAndroidTest.kt index 17188319b..c464feb68 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/client/HybridAppInstrumentedAndroidTest.kt +++ b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/client/HybridAppInstrumentedAndroidTest.kt @@ -1,6 +1,6 @@ package com.walletconnect.sign.test.client -import com.walletconnect.android.Core +import com.reown.android.Core import com.walletconnect.sign.BuildConfig import com.walletconnect.sign.client.Sign import com.walletconnect.sign.client.SignClient diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/client/SessionAuthenticateInstrumentedAndroidTest.kt b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/client/SessionAuthenticateInstrumentedAndroidTest.kt index ef7fb710e..a02221677 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/client/SessionAuthenticateInstrumentedAndroidTest.kt +++ b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/client/SessionAuthenticateInstrumentedAndroidTest.kt @@ -1,8 +1,8 @@ package com.walletconnect.sign.test.client -import com.walletconnect.android.Core -import com.walletconnect.android.cacao.signature.SignatureType -import com.walletconnect.android.utils.cacao.signHex +import com.reown.android.Core +import com.reown.android.cacao.signature.SignatureType +import com.reown.android.utils.cacao.signHex import com.walletconnect.sign.BuildConfig import com.walletconnect.sign.client.Sign import com.walletconnect.sign.client.SignClient diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/client/SignClientInstrumentedAndroidTest.kt b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/client/SignClientInstrumentedAndroidTest.kt index 3d4c77989..307be572d 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/client/SignClientInstrumentedAndroidTest.kt +++ b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/client/SignClientInstrumentedAndroidTest.kt @@ -1,6 +1,6 @@ package com.walletconnect.sign.test.client -import com.walletconnect.android.Core +import com.reown.android.Core import com.walletconnect.sign.BuildConfig import com.walletconnect.sign.client.Sign import com.walletconnect.sign.client.SignClient diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/scenario/HybridAppInstrumentedActivityScenario.kt b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/scenario/HybridAppInstrumentedActivityScenario.kt index 150e957a0..467f4a64b 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/scenario/HybridAppInstrumentedActivityScenario.kt +++ b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/scenario/HybridAppInstrumentedActivityScenario.kt @@ -1,6 +1,6 @@ package com.walletconnect.sign.test.scenario -import com.walletconnect.android.internal.common.scope +import com.reown.android.internal.common.scope import com.reown.foundation.network.model.Relay import com.walletconnect.sign.test.BuildConfig import com.walletconnect.sign.test.utils.TestClient diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/scenario/SignClientInstrumentedActivityScenario.kt b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/scenario/SignClientInstrumentedActivityScenario.kt index 99ac9bf68..a8eeeb474 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/scenario/SignClientInstrumentedActivityScenario.kt +++ b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/scenario/SignClientInstrumentedActivityScenario.kt @@ -1,6 +1,6 @@ package com.walletconnect.sign.test.scenario -import com.walletconnect.android.internal.common.scope +import com.reown.android.internal.common.scope import com.reown.foundation.network.model.Relay import com.walletconnect.sign.test.BuildConfig import com.walletconnect.sign.test.utils.TestClient diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/Common.kt b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/Common.kt index f293f0479..376b3efed 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/Common.kt +++ b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/Common.kt @@ -1,6 +1,6 @@ package com.walletconnect.sign.test.utils -import com.walletconnect.android.Core +import com.reown.android.Core import com.walletconnect.sign.client.Sign import junit.framework.TestCase.fail import timber.log.Timber diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/TestClient.kt b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/TestClient.kt index 44a913edf..55a018c7c 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/TestClient.kt +++ b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/TestClient.kt @@ -2,11 +2,11 @@ package com.walletconnect.sign.test.utils import android.app.Application import androidx.test.core.app.ApplicationProvider -import com.walletconnect.android.Core -import com.walletconnect.android.CoreClient -import com.walletconnect.android.CoreProtocol -import com.walletconnect.android.relay.ConnectionType -import com.walletconnect.android.relay.RelayClient +import com.reown.android.Core +import com.reown.android.CoreClient +import com.reown.android.CoreProtocol +import com.reown.android.relay.ConnectionType +import com.reown.android.relay.RelayClient import com.walletconnect.sign.BuildConfig import com.walletconnect.sign.client.Sign import com.walletconnect.sign.client.SignClient diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/dapp/DappSignClient.kt b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/dapp/DappSignClient.kt index b388c079e..acebe6137 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/dapp/DappSignClient.kt +++ b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/dapp/DappSignClient.kt @@ -1,6 +1,6 @@ package com.walletconnect.sign.test.utils.dapp -import com.walletconnect.android.Core +import com.reown.android.Core import com.walletconnect.sign.client.Sign import com.walletconnect.sign.test.utils.TestClient import com.walletconnect.sign.test.utils.globalOnError diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/hybrid/HybridSignClient.kt b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/hybrid/HybridSignClient.kt index 7969afb38..c71232707 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/hybrid/HybridSignClient.kt +++ b/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/hybrid/HybridSignClient.kt @@ -1,6 +1,6 @@ package com.walletconnect.sign.test.utils.hybrid -import com.walletconnect.android.Core +import com.reown.android.Core import com.walletconnect.sign.client.Sign import com.walletconnect.sign.test.utils.TestClient import com.walletconnect.sign.test.utils.globalOnError diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/Sign.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/Sign.kt index 5a776b407..751d33ba6 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/Sign.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/Sign.kt @@ -1,10 +1,10 @@ package com.walletconnect.sign.client import androidx.annotation.Keep -import com.walletconnect.android.Core -import com.walletconnect.android.CoreInterface -import com.walletconnect.android.cacao.SignatureInterface -import com.walletconnect.android.internal.common.signing.cacao.Issuer +import com.reown.android.Core +import com.reown.android.CoreInterface +import com.reown.android.cacao.SignatureInterface +import com.reown.android.internal.common.signing.cacao.Issuer import java.net.URI import kotlin.time.Duration import kotlin.time.Duration.Companion.seconds @@ -20,7 +20,7 @@ object Sign { @Deprecated( message = "ConnectionType for the relay is moved to CoreClient", - replaceWith = ReplaceWith(expression = "ConnectionType", imports = ["com.walletconnect.android.relay"]) + replaceWith = ReplaceWith(expression = "ConnectionType", imports = ["com.reown.android.relay"]) ) enum class ConnectionType { AUTOMATIC, MANUAL diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignInterface.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignInterface.kt index 0be223d60..7502b6bad 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignInterface.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignInterface.kt @@ -74,7 +74,7 @@ interface SignInterface { @Deprecated( message = "Creating a pairing will be moved to CoreClient to make pairing SDK agnostic", - replaceWith = ReplaceWith(expression = "CoreClient.Pairing.pair()", imports = ["com.walletconnect.android.CoreClient"]) + replaceWith = ReplaceWith(expression = "CoreClient.Pairing.pair()", imports = ["com.reown.android.CoreClient"]) ) fun pair(pair: Sign.Params.Pair, onSuccess: (Sign.Params.Pair) -> Unit = {}, onError: (Sign.Model.Error) -> Unit) fun approveSession(approve: Sign.Params.Approve, onSuccess: (Sign.Params.Approve) -> Unit = {}, onError: (Sign.Model.Error) -> Unit) diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignProtocol.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignProtocol.kt index 82d64aef1..ea4b98599 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignProtocol.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignProtocol.kt @@ -2,15 +2,15 @@ package com.walletconnect.sign.client -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.android.internal.common.di.DatabaseConfig -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.android.pairing.model.mapper.toPairing -import com.walletconnect.android.relay.WSSConnectionState +import com.reown.android.Core +import com.reown.android.internal.common.di.AndroidCommonDITags +import com.reown.android.internal.common.di.DatabaseConfig +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.scope +import com.reown.android.internal.common.wcKoinApp +import com.reown.android.pairing.model.mapper.toPairing +import com.reown.android.relay.WSSConnectionState import com.reown.foundation.common.model.Topic import com.walletconnect.sign.client.mapper.* import com.walletconnect.sign.common.exceptions.SignClientAlreadyInitializedException @@ -526,7 +526,7 @@ class SignProtocol(private val koinApp: KoinApplication = wcKoinApp) : SignInter @Deprecated( "Getting a list of Pairings will be moved to CoreClient to make pairing SDK agnostic", - replaceWith = ReplaceWith("CoreClient.Pairing.getPairings()", "com.walletconnect.android.CoreClient") + replaceWith = ReplaceWith("CoreClient.Pairing.getPairings()", "com.reown.android.CoreClient") ) @Throws(IllegalStateException::class) override fun getListOfSettledPairings(): List { diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/mapper/ClientMapper.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/mapper/ClientMapper.kt index 824bf758c..a6ca929cc 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/mapper/ClientMapper.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/mapper/ClientMapper.kt @@ -2,18 +2,18 @@ package com.walletconnect.sign.client.mapper -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.model.ConnectionState -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.Namespace -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.Validation -import com.walletconnect.android.internal.common.signing.cacao.Cacao -import com.walletconnect.android.internal.common.signing.cacao.CacaoType -import com.walletconnect.android.internal.common.signing.cacao.RECAPS_STATEMENT -import com.walletconnect.android.internal.common.signing.cacao.getStatement -import com.walletconnect.android.utils.toClient +import com.reown.android.Core +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.model.ConnectionState +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.Namespace +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.model.Validation +import com.reown.android.internal.common.signing.cacao.Cacao +import com.reown.android.internal.common.signing.cacao.CacaoType +import com.reown.android.internal.common.signing.cacao.RECAPS_STATEMENT +import com.reown.android.internal.common.signing.cacao.getStatement +import com.reown.android.utils.toClient import com.walletconnect.sign.client.Sign import com.walletconnect.sign.common.model.Request import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/utils/CacaoSigner.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/utils/CacaoSigner.kt index 6273140fd..6003731d6 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/utils/CacaoSigner.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/utils/CacaoSigner.kt @@ -1,14 +1,14 @@ package com.walletconnect.sign.client.utils -import com.walletconnect.android.cacao.signature.ISignatureType -import com.walletconnect.android.utils.cacao.CacaoSignerInterface +import com.reown.android.cacao.signature.ISignatureType +import com.reown.android.utils.cacao.CacaoSignerInterface import com.walletconnect.sign.client.Sign /** * @deprecated Only added to have backwards compatibility. Newer SDKs should only add CacaoSigner object below. */ -@Deprecated("Moved to android-core module, as other SDKs also need CACAO.", ReplaceWith("com.walletconnect.android.internal.common.cacao.signature.SignatureType")) +@Deprecated("Moved to android-core module, as other SDKs also need CACAO.", ReplaceWith("com.reown.android.internal.common.cacao.signature.SignatureType")) enum class SignatureType(override val header: String) : ISignatureType { EIP191("eip191"), EIP1271("eip1271"); } diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/utils/Utils.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/utils/Utils.kt index ec62a64f9..6771974a6 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/utils/Utils.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/utils/Utils.kt @@ -3,14 +3,14 @@ package com.walletconnect.sign.client.utils import android.util.Base64 -import com.walletconnect.android.internal.common.model.Namespace -import com.walletconnect.android.internal.common.signing.cacao.Cacao.Payload.Companion.RECAPS_PREFIX -import com.walletconnect.android.internal.common.signing.cacao.CacaoType -import com.walletconnect.android.internal.common.signing.cacao.RECAPS_STATEMENT -import com.walletconnect.android.internal.common.signing.cacao.decodeReCaps -import com.walletconnect.android.internal.common.signing.cacao.getStatement -import com.walletconnect.android.internal.common.signing.cacao.parseReCaps -import com.walletconnect.android.internal.utils.CoreValidator +import com.reown.android.internal.common.model.Namespace +import com.reown.android.internal.common.signing.cacao.Cacao.Payload.Companion.RECAPS_PREFIX +import com.reown.android.internal.common.signing.cacao.CacaoType +import com.reown.android.internal.common.signing.cacao.RECAPS_STATEMENT +import com.reown.android.internal.common.signing.cacao.decodeReCaps +import com.reown.android.internal.common.signing.cacao.getStatement +import com.reown.android.internal.common.signing.cacao.parseReCaps +import com.reown.android.internal.utils.CoreValidator import com.walletconnect.sign.client.Sign import com.walletconnect.sign.client.mapper.toCacaoPayload import com.walletconnect.sign.client.mapper.toCore diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/exceptions/PeerError.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/exceptions/PeerError.kt index 0b5cc74ca..e07276ad1 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/exceptions/PeerError.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/exceptions/PeerError.kt @@ -1,6 +1,6 @@ package com.walletconnect.sign.common.exceptions -import com.walletconnect.android.internal.common.model.type.Error +import com.reown.android.internal.common.model.type.Error /** * Documentation: https://github.com/WalletConnect/walletconnect-specs/blob/main/sign/error-codes.md diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/exceptions/SignExceptions.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/exceptions/SignExceptions.kt index 2da17dd00..1e5cb75d7 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/exceptions/SignExceptions.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/exceptions/SignExceptions.kt @@ -1,6 +1,6 @@ package com.walletconnect.sign.common.exceptions -import com.walletconnect.android.internal.common.exception.WalletConnectException +import com.reown.android.internal.common.exception.WalletConnectException class UnauthorizedPeerException(override val message: String?) : WalletConnectException(message) class UnauthorizedMethodException(override val message: String?) : WalletConnectException(message) diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/Request.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/Request.kt index f7f5c0d12..93728b829 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/Request.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/Request.kt @@ -1,7 +1,7 @@ package com.walletconnect.sign.common.model -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.TransportType +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.TransportType import com.reown.foundation.common.model.Topic internal data class Request( diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/common/Requester.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/common/Requester.kt index 140f93982..0313027fb 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/common/Requester.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/common/Requester.kt @@ -2,7 +2,7 @@ package com.walletconnect.sign.common.model.vo.clientsync.common import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.AppMetaData @JsonClass(generateAdapter = true) data class Requester( diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/common/SessionParticipant.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/common/SessionParticipant.kt index e1fa6af5a..126d9c211 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/common/SessionParticipant.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/common/SessionParticipant.kt @@ -4,7 +4,7 @@ package com.walletconnect.sign.common.model.vo.clientsync.common import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.AppMetaData @JsonClass(generateAdapter = true) internal data class SessionParticipant( diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/session/SignRpc.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/session/SignRpc.kt index d273d0f14..049b0d691 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/session/SignRpc.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/session/SignRpc.kt @@ -4,7 +4,7 @@ package com.walletconnect.sign.common.model.vo.clientsync.session import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.android.internal.common.model.type.JsonRpcClientSync +import com.reown.android.internal.common.model.type.JsonRpcClientSync import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams import com.walletconnect.sign.json_rpc.model.JsonRpcMethod import com.walletconnect.util.generateId diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/session/params/SignParams.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/session/params/SignParams.kt index 90060b6ac..1079e5aa9 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/session/params/SignParams.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/session/params/SignParams.kt @@ -4,10 +4,10 @@ package com.walletconnect.sign.common.model.vo.clientsync.session.params import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.android.internal.common.model.Namespace -import com.walletconnect.android.internal.common.model.RelayProtocolOptions -import com.walletconnect.android.internal.common.model.SessionProposer -import com.walletconnect.android.internal.common.model.params.CoreSignParams +import com.reown.android.internal.common.model.Namespace +import com.reown.android.internal.common.model.RelayProtocolOptions +import com.reown.android.internal.common.model.SessionProposer +import com.reown.android.internal.common.model.params.CoreSignParams import com.walletconnect.sign.common.model.vo.clientsync.common.PayloadParams import com.walletconnect.sign.common.model.vo.clientsync.common.Requester import com.walletconnect.sign.common.model.vo.clientsync.common.SessionParticipant diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/proposal/ProposalVO.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/proposal/ProposalVO.kt index 7d025f0f2..02618d9aa 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/proposal/ProposalVO.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/proposal/ProposalVO.kt @@ -1,9 +1,9 @@ package com.walletconnect.sign.common.model.vo.proposal -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.Namespace -import com.walletconnect.android.internal.common.model.Redirect +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.Namespace +import com.reown.android.internal.common.model.Redirect import com.reown.foundation.common.model.Topic internal data class ProposalVO( diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/sequence/SessionVO.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/sequence/SessionVO.kt index 84b6ff329..8fb27e4a5 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/sequence/SessionVO.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/sequence/SessionVO.kt @@ -2,12 +2,12 @@ package com.walletconnect.sign.common.model.vo.sequence -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.Namespace -import com.walletconnect.android.internal.common.model.TransportType -import com.walletconnect.android.internal.common.model.type.Sequence -import com.walletconnect.android.internal.utils.ACTIVE_SESSION +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.Namespace +import com.reown.android.internal.common.model.TransportType +import com.reown.android.internal.common.model.type.Sequence +import com.reown.android.internal.utils.ACTIVE_SESSION import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.walletconnect.sign.common.model.vo.clientsync.common.SessionParticipant diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/validator/SignValidator.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/validator/SignValidator.kt index c31465b89..7b639eff8 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/validator/SignValidator.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/validator/SignValidator.kt @@ -3,13 +3,13 @@ package com.walletconnect.sign.common.validator import android.annotation.SuppressLint -import com.walletconnect.android.internal.common.model.Namespace -import com.walletconnect.android.internal.common.model.RelayProtocolOptions -import com.walletconnect.android.internal.common.model.SymmetricKey -import com.walletconnect.android.internal.utils.CoreValidator.isAccountIdCAIP10Compliant -import com.walletconnect.android.internal.utils.CoreValidator.isChainIdCAIP2Compliant -import com.walletconnect.android.internal.utils.CoreValidator.isNamespaceRegexCompliant -import com.walletconnect.android.internal.utils.weekInSeconds +import com.reown.android.internal.common.model.Namespace +import com.reown.android.internal.common.model.RelayProtocolOptions +import com.reown.android.internal.common.model.SymmetricKey +import com.reown.android.internal.utils.CoreValidator.isAccountIdCAIP10Compliant +import com.reown.android.internal.utils.CoreValidator.isChainIdCAIP2Compliant +import com.reown.android.internal.utils.CoreValidator.isNamespaceRegexCompliant +import com.reown.android.internal.utils.weekInSeconds import com.reown.foundation.common.model.Topic import com.walletconnect.sign.common.exceptions.NAMESPACE_ACCOUNTS_CAIP_10_MESSAGE import com.walletconnect.sign.common.exceptions.NAMESPACE_ACCOUNTS_WRONG_NAMESPACE_MESSAGE diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/CallsModule.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/CallsModule.kt index d6237dfec..fe060e868 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/CallsModule.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/CallsModule.kt @@ -1,9 +1,9 @@ package com.walletconnect.sign.di -import com.walletconnect.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.push.notifications.DecryptMessageUseCaseInterface +import com.reown.android.internal.common.di.AndroidCommonDITags +import com.reown.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface +import com.reown.android.internal.common.model.Tags +import com.reown.android.push.notifications.DecryptMessageUseCaseInterface import com.walletconnect.sign.engine.use_case.calls.ApproveSessionAuthenticateUseCase import com.walletconnect.sign.engine.use_case.calls.ApproveSessionAuthenticateUseCaseInterface import com.walletconnect.sign.engine.use_case.calls.ApproveSessionUseCase diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/EngineModule.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/EngineModule.kt index 2f29c4c24..72f420f8a 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/EngineModule.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/EngineModule.kt @@ -2,8 +2,8 @@ package com.walletconnect.sign.di -import com.walletconnect.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.android.internal.common.signing.cacao.CacaoVerifier +import com.reown.android.internal.common.di.AndroidCommonDITags +import com.reown.android.internal.common.signing.cacao.CacaoVerifier import com.walletconnect.sign.engine.domain.SignEngine import com.walletconnect.sign.engine.use_case.calls.GetPendingAuthenticateRequestUseCase import com.walletconnect.sign.engine.use_case.calls.GetPendingAuthenticateRequestUseCaseInterface diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/RequestsModule.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/RequestsModule.kt index 1b5085a4b..449a87699 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/RequestsModule.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/RequestsModule.kt @@ -1,7 +1,7 @@ package com.walletconnect.sign.di -import com.walletconnect.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.android.pulse.domain.InsertEventUseCase +import com.reown.android.internal.common.di.AndroidCommonDITags +import com.reown.android.pulse.domain.InsertEventUseCase import com.walletconnect.sign.engine.use_case.requests.OnPingUseCase import com.walletconnect.sign.engine.use_case.requests.OnSessionAuthenticateUseCase import com.walletconnect.sign.engine.use_case.requests.OnSessionDeleteUseCase diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/ResponsesModule.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/ResponsesModule.kt index 46892396a..bc2f55c5a 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/ResponsesModule.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/ResponsesModule.kt @@ -1,7 +1,7 @@ package com.walletconnect.sign.di -import com.walletconnect.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.android.pulse.domain.InsertEventUseCase +import com.reown.android.internal.common.di.AndroidCommonDITags +import com.reown.android.pulse.domain.InsertEventUseCase import com.walletconnect.sign.engine.use_case.responses.OnSessionAuthenticateResponseUseCase import com.walletconnect.sign.engine.use_case.responses.OnSessionProposalResponseUseCase import com.walletconnect.sign.engine.use_case.responses.OnSessionRequestResponseUseCase diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/StorageModule.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/StorageModule.kt index d9dbb4455..23c0f6645 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/StorageModule.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/StorageModule.kt @@ -2,9 +2,9 @@ package com.walletconnect.sign.di -import com.walletconnect.android.di.sdkBaseStorageModule -import com.walletconnect.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.android.internal.common.di.deleteDatabase +import com.reown.android.di.sdkBaseStorageModule +import com.reown.android.internal.common.di.AndroidCommonDITags +import com.reown.android.internal.common.di.deleteDatabase import com.walletconnect.sign.SignDatabase import com.walletconnect.sign.storage.authenticate.AuthenticateResponseTopicRepository import com.walletconnect.sign.storage.data.dao.namespace.NamespaceDao @@ -21,7 +21,7 @@ import org.koin.core.module.Module import org.koin.core.qualifier.named import org.koin.core.scope.Scope import org.koin.dsl.module -import com.walletconnect.android.internal.common.scope as wcScope +import com.reown.android.internal.common.scope as wcScope @JvmSynthetic internal fun storageModule(dbName: String): Module = module { diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/domain/SignEngine.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/domain/SignEngine.kt index 81daae289..5a2b33510 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/domain/SignEngine.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/domain/SignEngine.kt @@ -2,26 +2,26 @@ package com.walletconnect.sign.engine.domain -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.Validation -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.android.internal.common.storage.verify.VerifyContextStorageRepository -import com.walletconnect.android.internal.utils.CoreValidator.isExpired -import com.walletconnect.android.pairing.handler.PairingControllerInterface -import com.walletconnect.android.pulse.domain.InsertTelemetryEventUseCase -import com.walletconnect.android.pulse.model.EventType -import com.walletconnect.android.pulse.model.Trace -import com.walletconnect.android.pulse.model.properties.Properties -import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.android.push.notifications.DecryptMessageUseCaseInterface -import com.walletconnect.android.relay.WSSConnectionState -import com.walletconnect.android.verify.model.VerifyContext +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.model.Validation +import com.reown.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.scope +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.common.storage.verify.VerifyContextStorageRepository +import com.reown.android.internal.utils.CoreValidator.isExpired +import com.reown.android.pairing.handler.PairingControllerInterface +import com.reown.android.pulse.domain.InsertTelemetryEventUseCase +import com.reown.android.pulse.model.EventType +import com.reown.android.pulse.model.Trace +import com.reown.android.pulse.model.properties.Properties +import com.reown.android.pulse.model.properties.Props +import com.reown.android.push.notifications.DecryptMessageUseCaseInterface +import com.reown.android.relay.WSSConnectionState +import com.reown.android.verify.model.VerifyContext import com.reown.foundation.util.Logger import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams import com.walletconnect.sign.engine.model.EngineDO diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/EngineDO.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/EngineDO.kt index a53b07473..25b44677c 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/EngineDO.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/EngineDO.kt @@ -3,16 +3,16 @@ package com.walletconnect.sign.engine.model import com.squareup.moshi.JsonClass -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.SymmetricKey -import com.walletconnect.android.internal.common.model.Validation -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.Sequence -import com.walletconnect.android.internal.common.signing.cacao.Cacao +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.SymmetricKey +import com.reown.android.internal.common.model.Validation +import com.reown.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.Sequence +import com.reown.android.internal.common.signing.cacao.Cacao import com.reown.foundation.common.model.Topic import java.net.URI -import com.walletconnect.android.internal.common.model.RelayProtocolOptions as CoreRelayProtocolOptions +import com.reown.android.internal.common.model.RelayProtocolOptions as CoreRelayProtocolOptions internal sealed class EngineDO { diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/mapper/EngineMapper.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/mapper/EngineMapper.kt index 13eddde31..7e5e22dee 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/mapper/EngineMapper.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/mapper/EngineMapper.kt @@ -2,20 +2,20 @@ package com.walletconnect.sign.engine.model.mapper -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.Namespace -import com.walletconnect.android.internal.common.model.RelayProtocolOptions -import com.walletconnect.android.internal.common.model.SessionProposer -import com.walletconnect.android.internal.common.model.TransportType -import com.walletconnect.android.internal.common.model.WCRequest -import com.walletconnect.android.internal.common.model.params.CoreSignParams -import com.walletconnect.android.internal.common.signing.cacao.Cacao -import com.walletconnect.android.internal.common.signing.cacao.CacaoType -import com.walletconnect.android.internal.common.signing.cacao.Issuer -import com.walletconnect.android.internal.common.signing.cacao.toCAIP222Message -import com.walletconnect.android.verify.model.VerifyContext +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.Namespace +import com.reown.android.internal.common.model.RelayProtocolOptions +import com.reown.android.internal.common.model.SessionProposer +import com.reown.android.internal.common.model.TransportType +import com.reown.android.internal.common.model.WCRequest +import com.reown.android.internal.common.model.params.CoreSignParams +import com.reown.android.internal.common.signing.cacao.Cacao +import com.reown.android.internal.common.signing.cacao.CacaoType +import com.reown.android.internal.common.signing.cacao.Issuer +import com.reown.android.internal.common.signing.cacao.toCAIP222Message +import com.reown.android.verify.model.VerifyContext import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.walletconnect.sign.common.exceptions.PeerError diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCase.kt index 7d9a5052b..823457960 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCase.kt @@ -1,40 +1,40 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.exception.NoInternetConnectionException -import com.walletconnect.android.internal.common.exception.NoRelayConnectionException -import com.walletconnect.android.internal.common.exception.RequestExpiredException -import com.walletconnect.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.model.EnvelopeType -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Namespace -import com.walletconnect.android.internal.common.model.Participant -import com.walletconnect.android.internal.common.model.Participants -import com.walletconnect.android.internal.common.model.SymmetricKey -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.TransportType -import com.walletconnect.android.internal.common.model.params.CoreSignParams -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.signing.cacao.Cacao -import com.walletconnect.android.internal.common.signing.cacao.CacaoVerifier -import com.walletconnect.android.internal.common.signing.cacao.Issuer -import com.walletconnect.android.internal.common.signing.cacao.getChains -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.android.internal.common.storage.verify.VerifyContextStorageRepository -import com.walletconnect.android.internal.utils.CoreValidator -import com.walletconnect.android.internal.utils.CoreValidator.isExpired -import com.walletconnect.android.internal.utils.dayInSeconds -import com.walletconnect.android.pulse.domain.InsertEventUseCase -import com.walletconnect.android.pulse.domain.InsertTelemetryEventUseCase -import com.walletconnect.android.pulse.model.Direction -import com.walletconnect.android.pulse.model.EventType -import com.walletconnect.android.pulse.model.Trace -import com.walletconnect.android.pulse.model.properties.Properties -import com.walletconnect.android.pulse.model.properties.Props +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.exception.NoInternetConnectionException +import com.reown.android.internal.common.exception.NoRelayConnectionException +import com.reown.android.internal.common.exception.RequestExpiredException +import com.reown.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.model.EnvelopeType +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.Namespace +import com.reown.android.internal.common.model.Participant +import com.reown.android.internal.common.model.Participants +import com.reown.android.internal.common.model.SymmetricKey +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.TransportType +import com.reown.android.internal.common.model.params.CoreSignParams +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.scope +import com.reown.android.internal.common.signing.cacao.Cacao +import com.reown.android.internal.common.signing.cacao.CacaoVerifier +import com.reown.android.internal.common.signing.cacao.Issuer +import com.reown.android.internal.common.signing.cacao.getChains +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.common.storage.verify.VerifyContextStorageRepository +import com.reown.android.internal.utils.CoreValidator +import com.reown.android.internal.utils.CoreValidator.isExpired +import com.reown.android.internal.utils.dayInSeconds +import com.reown.android.pulse.domain.InsertEventUseCase +import com.reown.android.pulse.domain.InsertTelemetryEventUseCase +import com.reown.android.pulse.model.Direction +import com.reown.android.pulse.model.EventType +import com.reown.android.pulse.model.Trace +import com.reown.android.pulse.model.properties.Properties +import com.reown.android.pulse.model.properties.Props import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionUseCase.kt index 75b19caf1..1c2a1d879 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionUseCase.kt @@ -1,24 +1,24 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.exception.NoInternetConnectionException -import com.walletconnect.android.internal.common.exception.NoRelayConnectionException -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.android.internal.common.storage.verify.VerifyContextStorageRepository -import com.walletconnect.android.internal.utils.ACTIVE_SESSION -import com.walletconnect.android.internal.utils.CoreValidator.isExpired -import com.walletconnect.android.internal.utils.fiveMinutesInSeconds -import com.walletconnect.android.pulse.domain.InsertTelemetryEventUseCase -import com.walletconnect.android.pulse.model.EventType -import com.walletconnect.android.pulse.model.Trace -import com.walletconnect.android.pulse.model.properties.Properties -import com.walletconnect.android.pulse.model.properties.Props +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.exception.NoInternetConnectionException +import com.reown.android.internal.common.exception.NoRelayConnectionException +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.scope +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.common.storage.verify.VerifyContextStorageRepository +import com.reown.android.internal.utils.ACTIVE_SESSION +import com.reown.android.internal.utils.CoreValidator.isExpired +import com.reown.android.internal.utils.fiveMinutesInSeconds +import com.reown.android.pulse.domain.InsertTelemetryEventUseCase +import com.reown.android.pulse.model.EventType +import com.reown.android.pulse.model.Trace +import com.reown.android.pulse.model.properties.Properties +import com.reown.android.pulse.model.properties.Props import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/DecryptSignMessageUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/DecryptSignMessageUseCase.kt index 60ff8d990..bfde9a273 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/DecryptSignMessageUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/DecryptSignMessageUseCase.kt @@ -1,18 +1,18 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.crypto.codec.Codec -import com.walletconnect.android.internal.common.crypto.sha256 -import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.model.Namespace -import com.walletconnect.android.internal.common.model.sync.ClientJsonRpc -import com.walletconnect.android.internal.common.model.type.ClientParams -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.android.internal.common.storage.push_messages.PushMessagesRepository -import com.walletconnect.android.push.notifications.DecryptMessageUseCaseInterface -import com.walletconnect.android.utils.toClient +import com.reown.android.Core +import com.reown.android.internal.common.crypto.codec.Codec +import com.reown.android.internal.common.crypto.sha256 +import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.model.Namespace +import com.reown.android.internal.common.model.sync.ClientJsonRpc +import com.reown.android.internal.common.model.type.ClientParams +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.common.storage.push_messages.PushMessagesRepository +import com.reown.android.push.notifications.DecryptMessageUseCaseInterface +import com.reown.android.utils.toClient import com.reown.foundation.common.model.Topic import com.walletconnect.sign.common.exceptions.InvalidSignParamsType import com.walletconnect.sign.common.model.vo.clientsync.common.PayloadParams diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/DisconnectSessionUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/DisconnectSessionUseCase.kt index a92298936..9555cdda3 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/DisconnectSessionUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/DisconnectSessionUseCase.kt @@ -1,11 +1,11 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.exception.CannotFindSequenceForTopic -import com.walletconnect.android.internal.common.exception.Reason -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.utils.dayInSeconds +import com.reown.android.internal.common.exception.CannotFindSequenceForTopic +import com.reown.android.internal.common.exception.Reason +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.utils.dayInSeconds import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/EmitEventUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/EmitEventUseCase.kt index a3dd4186d..5d5ddce93 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/EmitEventUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/EmitEventUseCase.kt @@ -1,10 +1,10 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.exception.CannotFindSequenceForTopic -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.utils.fiveMinutesInSeconds +import com.reown.android.internal.common.exception.CannotFindSequenceForTopic +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.utils.fiveMinutesInSeconds import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ExtendSessionUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ExtendSessionUseCase.kt index 30844caa8..e9dc05d24 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ExtendSessionUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ExtendSessionUseCase.kt @@ -1,11 +1,11 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.exception.CannotFindSequenceForTopic -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.utils.dayInSeconds -import com.walletconnect.android.internal.utils.weekInSeconds +import com.reown.android.internal.common.exception.CannotFindSequenceForTopic +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.utils.dayInSeconds +import com.reown.android.internal.utils.weekInSeconds import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/FormatAuthenticateMessageUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/FormatAuthenticateMessageUseCase.kt index 75f562baa..6f7591ee0 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/FormatAuthenticateMessageUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/FormatAuthenticateMessageUseCase.kt @@ -1,7 +1,7 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.signing.cacao.Issuer -import com.walletconnect.android.internal.utils.CoreValidator +import com.reown.android.internal.common.signing.cacao.Issuer +import com.reown.android.internal.utils.CoreValidator import com.walletconnect.sign.engine.model.EngineDO import com.walletconnect.sign.engine.model.mapper.toCAIP222Message import kotlinx.coroutines.supervisorScope diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetListOfVerifyContextsUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetListOfVerifyContextsUseCase.kt index 87686af16..67d437058 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetListOfVerifyContextsUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetListOfVerifyContextsUseCase.kt @@ -1,6 +1,6 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.storage.verify.VerifyContextStorageRepository +import com.reown.android.internal.common.storage.verify.VerifyContextStorageRepository import com.walletconnect.sign.engine.model.EngineDO import com.walletconnect.sign.engine.model.mapper.toEngineDO diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetNamespacesFromReCaps.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetNamespacesFromReCaps.kt index 139592f8c..bd5433116 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetNamespacesFromReCaps.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetNamespacesFromReCaps.kt @@ -1,7 +1,7 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.model.Namespace -import com.walletconnect.android.internal.utils.CoreValidator +import com.reown.android.internal.common.model.Namespace +import com.reown.android.internal.utils.CoreValidator import com.walletconnect.sign.common.validator.SignValidator class GetNamespacesFromReCaps { diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPairingForSessionAuthenticateUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPairingForSessionAuthenticateUseCase.kt index 7f67e7a6d..7a9859aef 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPairingForSessionAuthenticateUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPairingForSessionAuthenticateUseCase.kt @@ -1,7 +1,7 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.Core -import com.walletconnect.android.pairing.client.PairingInterface +import com.reown.android.Core +import com.reown.android.pairing.client.PairingInterface import com.walletconnect.sign.json_rpc.model.JsonRpcMethod internal class GetPairingForSessionAuthenticateUseCase(private var pairingProtocol: PairingInterface) { diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPairingsUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPairingsUseCase.kt index b4554760c..cd4aab154 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPairingsUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPairingsUseCase.kt @@ -1,7 +1,7 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.pairing.client.PairingInterface -import com.walletconnect.android.pairing.model.mapper.toPairing +import com.reown.android.pairing.client.PairingInterface +import com.reown.android.pairing.model.mapper.toPairing import com.walletconnect.sign.engine.model.EngineDO import kotlinx.coroutines.supervisorScope diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPendingAuthenticateRequestUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPendingAuthenticateRequestUseCase.kt index ec5b00c33..e84c524d2 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPendingAuthenticateRequestUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPendingAuthenticateRequestUseCase.kt @@ -1,7 +1,7 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer -import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory +import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer +import com.reown.android.internal.common.storage.rpc.JsonRpcHistory import com.walletconnect.sign.common.model.Request import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetSessionProposalsUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetSessionProposalsUseCase.kt index e6f570e53..4c0ded876 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetSessionProposalsUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetSessionProposalsUseCase.kt @@ -1,6 +1,6 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.utils.CoreValidator.isExpired +import com.reown.android.internal.utils.CoreValidator.isExpired import com.walletconnect.sign.common.model.vo.proposal.ProposalVO import com.walletconnect.sign.engine.model.EngineDO import com.walletconnect.sign.engine.model.mapper.toEngineDO diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetSessionsUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetSessionsUseCase.kt index 7f439f3e3..89e8bac6b 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetSessionsUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetSessionsUseCase.kt @@ -1,8 +1,8 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface import com.walletconnect.sign.engine.model.EngineDO import com.walletconnect.sign.engine.model.mapper.toEngineDO import com.walletconnect.sign.storage.sequence.SessionStorageRepository diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetVerifyContextByIdUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetVerifyContextByIdUseCase.kt index cfb7b0d66..5a95b061a 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetVerifyContextByIdUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetVerifyContextByIdUseCase.kt @@ -1,6 +1,6 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.storage.verify.VerifyContextStorageRepository +import com.reown.android.internal.common.storage.verify.VerifyContextStorageRepository import com.walletconnect.sign.engine.model.EngineDO import com.walletconnect.sign.engine.model.mapper.toEngineDO diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/PairUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/PairUseCase.kt index aaceafd8f..f86495536 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/PairUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/PairUseCase.kt @@ -1,7 +1,7 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.Core -import com.walletconnect.android.pairing.client.PairingInterface +import com.reown.android.Core +import com.reown.android.pairing.client.PairingInterface import kotlinx.coroutines.supervisorScope internal class PairUseCase(private val pairingInterface: PairingInterface) : PairUseCaseInterface { diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/PingUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/PingUseCase.kt index 49f67a64a..8f4d69b98 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/PingUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/PingUseCase.kt @@ -1,11 +1,11 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.utils.thirtySeconds +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.scope +import com.reown.android.internal.utils.thirtySeconds import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeSessionUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeSessionUseCase.kt index d902b3f09..07f8860e9 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeSessionUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeSessionUseCase.kt @@ -1,15 +1,15 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Pairing -import com.walletconnect.android.internal.common.model.RelayProtocolOptions -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.utils.PROPOSAL_EXPIRY -import com.walletconnect.android.internal.utils.fiveMinutesInSeconds +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.Pairing +import com.reown.android.internal.common.model.RelayProtocolOptions +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.utils.PROPOSAL_EXPIRY +import com.reown.android.internal.utils.fiveMinutesInSeconds import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionAuthenticateUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionAuthenticateUseCase.kt index 5575333f7..797a89429 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionAuthenticateUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionAuthenticateUseCase.kt @@ -1,26 +1,26 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.exception.RequestExpiredException -import com.walletconnect.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.EnvelopeType -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Participants -import com.walletconnect.android.internal.common.model.SymmetricKey -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.TransportType -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.storage.verify.VerifyContextStorageRepository -import com.walletconnect.android.internal.utils.CoreValidator.isExpired -import com.walletconnect.android.internal.utils.dayInSeconds -import com.walletconnect.android.pulse.domain.InsertEventUseCase -import com.walletconnect.android.pulse.model.Direction -import com.walletconnect.android.pulse.model.EventType -import com.walletconnect.android.pulse.model.properties.Properties -import com.walletconnect.android.pulse.model.properties.Props +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.exception.RequestExpiredException +import com.reown.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.EnvelopeType +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.Participants +import com.reown.android.internal.common.model.SymmetricKey +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.TransportType +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.scope +import com.reown.android.internal.common.storage.verify.VerifyContextStorageRepository +import com.reown.android.internal.utils.CoreValidator.isExpired +import com.reown.android.internal.utils.dayInSeconds +import com.reown.android.pulse.domain.InsertEventUseCase +import com.reown.android.pulse.model.Direction +import com.reown.android.pulse.model.EventType +import com.reown.android.pulse.model.properties.Properties +import com.reown.android.pulse.model.properties.Props import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionUseCase.kt index 2b5b6660b..7334d3128 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionUseCase.kt @@ -1,14 +1,14 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.storage.verify.VerifyContextStorageRepository -import com.walletconnect.android.internal.utils.CoreValidator.isExpired -import com.walletconnect.android.internal.utils.fiveMinutesInSeconds -import com.walletconnect.android.pairing.handler.PairingControllerInterface +import com.reown.android.Core +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.scope +import com.reown.android.internal.common.storage.verify.VerifyContextStorageRepository +import com.reown.android.internal.utils.CoreValidator.isExpired +import com.reown.android.internal.utils.fiveMinutesInSeconds +import com.reown.android.pairing.handler.PairingControllerInterface import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger import com.walletconnect.sign.common.exceptions.PeerError diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RespondSessionRequestUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RespondSessionRequestUseCase.kt index 6f75bd166..803422092 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RespondSessionRequestUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RespondSessionRequestUseCase.kt @@ -1,26 +1,26 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.exception.CannotFindSequenceForTopic -import com.walletconnect.android.internal.common.exception.RequestExpiredException -import com.walletconnect.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.TransportType -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.android.internal.common.storage.verify.VerifyContextStorageRepository -import com.walletconnect.android.internal.utils.CoreValidator.isExpired -import com.walletconnect.android.internal.utils.fiveMinutesInSeconds -import com.walletconnect.android.pulse.domain.InsertEventUseCase -import com.walletconnect.android.pulse.model.Direction -import com.walletconnect.android.pulse.model.EventType -import com.walletconnect.android.pulse.model.properties.Properties -import com.walletconnect.android.pulse.model.properties.Props +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.exception.CannotFindSequenceForTopic +import com.reown.android.internal.common.exception.RequestExpiredException +import com.reown.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.TransportType +import com.reown.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.scope +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.common.storage.verify.VerifyContextStorageRepository +import com.reown.android.internal.utils.CoreValidator.isExpired +import com.reown.android.internal.utils.fiveMinutesInSeconds +import com.reown.android.pulse.domain.InsertEventUseCase +import com.reown.android.pulse.model.Direction +import com.reown.android.pulse.model.EventType +import com.reown.android.pulse.model.properties.Properties +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 diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionAuthenticateUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionAuthenticateUseCase.kt index 652a4b123..4a33bfd42 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionAuthenticateUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionAuthenticateUseCase.kt @@ -1,31 +1,31 @@ package com.walletconnect.sign.engine.use_case.calls import android.util.Base64 -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.exception.InvalidExpiryException -import com.walletconnect.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.EnvelopeType -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.signing.cacao.Cacao.Payload.Companion.ATT_KEY -import com.walletconnect.android.internal.common.signing.cacao.Cacao.Payload.Companion.RECAPS_PREFIX -import com.walletconnect.android.internal.common.signing.cacao.mergeReCaps -import com.walletconnect.android.internal.utils.CoreValidator -import com.walletconnect.android.internal.utils.currentTimeInSeconds -import com.walletconnect.android.internal.utils.dayInSeconds -import com.walletconnect.android.internal.utils.getParticipantTag -import com.walletconnect.android.internal.utils.oneHourInSeconds -import com.walletconnect.android.pairing.model.mapper.toPairing -import com.walletconnect.android.pulse.domain.InsertEventUseCase -import com.walletconnect.android.pulse.model.Direction -import com.walletconnect.android.pulse.model.EventType -import com.walletconnect.android.pulse.model.properties.Properties -import com.walletconnect.android.pulse.model.properties.Props +import com.reown.android.Core +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.exception.InvalidExpiryException +import com.reown.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.EnvelopeType +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.scope +import com.reown.android.internal.common.signing.cacao.Cacao.Payload.Companion.ATT_KEY +import com.reown.android.internal.common.signing.cacao.Cacao.Payload.Companion.RECAPS_PREFIX +import com.reown.android.internal.common.signing.cacao.mergeReCaps +import com.reown.android.internal.utils.CoreValidator +import com.reown.android.internal.utils.currentTimeInSeconds +import com.reown.android.internal.utils.dayInSeconds +import com.reown.android.internal.utils.getParticipantTag +import com.reown.android.internal.utils.oneHourInSeconds +import com.reown.android.pairing.model.mapper.toPairing +import com.reown.android.pulse.domain.InsertEventUseCase +import com.reown.android.pulse.model.Direction +import com.reown.android.pulse.model.EventType +import com.reown.android.pulse.model.properties.Properties +import com.reown.android.pulse.model.properties.Props import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionRequestUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionRequestUseCase.kt index 558dbb4e4..a42619d8f 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionRequestUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionRequestUseCase.kt @@ -1,27 +1,27 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.exception.CannotFindSequenceForTopic -import com.walletconnect.android.internal.common.exception.InvalidExpiryException -import com.walletconnect.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Namespace -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.TransportType -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.android.internal.utils.CoreValidator -import com.walletconnect.android.internal.utils.currentTimeInSeconds -import com.walletconnect.android.internal.utils.fiveMinutesInSeconds -import com.walletconnect.android.pulse.domain.InsertEventUseCase -import com.walletconnect.android.pulse.model.Direction -import com.walletconnect.android.pulse.model.EventType -import com.walletconnect.android.pulse.model.properties.Properties -import com.walletconnect.android.pulse.model.properties.Props +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.exception.CannotFindSequenceForTopic +import com.reown.android.internal.common.exception.InvalidExpiryException +import com.reown.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.Namespace +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.TransportType +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.scope +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.utils.CoreValidator +import com.reown.android.internal.utils.currentTimeInSeconds +import com.reown.android.internal.utils.fiveMinutesInSeconds +import com.reown.android.pulse.domain.InsertEventUseCase +import com.reown.android.pulse.model.Direction +import com.reown.android.pulse.model.EventType +import com.reown.android.pulse.model.properties.Properties +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 diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionUpdateUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionUpdateUseCase.kt index 8026c2c7e..200a20db8 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionUpdateUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionUpdateUseCase.kt @@ -1,11 +1,11 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.exception.CannotFindSequenceForTopic -import com.walletconnect.android.internal.common.exception.GenericException -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.utils.dayInSeconds +import com.reown.android.internal.common.exception.CannotFindSequenceForTopic +import com.reown.android.internal.common.exception.GenericException +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.utils.dayInSeconds import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnPingUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnPingUseCase.kt index 010deafd5..d668ada72 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnPingUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnPingUseCase.kt @@ -1,10 +1,10 @@ package com.walletconnect.sign.engine.use_case.requests -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.WCRequest -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.utils.thirtySeconds +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.WCRequest +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.utils.thirtySeconds import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger import kotlinx.coroutines.supervisorScope diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionAuthenticateUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionAuthenticateUseCase.kt index 0503e007e..ba0575eb7 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionAuthenticateUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionAuthenticateUseCase.kt @@ -1,28 +1,28 @@ package com.walletconnect.sign.engine.use_case.requests -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.exception.Invalid -import com.walletconnect.android.internal.common.exception.Uncategorized -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.TransportType -import com.walletconnect.android.internal.common.model.WCRequest -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.utils.CoreValidator.isExpired -import com.walletconnect.android.internal.utils.dayInSeconds -import com.walletconnect.android.pairing.handler.PairingControllerInterface -import com.walletconnect.android.pulse.domain.InsertEventUseCase -import com.walletconnect.android.pulse.domain.InsertTelemetryEventUseCase -import com.walletconnect.android.pulse.model.Direction -import com.walletconnect.android.pulse.model.EventType -import com.walletconnect.android.pulse.model.properties.Properties -import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.android.verify.domain.ResolveAttestationIdUseCase -import com.walletconnect.android.verify.model.VerifyContext +import com.reown.android.Core +import com.reown.android.internal.common.exception.Invalid +import com.reown.android.internal.common.exception.Uncategorized +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.TransportType +import com.reown.android.internal.common.model.WCRequest +import com.reown.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.scope +import com.reown.android.internal.utils.CoreValidator.isExpired +import com.reown.android.internal.utils.dayInSeconds +import com.reown.android.pairing.handler.PairingControllerInterface +import com.reown.android.pulse.domain.InsertEventUseCase +import com.reown.android.pulse.domain.InsertTelemetryEventUseCase +import com.reown.android.pulse.model.Direction +import com.reown.android.pulse.model.EventType +import com.reown.android.pulse.model.properties.Properties +import com.reown.android.pulse.model.properties.Props +import com.reown.android.verify.domain.ResolveAttestationIdUseCase +import com.reown.android.verify.model.VerifyContext import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionDeleteUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionDeleteUseCase.kt index dd857b41e..92607ca4b 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionDeleteUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionDeleteUseCase.kt @@ -1,14 +1,14 @@ package com.walletconnect.sign.engine.use_case.requests -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.exception.Uncategorized -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.WCRequest -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.utils.dayInSeconds +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.exception.Uncategorized +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.WCRequest +import com.reown.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.utils.dayInSeconds import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger import com.walletconnect.sign.common.model.type.Sequences diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionEventUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionEventUseCase.kt index 5ad8a8694..9393d1c6f 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionEventUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionEventUseCase.kt @@ -1,13 +1,13 @@ package com.walletconnect.sign.engine.use_case.requests -import com.walletconnect.android.internal.common.exception.Uncategorized -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.WCRequest -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.utils.fiveMinutesInSeconds +import com.reown.android.internal.common.exception.Uncategorized +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.WCRequest +import com.reown.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.utils.fiveMinutesInSeconds import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger import com.walletconnect.sign.common.exceptions.PeerError diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionExtendUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionExtendUseCase.kt index 12057f6a8..409913c59 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionExtendUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionExtendUseCase.kt @@ -1,14 +1,14 @@ package com.walletconnect.sign.engine.use_case.requests -import com.walletconnect.android.internal.common.exception.Uncategorized -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.WCRequest -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.utils.dayInSeconds +import com.reown.android.internal.common.exception.Uncategorized +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.WCRequest +import com.reown.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.utils.dayInSeconds import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger import com.walletconnect.sign.common.model.type.Sequences diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionProposalUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionProposalUseCase.kt index 288418b9a..aab8c464a 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionProposalUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionProposalUseCase.kt @@ -1,24 +1,24 @@ package com.walletconnect.sign.engine.use_case.requests -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.android.internal.common.exception.Uncategorized -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.TransportType -import com.walletconnect.android.internal.common.model.WCRequest -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.android.internal.utils.fiveMinutesInSeconds -import com.walletconnect.android.pairing.handler.PairingControllerInterface -import com.walletconnect.android.pulse.domain.InsertTelemetryEventUseCase -import com.walletconnect.android.pulse.model.EventType -import com.walletconnect.android.pulse.model.properties.Properties -import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.android.verify.domain.ResolveAttestationIdUseCase +import com.reown.android.Core +import com.reown.android.internal.common.di.AndroidCommonDITags +import com.reown.android.internal.common.exception.Uncategorized +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.TransportType +import com.reown.android.internal.common.model.WCRequest +import com.reown.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.scope +import com.reown.android.internal.common.wcKoinApp +import com.reown.android.internal.utils.fiveMinutesInSeconds +import com.reown.android.pairing.handler.PairingControllerInterface +import com.reown.android.pulse.domain.InsertTelemetryEventUseCase +import com.reown.android.pulse.model.EventType +import com.reown.android.pulse.model.properties.Properties +import com.reown.android.pulse.model.properties.Props +import com.reown.android.verify.domain.ResolveAttestationIdUseCase import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionRequestUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionRequestUseCase.kt index 42636cd8c..a1ff59be6 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionRequestUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionRequestUseCase.kt @@ -1,29 +1,29 @@ package com.walletconnect.sign.engine.use_case.requests -import com.walletconnect.android.internal.common.exception.Invalid -import com.walletconnect.android.internal.common.exception.Uncategorized -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.Namespace -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.TransportType -import com.walletconnect.android.internal.common.model.WCRequest -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.android.internal.utils.CoreValidator.isExpired -import com.walletconnect.android.internal.utils.fiveMinutesInSeconds -import com.walletconnect.android.pulse.domain.InsertEventUseCase -import com.walletconnect.android.pulse.model.Direction -import com.walletconnect.android.pulse.model.EventType -import com.walletconnect.android.pulse.model.properties.Properties -import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.android.verify.domain.ResolveAttestationIdUseCase -import com.walletconnect.android.verify.model.VerifyContext +import com.reown.android.internal.common.exception.Invalid +import com.reown.android.internal.common.exception.Uncategorized +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.Namespace +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.TransportType +import com.reown.android.internal.common.model.WCRequest +import com.reown.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.scope +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.utils.CoreValidator.isExpired +import com.reown.android.internal.utils.fiveMinutesInSeconds +import com.reown.android.pulse.domain.InsertEventUseCase +import com.reown.android.pulse.model.Direction +import com.reown.android.pulse.model.EventType +import com.reown.android.pulse.model.properties.Properties +import com.reown.android.pulse.model.properties.Props +import com.reown.android.verify.domain.ResolveAttestationIdUseCase +import com.reown.android.verify.model.VerifyContext import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger import com.walletconnect.sign.common.model.type.Sequences diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionSettleUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionSettleUseCase.kt index 01ba00a71..38d2c2a4e 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionSettleUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionSettleUseCase.kt @@ -1,19 +1,19 @@ package com.walletconnect.sign.engine.use_case.requests -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.WCRequest -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.android.internal.utils.fiveMinutesInSeconds -import com.walletconnect.android.pairing.handler.PairingControllerInterface -import com.walletconnect.android.utils.toClient +import com.reown.android.Core +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.WCRequest +import com.reown.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.utils.fiveMinutesInSeconds +import com.reown.android.pairing.handler.PairingControllerInterface +import com.reown.android.utils.toClient import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionUpdateUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionUpdateUseCase.kt index 2c0f60b74..fa904100b 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionUpdateUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionUpdateUseCase.kt @@ -1,13 +1,13 @@ package com.walletconnect.sign.engine.use_case.requests -import com.walletconnect.android.internal.common.exception.Uncategorized -import com.walletconnect.android.internal.common.model.IrnParams -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.WCRequest -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.utils.dayInSeconds +import com.reown.android.internal.common.exception.Uncategorized +import com.reown.android.internal.common.model.IrnParams +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.WCRequest +import com.reown.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.utils.dayInSeconds import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger import com.walletconnect.sign.common.exceptions.PeerError diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionAuthenticateResponseUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionAuthenticateResponseUseCase.kt index 16326a03a..20016cf37 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionAuthenticateResponseUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionAuthenticateResponseUseCase.kt @@ -1,32 +1,32 @@ package com.walletconnect.sign.engine.use_case.responses -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.model.Namespace -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.SymmetricKey -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.TransportType -import com.walletconnect.android.internal.common.model.WCResponse -import com.walletconnect.android.internal.common.model.params.CoreSignParams -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.internal.common.signing.cacao.CacaoVerifier -import com.walletconnect.android.internal.common.signing.cacao.Issuer -import com.walletconnect.android.internal.common.signing.cacao.getChains -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.android.internal.utils.CoreValidator -import com.walletconnect.android.pairing.client.PairingInterface -import com.walletconnect.android.pairing.handler.PairingControllerInterface -import com.walletconnect.android.pulse.domain.InsertEventUseCase -import com.walletconnect.android.pulse.model.Direction -import com.walletconnect.android.pulse.model.EventType -import com.walletconnect.android.pulse.model.properties.Properties -import com.walletconnect.android.pulse.model.properties.Props -import com.walletconnect.android.utils.toClient +import com.reown.android.Core +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.model.Namespace +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.model.SymmetricKey +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.TransportType +import com.reown.android.internal.common.model.WCResponse +import com.reown.android.internal.common.model.params.CoreSignParams +import com.reown.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.scope +import com.reown.android.internal.common.signing.cacao.CacaoVerifier +import com.reown.android.internal.common.signing.cacao.Issuer +import com.reown.android.internal.common.signing.cacao.getChains +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.utils.CoreValidator +import com.reown.android.pairing.client.PairingInterface +import com.reown.android.pairing.handler.PairingControllerInterface +import com.reown.android.pulse.domain.InsertEventUseCase +import com.reown.android.pulse.model.Direction +import com.reown.android.pulse.model.EventType +import com.reown.android.pulse.model.properties.Properties +import com.reown.android.pulse.model.properties.Props +import com.reown.android.utils.toClient import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.reown.foundation.util.Logger diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionProposalResponseUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionProposalResponseUseCase.kt index 482d0dc32..49947e184 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionProposalResponseUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionProposalResponseUseCase.kt @@ -1,15 +1,15 @@ package com.walletconnect.sign.engine.use_case.responses -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.WCResponse -import com.walletconnect.android.internal.common.model.params.CoreSignParams -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.scope -import com.walletconnect.android.pairing.handler.PairingControllerInterface +import com.reown.android.Core +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.model.WCResponse +import com.reown.android.internal.common.model.params.CoreSignParams +import com.reown.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.scope +import com.reown.android.pairing.handler.PairingControllerInterface import com.reown.foundation.common.model.PublicKey import com.reown.foundation.util.Logger import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionRequestResponseUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionRequestResponseUseCase.kt index c6ec58953..11802ed02 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionRequestResponseUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionRequestResponseUseCase.kt @@ -1,16 +1,16 @@ package com.walletconnect.sign.engine.use_case.responses -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.Tags -import com.walletconnect.android.internal.common.model.TransportType -import com.walletconnect.android.internal.common.model.WCResponse -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.pulse.domain.InsertEventUseCase -import com.walletconnect.android.pulse.model.Direction -import com.walletconnect.android.pulse.model.EventType -import com.walletconnect.android.pulse.model.properties.Properties -import com.walletconnect.android.pulse.model.properties.Props +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.model.Tags +import com.reown.android.internal.common.model.TransportType +import com.reown.android.internal.common.model.WCResponse +import com.reown.android.internal.common.model.type.EngineEvent +import com.reown.android.pulse.domain.InsertEventUseCase +import com.reown.android.pulse.model.Direction +import com.reown.android.pulse.model.EventType +import com.reown.android.pulse.model.properties.Properties +import com.reown.android.pulse.model.properties.Props import com.reown.foundation.util.Logger import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams import com.walletconnect.sign.engine.model.EngineDO diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionSettleResponseUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionSettleResponseUseCase.kt index 86627f521..761382904 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionSettleResponseUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionSettleResponseUseCase.kt @@ -1,13 +1,13 @@ package com.walletconnect.sign.engine.use_case.responses -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.WCResponse -import com.walletconnect.android.internal.common.model.type.EngineEvent -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.model.WCResponse +import com.reown.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface import com.reown.foundation.util.Logger import com.walletconnect.sign.engine.model.EngineDO import com.walletconnect.sign.engine.model.mapper.toEngineDO diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionUpdateResponseUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionUpdateResponseUseCase.kt index 1af1e0f3e..9fd107522 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionUpdateResponseUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionUpdateResponseUseCase.kt @@ -1,9 +1,9 @@ package com.walletconnect.sign.engine.use_case.responses -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.model.SDKError -import com.walletconnect.android.internal.common.model.WCResponse -import com.walletconnect.android.internal.common.model.type.EngineEvent +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.model.SDKError +import com.reown.android.internal.common.model.WCResponse +import com.reown.android.internal.common.model.type.EngineEvent import com.reown.foundation.util.Logger import com.walletconnect.sign.engine.model.EngineDO import com.walletconnect.sign.engine.model.mapper.toMapOfEngineNamespacesSession diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/DeleteRequestByIdUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/DeleteRequestByIdUseCase.kt index 8fef1eb48..9116a633c 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/DeleteRequestByIdUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/DeleteRequestByIdUseCase.kt @@ -1,7 +1,7 @@ package com.walletconnect.sign.json_rpc.domain -import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory -import com.walletconnect.android.internal.common.storage.verify.VerifyContextStorageRepository +import com.reown.android.internal.common.storage.rpc.JsonRpcHistory +import com.reown.android.internal.common.storage.verify.VerifyContextStorageRepository import kotlinx.coroutines.supervisorScope internal class DeleteRequestByIdUseCase( diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingJsonRpcHistoryEntryByIdUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingJsonRpcHistoryEntryByIdUseCase.kt index 9b1dc3c14..bd1afb415 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingJsonRpcHistoryEntryByIdUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingJsonRpcHistoryEntryByIdUseCase.kt @@ -1,8 +1,8 @@ package com.walletconnect.sign.json_rpc.domain -import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer -import com.walletconnect.android.internal.common.json_rpc.model.JsonRpcHistoryRecord -import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory +import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer +import com.reown.android.internal.common.json_rpc.model.JsonRpcHistoryRecord +import com.reown.android.internal.common.storage.rpc.JsonRpcHistory import com.walletconnect.sign.common.model.Request import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingRequestsByTopicUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingRequestsByTopicUseCase.kt index 3fcbe1cfc..4dd9fb9a8 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingRequestsByTopicUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingRequestsByTopicUseCase.kt @@ -1,7 +1,7 @@ package com.walletconnect.sign.json_rpc.domain -import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer -import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory +import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer +import com.reown.android.internal.common.storage.rpc.JsonRpcHistory import com.reown.foundation.common.model.Topic import com.walletconnect.sign.common.model.Request import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingSessionAuthenticateRequest.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingSessionAuthenticateRequest.kt index 557ffceb8..c851ec6f0 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingSessionAuthenticateRequest.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingSessionAuthenticateRequest.kt @@ -1,8 +1,8 @@ package com.walletconnect.sign.json_rpc.domain -import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer -import com.walletconnect.android.internal.common.json_rpc.model.JsonRpcHistoryRecord -import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory +import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer +import com.reown.android.internal.common.json_rpc.model.JsonRpcHistoryRecord +import com.reown.android.internal.common.storage.rpc.JsonRpcHistory import com.walletconnect.sign.common.model.Request import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingSessionRequestByTopicUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingSessionRequestByTopicUseCase.kt index c38d2e033..09f1aa88e 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingSessionRequestByTopicUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingSessionRequestByTopicUseCase.kt @@ -1,9 +1,9 @@ package com.walletconnect.sign.json_rpc.domain -import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer -import com.walletconnect.android.internal.common.model.AppMetaDataType -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory +import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer +import com.reown.android.internal.common.model.AppMetaDataType +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.common.storage.rpc.JsonRpcHistory import com.reown.foundation.common.model.Topic import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc import com.walletconnect.sign.engine.model.EngineDO diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingSessionRequests.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingSessionRequests.kt index b9e888edd..c3c4bd2e9 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingSessionRequests.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingSessionRequests.kt @@ -1,7 +1,7 @@ package com.walletconnect.sign.json_rpc.domain -import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer -import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory +import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer +import com.reown.android.internal.common.storage.rpc.JsonRpcHistory import com.walletconnect.sign.common.model.Request import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc import com.walletconnect.sign.json_rpc.model.JsonRpcMethod diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetSessionAuthenticateRequest.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetSessionAuthenticateRequest.kt index 169f35281..2afb002e4 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetSessionAuthenticateRequest.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetSessionAuthenticateRequest.kt @@ -1,8 +1,8 @@ package com.walletconnect.sign.json_rpc.domain -import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer -import com.walletconnect.android.internal.common.json_rpc.model.JsonRpcHistoryRecord -import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory +import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer +import com.reown.android.internal.common.json_rpc.model.JsonRpcHistoryRecord +import com.reown.android.internal.common.storage.rpc.JsonRpcHistory import com.walletconnect.sign.common.model.Request import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetSessionRequestByIdUseCase.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetSessionRequestByIdUseCase.kt index 045ee6770..fd6addcd0 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetSessionRequestByIdUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetSessionRequestByIdUseCase.kt @@ -1,8 +1,8 @@ package com.walletconnect.sign.json_rpc.domain -import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer -import com.walletconnect.android.internal.common.json_rpc.model.JsonRpcHistoryRecord -import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory +import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer +import com.reown.android.internal.common.json_rpc.model.JsonRpcHistoryRecord +import com.reown.android.internal.common.storage.rpc.JsonRpcHistory import com.walletconnect.sign.common.model.Request import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/model/JsonRpcMapper.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/model/JsonRpcMapper.kt index 9dd427a9a..86d4902b2 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/model/JsonRpcMapper.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/model/JsonRpcMapper.kt @@ -2,8 +2,8 @@ package com.walletconnect.sign.json_rpc.model -import com.walletconnect.android.internal.common.json_rpc.model.JsonRpcHistoryRecord -import com.walletconnect.android.internal.common.model.Expiry +import com.reown.android.internal.common.json_rpc.model.JsonRpcHistoryRecord +import com.reown.android.internal.common.model.Expiry import com.reown.foundation.common.model.Topic import com.walletconnect.sign.common.model.Request import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/proposal/ProposalStorageRepository.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/proposal/ProposalStorageRepository.kt index 7702ed44e..2bbe587d2 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/proposal/ProposalStorageRepository.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/proposal/ProposalStorageRepository.kt @@ -4,9 +4,9 @@ package com.walletconnect.sign.storage.proposal import android.database.sqlite.SQLiteException import app.cash.sqldelight.async.coroutines.awaitAsList -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.Namespace -import com.walletconnect.android.internal.common.scope +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.Namespace +import com.reown.android.internal.common.scope import com.reown.foundation.common.model.Topic import com.walletconnect.sign.common.model.vo.proposal.ProposalVO import com.walletconnect.sign.storage.data.dao.optionalnamespaces.OptionalNamespaceDaoQueries diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/sequence/SessionStorageRepository.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/sequence/SessionStorageRepository.kt index 544a6a730..2b40a97a5 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/sequence/SessionStorageRepository.kt +++ b/protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/sequence/SessionStorageRepository.kt @@ -3,9 +3,9 @@ package com.walletconnect.sign.storage.sequence import android.database.sqlite.SQLiteException -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.Namespace -import com.walletconnect.android.internal.common.model.TransportType +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.Namespace +import com.reown.android.internal.common.model.TransportType import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.walletconnect.sign.common.model.vo.sequence.SessionVO diff --git a/protocol/sign/src/main/sqldelight/com/walletconnect/sign/storage/data/dao/session/SessionDao.sq b/protocol/sign/src/main/sqldelight/com/walletconnect/sign/storage/data/dao/session/SessionDao.sq index b81964966..47383e2af 100644 --- a/protocol/sign/src/main/sqldelight/com/walletconnect/sign/storage/data/dao/session/SessionDao.sq +++ b/protocol/sign/src/main/sqldelight/com/walletconnect/sign/storage/data/dao/session/SessionDao.sq @@ -1,7 +1,7 @@ import kotlin.Boolean; import kotlin.String; import kotlin.collections.Map; -import com.walletconnect.android.internal.common.model.TransportType; +import com.reown.android.internal.common.model.TransportType; CREATE TABLE SessionDao( id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, diff --git a/protocol/sign/src/main/sqldelight/migrations/1.sqm b/protocol/sign/src/main/sqldelight/migrations/1.sqm index 23981e44b..fce322b12 100644 --- a/protocol/sign/src/main/sqldelight/migrations/1.sqm +++ b/protocol/sign/src/main/sqldelight/migrations/1.sqm @@ -1,4 +1,4 @@ -import com.walletconnect.android.internal.common.model.AppMetaDataType; +import com.reown.android.internal.common.model.AppMetaDataType; import kotlin.Boolean; import kotlin.String; import kotlin.collections.List; diff --git a/protocol/sign/src/main/sqldelight/migrations/2.sqm b/protocol/sign/src/main/sqldelight/migrations/2.sqm index ccf652f61..c99bbe7f7 100644 --- a/protocol/sign/src/main/sqldelight/migrations/2.sqm +++ b/protocol/sign/src/main/sqldelight/migrations/2.sqm @@ -1,4 +1,4 @@ -import com.walletconnect.android.internal.common.model.AppMetaDataType; +import com.reown.android.internal.common.model.AppMetaDataType; import kotlin.Boolean; import kotlin.String; import kotlin.collections.List; diff --git a/protocol/sign/src/main/sqldelight/migrations/3.sqm b/protocol/sign/src/main/sqldelight/migrations/3.sqm index 436ed436c..8e910664e 100644 --- a/protocol/sign/src/main/sqldelight/migrations/3.sqm +++ b/protocol/sign/src/main/sqldelight/migrations/3.sqm @@ -1,4 +1,4 @@ -import com.walletconnect.android.internal.common.model.AppMetaDataType; +import com.reown.android.internal.common.model.AppMetaDataType; import kotlin.Boolean; import kotlin.String; import kotlin.collections.List; diff --git a/protocol/sign/src/main/sqldelight/migrations/4.sqm b/protocol/sign/src/main/sqldelight/migrations/4.sqm index 949586495..bc14f8ca0 100644 --- a/protocol/sign/src/main/sqldelight/migrations/4.sqm +++ b/protocol/sign/src/main/sqldelight/migrations/4.sqm @@ -1,4 +1,4 @@ -import com.walletconnect.android.internal.common.model.AppMetaDataType; +import com.reown.android.internal.common.model.AppMetaDataType; import kotlin.Boolean; import kotlin.String; import kotlin.collections.List; diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/AttestationIdGenerationTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/AttestationIdGenerationTest.kt index ecbeb1cbc..2ceff7ede 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/AttestationIdGenerationTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/AttestationIdGenerationTest.kt @@ -2,11 +2,11 @@ package com.walletconnect.sign import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory -import com.walletconnect.android.internal.common.crypto.sha256 -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.Namespace -import com.walletconnect.android.internal.common.model.RelayProtocolOptions -import com.walletconnect.android.internal.common.model.SessionProposer +import com.reown.android.internal.common.crypto.sha256 +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.Namespace +import com.reown.android.internal.common.model.RelayProtocolOptions +import com.reown.android.internal.common.model.SessionProposer import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams import junit.framework.TestCase.assertEquals diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/DeleteRequestByIdUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/DeleteRequestByIdUseCaseTest.kt index 68b5f22fa..258d26bfb 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/DeleteRequestByIdUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/DeleteRequestByIdUseCaseTest.kt @@ -1,7 +1,7 @@ package com.walletconnect.sign -import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory -import com.walletconnect.android.internal.common.storage.verify.VerifyContextStorageRepository +import com.reown.android.internal.common.storage.rpc.JsonRpcHistory +import com.reown.android.internal.common.storage.verify.VerifyContextStorageRepository import com.walletconnect.sign.json_rpc.domain.DeleteRequestByIdUseCase import io.mockk.coVerify import io.mockk.mockk diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/GetSessionRequestByIdUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/GetSessionRequestByIdUseCaseTest.kt index d77bb7f56..2a43ca943 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/GetSessionRequestByIdUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/GetSessionRequestByIdUseCaseTest.kt @@ -1,8 +1,8 @@ package com.walletconnect.sign -import com.walletconnect.android.internal.common.json_rpc.data.JsonRpcSerializer -import com.walletconnect.android.internal.common.json_rpc.model.JsonRpcHistoryRecord -import com.walletconnect.android.internal.common.storage.rpc.JsonRpcHistory +import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer +import com.reown.android.internal.common.json_rpc.model.JsonRpcHistoryRecord +import com.reown.android.internal.common.storage.rpc.JsonRpcHistory import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams import com.walletconnect.sign.common.model.vo.clientsync.session.payload.SessionRequestVO diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCaseTest.kt index 5d0c6201d..113f1e819 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCaseTest.kt @@ -1,22 +1,22 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.exception.RequestExpiredException -import com.walletconnect.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.SymmetricKey -import com.walletconnect.android.internal.common.model.TransportType -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.signing.cacao.Cacao -import com.walletconnect.android.internal.common.signing.cacao.CacaoType -import com.walletconnect.android.internal.common.signing.cacao.CacaoVerifier -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.android.internal.common.storage.verify.VerifyContextStorageRepository -import com.walletconnect.android.internal.utils.fiveMinutesInSeconds -import com.walletconnect.android.pulse.domain.InsertEventUseCase -import com.walletconnect.android.pulse.domain.InsertTelemetryEventUseCase -import com.walletconnect.android.pulse.model.Trace +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.exception.RequestExpiredException +import com.reown.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.SymmetricKey +import com.reown.android.internal.common.model.TransportType +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.signing.cacao.Cacao +import com.reown.android.internal.common.signing.cacao.CacaoType +import com.reown.android.internal.common.signing.cacao.CacaoVerifier +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.common.storage.verify.VerifyContextStorageRepository +import com.reown.android.internal.utils.fiveMinutesInSeconds +import com.reown.android.pulse.domain.InsertEventUseCase +import com.reown.android.pulse.domain.InsertTelemetryEventUseCase +import com.reown.android.pulse.model.Trace import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.reown.foundation.util.Logger diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionUseCaseTest.kt index 7977e5abe..ddf6efd9b 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionUseCaseTest.kt @@ -1,12 +1,12 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.android.internal.common.storage.verify.VerifyContextStorageRepository -import com.walletconnect.android.pulse.domain.InsertTelemetryEventUseCase +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.common.storage.verify.VerifyContextStorageRepository +import com.reown.android.pulse.domain.InsertTelemetryEventUseCase import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.reown.foundation.util.Logger diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/DisconnectSessionUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/DisconnectSessionUseCaseTest.kt index bcaaaf6d7..453cabaeb 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/DisconnectSessionUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/DisconnectSessionUseCaseTest.kt @@ -1,7 +1,7 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.exception.CannotFindSequenceForTopic -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.exception.CannotFindSequenceForTopic +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.reown.foundation.util.Logger import com.walletconnect.sign.storage.sequence.SessionStorageRepository import io.mockk.every diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/EmitEventUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/EmitEventUseCaseTest.kt index 9487e7662..f313672c8 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/EmitEventUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/EmitEventUseCaseTest.kt @@ -1,8 +1,8 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.exception.CannotFindSequenceForTopic -import com.walletconnect.android.internal.common.model.Namespace -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.exception.CannotFindSequenceForTopic +import com.reown.android.internal.common.model.Namespace +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.reown.foundation.common.model.Topic import com.reown.foundation.util.Logger import com.walletconnect.sign.common.model.vo.sequence.SessionVO diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ExtendSessionUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ExtendSessionUseCaseTest.kt index 0674313e6..2397f3313 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ExtendSessionUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ExtendSessionUseCaseTest.kt @@ -1,8 +1,8 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.exception.CannotFindSequenceForTopic -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.exception.CannotFindSequenceForTopic +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.reown.foundation.util.Logger diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPairingForSessionAuthenticateUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPairingForSessionAuthenticateUseCaseTest.kt index 0d2e26c00..0a237c874 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPairingForSessionAuthenticateUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPairingForSessionAuthenticateUseCaseTest.kt @@ -1,9 +1,9 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.Core -import com.walletconnect.android.internal.utils.currentTimeInSeconds -import com.walletconnect.android.internal.utils.fiveMinutesInSeconds -import com.walletconnect.android.pairing.client.PairingInterface +import com.reown.android.Core +import com.reown.android.internal.utils.currentTimeInSeconds +import com.reown.android.internal.utils.fiveMinutesInSeconds +import com.reown.android.pairing.client.PairingInterface import io.mockk.every import io.mockk.mockk import org.junit.Assert.assertThrows diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeSessionUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeSessionUseCaseTest.kt index ff805d7fb..17b29b4af 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeSessionUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeSessionUseCaseTest.kt @@ -1,11 +1,11 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.RelayProtocolOptions -import com.walletconnect.android.internal.common.model.SymmetricKey -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.RelayProtocolOptions +import com.reown.android.internal.common.model.SymmetricKey +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.reown.foundation.common.model.Topic import com.reown.foundation.util.Logger import com.walletconnect.sign.common.exceptions.InvalidNamespaceException @@ -40,7 +40,7 @@ class ProposeSessionUseCaseTest { requiredNamespaces = mapOf("required" to EngineDO.Namespace.Proposal(listOf("required"), listOf("required"), listOf("required"))), optionalNamespaces = mapOf("optional" to EngineDO.Namespace.Proposal(listOf("optional"), listOf("optional"), listOf("optional"))), properties = mapOf("key" to "value"), - pairing = com.walletconnect.android.internal.common.model.Pairing( + pairing = com.reown.android.internal.common.model.Pairing( topic = Topic("topic"), relay = RelayProtocolOptions(), symmetricKey = SymmetricKey("symmetricKey"), diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeUseCaseTest.kt index 1580de1c7..e7712f4c8 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeUseCaseTest.kt @@ -1,13 +1,13 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.Pairing -import com.walletconnect.android.internal.common.model.RelayProtocolOptions -import com.walletconnect.android.internal.common.model.SymmetricKey -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.utils.fiveMinutesInSeconds +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.Pairing +import com.reown.android.internal.common.model.RelayProtocolOptions +import com.reown.android.internal.common.model.SymmetricKey +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.utils.fiveMinutesInSeconds import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.reown.foundation.util.Logger diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionAuthenticateUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionAuthenticateUseCaseTest.kt index 7ce4da846..b311e419d 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionAuthenticateUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionAuthenticateUseCaseTest.kt @@ -1,15 +1,15 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.EnvelopeType -import com.walletconnect.android.internal.common.model.SymmetricKey -import com.walletconnect.android.internal.common.model.TransportType -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.storage.verify.VerifyContextStorageRepository -import com.walletconnect.android.internal.utils.fiveMinutesInSeconds -import com.walletconnect.android.pulse.domain.InsertEventUseCase +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.EnvelopeType +import com.reown.android.internal.common.model.SymmetricKey +import com.reown.android.internal.common.model.TransportType +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.storage.verify.VerifyContextStorageRepository +import com.reown.android.internal.utils.fiveMinutesInSeconds +import com.reown.android.pulse.domain.InsertEventUseCase import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.reown.foundation.util.Logger diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/RespondSessionRequestUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/RespondSessionRequestUseCaseTest.kt index a0983f34a..716d4d7ea 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/RespondSessionRequestUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/RespondSessionRequestUseCaseTest.kt @@ -1,12 +1,12 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.JsonRpcResponse -import com.walletconnect.android.internal.common.exception.CannotFindSequenceForTopic -import com.walletconnect.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.android.internal.common.storage.verify.VerifyContextStorageRepository -import com.walletconnect.android.pulse.domain.InsertEventUseCase +import com.reown.android.internal.common.JsonRpcResponse +import com.reown.android.internal.common.exception.CannotFindSequenceForTopic +import com.reown.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.internal.common.storage.verify.VerifyContextStorageRepository +import com.reown.android.pulse.domain.InsertEventUseCase import com.reown.foundation.util.Logger import com.walletconnect.sign.json_rpc.domain.GetPendingJsonRpcHistoryEntryByIdUseCase import com.walletconnect.sign.storage.sequence.SessionStorageRepository diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionAuthenticateUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionAuthenticateUseCaseTest.kt index c28ed56e5..df194eab5 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionAuthenticateUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionAuthenticateUseCaseTest.kt @@ -1,17 +1,17 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.crypto.kmr.KeyManagementRepository -import com.walletconnect.android.internal.common.exception.InvalidExpiryException -import com.walletconnect.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.Expiry -import com.walletconnect.android.internal.common.model.Namespace -import com.walletconnect.android.internal.common.model.Redirect -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.utils.currentTimeInSeconds -import com.walletconnect.android.internal.utils.fiveMinutesInSeconds -import com.walletconnect.android.pulse.domain.InsertEventUseCase +import com.reown.android.Core +import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository +import com.reown.android.internal.common.exception.InvalidExpiryException +import com.reown.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.Expiry +import com.reown.android.internal.common.model.Namespace +import com.reown.android.internal.common.model.Redirect +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.utils.currentTimeInSeconds +import com.reown.android.internal.utils.fiveMinutesInSeconds +import com.reown.android.pulse.domain.InsertEventUseCase import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.reown.foundation.util.Logger diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionRequestUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionRequestUseCaseTest.kt index c0affc681..dc10ecfdf 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionRequestUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionRequestUseCaseTest.kt @@ -1,10 +1,10 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.exception.CannotFindSequenceForTopic -import com.walletconnect.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.android.pulse.domain.InsertEventUseCase +import com.reown.android.internal.common.exception.CannotFindSequenceForTopic +import com.reown.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface +import com.reown.android.pulse.domain.InsertEventUseCase import com.reown.foundation.util.Logger import com.walletconnect.sign.engine.model.EngineDO import com.walletconnect.sign.storage.sequence.SessionStorageRepository diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionUpdateUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionUpdateUseCaseTest.kt index 00a3909b9..2a7af2699 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionUpdateUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionUpdateUseCaseTest.kt @@ -1,7 +1,7 @@ package com.walletconnect.sign.engine.use_case.calls -import com.walletconnect.android.internal.common.exception.CannotFindSequenceForTopic -import com.walletconnect.android.internal.common.model.type.RelayJsonRpcInteractorInterface +import com.reown.android.internal.common.exception.CannotFindSequenceForTopic +import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.reown.foundation.util.Logger import com.walletconnect.sign.storage.sequence.SessionStorageRepository import io.mockk.every diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/mappers/EngineMapperTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/mappers/EngineMapperTest.kt index b9f35aa1e..53eee8b96 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/mappers/EngineMapperTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/mappers/EngineMapperTest.kt @@ -1,8 +1,8 @@ package com.walletconnect.sign.mappers -import com.walletconnect.android.internal.common.model.AppMetaData -import com.walletconnect.android.internal.common.model.RelayProtocolOptions -import com.walletconnect.android.internal.common.model.SessionProposer +import com.reown.android.internal.common.model.AppMetaData +import com.reown.android.internal.common.model.RelayProtocolOptions +import com.reown.android.internal.common.model.SessionProposer import com.reown.foundation.common.model.Topic import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams import com.walletconnect.sign.engine.model.mapper.toEngineDO diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/util/GenerateApprovedNamespacesUtilsTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/util/GenerateApprovedNamespacesUtilsTest.kt index b692c73ab..99fb28b51 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/util/GenerateApprovedNamespacesUtilsTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/util/GenerateApprovedNamespacesUtilsTest.kt @@ -1,6 +1,6 @@ package com.walletconnect.sign.util -import com.walletconnect.android.internal.common.model.Namespace +import com.reown.android.internal.common.model.Namespace import com.walletconnect.sign.client.Sign import com.walletconnect.sign.client.utils.generateApprovedNamespaces import com.walletconnect.sign.client.utils.normalizeNamespaces diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/util/MergeReCapsTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/util/MergeReCapsTest.kt index 7c10fa008..df5b1ad85 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/util/MergeReCapsTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/util/MergeReCapsTest.kt @@ -1,6 +1,6 @@ package com.walletconnect.sign.util -import com.walletconnect.android.internal.common.signing.cacao.mergeReCaps +import com.reown.android.internal.common.signing.cacao.mergeReCaps import org.json.JSONObject import org.junit.Test diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/validator/ValidatorTest.kt b/protocol/sign/src/test/kotlin/com/walletconnect/sign/validator/ValidatorTest.kt index c3a576e3f..bb6b6c35b 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/validator/ValidatorTest.kt +++ b/protocol/sign/src/test/kotlin/com/walletconnect/sign/validator/ValidatorTest.kt @@ -1,11 +1,11 @@ package com.walletconnect.sign.validator -import com.walletconnect.android.internal.common.model.RelayProtocolOptions -import com.walletconnect.android.internal.common.model.SymmetricKey -import com.walletconnect.android.internal.utils.dayInSeconds -import com.walletconnect.android.internal.utils.fiveMinutesInSeconds -import com.walletconnect.android.internal.utils.monthInSeconds -import com.walletconnect.android.internal.utils.weekInSeconds +import com.reown.android.internal.common.model.RelayProtocolOptions +import com.reown.android.internal.common.model.SymmetricKey +import com.reown.android.internal.utils.dayInSeconds +import com.reown.android.internal.utils.fiveMinutesInSeconds +import com.reown.android.internal.utils.monthInSeconds +import com.reown.android.internal.utils.weekInSeconds import com.reown.foundation.common.model.Topic import com.walletconnect.sign.common.exceptions.EMPTY_NAMESPACES_MESSAGE import com.walletconnect.sign.common.exceptions.INVALID_EVENT_MESSAGE @@ -23,7 +23,7 @@ import com.walletconnect.sign.common.exceptions.NAMESPACE_KEYS_MISSING_MESSAGE import com.walletconnect.sign.common.exceptions.NAMESPACE_METHODS_MISSING_MESSAGE import com.walletconnect.sign.common.exceptions.UNAUTHORIZED_EVENT_MESSAGE import com.walletconnect.sign.common.exceptions.UNAUTHORIZED_METHOD_MESSAGE -import com.walletconnect.android.internal.common.model.Namespace +import com.reown.android.internal.common.model.Namespace import com.walletconnect.sign.common.validator.SignValidator import com.walletconnect.sign.engine.model.EngineDO import com.walletconnect.sign.engine.model.mapper.toAbsoluteString diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/DappSampleApp.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/DappSampleApp.kt index 6c05c9a8d..822413c64 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/DappSampleApp.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/DappSampleApp.kt @@ -4,8 +4,8 @@ import android.app.Application import com.google.firebase.appdistribution.FirebaseAppDistribution import com.google.firebase.crashlytics.ktx.crashlytics import com.google.firebase.ktx.Firebase -import com.walletconnect.android.Core -import com.walletconnect.android.CoreClient +import com.reown.android.Core +import com.reown.android.CoreClient import com.walletconnect.sample.common.tag import com.walletconnect.util.bytesToHex import com.walletconnect.util.randomBytes diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/domain/DappDelegate.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/domain/DappDelegate.kt index 5f4186b9f..72ac61571 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/domain/DappDelegate.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/domain/DappDelegate.kt @@ -1,7 +1,7 @@ package com.walletconnect.sample.dapp.domain -import com.walletconnect.android.Core -import com.walletconnect.android.CoreClient +import com.reown.android.Core +import com.reown.android.CoreClient import com.walletconnect.sample.common.tag import com.walletconnect.web3.modal.client.AppKit import com.walletconnect.web3.modal.client.Modal diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt index a28b3269c..76bbad425 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt @@ -59,7 +59,7 @@ import androidx.compose.ui.window.Dialog import androidx.core.net.toUri import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController -import com.walletconnect.android.utils.isPackageInstalled +import com.reown.android.utils.isPackageInstalled import com.walletconnect.sample.common.Chains import com.walletconnect.sample.common.CompletePreviews import com.walletconnect.sample.common.ui.WCTopAppBarLegacy diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt index ea1c98fb3..2ee11d735 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt @@ -4,8 +4,8 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.google.firebase.crashlytics.ktx.crashlytics import com.google.firebase.ktx.Firebase -import com.walletconnect.android.Core -import com.walletconnect.android.CoreClient +import com.reown.android.Core +import com.reown.android.CoreClient import com.walletconnect.sample.common.Chains import com.walletconnect.sample.common.tag import com.walletconnect.sample.dapp.domain.DappDelegate diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/AppKitApp.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/AppKitApp.kt index 00fe697d6..10aae3c44 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/AppKitApp.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/AppKitApp.kt @@ -4,9 +4,9 @@ import android.app.Application import com.google.firebase.appdistribution.FirebaseAppDistribution import com.google.firebase.crashlytics.ktx.crashlytics import com.google.firebase.ktx.Firebase -import com.walletconnect.android.Core -import com.walletconnect.android.CoreClient -import com.walletconnect.android.relay.ConnectionType +import com.reown.android.Core +import com.reown.android.CoreClient +import com.reown.android.relay.ConnectionType import com.walletconnect.sample.common.tag import com.walletconnect.util.bytesToHex import com.walletconnect.util.randomBytes diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/WalletKitApplication.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/WalletKitApplication.kt index c18eb8af6..d4dbfec36 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/WalletKitApplication.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/WalletKitApplication.kt @@ -15,12 +15,12 @@ import com.pandulapeter.beagle.modules.HeaderModule import com.pandulapeter.beagle.modules.PaddingModule import com.pandulapeter.beagle.modules.TextInputModule import com.pandulapeter.beagle.modules.TextModule -import com.walletconnect.android.Core -import com.walletconnect.android.CoreClient -import com.walletconnect.android.cacao.signature.SignatureType -import com.walletconnect.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.android.utils.cacao.sign +import com.reown.android.Core +import com.reown.android.CoreClient +import com.reown.android.cacao.signature.SignatureType +import com.reown.android.internal.common.di.AndroidCommonDITags +import com.reown.android.internal.common.wcKoinApp +import com.reown.android.utils.cacao.sign import com.reown.foundation.util.Logger import com.walletconnect.notify.client.Notify import com.walletconnect.notify.client.NotifyClient diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/Web3WalletMessageService.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/Web3WalletMessageService.kt index e08542a06..d4f4de5eb 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/Web3WalletMessageService.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/Web3WalletMessageService.kt @@ -2,10 +2,10 @@ package com.walletconnect.sample.wallet import android.annotation.SuppressLint import com.google.firebase.messaging.RemoteMessage -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.android.internal.common.wcKoinApp -import com.walletconnect.android.push.notifications.PushMessagingService +import com.reown.android.Core +import com.reown.android.internal.common.di.AndroidCommonDITags +import com.reown.android.internal.common.wcKoinApp +import com.reown.android.push.notifications.PushMessagingService import com.reown.foundation.util.Logger import com.walletconnect.sample.wallet.domain.NotificationHandler import kotlinx.coroutines.runBlocking diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/NotificationHandler.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/NotificationHandler.kt index 85921180d..0a04459b3 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/NotificationHandler.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/NotificationHandler.kt @@ -16,7 +16,7 @@ import androidx.core.app.NotificationCompat import androidx.core.graphics.drawable.toBitmap import coil.ImageLoader import coil.request.ImageRequest -import com.walletconnect.android.Core +import com.reown.android.Core import com.walletconnect.notify.client.Notify import com.walletconnect.notify.client.NotifyClient import com.walletconnect.sample.wallet.R diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/WCDelegate.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/WCDelegate.kt index 2c1167f1b..cfb8c98de 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/WCDelegate.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/WCDelegate.kt @@ -1,8 +1,8 @@ package com.walletconnect.sample.wallet.domain import android.util.Log -import com.walletconnect.android.Core -import com.walletconnect.android.CoreClient +import com.reown.android.Core +import com.reown.android.CoreClient import com.walletconnect.web3.wallet.client.Wallet import com.walletconnect.web3.wallet.client.WalletKit import kotlinx.coroutines.CoroutineScope diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletViewModel.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletViewModel.kt index de3ebc300..4bf3b8c3a 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletViewModel.kt @@ -5,9 +5,9 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.google.firebase.crashlytics.ktx.crashlytics import com.google.firebase.ktx.Firebase -import com.walletconnect.android.Core -import com.walletconnect.android.internal.common.exception.InvalidProjectIdException -import com.walletconnect.android.internal.common.exception.ProjectIdDoesNotExistException +import com.reown.android.Core +import com.reown.android.internal.common.exception.InvalidProjectIdException +import com.reown.android.internal.common.exception.ProjectIdDoesNotExistException import com.walletconnect.sample.wallet.domain.ISSUER import com.walletconnect.sample.wallet.domain.WCDelegate import com.walletconnect.sample.wallet.ui.state.ConnectionState diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/InboxViewModel.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/InboxViewModel.kt index 738c48fc1..1b085b500 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/InboxViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/InboxViewModel.kt @@ -6,8 +6,8 @@ import android.app.Application import androidx.core.net.toUri import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.viewModelScope -import com.walletconnect.android.CoreClient -import com.walletconnect.android.internal.common.explorer.data.model.Project +import com.reown.android.CoreClient +import com.reown.android.internal.common.explorer.data.model.Project import com.walletconnect.notify.client.Notify import com.walletconnect.notify.client.NotifyClient import com.walletconnect.sample.wallet.domain.EthAccountDelegate @@ -38,7 +38,7 @@ import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import timber.log.Timber import kotlin.time.Duration.Companion.seconds -import com.walletconnect.android.internal.common.explorer.data.model.ImageUrl as WCImageUrl +import com.reown.android.internal.common.explorer.data.model.ImageUrl as WCImageUrl class InboxViewModel(application: Application) : AndroidViewModel(application) { diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/settings/SettingsViewModel.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/settings/SettingsViewModel.kt index 9a4e24c78..f8c3bcda2 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/settings/SettingsViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/settings/SettingsViewModel.kt @@ -3,7 +3,7 @@ package com.walletconnect.sample.wallet.ui.routes.composable_routes.settings import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.google.firebase.messaging.FirebaseMessaging -import com.walletconnect.android.CoreClient +import com.reown.android.CoreClient import com.walletconnect.sample.wallet.domain.EthAccountDelegate import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateRoute.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateRoute.kt index 5996a920c..204f22b41 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateRoute.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateRoute.kt @@ -36,7 +36,7 @@ import androidx.compose.ui.unit.sp import androidx.core.net.toUri import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavHostController -import com.walletconnect.android.internal.common.exception.NoConnectivityException +import com.reown.android.internal.common.exception.NoConnectivityException import com.walletconnect.sample.common.sendResponseDeepLink import com.walletconnect.sample.common.ui.theme.mismatch_color import com.walletconnect.sample.common.ui.themedColor diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt index 851b26c1a..8d6198c92 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt @@ -3,9 +3,9 @@ package com.walletconnect.sample.wallet.ui.routes.dialog_routes.session_authenti import androidx.lifecycle.ViewModel import com.google.firebase.crashlytics.ktx.crashlytics import com.google.firebase.ktx.Firebase -import com.walletconnect.android.cacao.signature.SignatureType -import com.walletconnect.android.internal.common.exception.NoConnectivityException -import com.walletconnect.android.utils.cacao.sign +import com.reown.android.cacao.signature.SignatureType +import com.reown.android.internal.common.exception.NoConnectivityException +import com.reown.android.utils.cacao.sign import com.walletconnect.sample.wallet.domain.ACCOUNTS_1_EIP155_ADDRESS import com.walletconnect.sample.wallet.domain.EthAccountDelegate import com.walletconnect.sample.wallet.domain.WCDelegate diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalRoute.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalRoute.kt index 2b55eb980..0b4ad4c9b 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalRoute.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalRoute.kt @@ -41,7 +41,7 @@ import androidx.core.net.toUri import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavHostController import androidx.navigation.compose.rememberNavController -import com.walletconnect.android.internal.common.exception.NoConnectivityException +import com.reown.android.internal.common.exception.NoConnectivityException import com.walletconnect.sample.common.Chains import com.walletconnect.sample.common.CompletePreviews import com.walletconnect.sample.common.sendResponseDeepLink diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestRoute.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestRoute.kt index 91326db6b..b3df172ad 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestRoute.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestRoute.kt @@ -32,7 +32,7 @@ import androidx.compose.ui.unit.sp import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavHostController import androidx.navigation.compose.rememberNavController -import com.walletconnect.android.internal.common.exception.NoConnectivityException +import com.reown.android.internal.common.exception.NoConnectivityException import com.walletconnect.sample.common.CompletePreviews import com.walletconnect.sample.common.sendResponseDeepLink import com.walletconnect.sample.common.ui.theme.PreviewTheme diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt index 082e473ce..cdd217840 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt @@ -5,9 +5,9 @@ import androidx.core.net.toUri import androidx.lifecycle.ViewModel import com.google.firebase.crashlytics.ktx.crashlytics import com.google.firebase.ktx.Firebase -import com.walletconnect.android.cacao.signature.SignatureType -import com.walletconnect.android.internal.common.exception.NoConnectivityException -import com.walletconnect.android.utils.cacao.sign +import com.reown.android.cacao.signature.SignatureType +import com.reown.android.internal.common.exception.NoConnectivityException +import com.reown.android.utils.cacao.sign import com.walletconnect.sample.common.Chains import com.walletconnect.sample.wallet.domain.EthAccountDelegate import com.walletconnect.sample.wallet.domain.WCDelegate diff --git a/sample/wallet/src/test/kotlin/com/walletconnect/sample/wallet/domain/EthAccountDelegateTest.kt b/sample/wallet/src/test/kotlin/com/walletconnect/sample/wallet/domain/EthAccountDelegateTest.kt index 7f3b07723..4a9fa7f88 100644 --- a/sample/wallet/src/test/kotlin/com/walletconnect/sample/wallet/domain/EthAccountDelegateTest.kt +++ b/sample/wallet/src/test/kotlin/com/walletconnect/sample/wallet/domain/EthAccountDelegateTest.kt @@ -1,9 +1,9 @@ package com.walletconnect.sample.wallet.domain -import com.walletconnect.android.cacao.signature.SignatureType -import com.walletconnect.android.internal.common.model.ProjectId -import com.walletconnect.android.internal.common.signing.message.MessageSignatureVerifier -import com.walletconnect.android.utils.cacao.sign +import com.reown.android.cacao.signature.SignatureType +import com.reown.android.internal.common.model.ProjectId +import com.reown.android.internal.common.signing.message.MessageSignatureVerifier +import com.reown.android.utils.cacao.sign import com.walletconnect.util.hexToBytes import com.walletconnect.web3.wallet.utils.CacaoSigner import junit.framework.TestCase.assertEquals From f5e4f78634fd2dc710a8b1278c726261a960dafb Mon Sep 17 00:00:00 2001 From: kubel Date: Wed, 4 Sep 2024 16:10:07 +0200 Subject: [PATCH 17/51] Migrate sign to reown --- ReadMe.md | 4 +- gradle/consumer-rules/walletconnect-rules.pro | 1 + .../walletconnect/web3/modal/client/AppKit.kt | 6 +- .../web3/modal/client/ClientMapper.kt | 2 +- .../models/request/SentRequestResult.kt | 2 +- .../web3/modal/engine/AppKitEngine.kt | 4 +- .../web3/modal/utils/SessionUtils.kt | 2 +- .../web3/wallet/client/ClientMapper.kt | 2 +- .../web3/wallet/client/WalletKit.kt | 12 +-- protocol/sign/build.gradle.kts | 4 +- .../sign/src/androidTest/AndroidManifest.xml | 2 +- .../sign/di/OverrideModule.kt | 2 +- .../sign/test/CacaoUtilsTests.kt | 2 +- .../test/GenerateAuthPayloadParamsTest.kt | 6 +- .../sign/test/ParseReCapsTest.kt | 2 +- .../test/activity/InstrumentedTestActivity.kt | 2 +- .../HybridAppInstrumentedAndroidTest.kt | 34 +++--- ...sionAuthenticateInstrumentedAndroidTest.kt | 36 +++---- .../SignClientInstrumentedAndroidTest.kt | 48 ++++----- .../HybridAppInstrumentedActivityScenario.kt | 6 +- .../test/scenario/SignActivityScenario.kt | 4 +- .../SignClientInstrumentedActivityScenario.kt | 6 +- .../sign/test/utils/Common.kt | 4 +- .../sign/test/utils/TestClient.kt | 12 +-- .../sign/test/utils/dapp/DappDelegate.kt | 10 +- .../sign/test/utils/dapp/DappSignClient.kt | 14 +-- .../sign/test/utils/hybrid/HybridDelegate.kt | 8 +- .../test/utils/hybrid/HybridSignClient.kt | 10 +- .../sign/test/utils/wallet/WalletDelegate.kt | 10 +- .../test/utils/wallet/WalletSignClient.kt | 20 ++-- protocol/sign/src/main/AndroidManifest.xml | 2 +- .../sign/client/Sign.kt | 2 +- .../sign/client/SignClient.kt | 2 +- .../sign/client/SignInterface.kt | 4 +- .../sign/client/SignProtocol.kt | 18 ++-- .../sign/client/mapper/ClientMapper.kt | 10 +- .../sign/client/utils/CacaoSigner.kt | 4 +- .../sign/client/utils/Utils.kt | 14 +-- .../adapters/SessionEventVOJsonAdapter.kt | 4 +- .../adapters/SessionRequestVOJsonAdapter.kt | 4 +- .../sign/common/exceptions/Messages.kt | 2 +- .../sign/common/exceptions/PeerError.kt | 2 +- .../sign/common/exceptions/SignExceptions.kt | 2 +- .../sign/common/model/Request.kt | 2 +- .../reown/sign/common/model/type/Sequences.kt | 5 + .../vo/clientsync/common/PayloadParams.kt | 2 +- .../model/vo/clientsync/common/Requester.kt | 2 +- .../clientsync/common/SessionParticipant.kt | 2 +- .../model/vo/clientsync/session/SignRpc.kt | 6 +- .../clientsync/session/params/SignParams.kt | 12 +-- .../session/payload/SessionEventVO.kt | 2 +- .../session/payload/SessionRequestVO.kt | 2 +- .../common/model/vo/proposal/ProposalVO.kt | 2 +- .../common/model/vo/sequence/SessionVO.kt | 12 +-- .../sign/common/validator/SignValidator.kt | 18 ++-- .../sign/di/CallsModule.kt | 96 ++++++++--------- .../sign/di/EngineModule.kt | 20 ++-- .../sign/di/RequestsModule.kt | 20 ++-- .../sign/di/ResponsesModule.kt | 12 +-- .../sign/di/SignDITags.kt | 2 +- .../sign/di/SignJsonRpcModule.kt | 14 +-- .../sign/di/StorageModule.kt | 24 ++--- .../sign/engine/SessionRequestQueue.kt | 4 +- .../sign/engine/domain/SignEngine.kt | 102 +++++++++--------- .../sign/engine/model/EngineDO.kt | 2 +- .../sign/engine/model/ValidationError.kt | 4 +- .../sign/engine/model/mapper/EngineMapper.kt | 24 ++--- .../ApproveSessionAuthenticateUseCase.kt | 14 +-- .../use_case/calls/ApproveSessionUseCase.kt | 30 +++--- .../calls/DecryptSignMessageUseCase.kt | 8 +- .../calls/DisconnectSessionUseCase.kt | 10 +- .../engine/use_case/calls/EmitEventUseCase.kt | 24 ++--- .../use_case/calls/ExtendSessionUseCase.kt | 14 +-- .../calls/FormatAuthenticateMessageUseCase.kt | 6 +- .../calls/GetListOfVerifyContextsUseCase.kt | 6 +- .../use_case/calls/GetNamespacesFromReCaps.kt | 4 +- ...GetPairingForSessionAuthenticateUseCase.kt | 4 +- .../use_case/calls/GetPairingsUseCase.kt | 4 +- .../GetPendingAuthenticateRequestUseCase.kt | 12 +-- .../calls/GetSessionProposalsUseCase.kt | 10 +- .../use_case/calls/GetSessionsUseCase.kt | 8 +- .../calls/GetVerifyContextByIdUseCase.kt | 6 +- .../sign/engine/use_case/calls/PairUseCase.kt | 2 +- .../sign/engine/use_case/calls/PingUseCase.kt | 8 +- .../use_case/calls/ProposeSessionUseCase.kt | 24 ++--- .../calls/RejectSessionAuthenticateUseCase.kt | 8 +- .../use_case/calls/RejectSessionUseCase.kt | 10 +- .../calls/RespondSessionRequestUseCase.kt | 10 +- .../calls/SessionAuthenticateUseCase.kt | 20 ++-- .../use_case/calls/SessionRequestUseCase.kt | 20 ++-- .../use_case/calls/SessionUpdateUseCase.kt | 26 ++--- .../engine/use_case/requests/OnPingUseCase.kt | 2 +- .../requests/OnSessionAuthenticateUseCase.kt | 8 +- .../requests/OnSessionDeleteUseCase.kt | 10 +- .../requests/OnSessionEventUseCase.kt | 18 ++-- .../requests/OnSessionExtendUseCase.kt | 14 +-- .../requests/OnSessionProposalUseCase.kt | 18 ++-- .../requests/OnSessionRequestUseCase.kt | 18 ++-- .../requests/OnSessionSettleUseCase.kt | 18 ++-- .../requests/OnSessionUpdateUseCase.kt | 18 ++-- .../OnSessionAuthenticateResponseUseCase.kt | 20 ++-- .../OnSessionProposalResponseUseCase.kt | 8 +- .../OnSessionRequestResponseUseCase.kt | 10 +- .../OnSessionSettleResponseUseCase.kt | 8 +- .../OnSessionUpdateResponseUseCase.kt | 8 +- .../domain/DeleteRequestByIdUseCase.kt | 2 +- ...etPendingJsonRpcHistoryEntryByIdUseCase.kt | 10 +- .../GetPendingRequestsByTopicUseCase.kt | 10 +- .../GetPendingSessionAuthenticateRequest.kt | 10 +- .../GetPendingSessionRequestByTopicUseCase.kt | 12 +-- .../domain/GetPendingSessionRequests.kt | 10 +- .../domain/GetSessionAuthenticateRequest.kt | 10 +- .../domain/GetSessionRequestByIdUseCase.kt | 10 +- .../sign/json_rpc/model/JsonRpcMapper.kt | 8 +- .../sign/json_rpc/model/JsonRpcMethod.kt | 2 +- .../AuthenticateResponseTopicRepository.kt | 4 +- .../link_mode/LinkModeStorageRepository.kt | 4 +- .../proposal/ProposalStorageRepository.kt | 10 +- .../sequence/SessionStorageRepository.kt | 16 +-- .../sign/common/model/type/Sequences.kt | 5 - .../AuthenticateResponseTopicDao.sq | 0 .../storage/data/dao/link_mode/LinkModeDao.sq | 0 .../data/dao/namespace/NamespaceDao.sq | 0 .../OptionalNamespaceDao.sq | 0 .../storage/data/dao/proposal/ProposalDao.sq | 0 .../ProposalNamespaceDao.sq | 0 .../storage/data/dao/session/SessionDao.sq | 0 .../storage/data/dao/temp/TempNamespaceDao.sq | 0 .../sign/AttestationIdGenerationTest.kt | 6 +- .../sign/DeleteRequestByIdUseCaseTest.kt | 4 +- .../sign/GetSessionRequestByIdUseCaseTest.kt | 10 +- .../sign/ReCapsTest.kt | 2 +- .../sign/adapters/GenericPayloadsTest.kt | 2 +- .../adapters/SessionEventVOJsonAdapterTest.kt | 10 +- .../SessionRequestParamsParsingTest.kt | 2 +- .../SessionRequestVOJsonAdapterTest.kt | 14 +-- .../sign/engine/SessionRequestQueueTest.kt | 2 +- .../ApproveSessionAuthenticateUseCaseTest.kt | 16 +-- .../calls/ApproveSessionUseCaseTest.kt | 14 +-- .../calls/DisconnectSessionUseCaseTest.kt | 4 +- .../use_case/calls/EmitEventUseCaseTest.kt | 8 +- .../calls/ExtendSessionUseCaseTest.kt | 8 +- .../calls/GetNamespacesFromReCapsTest.kt | 2 +- ...airingForSessionAuthenticateUseCaseTest.kt | 2 +- .../calls/ProposeSessionUseCaseTest.kt | 8 +- .../use_case/calls/ProposeUseCaseTest.kt | 8 +- .../RejectSessionAuthenticateUseCaseTest.kt | 14 +-- .../calls/RespondSessionRequestUseCaseTest.kt | 6 +- .../calls/SessionAuthenticateUseCaseTest.kt | 8 +- .../calls/SessionRequestUseCaseTest.kt | 6 +- .../calls/SessionUpdateUseCaseTest.kt | 4 +- .../sign/mappers/EngineMapperTest.kt | 6 +- .../sign/util/CoroutineTestRule.kt | 2 +- .../GenerateApprovedNamespacesUtilsTest.kt | 8 +- .../sign/util/MergeReCapsTest.kt | 2 +- .../sign/util/UtilFunctions.kt | 2 +- .../sign/validator/ValidatorTest.kt | 86 +++++++-------- .../sample/dapp/ui/DappSampleActivity.kt | 2 +- .../ChainSelectionViewModel.kt | 4 +- 159 files changed, 800 insertions(+), 799 deletions(-) rename protocol/sign/src/androidTest/kotlin/com/{walletconnect => reown}/sign/di/OverrideModule.kt (97%) rename protocol/sign/src/androidTest/kotlin/com/{walletconnect => reown}/sign/test/CacaoUtilsTests.kt (99%) rename protocol/sign/src/androidTest/kotlin/com/{walletconnect => reown}/sign/test/GenerateAuthPayloadParamsTest.kt (98%) rename protocol/sign/src/androidTest/kotlin/com/{walletconnect => reown}/sign/test/ParseReCapsTest.kt (98%) rename protocol/sign/src/androidTest/kotlin/com/{walletconnect => reown}/sign/test/activity/InstrumentedTestActivity.kt (82%) rename protocol/sign/src/androidTest/kotlin/com/{walletconnect => reown}/sign/test/client/HybridAppInstrumentedAndroidTest.kt (92%) rename protocol/sign/src/androidTest/kotlin/com/{walletconnect => reown}/sign/test/client/SessionAuthenticateInstrumentedAndroidTest.kt (91%) rename protocol/sign/src/androidTest/kotlin/com/{walletconnect => reown}/sign/test/client/SignClientInstrumentedAndroidTest.kt (89%) rename protocol/sign/src/androidTest/kotlin/com/{walletconnect => reown}/sign/test/scenario/HybridAppInstrumentedActivityScenario.kt (95%) rename protocol/sign/src/androidTest/kotlin/com/{walletconnect => reown}/sign/test/scenario/SignActivityScenario.kt (93%) rename protocol/sign/src/androidTest/kotlin/com/{walletconnect => reown}/sign/test/scenario/SignClientInstrumentedActivityScenario.kt (95%) rename protocol/sign/src/androidTest/kotlin/com/{walletconnect => reown}/sign/test/utils/Common.kt (92%) rename protocol/sign/src/androidTest/kotlin/com/{walletconnect => reown}/sign/test/utils/TestClient.kt (97%) rename protocol/sign/src/androidTest/kotlin/com/{walletconnect => reown}/sign/test/utils/dapp/DappDelegate.kt (90%) rename protocol/sign/src/androidTest/kotlin/com/{walletconnect => reown}/sign/test/utils/dapp/DappSignClient.kt (87%) rename protocol/sign/src/androidTest/kotlin/com/{walletconnect => reown}/sign/test/utils/hybrid/HybridDelegate.kt (92%) rename protocol/sign/src/androidTest/kotlin/com/{walletconnect => reown}/sign/test/utils/hybrid/HybridSignClient.kt (65%) rename protocol/sign/src/androidTest/kotlin/com/{walletconnect => reown}/sign/test/utils/wallet/WalletDelegate.kt (89%) rename protocol/sign/src/androidTest/kotlin/com/{walletconnect => reown}/sign/test/utils/wallet/WalletSignClient.kt (75%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/client/Sign.kt (99%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/client/SignClient.kt (82%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/client/SignInterface.kt (98%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/client/SignProtocol.kt (98%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/client/mapper/ClientMapper.kt (98%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/client/utils/CacaoSigner.kt (87%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/client/utils/Utils.kt (95%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/common/adapters/SessionEventVOJsonAdapter.kt (97%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/common/adapters/SessionRequestVOJsonAdapter.kt (97%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/common/exceptions/Messages.kt (98%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/common/exceptions/PeerError.kt (98%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/common/exceptions/SignExceptions.kt (96%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/common/model/Request.kt (89%) create mode 100644 protocol/sign/src/main/kotlin/com/reown/sign/common/model/type/Sequences.kt rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/common/model/vo/clientsync/common/PayloadParams.kt (92%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/common/model/vo/clientsync/common/Requester.kt (82%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/common/model/vo/clientsync/common/SessionParticipant.kt (84%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/common/model/vo/clientsync/session/SignRpc.kt (95%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/common/model/vo/clientsync/session/params/SignParams.kt (86%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/common/model/vo/clientsync/session/payload/SessionEventVO.kt (77%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/common/model/vo/clientsync/session/payload/SessionRequestVO.kt (82%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/common/model/vo/proposal/ProposalVO.kt (94%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/common/model/vo/sequence/SessionVO.kt (92%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/common/validator/SignValidator.kt (95%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/di/CallsModule.kt (65%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/di/EngineModule.kt (82%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/di/RequestsModule.kt (77%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/di/ResponsesModule.kt (80%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/di/SignDITags.kt (73%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/di/SignJsonRpcModule.kt (77%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/di/StorageModule.kt (83%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/SessionRequestQueue.kt (61%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/domain/SignEngine.kt (84%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/model/EngineDO.kt (99%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/model/ValidationError.kt (92%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/model/mapper/EngineMapper.kt (94%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCase.kt (96%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/ApproveSessionUseCase.kt (90%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/DecryptSignMessageUseCase.kt (94%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/DisconnectSessionUseCase.kt (86%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/EmitEventUseCase.kt (79%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/ExtendSessionUseCase.kt (82%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/FormatAuthenticateMessageUseCase.kt (87%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/GetListOfVerifyContextsUseCase.kt (77%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/GetNamespacesFromReCaps.kt (87%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/GetPairingForSessionAuthenticateUseCase.kt (88%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/GetPairingsUseCase.kt (87%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/GetPendingAuthenticateRequestUseCase.kt (70%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/GetSessionProposalsUseCase.kt (68%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/GetSessionsUseCase.kt (83%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/GetVerifyContextByIdUseCase.kt (75%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/PairUseCase.kt (92%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/PingUseCase.kt (93%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/ProposeSessionUseCase.kt (85%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/RejectSessionAuthenticateUseCase.kt (95%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/RejectSessionUseCase.kt (89%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/RespondSessionRequestUseCase.kt (95%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/SessionAuthenticateUseCase.kt (94%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/SessionRequestUseCase.kt (91%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/SessionUpdateUseCase.kt (81%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/requests/OnPingUseCase.kt (93%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/requests/OnSessionAuthenticateUseCase.kt (95%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/requests/OnSessionDeleteUseCase.kt (90%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/requests/OnSessionEventUseCase.kt (87%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/requests/OnSessionExtendUseCase.kt (86%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/requests/OnSessionProposalUseCase.kt (91%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/requests/OnSessionRequestUseCase.kt (92%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/requests/OnSessionSettleUseCase.kt (89%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/requests/OnSessionUpdateUseCase.kt (87%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/responses/OnSessionAuthenticateResponseUseCase.kt (94%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/responses/OnSessionProposalResponseUseCase.kt (92%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/responses/OnSessionRequestResponseUseCase.kt (89%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/responses/OnSessionSettleResponseUseCase.kt (92%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/engine/use_case/responses/OnSessionUpdateResponseUseCase.kt (91%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/json_rpc/domain/DeleteRequestByIdUseCase.kt (92%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/json_rpc/domain/GetPendingJsonRpcHistoryEntryByIdUseCase.kt (74%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/json_rpc/domain/GetPendingRequestsByTopicUseCase.kt (76%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/json_rpc/domain/GetPendingSessionAuthenticateRequest.kt (74%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/json_rpc/domain/GetPendingSessionRequestByTopicUseCase.kt (79%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/json_rpc/domain/GetPendingSessionRequests.kt (69%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/json_rpc/domain/GetSessionAuthenticateRequest.kt (74%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/json_rpc/domain/GetSessionRequestByIdUseCase.kt (74%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/json_rpc/model/JsonRpcMapper.kt (86%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/json_rpc/model/JsonRpcMethod.kt (94%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/storage/authenticate/AuthenticateResponseTopicRepository.kt (84%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/storage/link_mode/LinkModeStorageRepository.kt (83%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/storage/proposal/ProposalStorageRepository.kt (92%) rename protocol/sign/src/main/kotlin/com/{walletconnect => reown}/sign/storage/sequence/SessionStorageRepository.kt (94%) delete mode 100644 protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/type/Sequences.kt rename protocol/sign/src/main/sqldelight/com/{walletconnect => reown}/sign/storage/data/dao/authenticate_reponse/AuthenticateResponseTopicDao.sq (100%) rename protocol/sign/src/main/sqldelight/com/{walletconnect => reown}/sign/storage/data/dao/link_mode/LinkModeDao.sq (100%) rename protocol/sign/src/main/sqldelight/com/{walletconnect => reown}/sign/storage/data/dao/namespace/NamespaceDao.sq (100%) rename protocol/sign/src/main/sqldelight/com/{walletconnect => reown}/sign/storage/data/dao/optional_namespaces/OptionalNamespaceDao.sq (100%) rename protocol/sign/src/main/sqldelight/com/{walletconnect => reown}/sign/storage/data/dao/proposal/ProposalDao.sq (100%) rename protocol/sign/src/main/sqldelight/com/{walletconnect => reown}/sign/storage/data/dao/proposal_namespace/ProposalNamespaceDao.sq (100%) rename protocol/sign/src/main/sqldelight/com/{walletconnect => reown}/sign/storage/data/dao/session/SessionDao.sq (100%) rename protocol/sign/src/main/sqldelight/com/{walletconnect => reown}/sign/storage/data/dao/temp/TempNamespaceDao.sq (100%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/AttestationIdGenerationTest.kt (96%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/DeleteRequestByIdUseCaseTest.kt (92%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/GetSessionRequestByIdUseCaseTest.kt (88%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/ReCapsTest.kt (99%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/adapters/GenericPayloadsTest.kt (98%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/adapters/SessionEventVOJsonAdapterTest.kt (86%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/adapters/SessionRequestParamsParsingTest.kt (97%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/adapters/SessionRequestVOJsonAdapterTest.kt (98%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/engine/SessionRequestQueueTest.kt (98%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCaseTest.kt (95%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/ApproveSessionUseCaseTest.kt (94%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/DisconnectSessionUseCaseTest.kt (91%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/EmitEventUseCaseTest.kt (93%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/ExtendSessionUseCaseTest.kt (91%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/GetNamespacesFromReCapsTest.kt (95%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/GetPairingForSessionAuthenticateUseCaseTest.kt (98%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/ProposeSessionUseCaseTest.kt (90%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/ProposeUseCaseTest.kt (96%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/RejectSessionAuthenticateUseCaseTest.kt (92%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/RespondSessionRequestUseCaseTest.kt (92%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/SessionAuthenticateUseCaseTest.kt (96%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/SessionRequestUseCaseTest.kt (92%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/engine/use_case/calls/SessionUpdateUseCaseTest.kt (92%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/mappers/EngineMapperTest.kt (93%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/util/CoroutineTestRule.kt (96%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/util/GenerateApprovedNamespacesUtilsTest.kt (99%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/util/MergeReCapsTest.kt (98%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/util/UtilFunctions.kt (97%) rename protocol/sign/src/test/kotlin/com/{walletconnect => reown}/sign/validator/ValidatorTest.kt (93%) diff --git a/ReadMe.md b/ReadMe.md index af6dc6f9d..292102af7 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -1,6 +1,6 @@ -# **reown-kotlin** +# **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 +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. #### diff --git a/gradle/consumer-rules/walletconnect-rules.pro b/gradle/consumer-rules/walletconnect-rules.pro index 2f04d34d9..e622a83c5 100644 --- a/gradle/consumer-rules/walletconnect-rules.pro +++ b/gradle/consumer-rules/walletconnect-rules.pro @@ -1,5 +1,6 @@ -keep class com.reown.android.** { *; } -keep interface com.walletconnect.** { *; } +-keep interface com.reown.** { *; } -keep class kotlinx.coroutines.** { *; } -dontwarn kotlinx.coroutines.** diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/AppKit.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/AppKit.kt index bc1c5ca0b..d9e5e04e2 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/AppKit.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/AppKit.kt @@ -6,9 +6,9 @@ import com.reown.android.internal.common.scope import com.reown.android.internal.common.wcKoinApp import com.reown.android.pulse.model.EventType import com.reown.android.pulse.model.properties.Props -import com.walletconnect.sign.client.Sign -import com.walletconnect.sign.client.SignClient -import com.walletconnect.sign.common.exceptions.SignClientAlreadyInitializedException +import com.reown.sign.client.Sign +import com.reown.sign.client.SignClient +import com.reown.sign.common.exceptions.SignClientAlreadyInitializedException import com.walletconnect.util.Empty import com.walletconnect.web3.modal.client.models.Account import com.walletconnect.web3.modal.client.models.Session diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/ClientMapper.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/ClientMapper.kt index 7002c3b8d..79cf32204 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/ClientMapper.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/ClientMapper.kt @@ -1,7 +1,7 @@ package com.walletconnect.web3.modal.client import com.reown.android.internal.common.signing.cacao.Cacao -import com.walletconnect.sign.client.Sign +import com.reown.sign.client.Sign import com.walletconnect.web3.modal.client.models.Account import com.walletconnect.web3.modal.client.models.Session import com.walletconnect.web3.modal.client.models.request.Request diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/request/SentRequestResult.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/request/SentRequestResult.kt index 2ce7dd9f6..626de4bbc 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/request/SentRequestResult.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/request/SentRequestResult.kt @@ -1,6 +1,6 @@ package com.walletconnect.web3.modal.client.models.request -import com.walletconnect.sign.client.Sign +import com.reown.sign.client.Sign import com.walletconnect.web3.modal.engine.coinbase.CoinbaseResult sealed class SentRequestResult { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/AppKitEngine.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/AppKitEngine.kt index 2449f8fdd..413350508 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/AppKitEngine.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/AppKitEngine.kt @@ -13,8 +13,8 @@ import com.reown.android.pulse.model.EventType import com.reown.android.pulse.model.properties.Properties import com.reown.android.pulse.model.properties.Props import com.reown.foundation.util.Logger -import com.walletconnect.sign.client.Sign -import com.walletconnect.sign.client.SignClient +import com.reown.sign.client.Sign +import com.reown.sign.client.SignClient import com.walletconnect.util.Empty import com.walletconnect.web3.modal.client.Modal import com.walletconnect.web3.modal.client.AppKit diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/SessionUtils.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/SessionUtils.kt index 4ccd66d90..44d2f8a33 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/SessionUtils.kt +++ b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/SessionUtils.kt @@ -1,7 +1,7 @@ package com.walletconnect.web3.modal.utils import com.reown.android.internal.utils.CoreValidator -import com.walletconnect.sign.client.Sign +import com.reown.sign.client.Sign import com.walletconnect.util.Empty import com.walletconnect.web3.modal.client.Modal import com.walletconnect.web3.modal.client.AppKit diff --git a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/ClientMapper.kt b/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/ClientMapper.kt index 3ea60cebc..2fd620328 100644 --- a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/ClientMapper.kt +++ b/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/ClientMapper.kt @@ -1,7 +1,7 @@ package com.walletconnect.web3.wallet.client import com.reown.android.internal.common.signing.cacao.CacaoType -import com.walletconnect.sign.client.Sign +import com.reown.sign.client.Sign @JvmSynthetic internal fun Map.toSign(): Map = diff --git a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/WalletKit.kt b/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/WalletKit.kt index 5d0692fa2..d3bf6ca41 100644 --- a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/WalletKit.kt +++ b/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/WalletKit.kt @@ -3,9 +3,9 @@ package com.walletconnect.web3.wallet.client import com.reown.android.Core import com.reown.android.CoreInterface import com.reown.android.internal.common.scope -import com.walletconnect.sign.client.Sign -import com.walletconnect.sign.client.SignClient -import com.walletconnect.sign.common.exceptions.SignClientAlreadyInitializedException +import com.reown.sign.client.Sign +import com.reown.sign.client.SignClient +import com.reown.sign.common.exceptions.SignClientAlreadyInitializedException import kotlinx.coroutines.* import java.util.* @@ -160,7 +160,7 @@ object WalletKit { @Throws(Exception::class) fun generateApprovedNamespaces(sessionProposal: Wallet.Model.SessionProposal, supportedNamespaces: Map): Map { - return com.walletconnect.sign.client.utils.generateApprovedNamespaces(sessionProposal.toSign(), supportedNamespaces.toSign()).toWallet() + return com.reown.sign.client.utils.generateApprovedNamespaces(sessionProposal.toSign(), supportedNamespaces.toSign()).toWallet() } @Throws(IllegalStateException::class) @@ -195,12 +195,12 @@ object WalletKit { @Throws(Exception::class) fun generateAuthObject(payloadParams: Wallet.Model.PayloadAuthRequestParams, issuer: String, signature: Wallet.Model.Cacao.Signature): Wallet.Model.Cacao { - return com.walletconnect.sign.client.utils.generateAuthObject(payloadParams.toSign(), issuer, signature.toSign()).toWallet() + return com.reown.sign.client.utils.generateAuthObject(payloadParams.toSign(), issuer, signature.toSign()).toWallet() } @Throws(Exception::class) fun generateAuthPayloadParams(payloadParams: Wallet.Model.PayloadAuthRequestParams, supportedChains: List, supportedMethods: List): Wallet.Model.PayloadAuthRequestParams { - return com.walletconnect.sign.client.utils.generateAuthPayloadParams(payloadParams.toSign(), supportedChains, supportedMethods).toWallet() + return com.reown.sign.client.utils.generateAuthPayloadParams(payloadParams.toSign(), supportedChains, supportedMethods).toWallet() } @Throws(IllegalStateException::class) diff --git a/protocol/sign/build.gradle.kts b/protocol/sign/build.gradle.kts index 78180891a..300947407 100644 --- a/protocol/sign/build.gradle.kts +++ b/protocol/sign/build.gradle.kts @@ -14,7 +14,7 @@ project.apply { } android { - namespace = "com.walletconnect.sign" + namespace = "com.reown.sign" compileSdk = COMPILE_SDK defaultConfig { @@ -89,7 +89,7 @@ android { sqldelight { databases { create("SignDatabase") { - packageName.set("com.walletconnect.sign") + packageName.set("com.reown.sign") schemaOutputDirectory.set(file("src/main/sqldelight/databases")) // generateAsync.set(true) // TODO: Enable once all repository methods have been converted to suspend functions verifyMigrations.set(true) diff --git a/protocol/sign/src/androidTest/AndroidManifest.xml b/protocol/sign/src/androidTest/AndroidManifest.xml index cb6dd1dbc..ccb36ba68 100644 --- a/protocol/sign/src/androidTest/AndroidManifest.xml +++ b/protocol/sign/src/androidTest/AndroidManifest.xml @@ -7,7 +7,7 @@ diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/di/OverrideModule.kt b/protocol/sign/src/androidTest/kotlin/com/reown/sign/di/OverrideModule.kt similarity index 97% rename from protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/di/OverrideModule.kt rename to protocol/sign/src/androidTest/kotlin/com/reown/sign/di/OverrideModule.kt index bf68fff08..d781b64a8 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/di/OverrideModule.kt +++ b/protocol/sign/src/androidTest/kotlin/com/reown/sign/di/OverrideModule.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.di +package com.reown.sign.di import com.reown.android.di.coreStorageModule import com.reown.android.internal.common.di.coreAndroidNetworkModule diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/CacaoUtilsTests.kt b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/CacaoUtilsTests.kt similarity index 99% rename from protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/CacaoUtilsTests.kt rename to protocol/sign/src/androidTest/kotlin/com/reown/sign/test/CacaoUtilsTests.kt index 77e6df245..426357f66 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/CacaoUtilsTests.kt +++ b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/CacaoUtilsTests.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.test +package com.reown.sign.test import com.reown.android.internal.common.signing.cacao.decodeReCaps import com.reown.android.internal.common.signing.cacao.getChains diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/GenerateAuthPayloadParamsTest.kt b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/GenerateAuthPayloadParamsTest.kt similarity index 98% rename from protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/GenerateAuthPayloadParamsTest.kt rename to protocol/sign/src/androidTest/kotlin/com/reown/sign/test/GenerateAuthPayloadParamsTest.kt index 6232e3b35..372df1528 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/GenerateAuthPayloadParamsTest.kt +++ b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/GenerateAuthPayloadParamsTest.kt @@ -1,9 +1,9 @@ -package com.walletconnect.sign.test +package com.reown.sign.test import com.reown.android.internal.common.signing.cacao.getChains import com.reown.android.internal.common.signing.cacao.getMethods -import com.walletconnect.sign.client.Sign -import com.walletconnect.sign.client.utils.generateAuthPayloadParams +import com.reown.sign.client.Sign +import com.reown.sign.client.utils.generateAuthPayloadParams import org.junit.Test class GenerateAuthPayloadParamsTest { diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/ParseReCapsTest.kt b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/ParseReCapsTest.kt similarity index 98% rename from protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/ParseReCapsTest.kt rename to protocol/sign/src/androidTest/kotlin/com/reown/sign/test/ParseReCapsTest.kt index 54d47613c..e5ff9b5d4 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/ParseReCapsTest.kt +++ b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/ParseReCapsTest.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.test +package com.reown.sign.test import com.reown.android.internal.common.signing.cacao.getChains import com.reown.android.internal.common.signing.cacao.getMethods diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/activity/InstrumentedTestActivity.kt b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/activity/InstrumentedTestActivity.kt similarity index 82% rename from protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/activity/InstrumentedTestActivity.kt rename to protocol/sign/src/androidTest/kotlin/com/reown/sign/test/activity/InstrumentedTestActivity.kt index 9aef5841d..584879ae0 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/activity/InstrumentedTestActivity.kt +++ b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/activity/InstrumentedTestActivity.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.test.activity +package com.reown.sign.test.activity import android.app.Activity import android.os.Bundle diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/client/HybridAppInstrumentedAndroidTest.kt b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/client/HybridAppInstrumentedAndroidTest.kt similarity index 92% rename from protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/client/HybridAppInstrumentedAndroidTest.kt rename to protocol/sign/src/androidTest/kotlin/com/reown/sign/test/client/HybridAppInstrumentedAndroidTest.kt index c464feb68..b37715488 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/client/HybridAppInstrumentedAndroidTest.kt +++ b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/client/HybridAppInstrumentedAndroidTest.kt @@ -1,22 +1,22 @@ -package com.walletconnect.sign.test.client +package com.reown.sign.test.client import com.reown.android.Core -import com.walletconnect.sign.BuildConfig -import com.walletconnect.sign.client.Sign -import com.walletconnect.sign.client.SignClient -import com.walletconnect.sign.test.scenario.HybridAppInstrumentedActivityScenario -import com.walletconnect.sign.test.utils.TestClient -import com.walletconnect.sign.test.utils.dapp.DappDelegate -import com.walletconnect.sign.test.utils.dapp.DappSignClient -import com.walletconnect.sign.test.utils.dapp.dappClientConnect -import com.walletconnect.sign.test.utils.globalOnError -import com.walletconnect.sign.test.utils.hybrid.HybridAppDappDelegate -import com.walletconnect.sign.test.utils.hybrid.HybridAppWalletDelegate -import com.walletconnect.sign.test.utils.hybrid.HybridSignClient -import com.walletconnect.sign.test.utils.hybrid.hybridClientConnect -import com.walletconnect.sign.test.utils.sessionNamespaces -import com.walletconnect.sign.test.utils.wallet.WalletDelegate -import com.walletconnect.sign.test.utils.wallet.WalletSignClient +import com.reown.sign.BuildConfig +import com.reown.sign.client.Sign +import com.reown.sign.client.SignClient +import com.reown.sign.test.scenario.HybridAppInstrumentedActivityScenario +import com.reown.sign.test.utils.TestClient +import com.reown.sign.test.utils.dapp.DappDelegate +import com.reown.sign.test.utils.dapp.DappSignClient +import com.reown.sign.test.utils.dapp.dappClientConnect +import com.reown.sign.test.utils.globalOnError +import com.reown.sign.test.utils.hybrid.HybridAppDappDelegate +import com.reown.sign.test.utils.hybrid.HybridAppWalletDelegate +import com.reown.sign.test.utils.hybrid.HybridSignClient +import com.reown.sign.test.utils.hybrid.hybridClientConnect +import com.reown.sign.test.utils.sessionNamespaces +import com.reown.sign.test.utils.wallet.WalletDelegate +import com.reown.sign.test.utils.wallet.WalletSignClient import junit.framework.TestCase import org.junit.Rule import org.junit.Test diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/client/SessionAuthenticateInstrumentedAndroidTest.kt b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/client/SessionAuthenticateInstrumentedAndroidTest.kt similarity index 91% rename from protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/client/SessionAuthenticateInstrumentedAndroidTest.kt rename to protocol/sign/src/androidTest/kotlin/com/reown/sign/test/client/SessionAuthenticateInstrumentedAndroidTest.kt index a02221677..bb7101c0d 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/client/SessionAuthenticateInstrumentedAndroidTest.kt +++ b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/client/SessionAuthenticateInstrumentedAndroidTest.kt @@ -1,25 +1,25 @@ -package com.walletconnect.sign.test.client +package com.reown.sign.test.client import com.reown.android.Core import com.reown.android.cacao.signature.SignatureType import com.reown.android.utils.cacao.signHex -import com.walletconnect.sign.BuildConfig -import com.walletconnect.sign.client.Sign -import com.walletconnect.sign.client.SignClient -import com.walletconnect.sign.client.utils.CacaoSigner -import com.walletconnect.sign.client.utils.generateAuthObject -import com.walletconnect.sign.client.utils.generateAuthPayloadParams -import com.walletconnect.sign.test.scenario.SignClientInstrumentedActivityScenario -import com.walletconnect.sign.test.utils.TestClient -import com.walletconnect.sign.test.utils.dapp.DappDelegate -import com.walletconnect.sign.test.utils.dapp.DappSignClient -import com.walletconnect.sign.test.utils.dapp.dappClientAuthenticate -import com.walletconnect.sign.test.utils.dapp.dappClientAuthenticateLinkMode -import com.walletconnect.sign.test.utils.dapp.dappClientSendRequest -import com.walletconnect.sign.test.utils.globalOnError -import com.walletconnect.sign.test.utils.wallet.WalletDelegate -import com.walletconnect.sign.test.utils.wallet.WalletSignClient -import com.walletconnect.sign.test.utils.wallet.walletClientRespondToRequest +import com.reown.sign.BuildConfig +import com.reown.sign.client.Sign +import com.reown.sign.client.SignClient +import com.reown.sign.client.utils.CacaoSigner +import com.reown.sign.client.utils.generateAuthObject +import com.reown.sign.client.utils.generateAuthPayloadParams +import com.reown.sign.test.scenario.SignClientInstrumentedActivityScenario +import com.reown.sign.test.utils.TestClient +import com.reown.sign.test.utils.dapp.DappDelegate +import com.reown.sign.test.utils.dapp.DappSignClient +import com.reown.sign.test.utils.dapp.dappClientAuthenticate +import com.reown.sign.test.utils.dapp.dappClientAuthenticateLinkMode +import com.reown.sign.test.utils.dapp.dappClientSendRequest +import com.reown.sign.test.utils.globalOnError +import com.reown.sign.test.utils.wallet.WalletDelegate +import com.reown.sign.test.utils.wallet.WalletSignClient +import com.reown.sign.test.utils.wallet.walletClientRespondToRequest import com.walletconnect.util.hexToBytes import org.junit.Rule import org.junit.Test diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/client/SignClientInstrumentedAndroidTest.kt b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/client/SignClientInstrumentedAndroidTest.kt similarity index 89% rename from protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/client/SignClientInstrumentedAndroidTest.kt rename to protocol/sign/src/androidTest/kotlin/com/reown/sign/test/client/SignClientInstrumentedAndroidTest.kt index 307be572d..6b7781663 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/client/SignClientInstrumentedAndroidTest.kt +++ b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/client/SignClientInstrumentedAndroidTest.kt @@ -1,29 +1,29 @@ -package com.walletconnect.sign.test.client +package com.reown.sign.test.client import com.reown.android.Core -import com.walletconnect.sign.BuildConfig -import com.walletconnect.sign.client.Sign -import com.walletconnect.sign.client.SignClient -import com.walletconnect.sign.test.scenario.SignClientInstrumentedActivityScenario -import com.walletconnect.sign.test.utils.TestClient -import com.walletconnect.sign.test.utils.dapp.AutoApproveDappDelegate -import com.walletconnect.sign.test.utils.dapp.DappDelegate -import com.walletconnect.sign.test.utils.dapp.DappSignClient -import com.walletconnect.sign.test.utils.dapp.dappClientConnect -import com.walletconnect.sign.test.utils.dapp.dappClientSendRequest -import com.walletconnect.sign.test.utils.globalOnError -import com.walletconnect.sign.test.utils.sessionChains -import com.walletconnect.sign.test.utils.sessionEvents -import com.walletconnect.sign.test.utils.sessionNamespaceKey -import com.walletconnect.sign.test.utils.wallet.AutoApproveSessionWalletDelegate -import com.walletconnect.sign.test.utils.wallet.WalletDelegate -import com.walletconnect.sign.test.utils.wallet.WalletSignClient -import com.walletconnect.sign.test.utils.wallet.dappClientExtendSession -import com.walletconnect.sign.test.utils.wallet.rejectOnSessionProposal -import com.walletconnect.sign.test.utils.wallet.walletClientEmitEvent -import com.walletconnect.sign.test.utils.wallet.walletClientExtendSession -import com.walletconnect.sign.test.utils.wallet.walletClientRespondToRequest -import com.walletconnect.sign.test.utils.wallet.walletClientUpdateSession +import com.reown.sign.BuildConfig +import com.reown.sign.client.Sign +import com.reown.sign.client.SignClient +import com.reown.sign.test.scenario.SignClientInstrumentedActivityScenario +import com.reown.sign.test.utils.TestClient +import com.reown.sign.test.utils.dapp.AutoApproveDappDelegate +import com.reown.sign.test.utils.dapp.DappDelegate +import com.reown.sign.test.utils.dapp.DappSignClient +import com.reown.sign.test.utils.dapp.dappClientConnect +import com.reown.sign.test.utils.dapp.dappClientSendRequest +import com.reown.sign.test.utils.globalOnError +import com.reown.sign.test.utils.sessionChains +import com.reown.sign.test.utils.sessionEvents +import com.reown.sign.test.utils.sessionNamespaceKey +import com.reown.sign.test.utils.wallet.AutoApproveSessionWalletDelegate +import com.reown.sign.test.utils.wallet.WalletDelegate +import com.reown.sign.test.utils.wallet.WalletSignClient +import com.reown.sign.test.utils.wallet.dappClientExtendSession +import com.reown.sign.test.utils.wallet.rejectOnSessionProposal +import com.reown.sign.test.utils.wallet.walletClientEmitEvent +import com.reown.sign.test.utils.wallet.walletClientExtendSession +import com.reown.sign.test.utils.wallet.walletClientRespondToRequest +import com.reown.sign.test.utils.wallet.walletClientUpdateSession import junit.framework.TestCase.fail import org.junit.Rule import org.junit.Test diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/scenario/HybridAppInstrumentedActivityScenario.kt b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/scenario/HybridAppInstrumentedActivityScenario.kt similarity index 95% rename from protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/scenario/HybridAppInstrumentedActivityScenario.kt rename to protocol/sign/src/androidTest/kotlin/com/reown/sign/test/scenario/HybridAppInstrumentedActivityScenario.kt index 467f4a64b..e3eba3525 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/scenario/HybridAppInstrumentedActivityScenario.kt +++ b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/scenario/HybridAppInstrumentedActivityScenario.kt @@ -1,9 +1,9 @@ -package com.walletconnect.sign.test.scenario +package com.reown.sign.test.scenario import com.reown.android.internal.common.scope import com.reown.foundation.network.model.Relay -import com.walletconnect.sign.test.BuildConfig -import com.walletconnect.sign.test.utils.TestClient +import com.reown.sign.test.BuildConfig +import com.reown.sign.test.utils.TestClient import junit.framework.TestCase import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableStateFlow diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/scenario/SignActivityScenario.kt b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/scenario/SignActivityScenario.kt similarity index 93% rename from protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/scenario/SignActivityScenario.kt rename to protocol/sign/src/androidTest/kotlin/com/reown/sign/test/scenario/SignActivityScenario.kt index a70bda0a1..121f2a960 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/scenario/SignActivityScenario.kt +++ b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/scenario/SignActivityScenario.kt @@ -1,8 +1,8 @@ -package com.walletconnect.sign.test.scenario +package com.reown.sign.test.scenario import androidx.lifecycle.Lifecycle import androidx.test.core.app.ActivityScenario -import com.walletconnect.sign.test.activity.InstrumentedTestActivity +import com.reown.sign.test.activity.InstrumentedTestActivity import junit.framework.TestCase import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/scenario/SignClientInstrumentedActivityScenario.kt b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/scenario/SignClientInstrumentedActivityScenario.kt similarity index 95% rename from protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/scenario/SignClientInstrumentedActivityScenario.kt rename to protocol/sign/src/androidTest/kotlin/com/reown/sign/test/scenario/SignClientInstrumentedActivityScenario.kt index a8eeeb474..2bc5d96e8 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/scenario/SignClientInstrumentedActivityScenario.kt +++ b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/scenario/SignClientInstrumentedActivityScenario.kt @@ -1,9 +1,9 @@ -package com.walletconnect.sign.test.scenario +package com.reown.sign.test.scenario import com.reown.android.internal.common.scope import com.reown.foundation.network.model.Relay -import com.walletconnect.sign.test.BuildConfig -import com.walletconnect.sign.test.utils.TestClient +import com.reown.sign.test.BuildConfig +import com.reown.sign.test.utils.TestClient import junit.framework.TestCase.fail import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableStateFlow diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/Common.kt b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/Common.kt similarity index 92% rename from protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/Common.kt rename to protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/Common.kt index 376b3efed..bbb97e86e 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/Common.kt +++ b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/Common.kt @@ -1,7 +1,7 @@ -package com.walletconnect.sign.test.utils +package com.reown.sign.test.utils import com.reown.android.Core -import com.walletconnect.sign.client.Sign +import com.reown.sign.client.Sign import junit.framework.TestCase.fail import timber.log.Timber diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/TestClient.kt b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/TestClient.kt similarity index 97% rename from protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/TestClient.kt rename to protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/TestClient.kt index 55a018c7c..2e16e7970 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/TestClient.kt +++ b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/TestClient.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.test.utils +package com.reown.sign.test.utils import android.app.Application import androidx.test.core.app.ApplicationProvider @@ -7,11 +7,11 @@ import com.reown.android.CoreClient import com.reown.android.CoreProtocol import com.reown.android.relay.ConnectionType import com.reown.android.relay.RelayClient -import com.walletconnect.sign.BuildConfig -import com.walletconnect.sign.client.Sign -import com.walletconnect.sign.client.SignClient -import com.walletconnect.sign.client.SignProtocol -import com.walletconnect.sign.di.overrideModule +import com.reown.sign.BuildConfig +import com.reown.sign.client.Sign +import com.reown.sign.client.SignClient +import com.reown.sign.client.SignProtocol +import com.reown.sign.di.overrideModule import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import org.koin.core.KoinApplication diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/dapp/DappDelegate.kt b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/dapp/DappDelegate.kt similarity index 90% rename from protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/dapp/DappDelegate.kt rename to protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/dapp/DappDelegate.kt index 52969b5a9..13ffbd685 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/dapp/DappDelegate.kt +++ b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/dapp/DappDelegate.kt @@ -1,9 +1,9 @@ -package com.walletconnect.sign.test.utils.dapp +package com.reown.sign.test.utils.dapp -import com.walletconnect.sign.BuildConfig -import com.walletconnect.sign.client.Sign -import com.walletconnect.sign.client.SignClient -import com.walletconnect.sign.test.utils.globalOnError +import com.reown.sign.BuildConfig +import com.reown.sign.client.Sign +import com.reown.sign.client.SignClient +import com.reown.sign.test.utils.globalOnError import junit.framework.TestCase.fail import timber.log.Timber import kotlin.time.Duration.Companion.seconds diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/dapp/DappSignClient.kt b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/dapp/DappSignClient.kt similarity index 87% rename from protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/dapp/DappSignClient.kt rename to protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/dapp/DappSignClient.kt index acebe6137..0108821e3 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/dapp/DappSignClient.kt +++ b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/dapp/DappSignClient.kt @@ -1,12 +1,12 @@ -package com.walletconnect.sign.test.utils.dapp +package com.reown.sign.test.utils.dapp import com.reown.android.Core -import com.walletconnect.sign.client.Sign -import com.walletconnect.sign.test.utils.TestClient -import com.walletconnect.sign.test.utils.globalOnError -import com.walletconnect.sign.test.utils.proposalNamespaces -import com.walletconnect.sign.test.utils.sessionChains -import com.walletconnect.sign.test.utils.sessionMethods +import com.reown.sign.client.Sign +import com.reown.sign.test.utils.TestClient +import com.reown.sign.test.utils.globalOnError +import com.reown.sign.test.utils.proposalNamespaces +import com.reown.sign.test.utils.sessionChains +import com.reown.sign.test.utils.sessionMethods import com.walletconnect.util.bytesToHex import com.walletconnect.util.randomBytes import timber.log.Timber diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/hybrid/HybridDelegate.kt b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/hybrid/HybridDelegate.kt similarity index 92% rename from protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/hybrid/HybridDelegate.kt rename to protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/hybrid/HybridDelegate.kt index 88422190a..b26f80496 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/hybrid/HybridDelegate.kt +++ b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/hybrid/HybridDelegate.kt @@ -1,8 +1,8 @@ -package com.walletconnect.sign.test.utils.hybrid +package com.reown.sign.test.utils.hybrid -import com.walletconnect.sign.client.Sign -import com.walletconnect.sign.client.SignClient -import com.walletconnect.sign.test.utils.globalOnError +import com.reown.sign.client.Sign +import com.reown.sign.client.SignClient +import com.reown.sign.test.utils.globalOnError import timber.log.Timber open class HybridAppWalletDelegate : SignClient.WalletDelegate { diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/hybrid/HybridSignClient.kt b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/hybrid/HybridSignClient.kt similarity index 65% rename from protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/hybrid/HybridSignClient.kt rename to protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/hybrid/HybridSignClient.kt index c71232707..ac076a7f7 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/hybrid/HybridSignClient.kt +++ b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/hybrid/HybridSignClient.kt @@ -1,10 +1,10 @@ -package com.walletconnect.sign.test.utils.hybrid +package com.reown.sign.test.utils.hybrid import com.reown.android.Core -import com.walletconnect.sign.client.Sign -import com.walletconnect.sign.test.utils.TestClient -import com.walletconnect.sign.test.utils.globalOnError -import com.walletconnect.sign.test.utils.proposalNamespaces +import com.reown.sign.client.Sign +import com.reown.sign.test.utils.TestClient +import com.reown.sign.test.utils.globalOnError +import com.reown.sign.test.utils.proposalNamespaces import timber.log.Timber val HybridSignClient = TestClient.Hybrid.signClient diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/wallet/WalletDelegate.kt b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/wallet/WalletDelegate.kt similarity index 89% rename from protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/wallet/WalletDelegate.kt rename to protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/wallet/WalletDelegate.kt index 08b4dbf55..68d7625e9 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/wallet/WalletDelegate.kt +++ b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/wallet/WalletDelegate.kt @@ -1,9 +1,9 @@ -package com.walletconnect.sign.test.utils.wallet +package com.reown.sign.test.utils.wallet -import com.walletconnect.sign.client.Sign -import com.walletconnect.sign.client.SignClient -import com.walletconnect.sign.test.utils.globalOnError -import com.walletconnect.sign.test.utils.sessionNamespaces +import com.reown.sign.client.Sign +import com.reown.sign.client.SignClient +import com.reown.sign.test.utils.globalOnError +import com.reown.sign.test.utils.sessionNamespaces import timber.log.Timber open class WalletDelegate : SignClient.WalletDelegate { diff --git a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/wallet/WalletSignClient.kt b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/wallet/WalletSignClient.kt similarity index 75% rename from protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/wallet/WalletSignClient.kt rename to protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/wallet/WalletSignClient.kt index 1722b33e8..f42a87813 100644 --- a/protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/wallet/WalletSignClient.kt +++ b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/wallet/WalletSignClient.kt @@ -1,13 +1,13 @@ -package com.walletconnect.sign.test.utils.wallet - -import com.walletconnect.sign.client.Sign -import com.walletconnect.sign.test.utils.TestClient -import com.walletconnect.sign.test.utils.dapp.DappSignClient -import com.walletconnect.sign.test.utils.globalOnError -import com.walletconnect.sign.test.utils.sessionChains -import com.walletconnect.sign.test.utils.sessionEvents -import com.walletconnect.sign.test.utils.sessionNamespace -import com.walletconnect.sign.test.utils.sessionNamespaceKey +package com.reown.sign.test.utils.wallet + +import com.reown.sign.client.Sign +import com.reown.sign.test.utils.TestClient +import com.reown.sign.test.utils.dapp.DappSignClient +import com.reown.sign.test.utils.globalOnError +import com.reown.sign.test.utils.sessionChains +import com.reown.sign.test.utils.sessionEvents +import com.reown.sign.test.utils.sessionNamespace +import com.reown.sign.test.utils.sessionNamespaceKey import timber.log.Timber val WalletSignClient = TestClient.Wallet.signClient diff --git a/protocol/sign/src/main/AndroidManifest.xml b/protocol/sign/src/main/AndroidManifest.xml index 3c2701c08..91067cbd5 100644 --- a/protocol/sign/src/main/AndroidManifest.xml +++ b/protocol/sign/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.reown.sign"> \ No newline at end of file diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/Sign.kt b/protocol/sign/src/main/kotlin/com/reown/sign/client/Sign.kt similarity index 99% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/client/Sign.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/client/Sign.kt index 751d33ba6..383f412fc 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/Sign.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/client/Sign.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.client +package com.reown.sign.client import androidx.annotation.Keep import com.reown.android.Core diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignClient.kt b/protocol/sign/src/main/kotlin/com/reown/sign/client/SignClient.kt similarity index 82% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignClient.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/client/SignClient.kt index 663f898d3..b91193d2e 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignClient.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/client/SignClient.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.client +package com.reown.sign.client object SignClient : SignInterface by SignProtocol.instance { interface WalletDelegate: SignInterface.WalletDelegate diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignInterface.kt b/protocol/sign/src/main/kotlin/com/reown/sign/client/SignInterface.kt similarity index 98% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignInterface.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/client/SignInterface.kt index 7502b6bad..9b80fb524 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignInterface.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/client/SignInterface.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.client +package com.reown.sign.client interface SignInterface { interface WalletDelegate { @@ -85,7 +85,7 @@ interface SignInterface { @Deprecated( message = "The onSuccess callback has been replaced with a new callback that returns Sign.Model.SentRequest", - replaceWith = ReplaceWith(expression = "this.request(request, onSuccessWithSentRequest, onError)", imports = ["com.walletconnect.sign.client"]) + replaceWith = ReplaceWith(expression = "this.request(request, onSuccessWithSentRequest, onError)", imports = ["com.reown.sign.client"]) ) fun request( request: Sign.Params.Request, diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignProtocol.kt b/protocol/sign/src/main/kotlin/com/reown/sign/client/SignProtocol.kt similarity index 98% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignProtocol.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/client/SignProtocol.kt index ea4b98599..2a5db588f 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignProtocol.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/client/SignProtocol.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.sign.client +package com.reown.sign.client import com.reown.android.Core import com.reown.android.internal.common.di.AndroidCommonDITags @@ -12,13 +12,13 @@ import com.reown.android.internal.common.wcKoinApp import com.reown.android.pairing.model.mapper.toPairing import com.reown.android.relay.WSSConnectionState import com.reown.foundation.common.model.Topic -import com.walletconnect.sign.client.mapper.* -import com.walletconnect.sign.common.exceptions.SignClientAlreadyInitializedException -import com.walletconnect.sign.di.engineModule -import com.walletconnect.sign.di.signJsonRpcModule -import com.walletconnect.sign.di.storageModule -import com.walletconnect.sign.engine.domain.SignEngine -import com.walletconnect.sign.engine.model.EngineDO +import com.reown.sign.client.mapper.* +import com.reown.sign.common.exceptions.SignClientAlreadyInitializedException +import com.reown.sign.di.engineModule +import com.reown.sign.di.signJsonRpcModule +import com.reown.sign.di.storageModule +import com.reown.sign.engine.domain.SignEngine +import com.reown.sign.engine.model.EngineDO import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch @@ -500,7 +500,7 @@ class SignProtocol(private val koinApp: KoinApplication = wcKoinApp) : SignInter @Deprecated( "The onSuccess callback has been replaced with a new callback that returns Sign.Model.SentRequest", - replaceWith = ReplaceWith("this.request(request, onSuccessWithSentRequest, onError)", "com.walletconnect.sign.client") + replaceWith = ReplaceWith("this.request(request, onSuccessWithSentRequest, onError)", "com.reown.sign.client") ) @Throws(IllegalStateException::class) override fun request( diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/mapper/ClientMapper.kt b/protocol/sign/src/main/kotlin/com/reown/sign/client/mapper/ClientMapper.kt similarity index 98% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/client/mapper/ClientMapper.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/client/mapper/ClientMapper.kt index a6ca929cc..595ad2ecc 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/mapper/ClientMapper.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/client/mapper/ClientMapper.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.sign.client.mapper +package com.reown.sign.client.mapper import com.reown.android.Core import com.reown.android.internal.common.JsonRpcResponse @@ -14,10 +14,10 @@ import com.reown.android.internal.common.signing.cacao.CacaoType import com.reown.android.internal.common.signing.cacao.RECAPS_STATEMENT import com.reown.android.internal.common.signing.cacao.getStatement import com.reown.android.utils.toClient -import com.walletconnect.sign.client.Sign -import com.walletconnect.sign.common.model.Request -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.engine.model.EngineDO +import com.reown.sign.client.Sign +import com.reown.sign.common.model.Request +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.engine.model.EngineDO @JvmSynthetic internal fun Sign.Model.JsonRpcResponse.toJsonRpcResponse(): JsonRpcResponse = diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/utils/CacaoSigner.kt b/protocol/sign/src/main/kotlin/com/reown/sign/client/utils/CacaoSigner.kt similarity index 87% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/client/utils/CacaoSigner.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/client/utils/CacaoSigner.kt index 6003731d6..4c64f1946 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/utils/CacaoSigner.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/client/utils/CacaoSigner.kt @@ -1,8 +1,8 @@ -package com.walletconnect.sign.client.utils +package com.reown.sign.client.utils import com.reown.android.cacao.signature.ISignatureType import com.reown.android.utils.cacao.CacaoSignerInterface -import com.walletconnect.sign.client.Sign +import com.reown.sign.client.Sign /** * @deprecated Only added to have backwards compatibility. Newer SDKs should only add CacaoSigner object below. diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/utils/Utils.kt b/protocol/sign/src/main/kotlin/com/reown/sign/client/utils/Utils.kt similarity index 95% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/client/utils/Utils.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/client/utils/Utils.kt index 6771974a6..321ae4b14 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/client/utils/Utils.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/client/utils/Utils.kt @@ -1,6 +1,6 @@ @file:JvmName("ApprovedNamespacesUtils") -package com.walletconnect.sign.client.utils +package com.reown.sign.client.utils import android.util.Base64 import com.reown.android.internal.common.model.Namespace @@ -11,12 +11,12 @@ import com.reown.android.internal.common.signing.cacao.decodeReCaps import com.reown.android.internal.common.signing.cacao.getStatement import com.reown.android.internal.common.signing.cacao.parseReCaps import com.reown.android.internal.utils.CoreValidator -import com.walletconnect.sign.client.Sign -import com.walletconnect.sign.client.mapper.toCacaoPayload -import com.walletconnect.sign.client.mapper.toCore -import com.walletconnect.sign.client.mapper.toProposalNamespacesVO -import com.walletconnect.sign.client.mapper.toSessionNamespacesVO -import com.walletconnect.sign.common.validator.SignValidator +import com.reown.sign.client.Sign +import com.reown.sign.client.mapper.toCacaoPayload +import com.reown.sign.client.mapper.toCore +import com.reown.sign.client.mapper.toProposalNamespacesVO +import com.reown.sign.client.mapper.toSessionNamespacesVO +import com.reown.sign.common.validator.SignValidator import org.json.JSONArray import org.json.JSONObject diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/adapters/SessionEventVOJsonAdapter.kt b/protocol/sign/src/main/kotlin/com/reown/sign/common/adapters/SessionEventVOJsonAdapter.kt similarity index 97% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/common/adapters/SessionEventVOJsonAdapter.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/common/adapters/SessionEventVOJsonAdapter.kt index 92b28d099..f09b3612a 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/adapters/SessionEventVOJsonAdapter.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/common/adapters/SessionEventVOJsonAdapter.kt @@ -1,11 +1,11 @@ -package com.walletconnect.sign.common.adapters +package com.reown.sign.common.adapters import com.squareup.moshi.JsonAdapter import com.squareup.moshi.JsonReader import com.squareup.moshi.JsonWriter import com.squareup.moshi.Moshi import com.squareup.moshi.internal.Util -import com.walletconnect.sign.common.model.vo.clientsync.session.payload.SessionEventVO +import com.reown.sign.common.model.vo.clientsync.session.payload.SessionEventVO import org.json.JSONArray import org.json.JSONObject diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/adapters/SessionRequestVOJsonAdapter.kt b/protocol/sign/src/main/kotlin/com/reown/sign/common/adapters/SessionRequestVOJsonAdapter.kt similarity index 97% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/common/adapters/SessionRequestVOJsonAdapter.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/common/adapters/SessionRequestVOJsonAdapter.kt index 25bee84bf..f60467279 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/adapters/SessionRequestVOJsonAdapter.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/common/adapters/SessionRequestVOJsonAdapter.kt @@ -1,13 +1,13 @@ @file:JvmSynthetic -package com.walletconnect.sign.common.adapters +package com.reown.sign.common.adapters import com.squareup.moshi.JsonAdapter import com.squareup.moshi.JsonReader import com.squareup.moshi.JsonWriter import com.squareup.moshi.Moshi import com.squareup.moshi.internal.Util -import com.walletconnect.sign.common.model.vo.clientsync.session.payload.SessionRequestVO +import com.reown.sign.common.model.vo.clientsync.session.payload.SessionRequestVO import org.json.JSONArray import org.json.JSONObject import kotlin.String diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/exceptions/Messages.kt b/protocol/sign/src/main/kotlin/com/reown/sign/common/exceptions/Messages.kt similarity index 98% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/common/exceptions/Messages.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/common/exceptions/Messages.kt index 917b5f138..25c864ef1 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/exceptions/Messages.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/common/exceptions/Messages.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.common.exceptions +package com.reown.sign.common.exceptions internal const val NO_SEQUENCE_FOR_TOPIC_MESSAGE: String = "Cannot find sequence for given topic: " internal const val UNAUTHORIZED_UPDATE_MESSAGE: String = diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/exceptions/PeerError.kt b/protocol/sign/src/main/kotlin/com/reown/sign/common/exceptions/PeerError.kt similarity index 98% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/common/exceptions/PeerError.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/common/exceptions/PeerError.kt index e07276ad1..7685d4510 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/exceptions/PeerError.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/common/exceptions/PeerError.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.common.exceptions +package com.reown.sign.common.exceptions import com.reown.android.internal.common.model.type.Error diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/exceptions/SignExceptions.kt b/protocol/sign/src/main/kotlin/com/reown/sign/common/exceptions/SignExceptions.kt similarity index 96% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/common/exceptions/SignExceptions.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/common/exceptions/SignExceptions.kt index 1e5cb75d7..2dbadf058 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/exceptions/SignExceptions.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/common/exceptions/SignExceptions.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.common.exceptions +package com.reown.sign.common.exceptions import com.reown.android.internal.common.exception.WalletConnectException diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/Request.kt b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/Request.kt similarity index 89% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/Request.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/common/model/Request.kt index 93728b829..cc04522ce 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/Request.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/Request.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.common.model +package com.reown.sign.common.model import com.reown.android.internal.common.model.Expiry import com.reown.android.internal.common.model.TransportType diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/common/model/type/Sequences.kt b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/type/Sequences.kt new file mode 100644 index 000000000..a4c696225 --- /dev/null +++ b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/type/Sequences.kt @@ -0,0 +1,5 @@ +package com.reown.sign.common.model.type + +enum class Sequences { + SESSION, PAIRING +} \ No newline at end of file diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/common/PayloadParams.kt b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/common/PayloadParams.kt similarity index 92% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/common/PayloadParams.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/common/PayloadParams.kt index 5915abc63..24d4089a0 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/common/PayloadParams.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/common/PayloadParams.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.common.model.vo.clientsync.common +package com.reown.sign.common.model.vo.clientsync.common import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/common/Requester.kt b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/common/Requester.kt similarity index 82% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/common/Requester.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/common/Requester.kt index 0313027fb..2ef5746ed 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/common/Requester.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/common/Requester.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.common.model.vo.clientsync.common +package com.reown.sign.common.model.vo.clientsync.common import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/common/SessionParticipant.kt b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/common/SessionParticipant.kt similarity index 84% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/common/SessionParticipant.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/common/SessionParticipant.kt index 126d9c211..db0eebf5a 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/common/SessionParticipant.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/common/SessionParticipant.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.sign.common.model.vo.clientsync.common +package com.reown.sign.common.model.vo.clientsync.common import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/session/SignRpc.kt b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/session/SignRpc.kt similarity index 95% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/session/SignRpc.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/session/SignRpc.kt index 049b0d691..c0925463d 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/session/SignRpc.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/session/SignRpc.kt @@ -1,12 +1,12 @@ @file:JvmSynthetic -package com.walletconnect.sign.common.model.vo.clientsync.session +package com.reown.sign.common.model.vo.clientsync.session import com.squareup.moshi.Json import com.squareup.moshi.JsonClass import com.reown.android.internal.common.model.type.JsonRpcClientSync -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.json_rpc.model.JsonRpcMethod +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.json_rpc.model.JsonRpcMethod import com.walletconnect.util.generateId internal sealed class SignRpc : JsonRpcClientSync { diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/session/params/SignParams.kt b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/session/params/SignParams.kt similarity index 86% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/session/params/SignParams.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/session/params/SignParams.kt index 1079e5aa9..24b6f2683 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/session/params/SignParams.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/session/params/SignParams.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.sign.common.model.vo.clientsync.session.params +package com.reown.sign.common.model.vo.clientsync.session.params import com.squareup.moshi.Json import com.squareup.moshi.JsonClass @@ -8,11 +8,11 @@ import com.reown.android.internal.common.model.Namespace import com.reown.android.internal.common.model.RelayProtocolOptions import com.reown.android.internal.common.model.SessionProposer import com.reown.android.internal.common.model.params.CoreSignParams -import com.walletconnect.sign.common.model.vo.clientsync.common.PayloadParams -import com.walletconnect.sign.common.model.vo.clientsync.common.Requester -import com.walletconnect.sign.common.model.vo.clientsync.common.SessionParticipant -import com.walletconnect.sign.common.model.vo.clientsync.session.payload.SessionEventVO -import com.walletconnect.sign.common.model.vo.clientsync.session.payload.SessionRequestVO +import com.reown.sign.common.model.vo.clientsync.common.PayloadParams +import com.reown.sign.common.model.vo.clientsync.common.Requester +import com.reown.sign.common.model.vo.clientsync.common.SessionParticipant +import com.reown.sign.common.model.vo.clientsync.session.payload.SessionEventVO +import com.reown.sign.common.model.vo.clientsync.session.payload.SessionRequestVO import com.walletconnect.utils.DefaultId internal sealed class SignParams : CoreSignParams() { diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/session/payload/SessionEventVO.kt b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/session/payload/SessionEventVO.kt similarity index 77% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/session/payload/SessionEventVO.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/session/payload/SessionEventVO.kt index d1c3d204c..96ed537bd 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/session/payload/SessionEventVO.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/session/payload/SessionEventVO.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.sign.common.model.vo.clientsync.session.payload +package com.reown.sign.common.model.vo.clientsync.session.payload import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/session/payload/SessionRequestVO.kt b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/session/payload/SessionRequestVO.kt similarity index 82% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/session/payload/SessionRequestVO.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/session/payload/SessionRequestVO.kt index 9dbd748fb..b7b0bf183 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/session/payload/SessionRequestVO.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/session/payload/SessionRequestVO.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.sign.common.model.vo.clientsync.session.payload +package com.reown.sign.common.model.vo.clientsync.session.payload import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/proposal/ProposalVO.kt b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/proposal/ProposalVO.kt similarity index 94% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/proposal/ProposalVO.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/proposal/ProposalVO.kt index 02618d9aa..4576d30eb 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/proposal/ProposalVO.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/proposal/ProposalVO.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.common.model.vo.proposal +package com.reown.sign.common.model.vo.proposal import com.reown.android.internal.common.model.AppMetaData import com.reown.android.internal.common.model.Expiry diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/sequence/SessionVO.kt b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/sequence/SessionVO.kt similarity index 92% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/sequence/SessionVO.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/sequence/SessionVO.kt index 8fb27e4a5..38c35129e 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/sequence/SessionVO.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/sequence/SessionVO.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.sign.common.model.vo.sequence +package com.reown.sign.common.model.vo.sequence import com.reown.android.internal.common.model.AppMetaData import com.reown.android.internal.common.model.Expiry @@ -10,11 +10,11 @@ import com.reown.android.internal.common.model.type.Sequence import com.reown.android.internal.utils.ACTIVE_SESSION import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic -import com.walletconnect.sign.common.model.vo.clientsync.common.SessionParticipant -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.common.model.vo.proposal.ProposalVO -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.engine.model.mapper.toMapOfNamespacesVOSession +import com.reown.sign.common.model.vo.clientsync.common.SessionParticipant +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.common.model.vo.proposal.ProposalVO +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.engine.model.mapper.toMapOfNamespacesVOSession internal data class SessionVO( override val topic: Topic, diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/validator/SignValidator.kt b/protocol/sign/src/main/kotlin/com/reown/sign/common/validator/SignValidator.kt similarity index 95% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/common/validator/SignValidator.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/common/validator/SignValidator.kt index 7b639eff8..ef9695ca7 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/validator/SignValidator.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/common/validator/SignValidator.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.sign.common.validator +package com.reown.sign.common.validator import android.annotation.SuppressLint import com.reown.android.internal.common.model.Namespace @@ -11,14 +11,14 @@ import com.reown.android.internal.utils.CoreValidator.isChainIdCAIP2Compliant import com.reown.android.internal.utils.CoreValidator.isNamespaceRegexCompliant import com.reown.android.internal.utils.weekInSeconds import com.reown.foundation.common.model.Topic -import com.walletconnect.sign.common.exceptions.NAMESPACE_ACCOUNTS_CAIP_10_MESSAGE -import com.walletconnect.sign.common.exceptions.NAMESPACE_ACCOUNTS_WRONG_NAMESPACE_MESSAGE -import com.walletconnect.sign.common.exceptions.NAMESPACE_CHAINS_CAIP_2_MESSAGE -import com.walletconnect.sign.common.exceptions.NAMESPACE_CHAINS_MISSING_MESSAGE -import com.walletconnect.sign.common.exceptions.NAMESPACE_CHAINS_UNDEFINED_MISSING_MESSAGE -import com.walletconnect.sign.common.exceptions.NAMESPACE_CHAINS_WRONG_NAMESPACE_MESSAGE -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.engine.model.ValidationError +import com.reown.sign.common.exceptions.NAMESPACE_ACCOUNTS_CAIP_10_MESSAGE +import com.reown.sign.common.exceptions.NAMESPACE_ACCOUNTS_WRONG_NAMESPACE_MESSAGE +import com.reown.sign.common.exceptions.NAMESPACE_CHAINS_CAIP_2_MESSAGE +import com.reown.sign.common.exceptions.NAMESPACE_CHAINS_MISSING_MESSAGE +import com.reown.sign.common.exceptions.NAMESPACE_CHAINS_UNDEFINED_MISSING_MESSAGE +import com.reown.sign.common.exceptions.NAMESPACE_CHAINS_WRONG_NAMESPACE_MESSAGE +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.engine.model.ValidationError import java.net.URI import java.net.URISyntaxException diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/CallsModule.kt b/protocol/sign/src/main/kotlin/com/reown/sign/di/CallsModule.kt similarity index 65% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/di/CallsModule.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/di/CallsModule.kt index fe060e868..2169dffd8 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/CallsModule.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/di/CallsModule.kt @@ -1,56 +1,56 @@ -package com.walletconnect.sign.di +package com.reown.sign.di import com.reown.android.internal.common.di.AndroidCommonDITags import com.reown.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface import com.reown.android.internal.common.model.Tags import com.reown.android.push.notifications.DecryptMessageUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.ApproveSessionAuthenticateUseCase -import com.walletconnect.sign.engine.use_case.calls.ApproveSessionAuthenticateUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.ApproveSessionUseCase -import com.walletconnect.sign.engine.use_case.calls.ApproveSessionUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.DecryptSignMessageUseCase -import com.walletconnect.sign.engine.use_case.calls.DisconnectSessionUseCase -import com.walletconnect.sign.engine.use_case.calls.DisconnectSessionUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.EmitEventUseCase -import com.walletconnect.sign.engine.use_case.calls.EmitEventUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.ExtendSessionUseCase -import com.walletconnect.sign.engine.use_case.calls.ExtendSessionUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.FormatAuthenticateMessageUseCase -import com.walletconnect.sign.engine.use_case.calls.FormatAuthenticateMessageUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.GetListOfVerifyContextsUseCase -import com.walletconnect.sign.engine.use_case.calls.GetListOfVerifyContextsUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.GetNamespacesFromReCaps -import com.walletconnect.sign.engine.use_case.calls.GetPairingForSessionAuthenticateUseCase -import com.walletconnect.sign.engine.use_case.calls.GetPairingsUseCase -import com.walletconnect.sign.engine.use_case.calls.GetPairingsUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.GetSessionProposalsUseCase -import com.walletconnect.sign.engine.use_case.calls.GetSessionProposalsUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.GetSessionsUseCase -import com.walletconnect.sign.engine.use_case.calls.GetSessionsUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.GetVerifyContextByIdUseCase -import com.walletconnect.sign.engine.use_case.calls.GetVerifyContextByIdUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.PairUseCase -import com.walletconnect.sign.engine.use_case.calls.PairUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.PingUseCase -import com.walletconnect.sign.engine.use_case.calls.PingUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.ProposeSessionUseCase -import com.walletconnect.sign.engine.use_case.calls.ProposeSessionUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.RejectSessionAuthenticateUseCase -import com.walletconnect.sign.engine.use_case.calls.RejectSessionAuthenticateUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.RejectSessionUseCase -import com.walletconnect.sign.engine.use_case.calls.RejectSessionUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.RespondSessionRequestUseCase -import com.walletconnect.sign.engine.use_case.calls.RespondSessionRequestUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.SessionAuthenticateUseCase -import com.walletconnect.sign.engine.use_case.calls.SessionAuthenticateUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.SessionRequestUseCase -import com.walletconnect.sign.engine.use_case.calls.SessionRequestUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.SessionUpdateUseCase -import com.walletconnect.sign.engine.use_case.calls.SessionUpdateUseCaseInterface -import com.walletconnect.sign.json_rpc.domain.GetPendingRequestsUseCaseByTopic -import com.walletconnect.sign.json_rpc.domain.GetPendingRequestsUseCaseByTopicInterface -import com.walletconnect.sign.json_rpc.domain.GetPendingSessionRequestByTopicUseCase -import com.walletconnect.sign.json_rpc.domain.GetPendingSessionRequestByTopicUseCaseInterface +import com.reown.sign.engine.use_case.calls.ApproveSessionAuthenticateUseCase +import com.reown.sign.engine.use_case.calls.ApproveSessionAuthenticateUseCaseInterface +import com.reown.sign.engine.use_case.calls.ApproveSessionUseCase +import com.reown.sign.engine.use_case.calls.ApproveSessionUseCaseInterface +import com.reown.sign.engine.use_case.calls.DecryptSignMessageUseCase +import com.reown.sign.engine.use_case.calls.DisconnectSessionUseCase +import com.reown.sign.engine.use_case.calls.DisconnectSessionUseCaseInterface +import com.reown.sign.engine.use_case.calls.EmitEventUseCase +import com.reown.sign.engine.use_case.calls.EmitEventUseCaseInterface +import com.reown.sign.engine.use_case.calls.ExtendSessionUseCase +import com.reown.sign.engine.use_case.calls.ExtendSessionUseCaseInterface +import com.reown.sign.engine.use_case.calls.FormatAuthenticateMessageUseCase +import com.reown.sign.engine.use_case.calls.FormatAuthenticateMessageUseCaseInterface +import com.reown.sign.engine.use_case.calls.GetListOfVerifyContextsUseCase +import com.reown.sign.engine.use_case.calls.GetListOfVerifyContextsUseCaseInterface +import com.reown.sign.engine.use_case.calls.GetNamespacesFromReCaps +import com.reown.sign.engine.use_case.calls.GetPairingForSessionAuthenticateUseCase +import com.reown.sign.engine.use_case.calls.GetPairingsUseCase +import com.reown.sign.engine.use_case.calls.GetPairingsUseCaseInterface +import com.reown.sign.engine.use_case.calls.GetSessionProposalsUseCase +import com.reown.sign.engine.use_case.calls.GetSessionProposalsUseCaseInterface +import com.reown.sign.engine.use_case.calls.GetSessionsUseCase +import com.reown.sign.engine.use_case.calls.GetSessionsUseCaseInterface +import com.reown.sign.engine.use_case.calls.GetVerifyContextByIdUseCase +import com.reown.sign.engine.use_case.calls.GetVerifyContextByIdUseCaseInterface +import com.reown.sign.engine.use_case.calls.PairUseCase +import com.reown.sign.engine.use_case.calls.PairUseCaseInterface +import com.reown.sign.engine.use_case.calls.PingUseCase +import com.reown.sign.engine.use_case.calls.PingUseCaseInterface +import com.reown.sign.engine.use_case.calls.ProposeSessionUseCase +import com.reown.sign.engine.use_case.calls.ProposeSessionUseCaseInterface +import com.reown.sign.engine.use_case.calls.RejectSessionAuthenticateUseCase +import com.reown.sign.engine.use_case.calls.RejectSessionAuthenticateUseCaseInterface +import com.reown.sign.engine.use_case.calls.RejectSessionUseCase +import com.reown.sign.engine.use_case.calls.RejectSessionUseCaseInterface +import com.reown.sign.engine.use_case.calls.RespondSessionRequestUseCase +import com.reown.sign.engine.use_case.calls.RespondSessionRequestUseCaseInterface +import com.reown.sign.engine.use_case.calls.SessionAuthenticateUseCase +import com.reown.sign.engine.use_case.calls.SessionAuthenticateUseCaseInterface +import com.reown.sign.engine.use_case.calls.SessionRequestUseCase +import com.reown.sign.engine.use_case.calls.SessionRequestUseCaseInterface +import com.reown.sign.engine.use_case.calls.SessionUpdateUseCase +import com.reown.sign.engine.use_case.calls.SessionUpdateUseCaseInterface +import com.reown.sign.json_rpc.domain.GetPendingRequestsUseCaseByTopic +import com.reown.sign.json_rpc.domain.GetPendingRequestsUseCaseByTopicInterface +import com.reown.sign.json_rpc.domain.GetPendingSessionRequestByTopicUseCase +import com.reown.sign.json_rpc.domain.GetPendingSessionRequestByTopicUseCaseInterface import org.koin.core.qualifier.named import org.koin.dsl.module diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/EngineModule.kt b/protocol/sign/src/main/kotlin/com/reown/sign/di/EngineModule.kt similarity index 82% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/di/EngineModule.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/di/EngineModule.kt index 72f420f8a..04d500d87 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/EngineModule.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/di/EngineModule.kt @@ -1,18 +1,18 @@ @file:JvmSynthetic -package com.walletconnect.sign.di +package com.reown.sign.di import com.reown.android.internal.common.di.AndroidCommonDITags import com.reown.android.internal.common.signing.cacao.CacaoVerifier -import com.walletconnect.sign.engine.domain.SignEngine -import com.walletconnect.sign.engine.use_case.calls.GetPendingAuthenticateRequestUseCase -import com.walletconnect.sign.engine.use_case.calls.GetPendingAuthenticateRequestUseCaseInterface -import com.walletconnect.sign.json_rpc.domain.DeleteRequestByIdUseCase -import com.walletconnect.sign.json_rpc.domain.GetPendingJsonRpcHistoryEntryByIdUseCase -import com.walletconnect.sign.json_rpc.domain.GetPendingSessionAuthenticateRequest -import com.walletconnect.sign.json_rpc.domain.GetPendingSessionRequests -import com.walletconnect.sign.json_rpc.domain.GetSessionAuthenticateRequest -import com.walletconnect.sign.json_rpc.domain.GetSessionRequestByIdUseCase +import com.reown.sign.engine.domain.SignEngine +import com.reown.sign.engine.use_case.calls.GetPendingAuthenticateRequestUseCase +import com.reown.sign.engine.use_case.calls.GetPendingAuthenticateRequestUseCaseInterface +import com.reown.sign.json_rpc.domain.DeleteRequestByIdUseCase +import com.reown.sign.json_rpc.domain.GetPendingJsonRpcHistoryEntryByIdUseCase +import com.reown.sign.json_rpc.domain.GetPendingSessionAuthenticateRequest +import com.reown.sign.json_rpc.domain.GetPendingSessionRequests +import com.reown.sign.json_rpc.domain.GetSessionAuthenticateRequest +import com.reown.sign.json_rpc.domain.GetSessionRequestByIdUseCase import org.koin.core.qualifier.named import org.koin.dsl.module diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/RequestsModule.kt b/protocol/sign/src/main/kotlin/com/reown/sign/di/RequestsModule.kt similarity index 77% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/di/RequestsModule.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/di/RequestsModule.kt index 449a87699..b00ffbab6 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/RequestsModule.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/di/RequestsModule.kt @@ -1,16 +1,16 @@ -package com.walletconnect.sign.di +package com.reown.sign.di import com.reown.android.internal.common.di.AndroidCommonDITags import com.reown.android.pulse.domain.InsertEventUseCase -import com.walletconnect.sign.engine.use_case.requests.OnPingUseCase -import com.walletconnect.sign.engine.use_case.requests.OnSessionAuthenticateUseCase -import com.walletconnect.sign.engine.use_case.requests.OnSessionDeleteUseCase -import com.walletconnect.sign.engine.use_case.requests.OnSessionEventUseCase -import com.walletconnect.sign.engine.use_case.requests.OnSessionExtendUseCase -import com.walletconnect.sign.engine.use_case.requests.OnSessionProposalUseCase -import com.walletconnect.sign.engine.use_case.requests.OnSessionRequestUseCase -import com.walletconnect.sign.engine.use_case.requests.OnSessionSettleUseCase -import com.walletconnect.sign.engine.use_case.requests.OnSessionUpdateUseCase +import com.reown.sign.engine.use_case.requests.OnPingUseCase +import com.reown.sign.engine.use_case.requests.OnSessionAuthenticateUseCase +import com.reown.sign.engine.use_case.requests.OnSessionDeleteUseCase +import com.reown.sign.engine.use_case.requests.OnSessionEventUseCase +import com.reown.sign.engine.use_case.requests.OnSessionExtendUseCase +import com.reown.sign.engine.use_case.requests.OnSessionProposalUseCase +import com.reown.sign.engine.use_case.requests.OnSessionRequestUseCase +import com.reown.sign.engine.use_case.requests.OnSessionSettleUseCase +import com.reown.sign.engine.use_case.requests.OnSessionUpdateUseCase import org.koin.core.qualifier.named import org.koin.dsl.module diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/ResponsesModule.kt b/protocol/sign/src/main/kotlin/com/reown/sign/di/ResponsesModule.kt similarity index 80% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/di/ResponsesModule.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/di/ResponsesModule.kt index bc2f55c5a..f43e6f3ad 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/ResponsesModule.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/di/ResponsesModule.kt @@ -1,12 +1,12 @@ -package com.walletconnect.sign.di +package com.reown.sign.di import com.reown.android.internal.common.di.AndroidCommonDITags import com.reown.android.pulse.domain.InsertEventUseCase -import com.walletconnect.sign.engine.use_case.responses.OnSessionAuthenticateResponseUseCase -import com.walletconnect.sign.engine.use_case.responses.OnSessionProposalResponseUseCase -import com.walletconnect.sign.engine.use_case.responses.OnSessionRequestResponseUseCase -import com.walletconnect.sign.engine.use_case.responses.OnSessionSettleResponseUseCase -import com.walletconnect.sign.engine.use_case.responses.OnSessionUpdateResponseUseCase +import com.reown.sign.engine.use_case.responses.OnSessionAuthenticateResponseUseCase +import com.reown.sign.engine.use_case.responses.OnSessionProposalResponseUseCase +import com.reown.sign.engine.use_case.responses.OnSessionRequestResponseUseCase +import com.reown.sign.engine.use_case.responses.OnSessionSettleResponseUseCase +import com.reown.sign.engine.use_case.responses.OnSessionUpdateResponseUseCase import org.koin.core.qualifier.named import org.koin.dsl.module diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/SignDITags.kt b/protocol/sign/src/main/kotlin/com/reown/sign/di/SignDITags.kt similarity index 73% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/di/SignDITags.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/di/SignDITags.kt index 1382f27ea..35cef9fac 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/SignDITags.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/di/SignDITags.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.sign.di +package com.reown.sign.di internal enum class SignDITags { SERIALIZER_SET, diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/SignJsonRpcModule.kt b/protocol/sign/src/main/kotlin/com/reown/sign/di/SignJsonRpcModule.kt similarity index 77% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/di/SignJsonRpcModule.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/di/SignJsonRpcModule.kt index be33cdb9e..def194645 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/SignJsonRpcModule.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/di/SignJsonRpcModule.kt @@ -1,13 +1,13 @@ @file:JvmSynthetic -package com.walletconnect.sign.di +package com.reown.sign.di -import com.walletconnect.sign.common.adapters.SessionEventVOJsonAdapter -import com.walletconnect.sign.common.adapters.SessionRequestVOJsonAdapter -import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc -import com.walletconnect.sign.common.model.vo.clientsync.session.payload.SessionEventVO -import com.walletconnect.sign.common.model.vo.clientsync.session.payload.SessionRequestVO -import com.walletconnect.sign.json_rpc.model.JsonRpcMethod +import com.reown.sign.common.adapters.SessionEventVOJsonAdapter +import com.reown.sign.common.adapters.SessionRequestVOJsonAdapter +import com.reown.sign.common.model.vo.clientsync.session.SignRpc +import com.reown.sign.common.model.vo.clientsync.session.payload.SessionEventVO +import com.reown.sign.common.model.vo.clientsync.session.payload.SessionRequestVO +import com.reown.sign.json_rpc.model.JsonRpcMethod import com.walletconnect.utils.addDeserializerEntry import com.walletconnect.utils.addJsonAdapter import com.walletconnect.utils.addSerializerEntry diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/StorageModule.kt b/protocol/sign/src/main/kotlin/com/reown/sign/di/StorageModule.kt similarity index 83% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/di/StorageModule.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/di/StorageModule.kt index 23c0f6645..5f5637e0e 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/di/StorageModule.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/di/StorageModule.kt @@ -1,21 +1,21 @@ @file:JvmSynthetic -package com.walletconnect.sign.di +package com.reown.sign.di import com.reown.android.di.sdkBaseStorageModule import com.reown.android.internal.common.di.AndroidCommonDITags import com.reown.android.internal.common.di.deleteDatabase -import com.walletconnect.sign.SignDatabase -import com.walletconnect.sign.storage.authenticate.AuthenticateResponseTopicRepository -import com.walletconnect.sign.storage.data.dao.namespace.NamespaceDao -import com.walletconnect.sign.storage.data.dao.optionalnamespaces.OptionalNamespaceDao -import com.walletconnect.sign.storage.data.dao.proposal.ProposalDao -import com.walletconnect.sign.storage.data.dao.proposalnamespace.ProposalNamespaceDao -import com.walletconnect.sign.storage.data.dao.session.SessionDao -import com.walletconnect.sign.storage.data.dao.temp.TempNamespaceDao -import com.walletconnect.sign.storage.link_mode.LinkModeStorageRepository -import com.walletconnect.sign.storage.proposal.ProposalStorageRepository -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.SignDatabase +import com.reown.sign.storage.authenticate.AuthenticateResponseTopicRepository +import com.reown.sign.storage.data.dao.namespace.NamespaceDao +import com.reown.sign.storage.data.dao.optionalnamespaces.OptionalNamespaceDao +import com.reown.sign.storage.data.dao.proposal.ProposalDao +import com.reown.sign.storage.data.dao.proposalnamespace.ProposalNamespaceDao +import com.reown.sign.storage.data.dao.session.SessionDao +import com.reown.sign.storage.data.dao.temp.TempNamespaceDao +import com.reown.sign.storage.link_mode.LinkModeStorageRepository +import com.reown.sign.storage.proposal.ProposalStorageRepository +import com.reown.sign.storage.sequence.SessionStorageRepository import kotlinx.coroutines.launch import org.koin.core.module.Module import org.koin.core.qualifier.named diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/SessionRequestQueue.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/SessionRequestQueue.kt similarity index 61% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/SessionRequestQueue.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/SessionRequestQueue.kt index 2743823ea..3d680aff2 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/SessionRequestQueue.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/SessionRequestQueue.kt @@ -1,6 +1,6 @@ -package com.walletconnect.sign.engine +package com.reown.sign.engine -import com.walletconnect.sign.engine.model.EngineDO +import com.reown.sign.engine.model.EngineDO import java.util.concurrent.ConcurrentLinkedQueue internal val sessionRequestEventsQueue = ConcurrentLinkedQueue() \ No newline at end of file diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/domain/SignEngine.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/domain/SignEngine.kt similarity index 84% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/domain/SignEngine.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/domain/SignEngine.kt index 5a2b33510..a0603f1fd 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/domain/SignEngine.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/domain/SignEngine.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.sign.engine.domain +package com.reown.sign.engine.domain import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository import com.reown.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface @@ -23,56 +23,56 @@ import com.reown.android.push.notifications.DecryptMessageUseCaseInterface import com.reown.android.relay.WSSConnectionState import com.reown.android.verify.model.VerifyContext import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.engine.model.mapper.toEngineDO -import com.walletconnect.sign.engine.model.mapper.toExpiredProposal -import com.walletconnect.sign.engine.model.mapper.toExpiredSessionRequest -import com.walletconnect.sign.engine.model.mapper.toSessionRequest -import com.walletconnect.sign.engine.sessionRequestEventsQueue -import com.walletconnect.sign.engine.use_case.calls.ApproveSessionAuthenticateUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.ApproveSessionUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.DisconnectSessionUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.EmitEventUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.ExtendSessionUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.FormatAuthenticateMessageUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.GetListOfVerifyContextsUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.GetPairingsUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.GetPendingAuthenticateRequestUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.GetSessionProposalsUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.GetSessionsUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.GetVerifyContextByIdUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.PairUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.PingUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.ProposeSessionUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.RejectSessionAuthenticateUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.RejectSessionUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.RespondSessionRequestUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.SessionAuthenticateUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.SessionRequestUseCaseInterface -import com.walletconnect.sign.engine.use_case.calls.SessionUpdateUseCaseInterface -import com.walletconnect.sign.engine.use_case.requests.OnPingUseCase -import com.walletconnect.sign.engine.use_case.requests.OnSessionAuthenticateUseCase -import com.walletconnect.sign.engine.use_case.requests.OnSessionDeleteUseCase -import com.walletconnect.sign.engine.use_case.requests.OnSessionEventUseCase -import com.walletconnect.sign.engine.use_case.requests.OnSessionExtendUseCase -import com.walletconnect.sign.engine.use_case.requests.OnSessionProposalUseCase -import com.walletconnect.sign.engine.use_case.requests.OnSessionRequestUseCase -import com.walletconnect.sign.engine.use_case.requests.OnSessionSettleUseCase -import com.walletconnect.sign.engine.use_case.requests.OnSessionUpdateUseCase -import com.walletconnect.sign.engine.use_case.responses.OnSessionAuthenticateResponseUseCase -import com.walletconnect.sign.engine.use_case.responses.OnSessionProposalResponseUseCase -import com.walletconnect.sign.engine.use_case.responses.OnSessionRequestResponseUseCase -import com.walletconnect.sign.engine.use_case.responses.OnSessionSettleResponseUseCase -import com.walletconnect.sign.engine.use_case.responses.OnSessionUpdateResponseUseCase -import com.walletconnect.sign.json_rpc.domain.DeleteRequestByIdUseCase -import com.walletconnect.sign.json_rpc.domain.GetPendingRequestsUseCaseByTopicInterface -import com.walletconnect.sign.json_rpc.domain.GetPendingSessionRequestByTopicUseCaseInterface -import com.walletconnect.sign.json_rpc.domain.GetPendingSessionRequests -import com.walletconnect.sign.json_rpc.model.JsonRpcMethod -import com.walletconnect.sign.storage.authenticate.AuthenticateResponseTopicRepository -import com.walletconnect.sign.storage.proposal.ProposalStorageRepository -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.engine.model.mapper.toEngineDO +import com.reown.sign.engine.model.mapper.toExpiredProposal +import com.reown.sign.engine.model.mapper.toExpiredSessionRequest +import com.reown.sign.engine.model.mapper.toSessionRequest +import com.reown.sign.engine.sessionRequestEventsQueue +import com.reown.sign.engine.use_case.calls.ApproveSessionAuthenticateUseCaseInterface +import com.reown.sign.engine.use_case.calls.ApproveSessionUseCaseInterface +import com.reown.sign.engine.use_case.calls.DisconnectSessionUseCaseInterface +import com.reown.sign.engine.use_case.calls.EmitEventUseCaseInterface +import com.reown.sign.engine.use_case.calls.ExtendSessionUseCaseInterface +import com.reown.sign.engine.use_case.calls.FormatAuthenticateMessageUseCaseInterface +import com.reown.sign.engine.use_case.calls.GetListOfVerifyContextsUseCaseInterface +import com.reown.sign.engine.use_case.calls.GetPairingsUseCaseInterface +import com.reown.sign.engine.use_case.calls.GetPendingAuthenticateRequestUseCaseInterface +import com.reown.sign.engine.use_case.calls.GetSessionProposalsUseCaseInterface +import com.reown.sign.engine.use_case.calls.GetSessionsUseCaseInterface +import com.reown.sign.engine.use_case.calls.GetVerifyContextByIdUseCaseInterface +import com.reown.sign.engine.use_case.calls.PairUseCaseInterface +import com.reown.sign.engine.use_case.calls.PingUseCaseInterface +import com.reown.sign.engine.use_case.calls.ProposeSessionUseCaseInterface +import com.reown.sign.engine.use_case.calls.RejectSessionAuthenticateUseCaseInterface +import com.reown.sign.engine.use_case.calls.RejectSessionUseCaseInterface +import com.reown.sign.engine.use_case.calls.RespondSessionRequestUseCaseInterface +import com.reown.sign.engine.use_case.calls.SessionAuthenticateUseCaseInterface +import com.reown.sign.engine.use_case.calls.SessionRequestUseCaseInterface +import com.reown.sign.engine.use_case.calls.SessionUpdateUseCaseInterface +import com.reown.sign.engine.use_case.requests.OnPingUseCase +import com.reown.sign.engine.use_case.requests.OnSessionAuthenticateUseCase +import com.reown.sign.engine.use_case.requests.OnSessionDeleteUseCase +import com.reown.sign.engine.use_case.requests.OnSessionEventUseCase +import com.reown.sign.engine.use_case.requests.OnSessionExtendUseCase +import com.reown.sign.engine.use_case.requests.OnSessionProposalUseCase +import com.reown.sign.engine.use_case.requests.OnSessionRequestUseCase +import com.reown.sign.engine.use_case.requests.OnSessionSettleUseCase +import com.reown.sign.engine.use_case.requests.OnSessionUpdateUseCase +import com.reown.sign.engine.use_case.responses.OnSessionAuthenticateResponseUseCase +import com.reown.sign.engine.use_case.responses.OnSessionProposalResponseUseCase +import com.reown.sign.engine.use_case.responses.OnSessionRequestResponseUseCase +import com.reown.sign.engine.use_case.responses.OnSessionSettleResponseUseCase +import com.reown.sign.engine.use_case.responses.OnSessionUpdateResponseUseCase +import com.reown.sign.json_rpc.domain.DeleteRequestByIdUseCase +import com.reown.sign.json_rpc.domain.GetPendingRequestsUseCaseByTopicInterface +import com.reown.sign.json_rpc.domain.GetPendingSessionRequestByTopicUseCaseInterface +import com.reown.sign.json_rpc.domain.GetPendingSessionRequests +import com.reown.sign.json_rpc.model.JsonRpcMethod +import com.reown.sign.storage.authenticate.AuthenticateResponseTopicRepository +import com.reown.sign.storage.proposal.ProposalStorageRepository +import com.reown.sign.storage.sequence.SessionStorageRepository import com.walletconnect.utils.Empty import com.walletconnect.utils.isSequenceValid import kotlinx.coroutines.Dispatchers diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/EngineDO.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/model/EngineDO.kt similarity index 99% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/EngineDO.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/model/EngineDO.kt index 25b44677c..7cad80060 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/EngineDO.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/model/EngineDO.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.sign.engine.model +package com.reown.sign.engine.model import com.squareup.moshi.JsonClass import com.reown.android.internal.common.model.AppMetaData diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/ValidationError.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/model/ValidationError.kt similarity index 92% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/ValidationError.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/model/ValidationError.kt index 2ea785dc7..fcf5b5b48 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/ValidationError.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/model/ValidationError.kt @@ -1,6 +1,6 @@ -package com.walletconnect.sign.engine.model +package com.reown.sign.engine.model -import com.walletconnect.sign.common.exceptions.* +import com.reown.sign.common.exceptions.* internal sealed class ValidationError(val message: String) { diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/mapper/EngineMapper.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/model/mapper/EngineMapper.kt similarity index 94% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/mapper/EngineMapper.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/model/mapper/EngineMapper.kt index 7e5e22dee..f8e7be93e 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/mapper/EngineMapper.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/model/mapper/EngineMapper.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.sign.engine.model.mapper +package com.reown.sign.engine.model.mapper import com.reown.android.internal.common.JsonRpcResponse import com.reown.android.internal.common.model.AppMetaData @@ -18,17 +18,17 @@ import com.reown.android.internal.common.signing.cacao.toCAIP222Message import com.reown.android.verify.model.VerifyContext import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic -import com.walletconnect.sign.common.exceptions.PeerError -import com.walletconnect.sign.common.model.Request -import com.walletconnect.sign.common.model.vo.clientsync.common.PayloadParams -import com.walletconnect.sign.common.model.vo.clientsync.common.Requester -import com.walletconnect.sign.common.model.vo.clientsync.common.SessionParticipant -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.common.model.vo.proposal.ProposalVO -import com.walletconnect.sign.common.model.vo.sequence.SessionVO -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.engine.model.ValidationError -import com.walletconnect.sign.json_rpc.model.JsonRpcMethod +import com.reown.sign.common.exceptions.PeerError +import com.reown.sign.common.model.Request +import com.reown.sign.common.model.vo.clientsync.common.PayloadParams +import com.reown.sign.common.model.vo.clientsync.common.Requester +import com.reown.sign.common.model.vo.clientsync.common.SessionParticipant +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.common.model.vo.proposal.ProposalVO +import com.reown.sign.common.model.vo.sequence.SessionVO +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.engine.model.ValidationError +import com.reown.sign.json_rpc.model.JsonRpcMethod import com.walletconnect.util.Empty import java.net.URI import java.text.SimpleDateFormat diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCase.kt similarity index 96% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCase.kt index 823457960..dc6781350 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.JsonRpcResponse import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository @@ -39,12 +39,12 @@ import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.exceptions.MissingSessionAuthenticateRequest -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.common.model.vo.sequence.SessionVO -import com.walletconnect.sign.common.validator.SignValidator -import com.walletconnect.sign.json_rpc.domain.GetPendingSessionAuthenticateRequest -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.common.exceptions.MissingSessionAuthenticateRequest +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.common.model.vo.sequence.SessionVO +import com.reown.sign.common.validator.SignValidator +import com.reown.sign.json_rpc.domain.GetPendingSessionAuthenticateRequest +import com.reown.sign.storage.sequence.SessionStorageRepository import kotlinx.coroutines.launch import kotlinx.coroutines.supervisorScope diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ApproveSessionUseCase.kt similarity index 90% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ApproveSessionUseCase.kt index 1c2a1d879..ee94a5c1b 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ApproveSessionUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository import com.reown.android.internal.common.exception.NoInternetConnectionException @@ -23,20 +23,20 @@ import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.exceptions.InvalidNamespaceException -import com.walletconnect.sign.common.exceptions.SessionProposalExpiredException -import com.walletconnect.sign.common.model.vo.clientsync.common.SessionParticipant -import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc -import com.walletconnect.sign.common.model.vo.proposal.ProposalVO -import com.walletconnect.sign.common.model.vo.sequence.SessionVO -import com.walletconnect.sign.common.validator.SignValidator -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.engine.model.mapper.toMapOfNamespacesVOSession -import com.walletconnect.sign.engine.model.mapper.toSessionApproveParams -import com.walletconnect.sign.engine.model.mapper.toSessionProposeRequest -import com.walletconnect.sign.engine.model.mapper.toSessionSettleParams -import com.walletconnect.sign.storage.proposal.ProposalStorageRepository -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.common.exceptions.InvalidNamespaceException +import com.reown.sign.common.exceptions.SessionProposalExpiredException +import com.reown.sign.common.model.vo.clientsync.common.SessionParticipant +import com.reown.sign.common.model.vo.clientsync.session.SignRpc +import com.reown.sign.common.model.vo.proposal.ProposalVO +import com.reown.sign.common.model.vo.sequence.SessionVO +import com.reown.sign.common.validator.SignValidator +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.engine.model.mapper.toMapOfNamespacesVOSession +import com.reown.sign.engine.model.mapper.toSessionApproveParams +import com.reown.sign.engine.model.mapper.toSessionProposeRequest +import com.reown.sign.engine.model.mapper.toSessionSettleParams +import com.reown.sign.storage.proposal.ProposalStorageRepository +import com.reown.sign.storage.sequence.SessionStorageRepository import kotlinx.coroutines.launch import kotlinx.coroutines.supervisorScope diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/DecryptSignMessageUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/DecryptSignMessageUseCase.kt similarity index 94% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/DecryptSignMessageUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/DecryptSignMessageUseCase.kt index bfde9a273..42c0e6661 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/DecryptSignMessageUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/DecryptSignMessageUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.Core import com.reown.android.internal.common.crypto.codec.Codec @@ -14,9 +14,9 @@ import com.reown.android.internal.common.storage.push_messages.PushMessagesRepos import com.reown.android.push.notifications.DecryptMessageUseCaseInterface import com.reown.android.utils.toClient import com.reown.foundation.common.model.Topic -import com.walletconnect.sign.common.exceptions.InvalidSignParamsType -import com.walletconnect.sign.common.model.vo.clientsync.common.PayloadParams -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.common.exceptions.InvalidSignParamsType +import com.reown.sign.common.model.vo.clientsync.common.PayloadParams +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams import org.bouncycastle.util.encoders.Base64 internal class DecryptSignMessageUseCase( diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/DisconnectSessionUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/DisconnectSessionUseCase.kt similarity index 86% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/DisconnectSessionUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/DisconnectSessionUseCase.kt index 9555cdda3..561be2855 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/DisconnectSessionUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/DisconnectSessionUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.exception.CannotFindSequenceForTopic import com.reown.android.internal.common.exception.Reason @@ -9,10 +9,10 @@ import com.reown.android.internal.utils.dayInSeconds import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.exceptions.NO_SEQUENCE_FOR_TOPIC_MESSAGE -import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.common.exceptions.NO_SEQUENCE_FOR_TOPIC_MESSAGE +import com.reown.sign.common.model.vo.clientsync.session.SignRpc +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.storage.sequence.SessionStorageRepository import kotlinx.coroutines.supervisorScope internal class DisconnectSessionUseCase( diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/EmitEventUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/EmitEventUseCase.kt similarity index 79% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/EmitEventUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/EmitEventUseCase.kt index 5d5ddce93..efc539e4e 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/EmitEventUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/EmitEventUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.exception.CannotFindSequenceForTopic import com.reown.android.internal.common.model.IrnParams @@ -8,17 +8,17 @@ import com.reown.android.internal.utils.fiveMinutesInSeconds import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.exceptions.InvalidEventException -import com.walletconnect.sign.common.exceptions.NO_SEQUENCE_FOR_TOPIC_MESSAGE -import com.walletconnect.sign.common.exceptions.UNAUTHORIZED_EMIT_MESSAGE -import com.walletconnect.sign.common.exceptions.UnauthorizedEventException -import com.walletconnect.sign.common.exceptions.UnauthorizedPeerException -import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.common.model.vo.clientsync.session.payload.SessionEventVO -import com.walletconnect.sign.common.validator.SignValidator -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.common.exceptions.InvalidEventException +import com.reown.sign.common.exceptions.NO_SEQUENCE_FOR_TOPIC_MESSAGE +import com.reown.sign.common.exceptions.UNAUTHORIZED_EMIT_MESSAGE +import com.reown.sign.common.exceptions.UnauthorizedEventException +import com.reown.sign.common.exceptions.UnauthorizedPeerException +import com.reown.sign.common.model.vo.clientsync.session.SignRpc +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.common.model.vo.clientsync.session.payload.SessionEventVO +import com.reown.sign.common.validator.SignValidator +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.storage.sequence.SessionStorageRepository import com.walletconnect.util.generateId import kotlinx.coroutines.supervisorScope diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ExtendSessionUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ExtendSessionUseCase.kt similarity index 82% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ExtendSessionUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ExtendSessionUseCase.kt index e9dc05d24..7dd06a9d6 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ExtendSessionUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ExtendSessionUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.exception.CannotFindSequenceForTopic import com.reown.android.internal.common.model.IrnParams @@ -9,12 +9,12 @@ import com.reown.android.internal.utils.weekInSeconds import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.exceptions.NO_SEQUENCE_FOR_TOPIC_MESSAGE -import com.walletconnect.sign.common.exceptions.NotSettledSessionException -import com.walletconnect.sign.common.exceptions.SESSION_IS_NOT_ACKNOWLEDGED_MESSAGE -import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.common.exceptions.NO_SEQUENCE_FOR_TOPIC_MESSAGE +import com.reown.sign.common.exceptions.NotSettledSessionException +import com.reown.sign.common.exceptions.SESSION_IS_NOT_ACKNOWLEDGED_MESSAGE +import com.reown.sign.common.model.vo.clientsync.session.SignRpc +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.storage.sequence.SessionStorageRepository import kotlinx.coroutines.supervisorScope internal class ExtendSessionUseCase( diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/FormatAuthenticateMessageUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/FormatAuthenticateMessageUseCase.kt similarity index 87% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/FormatAuthenticateMessageUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/FormatAuthenticateMessageUseCase.kt index 6f7591ee0..4af64a247 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/FormatAuthenticateMessageUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/FormatAuthenticateMessageUseCase.kt @@ -1,9 +1,9 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.signing.cacao.Issuer import com.reown.android.internal.utils.CoreValidator -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.engine.model.mapper.toCAIP222Message +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.engine.model.mapper.toCAIP222Message import kotlinx.coroutines.supervisorScope internal class FormatAuthenticateMessageUseCase : FormatAuthenticateMessageUseCaseInterface { diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetListOfVerifyContextsUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetListOfVerifyContextsUseCase.kt similarity index 77% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetListOfVerifyContextsUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetListOfVerifyContextsUseCase.kt index 67d437058..c805b5ebc 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetListOfVerifyContextsUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetListOfVerifyContextsUseCase.kt @@ -1,8 +1,8 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.storage.verify.VerifyContextStorageRepository -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.engine.model.mapper.toEngineDO +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.engine.model.mapper.toEngineDO internal class GetListOfVerifyContextsUseCase(private val verifyContextStorageRepository: VerifyContextStorageRepository) : GetListOfVerifyContextsUseCaseInterface { override suspend fun getListOfVerifyContexts(): List = verifyContextStorageRepository.getAll().map { verifyContext -> verifyContext.toEngineDO() } diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetNamespacesFromReCaps.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetNamespacesFromReCaps.kt similarity index 87% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetNamespacesFromReCaps.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetNamespacesFromReCaps.kt index bd5433116..ee191220b 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetNamespacesFromReCaps.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetNamespacesFromReCaps.kt @@ -1,8 +1,8 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.model.Namespace import com.reown.android.internal.utils.CoreValidator -import com.walletconnect.sign.common.validator.SignValidator +import com.reown.sign.common.validator.SignValidator class GetNamespacesFromReCaps { operator fun invoke(chains: List, methods: List): Map { diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPairingForSessionAuthenticateUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetPairingForSessionAuthenticateUseCase.kt similarity index 88% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPairingForSessionAuthenticateUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetPairingForSessionAuthenticateUseCase.kt index 7a9859aef..845051fc5 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPairingForSessionAuthenticateUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetPairingForSessionAuthenticateUseCase.kt @@ -1,8 +1,8 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.Core import com.reown.android.pairing.client.PairingInterface -import com.walletconnect.sign.json_rpc.model.JsonRpcMethod +import com.reown.sign.json_rpc.model.JsonRpcMethod internal class GetPairingForSessionAuthenticateUseCase(private var pairingProtocol: PairingInterface) { operator fun invoke(pairingTopic: String?): Core.Model.Pairing { diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPairingsUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetPairingsUseCase.kt similarity index 87% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPairingsUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetPairingsUseCase.kt index cd4aab154..6f5ab0c1e 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPairingsUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetPairingsUseCase.kt @@ -1,8 +1,8 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.pairing.client.PairingInterface import com.reown.android.pairing.model.mapper.toPairing -import com.walletconnect.sign.engine.model.EngineDO +import com.reown.sign.engine.model.EngineDO import kotlinx.coroutines.supervisorScope internal class GetPairingsUseCase(private val pairingInterface: PairingInterface) : GetPairingsUseCaseInterface { diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPendingAuthenticateRequestUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetPendingAuthenticateRequestUseCase.kt similarity index 70% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPendingAuthenticateRequestUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetPendingAuthenticateRequestUseCase.kt index e84c524d2..a265de1a8 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPendingAuthenticateRequestUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetPendingAuthenticateRequestUseCase.kt @@ -1,12 +1,12 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer import com.reown.android.internal.common.storage.rpc.JsonRpcHistory -import com.walletconnect.sign.common.model.Request -import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.json_rpc.model.JsonRpcMethod -import com.walletconnect.sign.json_rpc.model.toRequest +import com.reown.sign.common.model.Request +import com.reown.sign.common.model.vo.clientsync.session.SignRpc +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.json_rpc.model.JsonRpcMethod +import com.reown.sign.json_rpc.model.toRequest internal class GetPendingAuthenticateRequestUseCase( private val jsonRpcHistory: JsonRpcHistory, diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetSessionProposalsUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetSessionProposalsUseCase.kt similarity index 68% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetSessionProposalsUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetSessionProposalsUseCase.kt index 4c0ded876..405de4951 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetSessionProposalsUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetSessionProposalsUseCase.kt @@ -1,10 +1,10 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.utils.CoreValidator.isExpired -import com.walletconnect.sign.common.model.vo.proposal.ProposalVO -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.engine.model.mapper.toEngineDO -import com.walletconnect.sign.storage.proposal.ProposalStorageRepository +import com.reown.sign.common.model.vo.proposal.ProposalVO +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.engine.model.mapper.toEngineDO +import com.reown.sign.storage.proposal.ProposalStorageRepository import kotlinx.coroutines.supervisorScope internal class GetSessionProposalsUseCase(private val proposalStorageRepository: ProposalStorageRepository) : GetSessionProposalsUseCaseInterface { diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetSessionsUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetSessionsUseCase.kt similarity index 83% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetSessionsUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetSessionsUseCase.kt index 89e8bac6b..048232f3a 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetSessionsUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetSessionsUseCase.kt @@ -1,11 +1,11 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.model.AppMetaData import com.reown.android.internal.common.model.AppMetaDataType import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.engine.model.mapper.toEngineDO -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.engine.model.mapper.toEngineDO +import com.reown.sign.storage.sequence.SessionStorageRepository import com.walletconnect.utils.isSequenceValid import kotlinx.coroutines.supervisorScope diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetVerifyContextByIdUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetVerifyContextByIdUseCase.kt similarity index 75% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetVerifyContextByIdUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetVerifyContextByIdUseCase.kt index 5a95b061a..53b24c95d 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/GetVerifyContextByIdUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetVerifyContextByIdUseCase.kt @@ -1,8 +1,8 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.storage.verify.VerifyContextStorageRepository -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.engine.model.mapper.toEngineDO +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.engine.model.mapper.toEngineDO internal class GetVerifyContextByIdUseCase(private val verifyContextStorageRepository: VerifyContextStorageRepository) : GetVerifyContextByIdUseCaseInterface { override suspend fun getVerifyContext(id: Long): EngineDO.VerifyContext? = verifyContextStorageRepository.get(id)?.toEngineDO() diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/PairUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/PairUseCase.kt similarity index 92% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/PairUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/PairUseCase.kt index f86495536..4c480df16 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/PairUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/PairUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.Core import com.reown.android.pairing.client.PairingInterface diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/PingUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/PingUseCase.kt similarity index 93% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/PingUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/PingUseCase.kt index 8f4d69b98..805d7a856 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/PingUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/PingUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.JsonRpcResponse import com.reown.android.internal.common.model.IrnParams @@ -9,9 +9,9 @@ import com.reown.android.internal.utils.thirtySeconds import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.common.model.vo.clientsync.session.SignRpc +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.storage.sequence.SessionStorageRepository import kotlinx.coroutines.TimeoutCancellationException import kotlinx.coroutines.cancel import kotlinx.coroutines.flow.filter diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeSessionUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ProposeSessionUseCase.kt similarity index 85% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeSessionUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ProposeSessionUseCase.kt index 07f8860e9..ce791304e 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeSessionUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/ProposeSessionUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository import com.reown.android.internal.common.model.AppMetaData @@ -13,17 +13,17 @@ import com.reown.android.internal.utils.fiveMinutesInSeconds import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.exceptions.InvalidNamespaceException -import com.walletconnect.sign.common.exceptions.InvalidPropertiesException -import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.common.validator.SignValidator -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.engine.model.mapper.toNamespacesVOOptional -import com.walletconnect.sign.engine.model.mapper.toNamespacesVORequired -import com.walletconnect.sign.engine.model.mapper.toSessionProposeParams -import com.walletconnect.sign.engine.model.mapper.toVO -import com.walletconnect.sign.storage.proposal.ProposalStorageRepository +import com.reown.sign.common.exceptions.InvalidNamespaceException +import com.reown.sign.common.exceptions.InvalidPropertiesException +import com.reown.sign.common.model.vo.clientsync.session.SignRpc +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.common.validator.SignValidator +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.engine.model.mapper.toNamespacesVOOptional +import com.reown.sign.engine.model.mapper.toNamespacesVORequired +import com.reown.sign.engine.model.mapper.toSessionProposeParams +import com.reown.sign.engine.model.mapper.toVO +import com.reown.sign.storage.proposal.ProposalStorageRepository import kotlinx.coroutines.supervisorScope internal class ProposeSessionUseCase( diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionAuthenticateUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/RejectSessionAuthenticateUseCase.kt similarity index 95% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionAuthenticateUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/RejectSessionAuthenticateUseCase.kt index 797a89429..bbc148525 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionAuthenticateUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/RejectSessionAuthenticateUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.JsonRpcResponse import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository @@ -25,9 +25,9 @@ import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.exceptions.MissingSessionAuthenticateRequest -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.json_rpc.domain.GetPendingSessionAuthenticateRequest +import com.reown.sign.common.exceptions.MissingSessionAuthenticateRequest +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.json_rpc.domain.GetPendingSessionAuthenticateRequest import kotlinx.coroutines.launch import kotlinx.coroutines.supervisorScope diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/RejectSessionUseCase.kt similarity index 89% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/RejectSessionUseCase.kt index 7334d3128..6d530fce7 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/RejectSessionUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.Core import com.reown.android.internal.common.model.IrnParams @@ -11,10 +11,10 @@ import com.reown.android.internal.utils.fiveMinutesInSeconds import com.reown.android.pairing.handler.PairingControllerInterface import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.exceptions.PeerError -import com.walletconnect.sign.common.exceptions.SessionProposalExpiredException -import com.walletconnect.sign.engine.model.mapper.toSessionProposeRequest -import com.walletconnect.sign.storage.proposal.ProposalStorageRepository +import com.reown.sign.common.exceptions.PeerError +import com.reown.sign.common.exceptions.SessionProposalExpiredException +import com.reown.sign.engine.model.mapper.toSessionProposeRequest +import com.reown.sign.storage.proposal.ProposalStorageRepository import kotlinx.coroutines.launch import kotlinx.coroutines.supervisorScope diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RespondSessionRequestUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/RespondSessionRequestUseCase.kt similarity index 95% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RespondSessionRequestUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/RespondSessionRequestUseCase.kt index 803422092..b8f46f92b 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/RespondSessionRequestUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/RespondSessionRequestUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.JsonRpcResponse import com.reown.android.internal.common.exception.CannotFindSequenceForTopic @@ -24,10 +24,10 @@ 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.sign.common.exceptions.NO_SEQUENCE_FOR_TOPIC_MESSAGE -import com.walletconnect.sign.engine.sessionRequestEventsQueue -import com.walletconnect.sign.json_rpc.domain.GetPendingJsonRpcHistoryEntryByIdUseCase -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.common.exceptions.NO_SEQUENCE_FOR_TOPIC_MESSAGE +import com.reown.sign.engine.sessionRequestEventsQueue +import com.reown.sign.json_rpc.domain.GetPendingJsonRpcHistoryEntryByIdUseCase +import com.reown.sign.storage.sequence.SessionStorageRepository import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionAuthenticateUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/SessionAuthenticateUseCase.kt similarity index 94% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionAuthenticateUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/SessionAuthenticateUseCase.kt index 4a33bfd42..024e4f4d5 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionAuthenticateUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/SessionAuthenticateUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import android.util.Base64 import com.reown.android.Core @@ -30,15 +30,15 @@ import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.model.vo.clientsync.common.Requester -import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.common.validator.SignValidator -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.engine.model.mapper.toCommon -import com.walletconnect.sign.engine.model.mapper.toMapOfEngineNamespacesOptional -import com.walletconnect.sign.storage.authenticate.AuthenticateResponseTopicRepository -import com.walletconnect.sign.storage.link_mode.LinkModeStorageRepository +import com.reown.sign.common.model.vo.clientsync.common.Requester +import com.reown.sign.common.model.vo.clientsync.session.SignRpc +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.common.validator.SignValidator +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.engine.model.mapper.toCommon +import com.reown.sign.engine.model.mapper.toMapOfEngineNamespacesOptional +import com.reown.sign.storage.authenticate.AuthenticateResponseTopicRepository +import com.reown.sign.storage.link_mode.LinkModeStorageRepository import com.walletconnect.utils.Empty import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.async diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionRequestUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/SessionRequestUseCase.kt similarity index 91% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionRequestUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/SessionRequestUseCase.kt index a42619d8f..cb96ca451 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionRequestUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/SessionRequestUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.JsonRpcResponse import com.reown.android.internal.common.exception.CannotFindSequenceForTopic @@ -25,15 +25,15 @@ 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.sign.common.exceptions.InvalidRequestException -import com.walletconnect.sign.common.exceptions.NO_SEQUENCE_FOR_TOPIC_MESSAGE -import com.walletconnect.sign.common.exceptions.UnauthorizedMethodException -import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.common.model.vo.clientsync.session.payload.SessionRequestVO -import com.walletconnect.sign.common.validator.SignValidator -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.common.exceptions.InvalidRequestException +import com.reown.sign.common.exceptions.NO_SEQUENCE_FOR_TOPIC_MESSAGE +import com.reown.sign.common.exceptions.UnauthorizedMethodException +import com.reown.sign.common.model.vo.clientsync.session.SignRpc +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.common.model.vo.clientsync.session.payload.SessionRequestVO +import com.reown.sign.common.validator.SignValidator +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.storage.sequence.SessionStorageRepository import kotlinx.coroutines.TimeoutCancellationException import kotlinx.coroutines.cancel import kotlinx.coroutines.flow.MutableSharedFlow diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionUpdateUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/SessionUpdateUseCase.kt similarity index 81% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionUpdateUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/SessionUpdateUseCase.kt index 200a20db8..7847a8c54 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionUpdateUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/SessionUpdateUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.exception.CannotFindSequenceForTopic import com.reown.android.internal.common.exception.GenericException @@ -9,18 +9,18 @@ import com.reown.android.internal.utils.dayInSeconds import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.exceptions.InvalidNamespaceException -import com.walletconnect.sign.common.exceptions.NO_SEQUENCE_FOR_TOPIC_MESSAGE -import com.walletconnect.sign.common.exceptions.NotSettledSessionException -import com.walletconnect.sign.common.exceptions.SESSION_IS_NOT_ACKNOWLEDGED_MESSAGE -import com.walletconnect.sign.common.exceptions.UNAUTHORIZED_UPDATE_MESSAGE -import com.walletconnect.sign.common.exceptions.UnauthorizedPeerException -import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.common.validator.SignValidator -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.engine.model.mapper.toMapOfNamespacesVOSession -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.common.exceptions.InvalidNamespaceException +import com.reown.sign.common.exceptions.NO_SEQUENCE_FOR_TOPIC_MESSAGE +import com.reown.sign.common.exceptions.NotSettledSessionException +import com.reown.sign.common.exceptions.SESSION_IS_NOT_ACKNOWLEDGED_MESSAGE +import com.reown.sign.common.exceptions.UNAUTHORIZED_UPDATE_MESSAGE +import com.reown.sign.common.exceptions.UnauthorizedPeerException +import com.reown.sign.common.model.vo.clientsync.session.SignRpc +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.common.validator.SignValidator +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.engine.model.mapper.toMapOfNamespacesVOSession +import com.reown.sign.storage.sequence.SessionStorageRepository import kotlinx.coroutines.supervisorScope internal class SessionUpdateUseCase( diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnPingUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnPingUseCase.kt similarity index 93% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnPingUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnPingUseCase.kt index d668ada72..87aff5075 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnPingUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnPingUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.requests +package com.reown.sign.engine.use_case.requests import com.reown.android.internal.common.model.IrnParams import com.reown.android.internal.common.model.Tags diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionAuthenticateUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionAuthenticateUseCase.kt similarity index 95% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionAuthenticateUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionAuthenticateUseCase.kt index ba0575eb7..fc4612287 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionAuthenticateUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionAuthenticateUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.requests +package com.reown.sign.engine.use_case.requests import com.reown.android.Core import com.reown.android.internal.common.exception.Invalid @@ -25,9 +25,9 @@ import com.reown.android.verify.domain.ResolveAttestationIdUseCase import com.reown.android.verify.model.VerifyContext import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.engine.model.mapper.toEngineDO +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.engine.model.mapper.toEngineDO import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionDeleteUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionDeleteUseCase.kt similarity index 90% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionDeleteUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionDeleteUseCase.kt index 92607ca4b..22b70aa01 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionDeleteUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionDeleteUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.requests +package com.reown.sign.engine.use_case.requests import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository import com.reown.android.internal.common.exception.Uncategorized @@ -11,10 +11,10 @@ import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterf import com.reown.android.internal.utils.dayInSeconds import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.model.type.Sequences -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.engine.model.mapper.toEngineDO -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.common.model.type.Sequences +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.engine.model.mapper.toEngineDO +import com.reown.sign.storage.sequence.SessionStorageRepository import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionEventUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionEventUseCase.kt similarity index 87% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionEventUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionEventUseCase.kt index 9393d1c6f..252eaaa1e 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionEventUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionEventUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.requests +package com.reown.sign.engine.use_case.requests import com.reown.android.internal.common.exception.Uncategorized import com.reown.android.internal.common.model.IrnParams @@ -10,14 +10,14 @@ import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterf import com.reown.android.internal.utils.fiveMinutesInSeconds import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.exceptions.PeerError -import com.walletconnect.sign.common.model.type.Sequences -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.common.validator.SignValidator -import com.walletconnect.sign.engine.model.mapper.toEngineDO -import com.walletconnect.sign.engine.model.mapper.toEngineDOEvent -import com.walletconnect.sign.engine.model.mapper.toPeerError -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.common.exceptions.PeerError +import com.reown.sign.common.model.type.Sequences +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.common.validator.SignValidator +import com.reown.sign.engine.model.mapper.toEngineDO +import com.reown.sign.engine.model.mapper.toEngineDOEvent +import com.reown.sign.engine.model.mapper.toPeerError +import com.reown.sign.storage.sequence.SessionStorageRepository import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionExtendUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionExtendUseCase.kt similarity index 86% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionExtendUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionExtendUseCase.kt index 409913c59..d4494c0cd 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionExtendUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionExtendUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.requests +package com.reown.sign.engine.use_case.requests import com.reown.android.internal.common.exception.Uncategorized import com.reown.android.internal.common.model.Expiry @@ -11,12 +11,12 @@ import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterf import com.reown.android.internal.utils.dayInSeconds import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.model.type.Sequences -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.common.validator.SignValidator -import com.walletconnect.sign.engine.model.mapper.toEngineDOSessionExtend -import com.walletconnect.sign.engine.model.mapper.toPeerError -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.common.model.type.Sequences +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.common.validator.SignValidator +import com.reown.sign.engine.model.mapper.toEngineDOSessionExtend +import com.reown.sign.engine.model.mapper.toPeerError +import com.reown.sign.storage.sequence.SessionStorageRepository import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionProposalUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionProposalUseCase.kt similarity index 91% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionProposalUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionProposalUseCase.kt index aab8c464a..24984adfa 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionProposalUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionProposalUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.requests +package com.reown.sign.engine.use_case.requests import com.reown.android.Core import com.reown.android.internal.common.di.AndroidCommonDITags @@ -21,14 +21,14 @@ import com.reown.android.pulse.model.properties.Props import com.reown.android.verify.domain.ResolveAttestationIdUseCase import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.common.validator.SignValidator -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.engine.model.mapper.toEngineDO -import com.walletconnect.sign.engine.model.mapper.toPeerError -import com.walletconnect.sign.engine.model.mapper.toVO -import com.walletconnect.sign.json_rpc.model.JsonRpcMethod -import com.walletconnect.sign.storage.proposal.ProposalStorageRepository +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.common.validator.SignValidator +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.engine.model.mapper.toEngineDO +import com.reown.sign.engine.model.mapper.toPeerError +import com.reown.sign.engine.model.mapper.toVO +import com.reown.sign.json_rpc.model.JsonRpcMethod +import com.reown.sign.storage.proposal.ProposalStorageRepository import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionRequestUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionRequestUseCase.kt similarity index 92% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionRequestUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionRequestUseCase.kt index a1ff59be6..2c4f1c4da 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionRequestUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionRequestUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.requests +package com.reown.sign.engine.use_case.requests import com.reown.android.internal.common.exception.Invalid import com.reown.android.internal.common.exception.Uncategorized @@ -26,14 +26,14 @@ import com.reown.android.verify.domain.ResolveAttestationIdUseCase import com.reown.android.verify.model.VerifyContext import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.model.type.Sequences -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.common.validator.SignValidator -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.engine.model.mapper.toEngineDO -import com.walletconnect.sign.engine.model.mapper.toPeerError -import com.walletconnect.sign.engine.sessionRequestEventsQueue -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.common.model.type.Sequences +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.common.validator.SignValidator +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.engine.model.mapper.toEngineDO +import com.reown.sign.engine.model.mapper.toPeerError +import com.reown.sign.engine.sessionRequestEventsQueue +import com.reown.sign.storage.sequence.SessionStorageRepository import com.walletconnect.utils.Empty import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionSettleUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionSettleUseCase.kt similarity index 89% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionSettleUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionSettleUseCase.kt index 38d2c2a4e..a724d6ecc 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionSettleUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionSettleUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.requests +package com.reown.sign.engine.use_case.requests import com.reown.android.Core import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository @@ -17,14 +17,14 @@ import com.reown.android.utils.toClient import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.exceptions.PeerError -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.common.model.vo.sequence.SessionVO -import com.walletconnect.sign.common.validator.SignValidator -import com.walletconnect.sign.engine.model.mapper.toPeerError -import com.walletconnect.sign.engine.model.mapper.toSessionApproved -import com.walletconnect.sign.storage.proposal.ProposalStorageRepository -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.common.exceptions.PeerError +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.common.model.vo.sequence.SessionVO +import com.reown.sign.common.validator.SignValidator +import com.reown.sign.engine.model.mapper.toPeerError +import com.reown.sign.engine.model.mapper.toSessionApproved +import com.reown.sign.storage.proposal.ProposalStorageRepository +import com.reown.sign.storage.sequence.SessionStorageRepository import com.walletconnect.utils.Empty import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionUpdateUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionUpdateUseCase.kt similarity index 87% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionUpdateUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionUpdateUseCase.kt index fa904100b..44f44ad9c 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/requests/OnSessionUpdateUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionUpdateUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.requests +package com.reown.sign.engine.use_case.requests import com.reown.android.internal.common.exception.Uncategorized import com.reown.android.internal.common.model.IrnParams @@ -10,14 +10,14 @@ import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterf import com.reown.android.internal.utils.dayInSeconds import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.exceptions.PeerError -import com.walletconnect.sign.common.model.type.Sequences -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.common.model.vo.sequence.SessionVO -import com.walletconnect.sign.common.validator.SignValidator -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.engine.model.mapper.toMapOfEngineNamespacesSession -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.common.exceptions.PeerError +import com.reown.sign.common.model.type.Sequences +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.common.model.vo.sequence.SessionVO +import com.reown.sign.common.validator.SignValidator +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.engine.model.mapper.toMapOfEngineNamespacesSession +import com.reown.sign.storage.sequence.SessionStorageRepository import com.walletconnect.utils.extractTimestamp import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionAuthenticateResponseUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/responses/OnSessionAuthenticateResponseUseCase.kt similarity index 94% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionAuthenticateResponseUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/responses/OnSessionAuthenticateResponseUseCase.kt index 20016cf37..55ddf50c6 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionAuthenticateResponseUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/responses/OnSessionAuthenticateResponseUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.responses +package com.reown.sign.engine.use_case.responses import com.reown.android.Core import com.reown.android.internal.common.JsonRpcResponse @@ -30,15 +30,15 @@ import com.reown.android.utils.toClient import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.common.model.vo.sequence.SessionVO -import com.walletconnect.sign.common.validator.SignValidator -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.engine.model.mapper.toEngineDO -import com.walletconnect.sign.json_rpc.domain.GetSessionAuthenticateRequest -import com.walletconnect.sign.storage.authenticate.AuthenticateResponseTopicRepository -import com.walletconnect.sign.storage.link_mode.LinkModeStorageRepository -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.common.model.vo.sequence.SessionVO +import com.reown.sign.common.validator.SignValidator +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.engine.model.mapper.toEngineDO +import com.reown.sign.json_rpc.domain.GetSessionAuthenticateRequest +import com.reown.sign.storage.authenticate.AuthenticateResponseTopicRepository +import com.reown.sign.storage.link_mode.LinkModeStorageRepository +import com.reown.sign.storage.sequence.SessionStorageRepository import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionProposalResponseUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/responses/OnSessionProposalResponseUseCase.kt similarity index 92% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionProposalResponseUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/responses/OnSessionProposalResponseUseCase.kt index 49947e184..fa707ab69 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionProposalResponseUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/responses/OnSessionProposalResponseUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.responses +package com.reown.sign.engine.use_case.responses import com.reown.android.Core import com.reown.android.internal.common.JsonRpcResponse @@ -12,9 +12,9 @@ import com.reown.android.internal.common.scope import com.reown.android.pairing.handler.PairingControllerInterface import com.reown.foundation.common.model.PublicKey import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.storage.proposal.ProposalStorageRepository +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.storage.proposal.ProposalStorageRepository import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionRequestResponseUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/responses/OnSessionRequestResponseUseCase.kt similarity index 89% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionRequestResponseUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/responses/OnSessionRequestResponseUseCase.kt index 11802ed02..54b00bc52 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionRequestResponseUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/responses/OnSessionRequestResponseUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.responses +package com.reown.sign.engine.use_case.responses import com.reown.android.internal.common.JsonRpcResponse import com.reown.android.internal.common.model.SDKError @@ -12,10 +12,10 @@ import com.reown.android.pulse.model.EventType import com.reown.android.pulse.model.properties.Properties import com.reown.android.pulse.model.properties.Props import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.engine.model.mapper.toEngineDO -import com.walletconnect.sign.json_rpc.domain.GetSessionRequestByIdUseCase +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.engine.model.mapper.toEngineDO +import com.reown.sign.json_rpc.domain.GetSessionRequestByIdUseCase import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionSettleResponseUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/responses/OnSessionSettleResponseUseCase.kt similarity index 92% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionSettleResponseUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/responses/OnSessionSettleResponseUseCase.kt index 761382904..9b46b931b 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionSettleResponseUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/responses/OnSessionSettleResponseUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.responses +package com.reown.sign.engine.use_case.responses import com.reown.android.internal.common.JsonRpcResponse import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository @@ -9,9 +9,9 @@ import com.reown.android.internal.common.model.type.EngineEvent import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface import com.reown.foundation.util.Logger -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.engine.model.mapper.toEngineDO -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.engine.model.mapper.toEngineDO +import com.reown.sign.storage.sequence.SessionStorageRepository import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionUpdateResponseUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/responses/OnSessionUpdateResponseUseCase.kt similarity index 91% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionUpdateResponseUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/responses/OnSessionUpdateResponseUseCase.kt index 9fd107522..8a1296f9f 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionUpdateResponseUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/responses/OnSessionUpdateResponseUseCase.kt @@ -1,13 +1,13 @@ -package com.walletconnect.sign.engine.use_case.responses +package com.reown.sign.engine.use_case.responses import com.reown.android.internal.common.JsonRpcResponse import com.reown.android.internal.common.model.SDKError import com.reown.android.internal.common.model.WCResponse import com.reown.android.internal.common.model.type.EngineEvent import com.reown.foundation.util.Logger -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.engine.model.mapper.toMapOfEngineNamespacesSession -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.engine.model.mapper.toMapOfEngineNamespacesSession +import com.reown.sign.storage.sequence.SessionStorageRepository import com.walletconnect.utils.extractTimestamp import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/DeleteRequestByIdUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/DeleteRequestByIdUseCase.kt similarity index 92% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/DeleteRequestByIdUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/DeleteRequestByIdUseCase.kt index 9116a633c..f237e6d58 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/DeleteRequestByIdUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/DeleteRequestByIdUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.json_rpc.domain +package com.reown.sign.json_rpc.domain import com.reown.android.internal.common.storage.rpc.JsonRpcHistory import com.reown.android.internal.common.storage.verify.VerifyContextStorageRepository diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingJsonRpcHistoryEntryByIdUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/GetPendingJsonRpcHistoryEntryByIdUseCase.kt similarity index 74% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingJsonRpcHistoryEntryByIdUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/GetPendingJsonRpcHistoryEntryByIdUseCase.kt index bd1afb415..476cee6c2 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingJsonRpcHistoryEntryByIdUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/GetPendingJsonRpcHistoryEntryByIdUseCase.kt @@ -1,12 +1,12 @@ -package com.walletconnect.sign.json_rpc.domain +package com.reown.sign.json_rpc.domain import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer import com.reown.android.internal.common.json_rpc.model.JsonRpcHistoryRecord import com.reown.android.internal.common.storage.rpc.JsonRpcHistory -import com.walletconnect.sign.common.model.Request -import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.json_rpc.model.toRequest +import com.reown.sign.common.model.Request +import com.reown.sign.common.model.vo.clientsync.session.SignRpc +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.json_rpc.model.toRequest internal class GetPendingJsonRpcHistoryEntryByIdUseCase( private val jsonRpcHistory: JsonRpcHistory, diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingRequestsByTopicUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/GetPendingRequestsByTopicUseCase.kt similarity index 76% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingRequestsByTopicUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/GetPendingRequestsByTopicUseCase.kt index 4dd9fb9a8..ab0aac1ce 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingRequestsByTopicUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/GetPendingRequestsByTopicUseCase.kt @@ -1,12 +1,12 @@ -package com.walletconnect.sign.json_rpc.domain +package com.reown.sign.json_rpc.domain import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer import com.reown.android.internal.common.storage.rpc.JsonRpcHistory import com.reown.foundation.common.model.Topic -import com.walletconnect.sign.common.model.Request -import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc -import com.walletconnect.sign.json_rpc.model.JsonRpcMethod -import com.walletconnect.sign.json_rpc.model.toRequest +import com.reown.sign.common.model.Request +import com.reown.sign.common.model.vo.clientsync.session.SignRpc +import com.reown.sign.json_rpc.model.JsonRpcMethod +import com.reown.sign.json_rpc.model.toRequest import kotlinx.coroutines.supervisorScope internal class GetPendingRequestsUseCaseByTopic( diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingSessionAuthenticateRequest.kt b/protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/GetPendingSessionAuthenticateRequest.kt similarity index 74% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingSessionAuthenticateRequest.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/GetPendingSessionAuthenticateRequest.kt index c851ec6f0..a8d66157d 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingSessionAuthenticateRequest.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/GetPendingSessionAuthenticateRequest.kt @@ -1,12 +1,12 @@ -package com.walletconnect.sign.json_rpc.domain +package com.reown.sign.json_rpc.domain import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer import com.reown.android.internal.common.json_rpc.model.JsonRpcHistoryRecord import com.reown.android.internal.common.storage.rpc.JsonRpcHistory -import com.walletconnect.sign.common.model.Request -import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.json_rpc.model.toRequest +import com.reown.sign.common.model.Request +import com.reown.sign.common.model.vo.clientsync.session.SignRpc +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.json_rpc.model.toRequest class GetPendingSessionAuthenticateRequest( private val jsonRpcHistory: JsonRpcHistory, diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingSessionRequestByTopicUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/GetPendingSessionRequestByTopicUseCase.kt similarity index 79% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingSessionRequestByTopicUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/GetPendingSessionRequestByTopicUseCase.kt index 09f1aa88e..4031c048d 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingSessionRequestByTopicUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/GetPendingSessionRequestByTopicUseCase.kt @@ -1,15 +1,15 @@ -package com.walletconnect.sign.json_rpc.domain +package com.reown.sign.json_rpc.domain import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer import com.reown.android.internal.common.model.AppMetaDataType import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface import com.reown.android.internal.common.storage.rpc.JsonRpcHistory import com.reown.foundation.common.model.Topic -import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.engine.model.mapper.toSessionRequest -import com.walletconnect.sign.json_rpc.model.JsonRpcMethod -import com.walletconnect.sign.json_rpc.model.toRequest +import com.reown.sign.common.model.vo.clientsync.session.SignRpc +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.engine.model.mapper.toSessionRequest +import com.reown.sign.json_rpc.model.JsonRpcMethod +import com.reown.sign.json_rpc.model.toRequest import kotlinx.coroutines.supervisorScope internal class GetPendingSessionRequestByTopicUseCase( diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingSessionRequests.kt b/protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/GetPendingSessionRequests.kt similarity index 69% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingSessionRequests.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/GetPendingSessionRequests.kt index c3c4bd2e9..7077c148b 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetPendingSessionRequests.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/GetPendingSessionRequests.kt @@ -1,11 +1,11 @@ -package com.walletconnect.sign.json_rpc.domain +package com.reown.sign.json_rpc.domain import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer import com.reown.android.internal.common.storage.rpc.JsonRpcHistory -import com.walletconnect.sign.common.model.Request -import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc -import com.walletconnect.sign.json_rpc.model.JsonRpcMethod -import com.walletconnect.sign.json_rpc.model.toRequest +import com.reown.sign.common.model.Request +import com.reown.sign.common.model.vo.clientsync.session.SignRpc +import com.reown.sign.json_rpc.model.JsonRpcMethod +import com.reown.sign.json_rpc.model.toRequest import kotlinx.coroutines.supervisorScope internal class GetPendingSessionRequests( diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetSessionAuthenticateRequest.kt b/protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/GetSessionAuthenticateRequest.kt similarity index 74% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetSessionAuthenticateRequest.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/GetSessionAuthenticateRequest.kt index 2afb002e4..58b14a687 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetSessionAuthenticateRequest.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/GetSessionAuthenticateRequest.kt @@ -1,12 +1,12 @@ -package com.walletconnect.sign.json_rpc.domain +package com.reown.sign.json_rpc.domain import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer import com.reown.android.internal.common.json_rpc.model.JsonRpcHistoryRecord import com.reown.android.internal.common.storage.rpc.JsonRpcHistory -import com.walletconnect.sign.common.model.Request -import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.json_rpc.model.toRequest +import com.reown.sign.common.model.Request +import com.reown.sign.common.model.vo.clientsync.session.SignRpc +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.json_rpc.model.toRequest internal class GetSessionAuthenticateRequest( private val jsonRpcHistory: JsonRpcHistory, diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetSessionRequestByIdUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/GetSessionRequestByIdUseCase.kt similarity index 74% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetSessionRequestByIdUseCase.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/GetSessionRequestByIdUseCase.kt index fd6addcd0..6091d0a3a 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetSessionRequestByIdUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/domain/GetSessionRequestByIdUseCase.kt @@ -1,12 +1,12 @@ -package com.walletconnect.sign.json_rpc.domain +package com.reown.sign.json_rpc.domain import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer import com.reown.android.internal.common.json_rpc.model.JsonRpcHistoryRecord import com.reown.android.internal.common.storage.rpc.JsonRpcHistory -import com.walletconnect.sign.common.model.Request -import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.json_rpc.model.toRequest +import com.reown.sign.common.model.Request +import com.reown.sign.common.model.vo.clientsync.session.SignRpc +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.json_rpc.model.toRequest internal class GetSessionRequestByIdUseCase( private val jsonRpcHistory: JsonRpcHistory, diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/model/JsonRpcMapper.kt b/protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/model/JsonRpcMapper.kt similarity index 86% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/model/JsonRpcMapper.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/model/JsonRpcMapper.kt index 86d4902b2..f572436c3 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/model/JsonRpcMapper.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/model/JsonRpcMapper.kt @@ -1,13 +1,13 @@ @file:JvmSynthetic -package com.walletconnect.sign.json_rpc.model +package com.reown.sign.json_rpc.model import com.reown.android.internal.common.json_rpc.model.JsonRpcHistoryRecord import com.reown.android.internal.common.model.Expiry import com.reown.foundation.common.model.Topic -import com.walletconnect.sign.common.model.Request -import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.common.model.Request +import com.reown.sign.common.model.vo.clientsync.session.SignRpc +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams @JvmSynthetic internal fun SignRpc.SessionRequest.toRequest(entry: JsonRpcHistoryRecord): Request = diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/model/JsonRpcMethod.kt b/protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/model/JsonRpcMethod.kt similarity index 94% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/model/JsonRpcMethod.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/model/JsonRpcMethod.kt index 0f717e04a..4a4133fa6 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/json_rpc/model/JsonRpcMethod.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/json_rpc/model/JsonRpcMethod.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.sign.json_rpc.model +package com.reown.sign.json_rpc.model internal object JsonRpcMethod { @get:JvmSynthetic diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/authenticate/AuthenticateResponseTopicRepository.kt b/protocol/sign/src/main/kotlin/com/reown/sign/storage/authenticate/AuthenticateResponseTopicRepository.kt similarity index 84% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/authenticate/AuthenticateResponseTopicRepository.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/storage/authenticate/AuthenticateResponseTopicRepository.kt index 10e06fddc..3692ba9bd 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/authenticate/AuthenticateResponseTopicRepository.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/storage/authenticate/AuthenticateResponseTopicRepository.kt @@ -1,7 +1,7 @@ -package com.walletconnect.sign.storage.authenticate +package com.reown.sign.storage.authenticate import android.database.sqlite.SQLiteException -import com.walletconnect.sign.storage.data.dao.authenticatereponse.AuthenticateResponseTopicDaoQueries +import com.reown.sign.storage.data.dao.authenticatereponse.AuthenticateResponseTopicDaoQueries internal class AuthenticateResponseTopicRepository(private val authenticateResponseTopicDaoQueries: AuthenticateResponseTopicDaoQueries) { @JvmSynthetic diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/link_mode/LinkModeStorageRepository.kt b/protocol/sign/src/main/kotlin/com/reown/sign/storage/link_mode/LinkModeStorageRepository.kt similarity index 83% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/link_mode/LinkModeStorageRepository.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/storage/link_mode/LinkModeStorageRepository.kt index c77052a6a..2f27eb755 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/link_mode/LinkModeStorageRepository.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/storage/link_mode/LinkModeStorageRepository.kt @@ -1,7 +1,7 @@ -package com.walletconnect.sign.storage.link_mode +package com.reown.sign.storage.link_mode import android.database.sqlite.SQLiteException -import com.walletconnect.sign.storage.data.dao.linkmode.LinkModeDaoQueries +import com.reown.sign.storage.data.dao.linkmode.LinkModeDaoQueries import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/proposal/ProposalStorageRepository.kt b/protocol/sign/src/main/kotlin/com/reown/sign/storage/proposal/ProposalStorageRepository.kt similarity index 92% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/proposal/ProposalStorageRepository.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/storage/proposal/ProposalStorageRepository.kt index 2bbe587d2..7b3850457 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/proposal/ProposalStorageRepository.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/storage/proposal/ProposalStorageRepository.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.sign.storage.proposal +package com.reown.sign.storage.proposal import android.database.sqlite.SQLiteException import app.cash.sqldelight.async.coroutines.awaitAsList @@ -8,10 +8,10 @@ import com.reown.android.internal.common.model.Expiry import com.reown.android.internal.common.model.Namespace import com.reown.android.internal.common.scope import com.reown.foundation.common.model.Topic -import com.walletconnect.sign.common.model.vo.proposal.ProposalVO -import com.walletconnect.sign.storage.data.dao.optionalnamespaces.OptionalNamespaceDaoQueries -import com.walletconnect.sign.storage.data.dao.proposal.ProposalDaoQueries -import com.walletconnect.sign.storage.data.dao.proposalnamespace.ProposalNamespaceDaoQueries +import com.reown.sign.common.model.vo.proposal.ProposalVO +import com.reown.sign.storage.data.dao.optionalnamespaces.OptionalNamespaceDaoQueries +import com.reown.sign.storage.data.dao.proposal.ProposalDaoQueries +import com.reown.sign.storage.data.dao.proposalnamespace.ProposalNamespaceDaoQueries import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/sequence/SessionStorageRepository.kt b/protocol/sign/src/main/kotlin/com/reown/sign/storage/sequence/SessionStorageRepository.kt similarity index 94% rename from protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/sequence/SessionStorageRepository.kt rename to protocol/sign/src/main/kotlin/com/reown/sign/storage/sequence/SessionStorageRepository.kt index 2b40a97a5..1a1ae20a0 100644 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/storage/sequence/SessionStorageRepository.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/storage/sequence/SessionStorageRepository.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.sign.storage.sequence +package com.reown.sign.storage.sequence import android.database.sqlite.SQLiteException import com.reown.android.internal.common.model.Expiry @@ -8,13 +8,13 @@ import com.reown.android.internal.common.model.Namespace import com.reown.android.internal.common.model.TransportType import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic -import com.walletconnect.sign.common.model.vo.sequence.SessionVO -import com.walletconnect.sign.engine.sessionRequestEventsQueue -import com.walletconnect.sign.storage.data.dao.namespace.NamespaceDaoQueries -import com.walletconnect.sign.storage.data.dao.optionalnamespaces.OptionalNamespaceDaoQueries -import com.walletconnect.sign.storage.data.dao.proposalnamespace.ProposalNamespaceDaoQueries -import com.walletconnect.sign.storage.data.dao.session.SessionDaoQueries -import com.walletconnect.sign.storage.data.dao.temp.TempNamespaceDaoQueries +import com.reown.sign.common.model.vo.sequence.SessionVO +import com.reown.sign.engine.sessionRequestEventsQueue +import com.reown.sign.storage.data.dao.namespace.NamespaceDaoQueries +import com.reown.sign.storage.data.dao.optionalnamespaces.OptionalNamespaceDaoQueries +import com.reown.sign.storage.data.dao.proposalnamespace.ProposalNamespaceDaoQueries +import com.reown.sign.storage.data.dao.session.SessionDaoQueries +import com.reown.sign.storage.data.dao.temp.TempNamespaceDaoQueries import com.walletconnect.utils.Empty import com.walletconnect.utils.isSequenceValid diff --git a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/type/Sequences.kt b/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/type/Sequences.kt deleted file mode 100644 index d27c5815a..000000000 --- a/protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/type/Sequences.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.walletconnect.sign.common.model.type - -enum class Sequences { - SESSION, PAIRING -} \ No newline at end of file diff --git a/protocol/sign/src/main/sqldelight/com/walletconnect/sign/storage/data/dao/authenticate_reponse/AuthenticateResponseTopicDao.sq b/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/authenticate_reponse/AuthenticateResponseTopicDao.sq similarity index 100% rename from protocol/sign/src/main/sqldelight/com/walletconnect/sign/storage/data/dao/authenticate_reponse/AuthenticateResponseTopicDao.sq rename to protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/authenticate_reponse/AuthenticateResponseTopicDao.sq diff --git a/protocol/sign/src/main/sqldelight/com/walletconnect/sign/storage/data/dao/link_mode/LinkModeDao.sq b/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/link_mode/LinkModeDao.sq similarity index 100% rename from protocol/sign/src/main/sqldelight/com/walletconnect/sign/storage/data/dao/link_mode/LinkModeDao.sq rename to protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/link_mode/LinkModeDao.sq diff --git a/protocol/sign/src/main/sqldelight/com/walletconnect/sign/storage/data/dao/namespace/NamespaceDao.sq b/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/namespace/NamespaceDao.sq similarity index 100% rename from protocol/sign/src/main/sqldelight/com/walletconnect/sign/storage/data/dao/namespace/NamespaceDao.sq rename to protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/namespace/NamespaceDao.sq diff --git a/protocol/sign/src/main/sqldelight/com/walletconnect/sign/storage/data/dao/optional_namespaces/OptionalNamespaceDao.sq b/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/optional_namespaces/OptionalNamespaceDao.sq similarity index 100% rename from protocol/sign/src/main/sqldelight/com/walletconnect/sign/storage/data/dao/optional_namespaces/OptionalNamespaceDao.sq rename to protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/optional_namespaces/OptionalNamespaceDao.sq diff --git a/protocol/sign/src/main/sqldelight/com/walletconnect/sign/storage/data/dao/proposal/ProposalDao.sq b/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/proposal/ProposalDao.sq similarity index 100% rename from protocol/sign/src/main/sqldelight/com/walletconnect/sign/storage/data/dao/proposal/ProposalDao.sq rename to protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/proposal/ProposalDao.sq diff --git a/protocol/sign/src/main/sqldelight/com/walletconnect/sign/storage/data/dao/proposal_namespace/ProposalNamespaceDao.sq b/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/proposal_namespace/ProposalNamespaceDao.sq similarity index 100% rename from protocol/sign/src/main/sqldelight/com/walletconnect/sign/storage/data/dao/proposal_namespace/ProposalNamespaceDao.sq rename to protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/proposal_namespace/ProposalNamespaceDao.sq diff --git a/protocol/sign/src/main/sqldelight/com/walletconnect/sign/storage/data/dao/session/SessionDao.sq b/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/session/SessionDao.sq similarity index 100% rename from protocol/sign/src/main/sqldelight/com/walletconnect/sign/storage/data/dao/session/SessionDao.sq rename to protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/session/SessionDao.sq diff --git a/protocol/sign/src/main/sqldelight/com/walletconnect/sign/storage/data/dao/temp/TempNamespaceDao.sq b/protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/temp/TempNamespaceDao.sq similarity index 100% rename from protocol/sign/src/main/sqldelight/com/walletconnect/sign/storage/data/dao/temp/TempNamespaceDao.sq rename to protocol/sign/src/main/sqldelight/com/reown/sign/storage/data/dao/temp/TempNamespaceDao.sq diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/AttestationIdGenerationTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/AttestationIdGenerationTest.kt similarity index 96% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/AttestationIdGenerationTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/AttestationIdGenerationTest.kt index 2ceff7ede..7589677ba 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/AttestationIdGenerationTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/AttestationIdGenerationTest.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign +package com.reown.sign import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory @@ -7,8 +7,8 @@ import com.reown.android.internal.common.model.AppMetaData import com.reown.android.internal.common.model.Namespace import com.reown.android.internal.common.model.RelayProtocolOptions import com.reown.android.internal.common.model.SessionProposer -import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.common.model.vo.clientsync.session.SignRpc +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams import junit.framework.TestCase.assertEquals import org.junit.Test diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/DeleteRequestByIdUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/DeleteRequestByIdUseCaseTest.kt similarity index 92% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/DeleteRequestByIdUseCaseTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/DeleteRequestByIdUseCaseTest.kt index 258d26bfb..bbb0fb584 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/DeleteRequestByIdUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/DeleteRequestByIdUseCaseTest.kt @@ -1,8 +1,8 @@ -package com.walletconnect.sign +package com.reown.sign import com.reown.android.internal.common.storage.rpc.JsonRpcHistory import com.reown.android.internal.common.storage.verify.VerifyContextStorageRepository -import com.walletconnect.sign.json_rpc.domain.DeleteRequestByIdUseCase +import com.reown.sign.json_rpc.domain.DeleteRequestByIdUseCase import io.mockk.coVerify import io.mockk.mockk import io.mockk.slot diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/GetSessionRequestByIdUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/GetSessionRequestByIdUseCaseTest.kt similarity index 88% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/GetSessionRequestByIdUseCaseTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/GetSessionRequestByIdUseCaseTest.kt index 2a43ca943..aabb4f5b8 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/GetSessionRequestByIdUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/GetSessionRequestByIdUseCaseTest.kt @@ -1,12 +1,12 @@ -package com.walletconnect.sign +package com.reown.sign import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer import com.reown.android.internal.common.json_rpc.model.JsonRpcHistoryRecord import com.reown.android.internal.common.storage.rpc.JsonRpcHistory -import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.common.model.vo.clientsync.session.payload.SessionRequestVO -import com.walletconnect.sign.json_rpc.domain.GetSessionRequestByIdUseCase +import com.reown.sign.common.model.vo.clientsync.session.SignRpc +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.common.model.vo.clientsync.session.payload.SessionRequestVO +import com.reown.sign.json_rpc.domain.GetSessionRequestByIdUseCase import io.mockk.every import io.mockk.mockk import io.mockk.verify diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/ReCapsTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/ReCapsTest.kt similarity index 99% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/ReCapsTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/ReCapsTest.kt index 7d74159f8..9fd8eeadb 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/ReCapsTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/ReCapsTest.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign +package com.reown.sign import org.bouncycastle.util.encoders.Base64 import org.json.JSONArray diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/adapters/GenericPayloadsTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/adapters/GenericPayloadsTest.kt similarity index 98% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/adapters/GenericPayloadsTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/adapters/GenericPayloadsTest.kt index de681be98..c7ac3e0c0 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/adapters/GenericPayloadsTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/adapters/GenericPayloadsTest.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.adapters +package com.reown.sign.adapters import com.squareup.moshi.JsonDataException import com.squareup.moshi.Moshi diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/adapters/SessionEventVOJsonAdapterTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/adapters/SessionEventVOJsonAdapterTest.kt similarity index 86% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/adapters/SessionEventVOJsonAdapterTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/adapters/SessionEventVOJsonAdapterTest.kt index 583b6dd94..b8504e9ac 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/adapters/SessionEventVOJsonAdapterTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/adapters/SessionEventVOJsonAdapterTest.kt @@ -1,12 +1,12 @@ -package com.walletconnect.sign.adapters +package com.reown.sign.adapters import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory import com.tinder.scarlet.utils.getRawType -import com.walletconnect.sign.common.adapters.SessionEventVOJsonAdapter -import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc -import com.walletconnect.sign.common.model.vo.clientsync.session.payload.SessionEventVO -import com.walletconnect.sign.util.iterateJsonArrays +import com.reown.sign.common.adapters.SessionEventVOJsonAdapter +import com.reown.sign.common.model.vo.clientsync.session.SignRpc +import com.reown.sign.common.model.vo.clientsync.session.payload.SessionEventVO +import com.reown.sign.util.iterateJsonArrays import junit.framework.TestCase import org.json.JSONArray import org.junit.Test diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/adapters/SessionRequestParamsParsingTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/adapters/SessionRequestParamsParsingTest.kt similarity index 97% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/adapters/SessionRequestParamsParsingTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/adapters/SessionRequestParamsParsingTest.kt index 330eaf758..26523de56 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/adapters/SessionRequestParamsParsingTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/adapters/SessionRequestParamsParsingTest.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.adapters +package com.reown.sign.adapters import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/adapters/SessionRequestVOJsonAdapterTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/adapters/SessionRequestVOJsonAdapterTest.kt similarity index 98% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/adapters/SessionRequestVOJsonAdapterTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/adapters/SessionRequestVOJsonAdapterTest.kt index 0e5b7c0fa..2409aa1eb 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/adapters/SessionRequestVOJsonAdapterTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/adapters/SessionRequestVOJsonAdapterTest.kt @@ -1,14 +1,14 @@ -package com.walletconnect.sign.adapters +package com.reown.sign.adapters import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory import com.tinder.scarlet.utils.getRawType -import com.walletconnect.sign.common.adapters.SessionRequestVOJsonAdapter -import com.walletconnect.sign.common.model.vo.clientsync.session.SignRpc -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.common.model.vo.clientsync.session.payload.SessionRequestVO -import com.walletconnect.sign.util.iterateJsonArrays -import com.walletconnect.sign.util.iterateJsonObjects +import com.reown.sign.common.adapters.SessionRequestVOJsonAdapter +import com.reown.sign.common.model.vo.clientsync.session.SignRpc +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.common.model.vo.clientsync.session.payload.SessionRequestVO +import com.reown.sign.util.iterateJsonArrays +import com.reown.sign.util.iterateJsonObjects import junit.framework.TestCase.assertEquals import junit.framework.TestCase.assertTrue import org.intellij.lang.annotations.Language diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/SessionRequestQueueTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/engine/SessionRequestQueueTest.kt similarity index 98% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/SessionRequestQueueTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/engine/SessionRequestQueueTest.kt index e2530f4e9..b6ded9281 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/SessionRequestQueueTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/engine/SessionRequestQueueTest.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine +package com.reown.sign.engine import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCaseTest.kt similarity index 95% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCaseTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCaseTest.kt index 113f1e819..72b72846c 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCaseTest.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository import com.reown.android.internal.common.exception.RequestExpiredException @@ -20,13 +20,13 @@ import com.reown.android.pulse.model.Trace import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.exceptions.MissingSessionAuthenticateRequest -import com.walletconnect.sign.common.model.Request -import com.walletconnect.sign.common.model.vo.clientsync.common.PayloadParams -import com.walletconnect.sign.common.model.vo.clientsync.common.Requester -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.json_rpc.domain.GetPendingSessionAuthenticateRequest -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.common.exceptions.MissingSessionAuthenticateRequest +import com.reown.sign.common.model.Request +import com.reown.sign.common.model.vo.clientsync.common.PayloadParams +import com.reown.sign.common.model.vo.clientsync.common.Requester +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.json_rpc.domain.GetPendingSessionAuthenticateRequest +import com.reown.sign.storage.sequence.SessionStorageRepository import com.walletconnect.util.bytesToHex import com.walletconnect.util.randomBytes import io.mockk.Runs diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/ApproveSessionUseCaseTest.kt similarity index 94% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionUseCaseTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/ApproveSessionUseCaseTest.kt index ddf6efd9b..302d79b23 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/ApproveSessionUseCaseTest.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository import com.reown.android.internal.common.model.AppMetaData @@ -10,12 +10,12 @@ import com.reown.android.pulse.domain.InsertTelemetryEventUseCase import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.exceptions.InvalidNamespaceException -import com.walletconnect.sign.common.exceptions.SessionProposalExpiredException -import com.walletconnect.sign.common.model.vo.proposal.ProposalVO -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.storage.proposal.ProposalStorageRepository -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.common.exceptions.InvalidNamespaceException +import com.reown.sign.common.exceptions.SessionProposalExpiredException +import com.reown.sign.common.model.vo.proposal.ProposalVO +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.storage.proposal.ProposalStorageRepository +import com.reown.sign.storage.sequence.SessionStorageRepository import io.mockk.Runs import io.mockk.coEvery import io.mockk.coVerify diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/DisconnectSessionUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/DisconnectSessionUseCaseTest.kt similarity index 91% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/DisconnectSessionUseCaseTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/DisconnectSessionUseCaseTest.kt index 453cabaeb..f6096cb06 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/DisconnectSessionUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/DisconnectSessionUseCaseTest.kt @@ -1,9 +1,9 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.exception.CannotFindSequenceForTopic import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.reown.foundation.util.Logger -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.storage.sequence.SessionStorageRepository import io.mockk.every import io.mockk.mockk import kotlinx.coroutines.test.runTest diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/EmitEventUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/EmitEventUseCaseTest.kt similarity index 93% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/EmitEventUseCaseTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/EmitEventUseCaseTest.kt index f313672c8..2670043f0 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/EmitEventUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/EmitEventUseCaseTest.kt @@ -1,13 +1,13 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.exception.CannotFindSequenceForTopic import com.reown.android.internal.common.model.Namespace import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.reown.foundation.common.model.Topic import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.model.vo.sequence.SessionVO -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.common.model.vo.sequence.SessionVO +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.storage.sequence.SessionStorageRepository import io.mockk.every import io.mockk.mockk import io.mockk.verify diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ExtendSessionUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/ExtendSessionUseCaseTest.kt similarity index 91% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ExtendSessionUseCaseTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/ExtendSessionUseCaseTest.kt index 2397f3313..fdd1ba2d0 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ExtendSessionUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/ExtendSessionUseCaseTest.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.exception.CannotFindSequenceForTopic import com.reown.android.internal.common.model.Expiry @@ -6,9 +6,9 @@ import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterf import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.exceptions.NotSettledSessionException -import com.walletconnect.sign.common.model.vo.sequence.SessionVO -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.common.exceptions.NotSettledSessionException +import com.reown.sign.common.model.vo.sequence.SessionVO +import com.reown.sign.storage.sequence.SessionStorageRepository import io.mockk.every import io.mockk.mockk import kotlinx.coroutines.test.runTest diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/GetNamespacesFromReCapsTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/GetNamespacesFromReCapsTest.kt similarity index 95% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/GetNamespacesFromReCapsTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/GetNamespacesFromReCapsTest.kt index 3ff01a26b..51368afa3 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/GetNamespacesFromReCapsTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/GetNamespacesFromReCapsTest.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import org.junit.Assert.assertEquals import org.junit.Assert.assertThrows diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPairingForSessionAuthenticateUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/GetPairingForSessionAuthenticateUseCaseTest.kt similarity index 98% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPairingForSessionAuthenticateUseCaseTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/GetPairingForSessionAuthenticateUseCaseTest.kt index 0a237c874..922ded387 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/GetPairingForSessionAuthenticateUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/GetPairingForSessionAuthenticateUseCaseTest.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.Core import com.reown.android.internal.utils.currentTimeInSeconds diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeSessionUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/ProposeSessionUseCaseTest.kt similarity index 90% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeSessionUseCaseTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/ProposeSessionUseCaseTest.kt index 17b29b4af..c067c5bae 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeSessionUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/ProposeSessionUseCaseTest.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository import com.reown.android.internal.common.model.AppMetaData @@ -8,9 +8,9 @@ import com.reown.android.internal.common.model.SymmetricKey import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.reown.foundation.common.model.Topic import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.exceptions.InvalidNamespaceException -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.storage.proposal.ProposalStorageRepository +import com.reown.sign.common.exceptions.InvalidNamespaceException +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.storage.proposal.ProposalStorageRepository import io.mockk.every import io.mockk.mockk import kotlinx.coroutines.test.runTest diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/ProposeUseCaseTest.kt similarity index 96% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeUseCaseTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/ProposeUseCaseTest.kt index e7712f4c8..82681f2b3 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/ProposeUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/ProposeUseCaseTest.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository import com.reown.android.internal.common.model.AppMetaData @@ -11,9 +11,9 @@ import com.reown.android.internal.utils.fiveMinutesInSeconds import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.exceptions.InvalidNamespaceException -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.storage.proposal.ProposalStorageRepository +import com.reown.sign.common.exceptions.InvalidNamespaceException +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.storage.proposal.ProposalStorageRepository import io.mockk.Called import io.mockk.Runs import io.mockk.coEvery diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionAuthenticateUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/RejectSessionAuthenticateUseCaseTest.kt similarity index 92% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionAuthenticateUseCaseTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/RejectSessionAuthenticateUseCaseTest.kt index b311e419d..58bc50b48 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/RejectSessionAuthenticateUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/RejectSessionAuthenticateUseCaseTest.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository import com.reown.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface @@ -13,12 +13,12 @@ import com.reown.android.pulse.domain.InsertEventUseCase import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.reown.foundation.util.Logger -import com.walletconnect.sign.common.exceptions.MissingSessionAuthenticateRequest -import com.walletconnect.sign.common.model.Request -import com.walletconnect.sign.common.model.vo.clientsync.common.PayloadParams -import com.walletconnect.sign.common.model.vo.clientsync.common.Requester -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.json_rpc.domain.GetPendingSessionAuthenticateRequest +import com.reown.sign.common.exceptions.MissingSessionAuthenticateRequest +import com.reown.sign.common.model.Request +import com.reown.sign.common.model.vo.clientsync.common.PayloadParams +import com.reown.sign.common.model.vo.clientsync.common.Requester +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.json_rpc.domain.GetPendingSessionAuthenticateRequest import com.walletconnect.util.bytesToHex import com.walletconnect.util.randomBytes import io.mockk.Runs diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/RespondSessionRequestUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/RespondSessionRequestUseCaseTest.kt similarity index 92% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/RespondSessionRequestUseCaseTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/RespondSessionRequestUseCaseTest.kt index 716d4d7ea..4410a3afd 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/RespondSessionRequestUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/RespondSessionRequestUseCaseTest.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.JsonRpcResponse import com.reown.android.internal.common.exception.CannotFindSequenceForTopic @@ -8,8 +8,8 @@ import com.reown.android.internal.common.storage.metadata.MetadataStorageReposit import com.reown.android.internal.common.storage.verify.VerifyContextStorageRepository import com.reown.android.pulse.domain.InsertEventUseCase import com.reown.foundation.util.Logger -import com.walletconnect.sign.json_rpc.domain.GetPendingJsonRpcHistoryEntryByIdUseCase -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.json_rpc.domain.GetPendingJsonRpcHistoryEntryByIdUseCase +import com.reown.sign.storage.sequence.SessionStorageRepository import io.mockk.every import io.mockk.mockk import kotlinx.coroutines.test.runTest diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionAuthenticateUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/SessionAuthenticateUseCaseTest.kt similarity index 96% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionAuthenticateUseCaseTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/SessionAuthenticateUseCaseTest.kt index df194eab5..d6e752328 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionAuthenticateUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/SessionAuthenticateUseCaseTest.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.Core import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository @@ -15,9 +15,9 @@ import com.reown.android.pulse.domain.InsertEventUseCase import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.reown.foundation.util.Logger -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.storage.authenticate.AuthenticateResponseTopicRepository -import com.walletconnect.sign.storage.link_mode.LinkModeStorageRepository +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.storage.authenticate.AuthenticateResponseTopicRepository +import com.reown.sign.storage.link_mode.LinkModeStorageRepository import io.mockk.Runs import io.mockk.clearAllMocks import io.mockk.coEvery diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionRequestUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/SessionRequestUseCaseTest.kt similarity index 92% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionRequestUseCaseTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/SessionRequestUseCaseTest.kt index dc10ecfdf..1a0e7981a 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionRequestUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/SessionRequestUseCaseTest.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.exception.CannotFindSequenceForTopic import com.reown.android.internal.common.json_rpc.domain.link_mode.LinkModeJsonRpcInteractorInterface @@ -6,8 +6,8 @@ import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterf import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface import com.reown.android.pulse.domain.InsertEventUseCase import com.reown.foundation.util.Logger -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.storage.sequence.SessionStorageRepository import io.mockk.every import io.mockk.mockk import kotlinx.coroutines.test.runTest diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionUpdateUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/SessionUpdateUseCaseTest.kt similarity index 92% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionUpdateUseCaseTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/SessionUpdateUseCaseTest.kt index 2a7af2699..b5d729eb9 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionUpdateUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/SessionUpdateUseCaseTest.kt @@ -1,9 +1,9 @@ -package com.walletconnect.sign.engine.use_case.calls +package com.reown.sign.engine.use_case.calls import com.reown.android.internal.common.exception.CannotFindSequenceForTopic import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.reown.foundation.util.Logger -import com.walletconnect.sign.storage.sequence.SessionStorageRepository +import com.reown.sign.storage.sequence.SessionStorageRepository import io.mockk.every import io.mockk.mockk import kotlinx.coroutines.test.runTest diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/mappers/EngineMapperTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/mappers/EngineMapperTest.kt similarity index 93% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/mappers/EngineMapperTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/mappers/EngineMapperTest.kt index 53eee8b96..6d8322312 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/mappers/EngineMapperTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/mappers/EngineMapperTest.kt @@ -1,11 +1,11 @@ -package com.walletconnect.sign.mappers +package com.reown.sign.mappers import com.reown.android.internal.common.model.AppMetaData import com.reown.android.internal.common.model.RelayProtocolOptions import com.reown.android.internal.common.model.SessionProposer import com.reown.foundation.common.model.Topic -import com.walletconnect.sign.common.model.vo.clientsync.session.params.SignParams -import com.walletconnect.sign.engine.model.mapper.toEngineDO +import com.reown.sign.common.model.vo.clientsync.session.params.SignParams +import com.reown.sign.engine.model.mapper.toEngineDO import org.junit.Test class EngineMapperTest { diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/util/CoroutineTestRule.kt b/protocol/sign/src/test/kotlin/com/reown/sign/util/CoroutineTestRule.kt similarity index 96% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/util/CoroutineTestRule.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/util/CoroutineTestRule.kt index 794b06a39..7397dcfe4 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/util/CoroutineTestRule.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/util/CoroutineTestRule.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.util +package com.reown.sign.util import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/util/GenerateApprovedNamespacesUtilsTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/util/GenerateApprovedNamespacesUtilsTest.kt similarity index 99% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/util/GenerateApprovedNamespacesUtilsTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/util/GenerateApprovedNamespacesUtilsTest.kt index 99fb28b51..960809d07 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/util/GenerateApprovedNamespacesUtilsTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/util/GenerateApprovedNamespacesUtilsTest.kt @@ -1,9 +1,9 @@ -package com.walletconnect.sign.util +package com.reown.sign.util import com.reown.android.internal.common.model.Namespace -import com.walletconnect.sign.client.Sign -import com.walletconnect.sign.client.utils.generateApprovedNamespaces -import com.walletconnect.sign.client.utils.normalizeNamespaces +import com.reown.sign.client.Sign +import com.reown.sign.client.utils.generateApprovedNamespaces +import com.reown.sign.client.utils.normalizeNamespaces import junit.framework.TestCase.assertEquals import org.junit.Assert.assertThrows import org.junit.Test diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/util/MergeReCapsTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/util/MergeReCapsTest.kt similarity index 98% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/util/MergeReCapsTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/util/MergeReCapsTest.kt index df5b1ad85..9eb0d7ae6 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/util/MergeReCapsTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/util/MergeReCapsTest.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.util +package com.reown.sign.util import com.reown.android.internal.common.signing.cacao.mergeReCaps import org.json.JSONObject diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/util/UtilFunctions.kt b/protocol/sign/src/test/kotlin/com/reown/sign/util/UtilFunctions.kt similarity index 97% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/util/UtilFunctions.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/util/UtilFunctions.kt index 51591039c..5da0fee60 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/util/UtilFunctions.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/util/UtilFunctions.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.util +package com.reown.sign.util import junit.framework.TestCase import org.json.JSONArray diff --git a/protocol/sign/src/test/kotlin/com/walletconnect/sign/validator/ValidatorTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/validator/ValidatorTest.kt similarity index 93% rename from protocol/sign/src/test/kotlin/com/walletconnect/sign/validator/ValidatorTest.kt rename to protocol/sign/src/test/kotlin/com/reown/sign/validator/ValidatorTest.kt index bb6b6c35b..9b69c5bb6 100644 --- a/protocol/sign/src/test/kotlin/com/walletconnect/sign/validator/ValidatorTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/validator/ValidatorTest.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sign.validator +package com.reown.sign.validator import com.reown.android.internal.common.model.RelayProtocolOptions import com.reown.android.internal.common.model.SymmetricKey @@ -7,49 +7,49 @@ import com.reown.android.internal.utils.fiveMinutesInSeconds import com.reown.android.internal.utils.monthInSeconds import com.reown.android.internal.utils.weekInSeconds import com.reown.foundation.common.model.Topic -import com.walletconnect.sign.common.exceptions.EMPTY_NAMESPACES_MESSAGE -import com.walletconnect.sign.common.exceptions.INVALID_EVENT_MESSAGE -import com.walletconnect.sign.common.exceptions.INVALID_EXTEND_TIME -import com.walletconnect.sign.common.exceptions.INVALID_REQUEST_MESSAGE -import com.walletconnect.sign.common.exceptions.NAMESPACE_ACCOUNTS_CAIP_10_MESSAGE -import com.walletconnect.sign.common.exceptions.NAMESPACE_ACCOUNTS_WRONG_NAMESPACE_MESSAGE -import com.walletconnect.sign.common.exceptions.NAMESPACE_CHAINS_CAIP_2_MESSAGE -import com.walletconnect.sign.common.exceptions.NAMESPACE_CHAINS_MISSING_MESSAGE -import com.walletconnect.sign.common.exceptions.NAMESPACE_CHAINS_UNDEFINED_MISSING_MESSAGE -import com.walletconnect.sign.common.exceptions.NAMESPACE_CHAINS_WRONG_NAMESPACE_MESSAGE -import com.walletconnect.sign.common.exceptions.NAMESPACE_EVENTS_MISSING_MESSAGE -import com.walletconnect.sign.common.exceptions.NAMESPACE_KEYS_INVALID_FORMAT -import com.walletconnect.sign.common.exceptions.NAMESPACE_KEYS_MISSING_MESSAGE -import com.walletconnect.sign.common.exceptions.NAMESPACE_METHODS_MISSING_MESSAGE -import com.walletconnect.sign.common.exceptions.UNAUTHORIZED_EVENT_MESSAGE -import com.walletconnect.sign.common.exceptions.UNAUTHORIZED_METHOD_MESSAGE +import com.reown.sign.common.exceptions.EMPTY_NAMESPACES_MESSAGE +import com.reown.sign.common.exceptions.INVALID_EVENT_MESSAGE +import com.reown.sign.common.exceptions.INVALID_EXTEND_TIME +import com.reown.sign.common.exceptions.INVALID_REQUEST_MESSAGE +import com.reown.sign.common.exceptions.NAMESPACE_ACCOUNTS_CAIP_10_MESSAGE +import com.reown.sign.common.exceptions.NAMESPACE_ACCOUNTS_WRONG_NAMESPACE_MESSAGE +import com.reown.sign.common.exceptions.NAMESPACE_CHAINS_CAIP_2_MESSAGE +import com.reown.sign.common.exceptions.NAMESPACE_CHAINS_MISSING_MESSAGE +import com.reown.sign.common.exceptions.NAMESPACE_CHAINS_UNDEFINED_MISSING_MESSAGE +import com.reown.sign.common.exceptions.NAMESPACE_CHAINS_WRONG_NAMESPACE_MESSAGE +import com.reown.sign.common.exceptions.NAMESPACE_EVENTS_MISSING_MESSAGE +import com.reown.sign.common.exceptions.NAMESPACE_KEYS_INVALID_FORMAT +import com.reown.sign.common.exceptions.NAMESPACE_KEYS_MISSING_MESSAGE +import com.reown.sign.common.exceptions.NAMESPACE_METHODS_MISSING_MESSAGE +import com.reown.sign.common.exceptions.UNAUTHORIZED_EVENT_MESSAGE +import com.reown.sign.common.exceptions.UNAUTHORIZED_METHOD_MESSAGE import com.reown.android.internal.common.model.Namespace -import com.walletconnect.sign.common.validator.SignValidator -import com.walletconnect.sign.engine.model.EngineDO -import com.walletconnect.sign.engine.model.mapper.toAbsoluteString -import com.walletconnect.sign.validator.ValidatorTest.Accounts.COSMOSHUB_4_1 -import com.walletconnect.sign.validator.ValidatorTest.Accounts.ETHEREUM_1 -import com.walletconnect.sign.validator.ValidatorTest.Accounts.ETHEREUM_2 -import com.walletconnect.sign.validator.ValidatorTest.Accounts.ETHEREUM_3 -import com.walletconnect.sign.validator.ValidatorTest.Accounts.ETHEREUM_4 -import com.walletconnect.sign.validator.ValidatorTest.Accounts.ETHEREUM_5 -import com.walletconnect.sign.validator.ValidatorTest.Accounts.KOVAN_1 -import com.walletconnect.sign.validator.ValidatorTest.Accounts.MATIC_1 -import com.walletconnect.sign.validator.ValidatorTest.Chains.COSMOSHUB_4 -import com.walletconnect.sign.validator.ValidatorTest.Chains.ETHEREUM -import com.walletconnect.sign.validator.ValidatorTest.Chains.KOVAN -import com.walletconnect.sign.validator.ValidatorTest.Chains.MATIC -import com.walletconnect.sign.validator.ValidatorTest.Chains.OPTIMISM -import com.walletconnect.sign.validator.ValidatorTest.Events.ACCOUNTS_CHANGED -import com.walletconnect.sign.validator.ValidatorTest.Events.CHAIN_CHANGED -import com.walletconnect.sign.validator.ValidatorTest.Events.COSMOS_EVENT -import com.walletconnect.sign.validator.ValidatorTest.Events.SOME_EVENT -import com.walletconnect.sign.validator.ValidatorTest.Methods.COSMOS_GET_ACCOUNTS -import com.walletconnect.sign.validator.ValidatorTest.Methods.COSMOS_SIGNDIRECT -import com.walletconnect.sign.validator.ValidatorTest.Methods.ETH_SIGN -import com.walletconnect.sign.validator.ValidatorTest.Methods.PERSONAL_SIGN -import com.walletconnect.sign.validator.ValidatorTest.Namespaces.COSMOS -import com.walletconnect.sign.validator.ValidatorTest.Namespaces.EIP155 +import com.reown.sign.common.validator.SignValidator +import com.reown.sign.engine.model.EngineDO +import com.reown.sign.engine.model.mapper.toAbsoluteString +import com.reown.sign.validator.ValidatorTest.Accounts.COSMOSHUB_4_1 +import com.reown.sign.validator.ValidatorTest.Accounts.ETHEREUM_1 +import com.reown.sign.validator.ValidatorTest.Accounts.ETHEREUM_2 +import com.reown.sign.validator.ValidatorTest.Accounts.ETHEREUM_3 +import com.reown.sign.validator.ValidatorTest.Accounts.ETHEREUM_4 +import com.reown.sign.validator.ValidatorTest.Accounts.ETHEREUM_5 +import com.reown.sign.validator.ValidatorTest.Accounts.KOVAN_1 +import com.reown.sign.validator.ValidatorTest.Accounts.MATIC_1 +import com.reown.sign.validator.ValidatorTest.Chains.COSMOSHUB_4 +import com.reown.sign.validator.ValidatorTest.Chains.ETHEREUM +import com.reown.sign.validator.ValidatorTest.Chains.KOVAN +import com.reown.sign.validator.ValidatorTest.Chains.MATIC +import com.reown.sign.validator.ValidatorTest.Chains.OPTIMISM +import com.reown.sign.validator.ValidatorTest.Events.ACCOUNTS_CHANGED +import com.reown.sign.validator.ValidatorTest.Events.CHAIN_CHANGED +import com.reown.sign.validator.ValidatorTest.Events.COSMOS_EVENT +import com.reown.sign.validator.ValidatorTest.Events.SOME_EVENT +import com.reown.sign.validator.ValidatorTest.Methods.COSMOS_GET_ACCOUNTS +import com.reown.sign.validator.ValidatorTest.Methods.COSMOS_SIGNDIRECT +import com.reown.sign.validator.ValidatorTest.Methods.ETH_SIGN +import com.reown.sign.validator.ValidatorTest.Methods.PERSONAL_SIGN +import com.reown.sign.validator.ValidatorTest.Namespaces.COSMOS +import com.reown.sign.validator.ValidatorTest.Namespaces.EIP155 import junit.framework.TestCase.assertEquals import junit.framework.TestCase.assertNotNull import junit.framework.TestCase.assertNull diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/DappSampleActivity.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/DappSampleActivity.kt index c8f7c0234..a849e8a41 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/DappSampleActivity.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/DappSampleActivity.kt @@ -12,7 +12,7 @@ import androidx.lifecycle.lifecycleScope import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi import com.walletconnect.sample.common.ui.theme.WCSampleAppTheme import com.walletconnect.sample.dapp.ui.routes.host.DappSampleHost -import com.walletconnect.sign.client.SignClient +import com.reown.sign.client.SignClient import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt index 2ee11d735..ea78487dc 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt @@ -10,8 +10,8 @@ import com.walletconnect.sample.common.Chains import com.walletconnect.sample.common.tag import com.walletconnect.sample.dapp.domain.DappDelegate import com.walletconnect.sample.dapp.ui.DappSampleEvents -import com.walletconnect.sign.client.Sign -import com.walletconnect.sign.client.SignClient +import com.reown.sign.client.Sign +import com.reown.sign.client.SignClient import com.walletconnect.util.bytesToHex import com.walletconnect.util.randomBytes import com.walletconnect.web3.modal.client.AppKit From 4592d1f776fcae3216ce5336812ab08b01433103 Mon Sep 17 00:00:00 2001 From: kubel Date: Thu, 5 Sep 2024 07:22:38 +0200 Subject: [PATCH 18/51] Migrate notify to reown --- protocol/notify/build.gradle.kts | 4 +- .../src/androidTest/AndroidManifest.xml | 2 +- .../notify/di/OverrideModule.kt | 2 +- .../test/activity/InstrumentedTestActivity.kt | 2 +- .../NotifyClientInstrumentedAndroidTest.kt | 20 ++++----- .../notify/test/scenario/ActivityScenario.kt | 4 +- .../ClientInstrumentedActivityScenario.kt | 8 ++-- .../notify/test/utils/Common.kt | 4 +- .../notify/test/utils/TestClient.kt | 14 +++--- .../test/utils/primary/PrimaryNotifyClient.kt | 5 +++ .../utils/primary/PrimaryNotifyDelegate.kt | 8 ++-- .../utils/secondary/SecondaryNotifyClient.kt | 5 +++ .../secondary/SecondaryNotifyDelegate.kt | 8 ++-- .../test/utils/primary/PrimaryNotifyClient.kt | 5 --- .../utils/secondary/SecondaryNotifyClient.kt | 5 --- protocol/notify/src/main/AndroidManifest.xml | 2 +- .../notify/client/Notify.kt | 2 +- .../notify/client/NotifyClient.kt | 2 +- .../notify/client/NotifyException.kt | 2 +- .../notify/client/NotifyInterface.kt | 2 +- .../notify/client/NotifyProtocol.kt | 18 ++++---- .../notify/client/cacao/CacaoSigner.kt | 4 +- .../notify/common/JsonRpcMethod.kt | 2 +- .../notify/common/NotifyServerUrl.kt | 2 +- .../notify/common/PeerError.kt | 2 +- .../notify/common/UtilFunctions.kt | 2 +- .../CacaoPayloadWithIdentityPrivateKey.kt | 2 +- .../notify/common/model/CreateSubscription.kt | 2 +- .../notify/common/model/DeleteSubscription.kt | 2 +- .../notify/common/model/EngineMapper.kt | 4 +- .../notify/common/model/Error.kt | 2 +- .../common/model/GetNotificationHistory.kt | 2 +- .../notify/common/model/Notification.kt | 2 +- .../common/model/NotificationMessage.kt | 2 +- .../notify/common/model/NotificationType.kt | 2 +- .../notify/common/model/NotifyRpc.kt | 4 +- .../notify/common/model/RegisteredAccount.kt | 2 +- .../notify/common/model/Scope.kt | 2 +- .../notify/common/model/ServerNotification.kt | 2 +- .../notify/common/model/ServerSubscription.kt | 2 +- .../notify/common/model/Subscription.kt | 2 +- .../common/model/SubscriptionChanged.kt | 2 +- .../notify/common/model/TimeoutInfo.kt | 2 +- .../notify/common/model/UpdateSubscription.kt | 2 +- .../notify/data/jwt/NotifyJwtBase.kt | 2 +- .../data/jwt/delete/DeleteRequestJwtClaim.kt | 4 +- .../data/jwt/delete/DeleteResponseJwtClaim.kt | 6 +-- .../delete/EncodeDeleteRequestJwtUseCase.kt | 2 +- ...EncodeGetNotificationsRequestJwtUseCase.kt | 2 +- .../GetNotificationsRequestJwtClaim.kt | 4 +- .../GetNotificationsResponseJwtClaim.kt | 6 +-- .../EncodeMessageResponseJwtUseCase.kt | 2 +- .../jwt/message/MessageRequestJwtClaim.kt | 6 +-- .../jwt/message/MessageResponseJwtClaim.kt | 4 +- .../EncodeSubscriptionRequestJwtUseCase.kt | 2 +- .../SubscriptionRequestJwtClaim.kt | 4 +- .../SubscriptionResponseJwtClaim.kt | 6 +-- ...eSubscriptionsChangedResponseJwtUseCase.kt | 2 +- .../SubscriptionsChangedRequestJwtClaim.kt | 6 +-- .../SubscriptionsChangedResponseJwtClaim.kt | 4 +- .../update/EncodeUpdateRequestJwtUseCase.kt | 2 +- .../data/jwt/update/UpdateRequestJwtClaim.kt | 4 +- .../data/jwt/update/UpdateResponseJwtClaim.kt | 6 +-- ...codeWatchSubscriptionsRequestJwtUseCase.kt | 2 +- .../WatchSubscriptionsRequestJwtClaim.kt | 4 +- .../WatchSubscriptionsResponseJwtClaim.kt | 6 +-- .../data/storage/NotificationsRepository.kt | 8 ++-- .../storage/RegisteredAccountsRepository.kt | 6 +-- .../data/storage/SubscriptionRepository.kt | 8 ++-- .../notify/data/wellknown/did/DidJsonDTO.kt | 2 +- .../data/wellknown/did/PublicKeyJwkDTO.kt | 2 +- .../wellknown/did/VerificationMethodDTO.kt | 2 +- .../notify/di/CallModule.kt | 44 +++++++++---------- .../notify/di/NotifyEngineModule.kt | 28 ++++++------ .../notify/di/NotifyJsonRpcModule.kt | 6 +-- .../notify/di/NotifyStorageModule.kt | 12 ++--- .../notify/di/RequestModule.kt | 6 +-- .../notify/di/ResponseModule.kt | 12 ++--- .../notify/engine/NotifyEngine.kt | 42 +++++++++--------- .../calls/DecryptNotifyMessageUseCase.kt | 12 ++--- .../engine/calls/DeleteSubscriptionUseCase.kt | 22 +++++----- .../calls/GetActiveSubscriptionsUseCase.kt | 8 ++-- .../calls/GetAllActiveSubscriptionsUseCase.kt | 6 +-- .../calls/GetNotificationHistoryUseCase.kt | 22 +++++----- .../calls/GetNotificationTypesUseCase.kt | 6 +-- .../engine/calls/IsRegisteredUseCase.kt | 6 +-- .../calls/PrepareRegistrationUseCase.kt | 6 +-- .../notify/engine/calls/RegisterUseCase.kt | 8 ++-- .../engine/calls/SubscribeToDappUseCase.kt | 28 ++++++------ .../notify/engine/calls/UnregisterUseCase.kt | 10 ++--- .../engine/calls/UpdateSubscriptionUseCase.kt | 20 ++++----- .../ExtractMetadataFromConfigUseCase.kt | 4 +- .../ExtractPublicKeysFromDidJsonUseCase.kt | 10 ++--- .../engine/domain/FetchDidJwtInteractor.kt | 16 +++---- .../FindRequestedSubscriptionUseCase.kt | 4 +- .../domain/GenerateAppropriateUriUseCase.kt | 2 +- .../GetSelfKeyForWatchSubscriptionUseCase.kt | 2 +- .../domain/SetActiveSubscriptionsUseCase.kt | 10 ++--- .../StopWatchingSubscriptionsUseCase.kt | 4 +- .../notify/engine/domain/Utils.kt | 2 +- ...iptionsForEveryRegisteredAccountUseCase.kt | 4 +- .../domain/WatchSubscriptionsUseCase.kt | 8 ++-- .../engine/requests/OnMessageUseCase.kt | 16 +++---- .../requests/OnSubscriptionsChangedUseCase.kt | 18 ++++---- .../responses/OnDeleteResponseUseCase.kt | 10 ++--- .../OnGetNotificationsResponseUseCase.kt | 16 +++---- .../responses/OnSubscribeResponseUseCase.kt | 14 +++--- .../responses/OnUpdateResponseUseCase.kt | 14 +++--- .../OnWatchSubscriptionsResponseUseCase.kt | 16 +++---- .../storage/data/dao/ActiveSubscriptions.sq | 0 .../common/storage/data/dao/Notifications.sq | 0 .../storage/data/dao/RegisteredAccounts.sq | 0 .../sample/wallet/WalletKitApplication.kt | 6 +-- .../wallet/domain/NotificationHandler.kt | 4 +- .../sample/wallet/domain/NotifyDelegate.kt | 4 +- .../subscriptions/ActiveSubscriptionsUI.kt | 2 +- .../UpdateSubscriptionViewModel.kt | 4 +- .../composable_routes/inbox/InboxRoute.kt | 2 +- .../composable_routes/inbox/InboxViewModel.kt | 4 +- .../notifications/NotificationsViewModel.kt | 4 +- 120 files changed, 397 insertions(+), 397 deletions(-) rename protocol/notify/src/androidTest/kotlin/com/{walletconnect => reown}/notify/di/OverrideModule.kt (97%) rename protocol/notify/src/androidTest/kotlin/com/{walletconnect => reown}/notify/test/activity/InstrumentedTestActivity.kt (81%) rename protocol/notify/src/androidTest/kotlin/com/{walletconnect => reown}/notify/test/client/NotifyClientInstrumentedAndroidTest.kt (93%) rename protocol/notify/src/androidTest/kotlin/com/{walletconnect => reown}/notify/test/scenario/ActivityScenario.kt (93%) rename protocol/notify/src/androidTest/kotlin/com/{walletconnect => reown}/notify/test/scenario/ClientInstrumentedActivityScenario.kt (96%) rename protocol/notify/src/androidTest/kotlin/com/{walletconnect => reown}/notify/test/utils/Common.kt (82%) rename protocol/notify/src/androidTest/kotlin/com/{walletconnect => reown}/notify/test/utils/TestClient.kt (95%) create mode 100644 protocol/notify/src/androidTest/kotlin/com/reown/notify/test/utils/primary/PrimaryNotifyClient.kt rename protocol/notify/src/androidTest/kotlin/com/{walletconnect => reown}/notify/test/utils/primary/PrimaryNotifyDelegate.kt (62%) create mode 100644 protocol/notify/src/androidTest/kotlin/com/reown/notify/test/utils/secondary/SecondaryNotifyClient.kt rename protocol/notify/src/androidTest/kotlin/com/{walletconnect => reown}/notify/test/utils/secondary/SecondaryNotifyDelegate.kt (62%) delete mode 100644 protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/primary/PrimaryNotifyClient.kt delete mode 100644 protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/secondary/SecondaryNotifyClient.kt rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/client/Notify.kt (99%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/client/NotifyClient.kt (74%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/client/NotifyException.kt (95%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/client/NotifyInterface.kt (98%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/client/NotifyProtocol.kt (93%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/client/cacao/CacaoSigner.kt (58%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/common/JsonRpcMethod.kt (94%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/common/NotifyServerUrl.kt (85%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/common/PeerError.kt (96%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/common/UtilFunctions.kt (94%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/common/model/CacaoPayloadWithIdentityPrivateKey.kt (82%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/common/model/CreateSubscription.kt (88%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/common/model/DeleteSubscription.kt (87%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/common/model/EngineMapper.kt (98%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/common/model/Error.kt (80%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/common/model/GetNotificationHistory.kt (89%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/common/model/Notification.kt (88%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/common/model/NotificationMessage.kt (79%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/common/model/NotificationType.kt (75%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/common/model/NotifyRpc.kt (97%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/common/model/RegisteredAccount.kt (89%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/common/model/Scope.kt (91%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/common/model/ServerNotification.kt (87%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/common/model/ServerSubscription.kt (91%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/common/model/Subscription.kt (95%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/common/model/SubscriptionChanged.kt (78%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/common/model/TimeoutInfo.kt (80%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/common/model/UpdateSubscription.kt (88%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/jwt/NotifyJwtBase.kt (97%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/jwt/delete/DeleteRequestJwtClaim.kt (89%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/jwt/delete/DeleteResponseJwtClaim.kt (84%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/jwt/delete/EncodeDeleteRequestJwtUseCase.kt (95%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/jwt/getNotifications/EncodeGetNotificationsRequestJwtUseCase.kt (95%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/jwt/getNotifications/GetNotificationsRequestJwtClaim.kt (89%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/jwt/getNotifications/GetNotificationsResponseJwtClaim.kt (83%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/jwt/message/EncodeMessageResponseJwtUseCase.kt (95%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/jwt/message/MessageRequestJwtClaim.kt (83%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/jwt/message/MessageResponseJwtClaim.kt (89%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/jwt/subscription/EncodeSubscriptionRequestJwtUseCase.kt (95%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/jwt/subscription/SubscriptionRequestJwtClaim.kt (89%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/jwt/subscription/SubscriptionResponseJwtClaim.kt (84%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/jwt/subscriptionsChanged/EncodeSubscriptionsChangedResponseJwtUseCase.kt (93%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/jwt/subscriptionsChanged/SubscriptionsChangedRequestJwtClaim.kt (82%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/jwt/subscriptionsChanged/SubscriptionsChangedResponseJwtClaim.kt (88%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/jwt/update/EncodeUpdateRequestJwtUseCase.kt (95%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/jwt/update/UpdateRequestJwtClaim.kt (89%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/jwt/update/UpdateResponseJwtClaim.kt (84%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/jwt/watchSubscriptions/EncodeWatchSubscriptionsRequestJwtUseCase.kt (94%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/jwt/watchSubscriptions/WatchSubscriptionsRequestJwtClaim.kt (88%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/jwt/watchSubscriptions/WatchSubscriptionsResponseJwtClaim.kt (83%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/storage/NotificationsRepository.kt (89%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/storage/RegisteredAccountsRepository.kt (92%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/storage/SubscriptionRepository.kt (95%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/wellknown/did/DidJsonDTO.kt (90%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/wellknown/did/PublicKeyJwkDTO.kt (84%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/data/wellknown/did/VerificationMethodDTO.kt (88%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/di/CallModule.kt (72%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/di/NotifyEngineModule.kt (76%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/di/NotifyJsonRpcModule.kt (90%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/di/NotifyStorageModule.kt (89%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/di/RequestModule.kt (85%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/di/ResponseModule.kt (79%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/NotifyEngine.kt (84%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/calls/DecryptNotifyMessageUseCase.kt (91%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/calls/DeleteSubscriptionUseCase.kt (85%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/calls/GetActiveSubscriptionsUseCase.kt (86%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/calls/GetAllActiveSubscriptionsUseCase.kt (82%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/calls/GetNotificationHistoryUseCase.kt (88%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/calls/GetNotificationTypesUseCase.kt (90%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/calls/IsRegisteredUseCase.kt (85%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/calls/PrepareRegistrationUseCase.kt (91%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/calls/RegisterUseCase.kt (91%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/calls/SubscribeToDappUseCase.kt (87%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/calls/UnregisterUseCase.kt (87%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/calls/UpdateSubscriptionUseCase.kt (86%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/domain/ExtractMetadataFromConfigUseCase.kt (92%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/domain/ExtractPublicKeysFromDidJsonUseCase.kt (91%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/domain/FetchDidJwtInteractor.kt (89%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/domain/FindRequestedSubscriptionUseCase.kt (90%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/domain/GenerateAppropriateUriUseCase.kt (86%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/domain/GetSelfKeyForWatchSubscriptionUseCase.kt (94%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/domain/SetActiveSubscriptionsUseCase.kt (91%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/domain/StopWatchingSubscriptionsUseCase.kt (88%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/domain/Utils.kt (85%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/domain/WatchSubscriptionsForEveryRegisteredAccountUseCase.kt (88%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/domain/WatchSubscriptionsUseCase.kt (92%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/requests/OnMessageUseCase.kt (90%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/requests/OnSubscriptionsChangedUseCase.kt (87%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/responses/OnDeleteResponseUseCase.kt (88%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/responses/OnGetNotificationsResponseUseCase.kt (86%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/responses/OnSubscribeResponseUseCase.kt (86%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/responses/OnUpdateResponseUseCase.kt (84%) rename protocol/notify/src/main/kotlin/com/{walletconnect => reown}/notify/engine/responses/OnWatchSubscriptionsResponseUseCase.kt (86%) rename protocol/notify/src/main/sqldelight/com/{walletconnect => reown}/notify/common/storage/data/dao/ActiveSubscriptions.sq (100%) rename protocol/notify/src/main/sqldelight/com/{walletconnect => reown}/notify/common/storage/data/dao/Notifications.sq (100%) rename protocol/notify/src/main/sqldelight/com/{walletconnect => reown}/notify/common/storage/data/dao/RegisteredAccounts.sq (100%) diff --git a/protocol/notify/build.gradle.kts b/protocol/notify/build.gradle.kts index ac98ab1e1..d9804e642 100644 --- a/protocol/notify/build.gradle.kts +++ b/protocol/notify/build.gradle.kts @@ -14,7 +14,7 @@ project.apply { } android { - namespace = "com.walletconnect.notify" + namespace = "com.reown.notify" compileSdk = COMPILE_SDK defaultConfig { @@ -74,7 +74,7 @@ android { sqldelight { databases { create("NotifyDatabase") { - packageName.set("com.walletconnect.notify") + packageName.set("com.reown.notify") schemaOutputDirectory.set(file("src/main/sqldelight/databases")) // generateAsync.set(true) TODO uncomment once all SDKs have this flag enabled verifyMigrations.set(true) diff --git a/protocol/notify/src/androidTest/AndroidManifest.xml b/protocol/notify/src/androidTest/AndroidManifest.xml index f2be8ec9e..ddbb8e4e1 100644 --- a/protocol/notify/src/androidTest/AndroidManifest.xml +++ b/protocol/notify/src/androidTest/AndroidManifest.xml @@ -7,7 +7,7 @@ diff --git a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/di/OverrideModule.kt b/protocol/notify/src/androidTest/kotlin/com/reown/notify/di/OverrideModule.kt similarity index 97% rename from protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/di/OverrideModule.kt rename to protocol/notify/src/androidTest/kotlin/com/reown/notify/di/OverrideModule.kt index 73a62b546..64549d500 100644 --- a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/di/OverrideModule.kt +++ b/protocol/notify/src/androidTest/kotlin/com/reown/notify/di/OverrideModule.kt @@ -1,4 +1,4 @@ -package com.walletconnect.notify.di +package com.reown.notify.di import com.reown.android.di.coreStorageModule import com.reown.android.internal.common.di.coreAndroidNetworkModule diff --git a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/activity/InstrumentedTestActivity.kt b/protocol/notify/src/androidTest/kotlin/com/reown/notify/test/activity/InstrumentedTestActivity.kt similarity index 81% rename from protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/activity/InstrumentedTestActivity.kt rename to protocol/notify/src/androidTest/kotlin/com/reown/notify/test/activity/InstrumentedTestActivity.kt index cd4af3754..16d6db5d8 100644 --- a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/activity/InstrumentedTestActivity.kt +++ b/protocol/notify/src/androidTest/kotlin/com/reown/notify/test/activity/InstrumentedTestActivity.kt @@ -1,4 +1,4 @@ -package com.walletconnect.notify.test.activity +package com.reown.notify.test.activity import android.app.Activity import android.os.Bundle diff --git a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/client/NotifyClientInstrumentedAndroidTest.kt b/protocol/notify/src/androidTest/kotlin/com/reown/notify/test/client/NotifyClientInstrumentedAndroidTest.kt similarity index 93% rename from protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/client/NotifyClientInstrumentedAndroidTest.kt rename to protocol/notify/src/androidTest/kotlin/com/reown/notify/test/client/NotifyClientInstrumentedAndroidTest.kt index a39ee70fe..68f871230 100644 --- a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/client/NotifyClientInstrumentedAndroidTest.kt +++ b/protocol/notify/src/androidTest/kotlin/com/reown/notify/test/client/NotifyClientInstrumentedAndroidTest.kt @@ -1,15 +1,15 @@ -package com.walletconnect.notify.test.client +package com.reown.notify.test.client import androidx.core.net.toUri -import com.walletconnect.notify.BuildConfig -import com.walletconnect.notify.client.Notify -import com.walletconnect.notify.client.NotifyInterface -import com.walletconnect.notify.test.scenario.ClientInstrumentedActivityScenario -import com.walletconnect.notify.test.utils.TestClient -import com.walletconnect.notify.test.utils.primary.PrimaryNotifyClient -import com.walletconnect.notify.test.utils.primary.PrimaryNotifyDelegate -import com.walletconnect.notify.test.utils.secondary.SecondaryNotifyClient -import com.walletconnect.notify.test.utils.secondary.SecondaryNotifyDelegate +import com.reown.notify.BuildConfig +import com.reown.notify.client.Notify +import com.reown.notify.client.NotifyInterface +import com.reown.notify.test.scenario.ClientInstrumentedActivityScenario +import com.reown.notify.test.utils.TestClient +import com.reown.notify.test.utils.primary.PrimaryNotifyClient +import com.reown.notify.test.utils.primary.PrimaryNotifyDelegate +import com.reown.notify.test.utils.secondary.SecondaryNotifyClient +import com.reown.notify.test.utils.secondary.SecondaryNotifyDelegate import kotlinx.coroutines.delay import kotlinx.coroutines.runBlocking import okhttp3.Headers diff --git a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/scenario/ActivityScenario.kt b/protocol/notify/src/androidTest/kotlin/com/reown/notify/test/scenario/ActivityScenario.kt similarity index 93% rename from protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/scenario/ActivityScenario.kt rename to protocol/notify/src/androidTest/kotlin/com/reown/notify/test/scenario/ActivityScenario.kt index 140b390ce..a76785a09 100644 --- a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/scenario/ActivityScenario.kt +++ b/protocol/notify/src/androidTest/kotlin/com/reown/notify/test/scenario/ActivityScenario.kt @@ -1,8 +1,8 @@ -package com.walletconnect.notify.test.scenario +package com.reown.notify.test.scenario import androidx.lifecycle.Lifecycle import androidx.test.core.app.ActivityScenario -import com.walletconnect.notify.test.activity.InstrumentedTestActivity +import com.reown.notify.test.activity.InstrumentedTestActivity import junit.framework.TestCase import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/scenario/ClientInstrumentedActivityScenario.kt b/protocol/notify/src/androidTest/kotlin/com/reown/notify/test/scenario/ClientInstrumentedActivityScenario.kt similarity index 96% rename from protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/scenario/ClientInstrumentedActivityScenario.kt rename to protocol/notify/src/androidTest/kotlin/com/reown/notify/test/scenario/ClientInstrumentedActivityScenario.kt index fcc47b2fd..4320bcd76 100644 --- a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/scenario/ClientInstrumentedActivityScenario.kt +++ b/protocol/notify/src/androidTest/kotlin/com/reown/notify/test/scenario/ClientInstrumentedActivityScenario.kt @@ -1,12 +1,12 @@ -package com.walletconnect.notify.test.scenario +package com.reown.notify.test.scenario import com.reown.android.Core import com.reown.android.internal.common.scope import com.reown.android.relay.WSSConnectionState import com.reown.foundation.network.model.Relay -import com.walletconnect.notify.client.Notify -import com.walletconnect.notify.test.BuildConfig -import com.walletconnect.notify.test.utils.TestClient +import com.reown.notify.client.Notify +import com.reown.notify.test.BuildConfig +import com.reown.notify.test.utils.TestClient import junit.framework.TestCase.fail import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/Common.kt b/protocol/notify/src/androidTest/kotlin/com/reown/notify/test/utils/Common.kt similarity index 82% rename from protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/Common.kt rename to protocol/notify/src/androidTest/kotlin/com/reown/notify/test/utils/Common.kt index 99d3204ba..d6c0a7747 100644 --- a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/Common.kt +++ b/protocol/notify/src/androidTest/kotlin/com/reown/notify/test/utils/Common.kt @@ -1,7 +1,7 @@ -package com.walletconnect.notify.test.utils +package com.reown.notify.test.utils import com.reown.android.Core -import com.walletconnect.notify.client.Notify +import com.reown.notify.client.Notify import junit.framework.TestCase.fail import timber.log.Timber diff --git a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/TestClient.kt b/protocol/notify/src/androidTest/kotlin/com/reown/notify/test/utils/TestClient.kt similarity index 95% rename from protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/TestClient.kt rename to protocol/notify/src/androidTest/kotlin/com/reown/notify/test/utils/TestClient.kt index 6c1878c6e..2f1102d77 100644 --- a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/TestClient.kt +++ b/protocol/notify/src/androidTest/kotlin/com/reown/notify/test/utils/TestClient.kt @@ -1,4 +1,4 @@ -package com.walletconnect.notify.test.utils +package com.reown.notify.test.utils import android.app.Application import androidx.test.core.app.ApplicationProvider @@ -10,12 +10,12 @@ import com.reown.android.relay.ConnectionType import com.reown.android.relay.RelayClient import com.reown.android.utils.cacao.sign import com.reown.foundation.common.model.PrivateKey -import com.walletconnect.notify.client.Notify -import com.walletconnect.notify.client.NotifyClient -import com.walletconnect.notify.client.NotifyProtocol -import com.walletconnect.notify.client.cacao.CacaoSigner -import com.walletconnect.notify.di.overrideModule -import com.walletconnect.notify.test.BuildConfig +import com.reown.notify.client.Notify +import com.reown.notify.client.NotifyClient +import com.reown.notify.client.NotifyProtocol +import com.reown.notify.client.cacao.CacaoSigner +import com.reown.notify.di.overrideModule +import com.reown.notify.test.BuildConfig import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import org.koin.core.KoinApplication diff --git a/protocol/notify/src/androidTest/kotlin/com/reown/notify/test/utils/primary/PrimaryNotifyClient.kt b/protocol/notify/src/androidTest/kotlin/com/reown/notify/test/utils/primary/PrimaryNotifyClient.kt new file mode 100644 index 000000000..10eaafe2d --- /dev/null +++ b/protocol/notify/src/androidTest/kotlin/com/reown/notify/test/utils/primary/PrimaryNotifyClient.kt @@ -0,0 +1,5 @@ +package com.reown.notify.test.utils.primary + +import com.reown.notify.test.utils.TestClient + +val PrimaryNotifyClient = TestClient.Primary.notifyClient diff --git a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/primary/PrimaryNotifyDelegate.kt b/protocol/notify/src/androidTest/kotlin/com/reown/notify/test/utils/primary/PrimaryNotifyDelegate.kt similarity index 62% rename from protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/primary/PrimaryNotifyDelegate.kt rename to protocol/notify/src/androidTest/kotlin/com/reown/notify/test/utils/primary/PrimaryNotifyDelegate.kt index b8fe40d30..f8e6f085a 100644 --- a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/primary/PrimaryNotifyDelegate.kt +++ b/protocol/notify/src/androidTest/kotlin/com/reown/notify/test/utils/primary/PrimaryNotifyDelegate.kt @@ -1,8 +1,8 @@ -package com.walletconnect.notify.test.utils.primary +package com.reown.notify.test.utils.primary -import com.walletconnect.notify.client.Notify -import com.walletconnect.notify.client.NotifyInterface -import com.walletconnect.notify.test.utils.globalOnError +import com.reown.notify.client.Notify +import com.reown.notify.client.NotifyInterface +import com.reown.notify.test.utils.globalOnError open class PrimaryNotifyDelegate : NotifyInterface.Delegate { diff --git a/protocol/notify/src/androidTest/kotlin/com/reown/notify/test/utils/secondary/SecondaryNotifyClient.kt b/protocol/notify/src/androidTest/kotlin/com/reown/notify/test/utils/secondary/SecondaryNotifyClient.kt new file mode 100644 index 000000000..18d380c06 --- /dev/null +++ b/protocol/notify/src/androidTest/kotlin/com/reown/notify/test/utils/secondary/SecondaryNotifyClient.kt @@ -0,0 +1,5 @@ +package com.reown.notify.test.utils.secondary + +import com.reown.notify.test.utils.TestClient + +val SecondaryNotifyClient = TestClient.Secondary.notifyClient \ No newline at end of file diff --git a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/secondary/SecondaryNotifyDelegate.kt b/protocol/notify/src/androidTest/kotlin/com/reown/notify/test/utils/secondary/SecondaryNotifyDelegate.kt similarity index 62% rename from protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/secondary/SecondaryNotifyDelegate.kt rename to protocol/notify/src/androidTest/kotlin/com/reown/notify/test/utils/secondary/SecondaryNotifyDelegate.kt index e7faaa829..691abc9aa 100644 --- a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/secondary/SecondaryNotifyDelegate.kt +++ b/protocol/notify/src/androidTest/kotlin/com/reown/notify/test/utils/secondary/SecondaryNotifyDelegate.kt @@ -1,8 +1,8 @@ -package com.walletconnect.notify.test.utils.secondary +package com.reown.notify.test.utils.secondary -import com.walletconnect.notify.client.Notify -import com.walletconnect.notify.client.NotifyInterface -import com.walletconnect.notify.test.utils.globalOnError +import com.reown.notify.client.Notify +import com.reown.notify.client.NotifyInterface +import com.reown.notify.test.utils.globalOnError open class SecondaryNotifyDelegate : NotifyInterface.Delegate { diff --git a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/primary/PrimaryNotifyClient.kt b/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/primary/PrimaryNotifyClient.kt deleted file mode 100644 index 1b3b0f024..000000000 --- a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/primary/PrimaryNotifyClient.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.walletconnect.notify.test.utils.primary - -import com.walletconnect.notify.test.utils.TestClient - -val PrimaryNotifyClient = TestClient.Primary.notifyClient diff --git a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/secondary/SecondaryNotifyClient.kt b/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/secondary/SecondaryNotifyClient.kt deleted file mode 100644 index 882bc59ea..000000000 --- a/protocol/notify/src/androidTest/kotlin/com/walletconnect/notify/test/utils/secondary/SecondaryNotifyClient.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.walletconnect.notify.test.utils.secondary - -import com.walletconnect.notify.test.utils.TestClient - -val SecondaryNotifyClient = TestClient.Secondary.notifyClient \ No newline at end of file diff --git a/protocol/notify/src/main/AndroidManifest.xml b/protocol/notify/src/main/AndroidManifest.xml index 860f25157..eac37efdd 100644 --- a/protocol/notify/src/main/AndroidManifest.xml +++ b/protocol/notify/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.reown.notify"> \ No newline at end of file diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/Notify.kt b/protocol/notify/src/main/kotlin/com/reown/notify/client/Notify.kt similarity index 99% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/client/Notify.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/client/Notify.kt index 4c4419ac1..d26905de2 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/Notify.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/client/Notify.kt @@ -1,4 +1,4 @@ -package com.walletconnect.notify.client +package com.reown.notify.client import android.net.Uri import androidx.annotation.Keep diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/NotifyClient.kt b/protocol/notify/src/main/kotlin/com/reown/notify/client/NotifyClient.kt similarity index 74% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/client/NotifyClient.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/client/NotifyClient.kt index 9736a7be4..3f31e37e6 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/NotifyClient.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/client/NotifyClient.kt @@ -1,4 +1,4 @@ -package com.walletconnect.notify.client +package com.reown.notify.client object NotifyClient: NotifyInterface by NotifyProtocol.instance { interface Delegate: NotifyInterface.Delegate diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/NotifyException.kt b/protocol/notify/src/main/kotlin/com/reown/notify/client/NotifyException.kt similarity index 95% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/client/NotifyException.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/client/NotifyException.kt index 1af95649a..59e0e1d24 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/NotifyException.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/client/NotifyException.kt @@ -1,4 +1,4 @@ -package com.walletconnect.notify.client +package com.reown.notify.client import com.reown.android.internal.common.exception.WalletConnectException diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/NotifyInterface.kt b/protocol/notify/src/main/kotlin/com/reown/notify/client/NotifyInterface.kt similarity index 98% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/client/NotifyInterface.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/client/NotifyInterface.kt index 9645f096e..d571d6e33 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/NotifyInterface.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/client/NotifyInterface.kt @@ -1,4 +1,4 @@ -package com.walletconnect.notify.client +package com.reown.notify.client interface NotifyInterface { interface Delegate { diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/NotifyProtocol.kt b/protocol/notify/src/main/kotlin/com/reown/notify/client/NotifyProtocol.kt similarity index 93% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/client/NotifyProtocol.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/client/NotifyProtocol.kt index 667b64f84..3f2de9a1d 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/NotifyProtocol.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/client/NotifyProtocol.kt @@ -1,18 +1,18 @@ -package com.walletconnect.notify.client +package com.reown.notify.client import com.reown.android.Core import com.reown.android.internal.common.di.DatabaseConfig import com.reown.android.internal.common.model.SDKError import com.reown.android.internal.common.scope import com.reown.android.internal.common.wcKoinApp -import com.walletconnect.notify.common.model.Notification -import com.walletconnect.notify.common.model.SubscriptionChanged -import com.walletconnect.notify.common.model.toClient -import com.walletconnect.notify.common.model.toCommon -import com.walletconnect.notify.di.engineModule -import com.walletconnect.notify.di.notifyJsonRpcModule -import com.walletconnect.notify.di.notifyStorageModule -import com.walletconnect.notify.engine.NotifyEngine +import com.reown.notify.common.model.Notification +import com.reown.notify.common.model.SubscriptionChanged +import com.reown.notify.common.model.toClient +import com.reown.notify.common.model.toCommon +import com.reown.notify.di.engineModule +import com.reown.notify.di.notifyJsonRpcModule +import com.reown.notify.di.notifyStorageModule +import com.reown.notify.engine.NotifyEngine import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/cacao/CacaoSigner.kt b/protocol/notify/src/main/kotlin/com/reown/notify/client/cacao/CacaoSigner.kt similarity index 58% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/client/cacao/CacaoSigner.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/client/cacao/CacaoSigner.kt index 8944dec48..dcf89f4bd 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/client/cacao/CacaoSigner.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/client/cacao/CacaoSigner.kt @@ -1,6 +1,6 @@ -package com.walletconnect.notify.client.cacao +package com.reown.notify.client.cacao import com.reown.android.utils.cacao.CacaoSignerInterface -import com.walletconnect.notify.client.Notify +import com.reown.notify.client.Notify object CacaoSigner : CacaoSignerInterface \ No newline at end of file diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/JsonRpcMethod.kt b/protocol/notify/src/main/kotlin/com/reown/notify/common/JsonRpcMethod.kt similarity index 94% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/common/JsonRpcMethod.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/common/JsonRpcMethod.kt index 54e009fa1..8f6dc2c4a 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/JsonRpcMethod.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/common/JsonRpcMethod.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.common +package com.reown.notify.common internal object JsonRpcMethod { diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/NotifyServerUrl.kt b/protocol/notify/src/main/kotlin/com/reown/notify/common/NotifyServerUrl.kt similarity index 85% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/common/NotifyServerUrl.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/common/NotifyServerUrl.kt index 0f500ade2..8e38d50d0 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/NotifyServerUrl.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/common/NotifyServerUrl.kt @@ -1,4 +1,4 @@ -package com.walletconnect.notify.common +package com.reown.notify.common import androidx.core.net.toUri diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/PeerError.kt b/protocol/notify/src/main/kotlin/com/reown/notify/common/PeerError.kt similarity index 96% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/common/PeerError.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/common/PeerError.kt index 94e08c6b4..7d13b457d 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/PeerError.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/common/PeerError.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.common +package com.reown.notify.common import com.reown.android.internal.common.model.type.Error diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/UtilFunctions.kt b/protocol/notify/src/main/kotlin/com/reown/notify/common/UtilFunctions.kt similarity index 94% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/common/UtilFunctions.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/common/UtilFunctions.kt index 92351027a..5765fad03 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/UtilFunctions.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/common/UtilFunctions.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.common +package com.reown.notify.common import com.reown.android.internal.common.model.Expiry import com.reown.android.internal.utils.monthInSeconds diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/CacaoPayloadWithIdentityPrivateKey.kt b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/CacaoPayloadWithIdentityPrivateKey.kt similarity index 82% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/CacaoPayloadWithIdentityPrivateKey.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/common/model/CacaoPayloadWithIdentityPrivateKey.kt index d16b3ee91..86d8fb607 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/CacaoPayloadWithIdentityPrivateKey.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/CacaoPayloadWithIdentityPrivateKey.kt @@ -1,4 +1,4 @@ -package com.walletconnect.notify.common.model +package com.reown.notify.common.model import com.reown.android.internal.common.signing.cacao.Cacao import com.reown.foundation.common.model.PrivateKey diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/CreateSubscription.kt b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/CreateSubscription.kt similarity index 88% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/CreateSubscription.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/common/model/CreateSubscription.kt index d53f0224d..17fdc83b8 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/CreateSubscription.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/CreateSubscription.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.common.model +package com.reown.notify.common.model import com.reown.android.internal.common.model.type.EngineEvent diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/DeleteSubscription.kt b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/DeleteSubscription.kt similarity index 87% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/DeleteSubscription.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/common/model/DeleteSubscription.kt index ebfd382c7..1f88879ca 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/DeleteSubscription.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/DeleteSubscription.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.common.model +package com.reown.notify.common.model import com.reown.android.internal.common.model.type.EngineEvent diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/EngineMapper.kt b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/EngineMapper.kt similarity index 98% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/EngineMapper.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/common/model/EngineMapper.kt index e6c64c8a5..a33a872ae 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/EngineMapper.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/EngineMapper.kt @@ -1,13 +1,13 @@ @file:JvmSynthetic -package com.walletconnect.notify.common.model +package com.reown.notify.common.model import com.reown.android.Core import com.reown.android.internal.common.model.RelayProtocolOptions import com.reown.android.internal.common.model.SDKError import com.reown.android.internal.common.signing.cacao.Cacao import com.reown.android.utils.toClient -import com.walletconnect.notify.client.Notify +import com.reown.notify.client.Notify @JvmSynthetic internal fun Core.Model.Message.Notify.toClient(topic: String): Notify.Model.Notification.Decrypted { diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Error.kt b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/Error.kt similarity index 80% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Error.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/common/model/Error.kt index 3930eb383..12f025908 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Error.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/Error.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.common.model +package com.reown.notify.common.model import com.reown.android.internal.common.model.type.EngineEvent diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/GetNotificationHistory.kt b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/GetNotificationHistory.kt similarity index 89% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/GetNotificationHistory.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/common/model/GetNotificationHistory.kt index f1b1cc7fa..9c932b98e 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/GetNotificationHistory.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/GetNotificationHistory.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.common.model +package com.reown.notify.common.model import com.reown.android.internal.common.model.type.EngineEvent diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Notification.kt b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/Notification.kt similarity index 88% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Notification.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/common/model/Notification.kt index 7415c0ec1..8a81a29f5 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Notification.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/Notification.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.common.model +package com.reown.notify.common.model import com.reown.android.internal.common.model.AppMetaData import com.reown.android.internal.common.model.type.EngineEvent diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/NotificationMessage.kt b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/NotificationMessage.kt similarity index 79% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/NotificationMessage.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/common/model/NotificationMessage.kt index be2b52a7a..a93b9a249 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/NotificationMessage.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/NotificationMessage.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.common.model +package com.reown.notify.common.model internal data class NotificationMessage( val title: String, diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/NotificationType.kt b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/NotificationType.kt similarity index 75% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/NotificationType.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/common/model/NotificationType.kt index 3be6677f3..0bc637e46 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/NotificationType.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/NotificationType.kt @@ -1,3 +1,3 @@ -package com.walletconnect.notify.common.model +package com.reown.notify.common.model internal data class NotificationType(val id: String, val name: String, val description: String, val isEnabled: Boolean, val iconUrl: String?) \ No newline at end of file diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/NotifyRpc.kt b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/NotifyRpc.kt similarity index 97% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/NotifyRpc.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/common/model/NotifyRpc.kt index 8a85098ab..8ae8c1071 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/NotifyRpc.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/NotifyRpc.kt @@ -1,12 +1,12 @@ @file:JvmSynthetic -package com.walletconnect.notify.common.model +package com.reown.notify.common.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass import com.reown.android.internal.common.model.params.CoreNotifyParams import com.reown.android.internal.common.model.type.JsonRpcClientSync -import com.walletconnect.notify.common.JsonRpcMethod +import com.reown.notify.common.JsonRpcMethod import com.walletconnect.util.generateId internal sealed class NotifyRpc : JsonRpcClientSync { diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/RegisteredAccount.kt b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/RegisteredAccount.kt similarity index 89% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/RegisteredAccount.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/common/model/RegisteredAccount.kt index cda82a9f2..c312c2b11 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/RegisteredAccount.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/RegisteredAccount.kt @@ -1,4 +1,4 @@ -package com.walletconnect.notify.common.model +package com.reown.notify.common.model import com.reown.android.internal.common.model.AccountId import com.reown.foundation.common.model.PublicKey diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Scope.kt b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/Scope.kt similarity index 91% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Scope.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/common/model/Scope.kt index c8e94bf3d..ae63a210b 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Scope.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/Scope.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.common.model +package com.reown.notify.common.model internal sealed class Scope { abstract val id: String diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/ServerNotification.kt b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/ServerNotification.kt similarity index 87% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/ServerNotification.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/common/model/ServerNotification.kt index 7a0fabeed..0573e8f67 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/ServerNotification.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/ServerNotification.kt @@ -1,4 +1,4 @@ -package com.walletconnect.notify.common.model +package com.reown.notify.common.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/ServerSubscription.kt b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/ServerSubscription.kt similarity index 91% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/ServerSubscription.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/common/model/ServerSubscription.kt index 24a7f6232..378ee2554 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/ServerSubscription.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/ServerSubscription.kt @@ -1,4 +1,4 @@ -package com.walletconnect.notify.common.model +package com.reown.notify.common.model import com.squareup.moshi.JsonClass diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Subscription.kt b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/Subscription.kt similarity index 95% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Subscription.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/common/model/Subscription.kt index 2a7054785..55608e776 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/Subscription.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/Subscription.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.common.model +package com.reown.notify.common.model import com.reown.android.internal.common.model.AccountId import com.reown.android.internal.common.model.AppMetaData diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/SubscriptionChanged.kt b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/SubscriptionChanged.kt similarity index 78% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/SubscriptionChanged.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/common/model/SubscriptionChanged.kt index b59a2ad56..4de92cea9 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/SubscriptionChanged.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/SubscriptionChanged.kt @@ -1,4 +1,4 @@ -package com.walletconnect.notify.common.model +package com.reown.notify.common.model import com.reown.android.internal.common.model.type.EngineEvent diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/TimeoutInfo.kt b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/TimeoutInfo.kt similarity index 80% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/TimeoutInfo.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/common/model/TimeoutInfo.kt index b0e438983..757c5bb33 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/TimeoutInfo.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/TimeoutInfo.kt @@ -1,4 +1,4 @@ -package com.walletconnect.notify.common.model +package com.reown.notify.common.model import com.reown.foundation.common.model.Topic diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/UpdateSubscription.kt b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/UpdateSubscription.kt similarity index 88% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/UpdateSubscription.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/common/model/UpdateSubscription.kt index d11d785f7..16fcdb83b 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/common/model/UpdateSubscription.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/UpdateSubscription.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.common.model +package com.reown.notify.common.model import com.reown.android.internal.common.model.type.EngineEvent diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/NotifyJwtBase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/NotifyJwtBase.kt similarity index 97% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/NotifyJwtBase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/NotifyJwtBase.kt index b15a489e5..5312dd410 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/NotifyJwtBase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/NotifyJwtBase.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.data.jwt +package com.reown.notify.data.jwt import com.reown.foundation.util.jwt.JwtClaims import java.util.concurrent.TimeUnit diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/delete/DeleteRequestJwtClaim.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/delete/DeleteRequestJwtClaim.kt similarity index 89% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/delete/DeleteRequestJwtClaim.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/delete/DeleteRequestJwtClaim.kt index 47629d83b..1f5c0fe2e 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/delete/DeleteRequestJwtClaim.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/delete/DeleteRequestJwtClaim.kt @@ -1,10 +1,10 @@ @file:JvmSynthetic -package com.walletconnect.notify.data.jwt.delete +package com.reown.notify.data.jwt.delete import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.notify.data.jwt.NotifyJwtBase +import com.reown.notify.data.jwt.NotifyJwtBase @JsonClass(generateAdapter = true) internal data class DeleteRequestJwtClaim( diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/delete/DeleteResponseJwtClaim.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/delete/DeleteResponseJwtClaim.kt similarity index 84% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/delete/DeleteResponseJwtClaim.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/delete/DeleteResponseJwtClaim.kt index fc8ade40a..cea33368e 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/delete/DeleteResponseJwtClaim.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/delete/DeleteResponseJwtClaim.kt @@ -1,11 +1,11 @@ @file:JvmSynthetic -package com.walletconnect.notify.data.jwt.delete +package com.reown.notify.data.jwt.delete import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.notify.common.model.ServerSubscription -import com.walletconnect.notify.data.jwt.NotifyJwtBase +import com.reown.notify.common.model.ServerSubscription +import com.reown.notify.data.jwt.NotifyJwtBase @JsonClass(generateAdapter = true) internal data class DeleteResponseJwtClaim( diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/delete/EncodeDeleteRequestJwtUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/delete/EncodeDeleteRequestJwtUseCase.kt similarity index 95% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/delete/EncodeDeleteRequestJwtUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/delete/EncodeDeleteRequestJwtUseCase.kt index 22641b3e7..c87ae58e7 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/delete/EncodeDeleteRequestJwtUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/delete/EncodeDeleteRequestJwtUseCase.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.data.jwt.delete +package com.reown.notify.data.jwt.delete import com.reown.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase import com.reown.android.internal.common.model.AccountId diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/getNotifications/EncodeGetNotificationsRequestJwtUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/getNotifications/EncodeGetNotificationsRequestJwtUseCase.kt similarity index 95% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/getNotifications/EncodeGetNotificationsRequestJwtUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/getNotifications/EncodeGetNotificationsRequestJwtUseCase.kt index 3fb3e5500..094975598 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/getNotifications/EncodeGetNotificationsRequestJwtUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/getNotifications/EncodeGetNotificationsRequestJwtUseCase.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.data.jwt.getNotifications +package com.reown.notify.data.jwt.getNotifications import com.reown.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase import com.reown.android.internal.common.model.AccountId diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/getNotifications/GetNotificationsRequestJwtClaim.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/getNotifications/GetNotificationsRequestJwtClaim.kt similarity index 89% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/getNotifications/GetNotificationsRequestJwtClaim.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/getNotifications/GetNotificationsRequestJwtClaim.kt index 659d533b7..0b0bcde32 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/getNotifications/GetNotificationsRequestJwtClaim.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/getNotifications/GetNotificationsRequestJwtClaim.kt @@ -1,8 +1,8 @@ -package com.walletconnect.notify.data.jwt.getNotifications +package com.reown.notify.data.jwt.getNotifications import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.notify.data.jwt.NotifyJwtBase +import com.reown.notify.data.jwt.NotifyJwtBase @JsonClass(generateAdapter = true) diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/getNotifications/GetNotificationsResponseJwtClaim.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/getNotifications/GetNotificationsResponseJwtClaim.kt similarity index 83% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/getNotifications/GetNotificationsResponseJwtClaim.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/getNotifications/GetNotificationsResponseJwtClaim.kt index cdc137e84..863d47aeb 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/getNotifications/GetNotificationsResponseJwtClaim.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/getNotifications/GetNotificationsResponseJwtClaim.kt @@ -1,9 +1,9 @@ -package com.walletconnect.notify.data.jwt.getNotifications +package com.reown.notify.data.jwt.getNotifications import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.notify.common.model.ServerNotification -import com.walletconnect.notify.data.jwt.NotifyJwtBase +import com.reown.notify.common.model.ServerNotification +import com.reown.notify.data.jwt.NotifyJwtBase @JsonClass(generateAdapter = true) internal data class GetNotificationsResponseJwtClaim( diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/message/EncodeMessageResponseJwtUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/message/EncodeMessageResponseJwtUseCase.kt similarity index 95% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/message/EncodeMessageResponseJwtUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/message/EncodeMessageResponseJwtUseCase.kt index d460b4847..ff354779c 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/message/EncodeMessageResponseJwtUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/message/EncodeMessageResponseJwtUseCase.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.data.jwt.message +package com.reown.notify.data.jwt.message import com.reown.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase import com.reown.android.internal.common.model.AccountId diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/message/MessageRequestJwtClaim.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/message/MessageRequestJwtClaim.kt similarity index 83% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/message/MessageRequestJwtClaim.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/message/MessageRequestJwtClaim.kt index a0faeb079..db4f0a346 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/message/MessageRequestJwtClaim.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/message/MessageRequestJwtClaim.kt @@ -1,11 +1,11 @@ @file:JvmSynthetic -package com.walletconnect.notify.data.jwt.message +package com.reown.notify.data.jwt.message import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.notify.common.model.ServerNotification -import com.walletconnect.notify.data.jwt.NotifyJwtBase +import com.reown.notify.common.model.ServerNotification +import com.reown.notify.data.jwt.NotifyJwtBase @JsonClass(generateAdapter = true) internal data class MessageRequestJwtClaim( diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/message/MessageResponseJwtClaim.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/message/MessageResponseJwtClaim.kt similarity index 89% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/message/MessageResponseJwtClaim.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/message/MessageResponseJwtClaim.kt index 9ed5f8849..19ed2c906 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/message/MessageResponseJwtClaim.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/message/MessageResponseJwtClaim.kt @@ -1,10 +1,10 @@ @file:JvmSynthetic -package com.walletconnect.notify.data.jwt.message +package com.reown.notify.data.jwt.message import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.notify.data.jwt.NotifyJwtBase +import com.reown.notify.data.jwt.NotifyJwtBase @JsonClass(generateAdapter = true) internal data class MessageResponseJwtClaim( diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscription/EncodeSubscriptionRequestJwtUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/subscription/EncodeSubscriptionRequestJwtUseCase.kt similarity index 95% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscription/EncodeSubscriptionRequestJwtUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/subscription/EncodeSubscriptionRequestJwtUseCase.kt index f9742aadc..dbfde2f0b 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscription/EncodeSubscriptionRequestJwtUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/subscription/EncodeSubscriptionRequestJwtUseCase.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.data.jwt.subscription +package com.reown.notify.data.jwt.subscription import com.reown.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase import com.reown.android.internal.common.model.AccountId diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscription/SubscriptionRequestJwtClaim.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/subscription/SubscriptionRequestJwtClaim.kt similarity index 89% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscription/SubscriptionRequestJwtClaim.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/subscription/SubscriptionRequestJwtClaim.kt index bb789716b..042b736f7 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscription/SubscriptionRequestJwtClaim.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/subscription/SubscriptionRequestJwtClaim.kt @@ -1,10 +1,10 @@ @file:JvmSynthetic -package com.walletconnect.notify.data.jwt.subscription +package com.reown.notify.data.jwt.subscription import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.notify.data.jwt.NotifyJwtBase +import com.reown.notify.data.jwt.NotifyJwtBase @JsonClass(generateAdapter = true) internal data class SubscriptionRequestJwtClaim( diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscription/SubscriptionResponseJwtClaim.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/subscription/SubscriptionResponseJwtClaim.kt similarity index 84% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscription/SubscriptionResponseJwtClaim.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/subscription/SubscriptionResponseJwtClaim.kt index ddb038fe9..66f827174 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscription/SubscriptionResponseJwtClaim.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/subscription/SubscriptionResponseJwtClaim.kt @@ -1,11 +1,11 @@ @file:JvmSynthetic -package com.walletconnect.notify.data.jwt.subscription +package com.reown.notify.data.jwt.subscription import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.notify.common.model.ServerSubscription -import com.walletconnect.notify.data.jwt.NotifyJwtBase +import com.reown.notify.common.model.ServerSubscription +import com.reown.notify.data.jwt.NotifyJwtBase @JsonClass(generateAdapter = true) internal data class SubscriptionResponseJwtClaim( diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscriptionsChanged/EncodeSubscriptionsChangedResponseJwtUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/subscriptionsChanged/EncodeSubscriptionsChangedResponseJwtUseCase.kt similarity index 93% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscriptionsChanged/EncodeSubscriptionsChangedResponseJwtUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/subscriptionsChanged/EncodeSubscriptionsChangedResponseJwtUseCase.kt index 5b0c55a1b..8974548f0 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscriptionsChanged/EncodeSubscriptionsChangedResponseJwtUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/subscriptionsChanged/EncodeSubscriptionsChangedResponseJwtUseCase.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.data.jwt.subscriptionsChanged +package com.reown.notify.data.jwt.subscriptionsChanged import com.reown.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase import com.reown.android.internal.common.model.AccountId diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscriptionsChanged/SubscriptionsChangedRequestJwtClaim.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/subscriptionsChanged/SubscriptionsChangedRequestJwtClaim.kt similarity index 82% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscriptionsChanged/SubscriptionsChangedRequestJwtClaim.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/subscriptionsChanged/SubscriptionsChangedRequestJwtClaim.kt index d702e1f52..8ded7a8fb 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscriptionsChanged/SubscriptionsChangedRequestJwtClaim.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/subscriptionsChanged/SubscriptionsChangedRequestJwtClaim.kt @@ -1,11 +1,11 @@ @file:JvmSynthetic -package com.walletconnect.notify.data.jwt.subscriptionsChanged +package com.reown.notify.data.jwt.subscriptionsChanged import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.notify.common.model.ServerSubscription -import com.walletconnect.notify.data.jwt.NotifyJwtBase +import com.reown.notify.common.model.ServerSubscription +import com.reown.notify.data.jwt.NotifyJwtBase @JsonClass(generateAdapter = true) internal data class SubscriptionsChangedRequestJwtClaim( diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscriptionsChanged/SubscriptionsChangedResponseJwtClaim.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/subscriptionsChanged/SubscriptionsChangedResponseJwtClaim.kt similarity index 88% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscriptionsChanged/SubscriptionsChangedResponseJwtClaim.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/subscriptionsChanged/SubscriptionsChangedResponseJwtClaim.kt index dbdc1bb32..e11e29678 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/subscriptionsChanged/SubscriptionsChangedResponseJwtClaim.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/subscriptionsChanged/SubscriptionsChangedResponseJwtClaim.kt @@ -1,10 +1,10 @@ @file:JvmSynthetic -package com.walletconnect.notify.data.jwt.subscriptionsChanged +package com.reown.notify.data.jwt.subscriptionsChanged import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.notify.data.jwt.NotifyJwtBase +import com.reown.notify.data.jwt.NotifyJwtBase @JsonClass(generateAdapter = true) internal data class SubscriptionsChangedResponseJwtClaim( diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/update/EncodeUpdateRequestJwtUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/update/EncodeUpdateRequestJwtUseCase.kt similarity index 95% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/update/EncodeUpdateRequestJwtUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/update/EncodeUpdateRequestJwtUseCase.kt index 3a49103f5..fe8a698a4 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/update/EncodeUpdateRequestJwtUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/update/EncodeUpdateRequestJwtUseCase.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.data.jwt.update +package com.reown.notify.data.jwt.update import com.reown.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase import com.reown.android.internal.common.model.AccountId diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/update/UpdateRequestJwtClaim.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/update/UpdateRequestJwtClaim.kt similarity index 89% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/update/UpdateRequestJwtClaim.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/update/UpdateRequestJwtClaim.kt index 26bb239a7..d172dc1c7 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/update/UpdateRequestJwtClaim.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/update/UpdateRequestJwtClaim.kt @@ -1,10 +1,10 @@ @file:JvmSynthetic -package com.walletconnect.notify.data.jwt.update +package com.reown.notify.data.jwt.update import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.notify.data.jwt.NotifyJwtBase +import com.reown.notify.data.jwt.NotifyJwtBase @JsonClass(generateAdapter = true) internal data class UpdateRequestJwtClaim( diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/update/UpdateResponseJwtClaim.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/update/UpdateResponseJwtClaim.kt similarity index 84% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/update/UpdateResponseJwtClaim.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/update/UpdateResponseJwtClaim.kt index ac9c05463..543e1f273 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/update/UpdateResponseJwtClaim.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/update/UpdateResponseJwtClaim.kt @@ -1,11 +1,11 @@ @file:JvmSynthetic -package com.walletconnect.notify.data.jwt.update +package com.reown.notify.data.jwt.update import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.notify.common.model.ServerSubscription -import com.walletconnect.notify.data.jwt.NotifyJwtBase +import com.reown.notify.common.model.ServerSubscription +import com.reown.notify.data.jwt.NotifyJwtBase @JsonClass(generateAdapter = true) internal data class UpdateResponseJwtClaim( diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/watchSubscriptions/EncodeWatchSubscriptionsRequestJwtUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/watchSubscriptions/EncodeWatchSubscriptionsRequestJwtUseCase.kt similarity index 94% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/watchSubscriptions/EncodeWatchSubscriptionsRequestJwtUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/watchSubscriptions/EncodeWatchSubscriptionsRequestJwtUseCase.kt index b0f2c1bc8..f1fbfd338 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/watchSubscriptions/EncodeWatchSubscriptionsRequestJwtUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/watchSubscriptions/EncodeWatchSubscriptionsRequestJwtUseCase.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.data.jwt.watchSubscriptions +package com.reown.notify.data.jwt.watchSubscriptions import com.reown.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase import com.reown.android.internal.common.model.AccountId diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/watchSubscriptions/WatchSubscriptionsRequestJwtClaim.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/watchSubscriptions/WatchSubscriptionsRequestJwtClaim.kt similarity index 88% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/watchSubscriptions/WatchSubscriptionsRequestJwtClaim.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/watchSubscriptions/WatchSubscriptionsRequestJwtClaim.kt index 1ae540b55..88d614065 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/watchSubscriptions/WatchSubscriptionsRequestJwtClaim.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/watchSubscriptions/WatchSubscriptionsRequestJwtClaim.kt @@ -1,10 +1,10 @@ @file:JvmSynthetic -package com.walletconnect.notify.data.jwt.watchSubscriptions +package com.reown.notify.data.jwt.watchSubscriptions import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.notify.data.jwt.NotifyJwtBase +import com.reown.notify.data.jwt.NotifyJwtBase @JsonClass(generateAdapter = true) internal data class WatchSubscriptionsRequestJwtClaim( diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/watchSubscriptions/WatchSubscriptionsResponseJwtClaim.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/watchSubscriptions/WatchSubscriptionsResponseJwtClaim.kt similarity index 83% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/watchSubscriptions/WatchSubscriptionsResponseJwtClaim.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/watchSubscriptions/WatchSubscriptionsResponseJwtClaim.kt index b087d2e64..f0879e9d2 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/jwt/watchSubscriptions/WatchSubscriptionsResponseJwtClaim.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/jwt/watchSubscriptions/WatchSubscriptionsResponseJwtClaim.kt @@ -1,11 +1,11 @@ @file:JvmSynthetic -package com.walletconnect.notify.data.jwt.watchSubscriptions +package com.reown.notify.data.jwt.watchSubscriptions import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.notify.common.model.ServerSubscription -import com.walletconnect.notify.data.jwt.NotifyJwtBase +import com.reown.notify.common.model.ServerSubscription +import com.reown.notify.data.jwt.NotifyJwtBase @JsonClass(generateAdapter = true) internal data class WatchSubscriptionsResponseJwtClaim( diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/storage/NotificationsRepository.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/storage/NotificationsRepository.kt similarity index 89% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/storage/NotificationsRepository.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/storage/NotificationsRepository.kt index 6abe012be..5409e8c5f 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/storage/NotificationsRepository.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/storage/NotificationsRepository.kt @@ -1,10 +1,10 @@ @file:JvmSynthetic -package com.walletconnect.notify.data.storage +package com.reown.notify.data.storage -import com.walletconnect.notify.common.model.Notification -import com.walletconnect.notify.common.model.NotificationMessage -import com.walletconnect.notify.common.storage.data.dao.NotificationsQueries +import com.reown.notify.common.model.Notification +import com.reown.notify.common.model.NotificationMessage +import com.reown.notify.common.storage.data.dao.NotificationsQueries import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/storage/RegisteredAccountsRepository.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/storage/RegisteredAccountsRepository.kt similarity index 92% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/storage/RegisteredAccountsRepository.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/storage/RegisteredAccountsRepository.kt index 98d9a535d..c2ae6b2cf 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/storage/RegisteredAccountsRepository.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/storage/RegisteredAccountsRepository.kt @@ -1,12 +1,12 @@ @file:JvmSynthetic -package com.walletconnect.notify.data.storage +package com.reown.notify.data.storage import com.reown.android.internal.common.model.AccountId import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic -import com.walletconnect.notify.common.model.RegisteredAccount -import com.walletconnect.notify.common.storage.data.dao.RegisteredAccountsQueries +import com.reown.notify.common.model.RegisteredAccount +import com.reown.notify.common.storage.data.dao.RegisteredAccountsQueries import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/storage/SubscriptionRepository.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/storage/SubscriptionRepository.kt similarity index 95% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/storage/SubscriptionRepository.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/storage/SubscriptionRepository.kt index 83c61a2a4..9166161c2 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/storage/SubscriptionRepository.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/storage/SubscriptionRepository.kt @@ -1,15 +1,15 @@ @file:JvmSynthetic -package com.walletconnect.notify.data.storage +package com.reown.notify.data.storage import com.reown.android.internal.common.model.AccountId import com.reown.android.internal.common.model.Expiry import com.reown.android.internal.common.model.RelayProtocolOptions import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic -import com.walletconnect.notify.common.model.Scope -import com.walletconnect.notify.common.model.Subscription -import com.walletconnect.notify.common.storage.data.dao.ActiveSubscriptionsQueries +import com.reown.notify.common.model.Scope +import com.reown.notify.common.model.Subscription +import com.reown.notify.common.storage.data.dao.ActiveSubscriptionsQueries import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/wellknown/did/DidJsonDTO.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/wellknown/did/DidJsonDTO.kt similarity index 90% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/wellknown/did/DidJsonDTO.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/wellknown/did/DidJsonDTO.kt index fbc7a9730..76bc2cf08 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/wellknown/did/DidJsonDTO.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/wellknown/did/DidJsonDTO.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.data.wellknown.did +package com.reown.notify.data.wellknown.did import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/wellknown/did/PublicKeyJwkDTO.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/wellknown/did/PublicKeyJwkDTO.kt similarity index 84% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/wellknown/did/PublicKeyJwkDTO.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/wellknown/did/PublicKeyJwkDTO.kt index dc30cdab8..a54d86e6a 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/wellknown/did/PublicKeyJwkDTO.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/wellknown/did/PublicKeyJwkDTO.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.data.wellknown.did +package com.reown.notify.data.wellknown.did import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/wellknown/did/VerificationMethodDTO.kt b/protocol/notify/src/main/kotlin/com/reown/notify/data/wellknown/did/VerificationMethodDTO.kt similarity index 88% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/data/wellknown/did/VerificationMethodDTO.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/data/wellknown/did/VerificationMethodDTO.kt index 17b138fa3..64c0629b5 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/data/wellknown/did/VerificationMethodDTO.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/data/wellknown/did/VerificationMethodDTO.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.data.wellknown.did +package com.reown.notify.data.wellknown.did import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/CallModule.kt b/protocol/notify/src/main/kotlin/com/reown/notify/di/CallModule.kt similarity index 72% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/di/CallModule.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/di/CallModule.kt index 48d9c801d..ee3deb07d 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/CallModule.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/di/CallModule.kt @@ -1,31 +1,31 @@ @file:JvmSynthetic -package com.walletconnect.notify.di +package com.reown.notify.di import com.reown.android.internal.common.di.AndroidCommonDITags import com.reown.android.internal.common.model.Tags import com.reown.android.push.notifications.DecryptMessageUseCaseInterface -import com.walletconnect.notify.engine.calls.DecryptNotifyMessageUseCase -import com.walletconnect.notify.engine.calls.DeleteSubscriptionUseCase -import com.walletconnect.notify.engine.calls.DeleteSubscriptionUseCaseInterface -import com.walletconnect.notify.engine.calls.GetActiveSubscriptionsUseCase -import com.walletconnect.notify.engine.calls.GetActiveSubscriptionsUseCaseInterface -import com.walletconnect.notify.engine.calls.GetNotificationHistoryUseCase -import com.walletconnect.notify.engine.calls.GetNotificationHistoryUseCaseInterface -import com.walletconnect.notify.engine.calls.GetNotificationTypesUseCase -import com.walletconnect.notify.engine.calls.GetNotificationTypesUseCaseInterface -import com.walletconnect.notify.engine.calls.IsRegisteredUseCase -import com.walletconnect.notify.engine.calls.IsRegisteredUseCaseInterface -import com.walletconnect.notify.engine.calls.PrepareRegistrationUseCase -import com.walletconnect.notify.engine.calls.PrepareRegistrationUseCaseInterface -import com.walletconnect.notify.engine.calls.RegisterUseCase -import com.walletconnect.notify.engine.calls.RegisterUseCaseInterface -import com.walletconnect.notify.engine.calls.SubscribeToDappUseCase -import com.walletconnect.notify.engine.calls.SubscribeToDappUseCaseInterface -import com.walletconnect.notify.engine.calls.UnregisterUseCase -import com.walletconnect.notify.engine.calls.UnregisterUseCaseInterface -import com.walletconnect.notify.engine.calls.UpdateSubscriptionUseCase -import com.walletconnect.notify.engine.calls.UpdateSubscriptionUseCaseInterface +import com.reown.notify.engine.calls.DecryptNotifyMessageUseCase +import com.reown.notify.engine.calls.DeleteSubscriptionUseCase +import com.reown.notify.engine.calls.DeleteSubscriptionUseCaseInterface +import com.reown.notify.engine.calls.GetActiveSubscriptionsUseCase +import com.reown.notify.engine.calls.GetActiveSubscriptionsUseCaseInterface +import com.reown.notify.engine.calls.GetNotificationHistoryUseCase +import com.reown.notify.engine.calls.GetNotificationHistoryUseCaseInterface +import com.reown.notify.engine.calls.GetNotificationTypesUseCase +import com.reown.notify.engine.calls.GetNotificationTypesUseCaseInterface +import com.reown.notify.engine.calls.IsRegisteredUseCase +import com.reown.notify.engine.calls.IsRegisteredUseCaseInterface +import com.reown.notify.engine.calls.PrepareRegistrationUseCase +import com.reown.notify.engine.calls.PrepareRegistrationUseCaseInterface +import com.reown.notify.engine.calls.RegisterUseCase +import com.reown.notify.engine.calls.RegisterUseCaseInterface +import com.reown.notify.engine.calls.SubscribeToDappUseCase +import com.reown.notify.engine.calls.SubscribeToDappUseCaseInterface +import com.reown.notify.engine.calls.UnregisterUseCase +import com.reown.notify.engine.calls.UnregisterUseCaseInterface +import com.reown.notify.engine.calls.UpdateSubscriptionUseCase +import com.reown.notify.engine.calls.UpdateSubscriptionUseCaseInterface import org.koin.core.qualifier.named import org.koin.dsl.module diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/NotifyEngineModule.kt b/protocol/notify/src/main/kotlin/com/reown/notify/di/NotifyEngineModule.kt similarity index 76% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/di/NotifyEngineModule.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/di/NotifyEngineModule.kt index 8127021d7..316983773 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/NotifyEngineModule.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/di/NotifyEngineModule.kt @@ -1,21 +1,21 @@ @file:JvmSynthetic -package com.walletconnect.notify.di +package com.reown.notify.di import com.reown.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.notify.common.NotifyServerUrl -import com.walletconnect.notify.engine.NotifyEngine -import com.walletconnect.notify.engine.calls.GetAllActiveSubscriptionsUseCase -import com.walletconnect.notify.engine.domain.ExtractMetadataFromConfigUseCase -import com.walletconnect.notify.engine.domain.ExtractPublicKeysFromDidJsonUseCase -import com.walletconnect.notify.engine.domain.FetchDidJwtInteractor -import com.walletconnect.notify.engine.domain.FindRequestedSubscriptionUseCase -import com.walletconnect.notify.engine.domain.GenerateAppropriateUriUseCase -import com.walletconnect.notify.engine.domain.GetSelfKeyForWatchSubscriptionUseCase -import com.walletconnect.notify.engine.domain.SetActiveSubscriptionsUseCase -import com.walletconnect.notify.engine.domain.StopWatchingSubscriptionsUseCase -import com.walletconnect.notify.engine.domain.WatchSubscriptionsForEveryRegisteredAccountUseCase -import com.walletconnect.notify.engine.domain.WatchSubscriptionsUseCase +import com.reown.notify.common.NotifyServerUrl +import com.reown.notify.engine.NotifyEngine +import com.reown.notify.engine.calls.GetAllActiveSubscriptionsUseCase +import com.reown.notify.engine.domain.ExtractMetadataFromConfigUseCase +import com.reown.notify.engine.domain.ExtractPublicKeysFromDidJsonUseCase +import com.reown.notify.engine.domain.FetchDidJwtInteractor +import com.reown.notify.engine.domain.FindRequestedSubscriptionUseCase +import com.reown.notify.engine.domain.GenerateAppropriateUriUseCase +import com.reown.notify.engine.domain.GetSelfKeyForWatchSubscriptionUseCase +import com.reown.notify.engine.domain.SetActiveSubscriptionsUseCase +import com.reown.notify.engine.domain.StopWatchingSubscriptionsUseCase +import com.reown.notify.engine.domain.WatchSubscriptionsForEveryRegisteredAccountUseCase +import com.reown.notify.engine.domain.WatchSubscriptionsUseCase import org.koin.core.qualifier.named import org.koin.dsl.module diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/NotifyJsonRpcModule.kt b/protocol/notify/src/main/kotlin/com/reown/notify/di/NotifyJsonRpcModule.kt similarity index 90% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/di/NotifyJsonRpcModule.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/di/NotifyJsonRpcModule.kt index 66e5b200c..e5417e06c 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/NotifyJsonRpcModule.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/di/NotifyJsonRpcModule.kt @@ -1,9 +1,9 @@ @file:JvmSynthetic -package com.walletconnect.notify.di +package com.reown.notify.di -import com.walletconnect.notify.common.JsonRpcMethod -import com.walletconnect.notify.common.model.NotifyRpc +import com.reown.notify.common.JsonRpcMethod +import com.reown.notify.common.model.NotifyRpc import com.walletconnect.utils.addDeserializerEntry import com.walletconnect.utils.addSerializerEntry import org.koin.dsl.module diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/NotifyStorageModule.kt b/protocol/notify/src/main/kotlin/com/reown/notify/di/NotifyStorageModule.kt similarity index 89% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/di/NotifyStorageModule.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/di/NotifyStorageModule.kt index bf62ff31c..3749d5d96 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/NotifyStorageModule.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/di/NotifyStorageModule.kt @@ -1,15 +1,15 @@ @file:JvmSynthetic -package com.walletconnect.notify.di +package com.reown.notify.di import app.cash.sqldelight.ColumnAdapter import com.reown.android.di.sdkBaseStorageModule import com.reown.android.internal.common.di.deleteDatabase -import com.walletconnect.notify.NotifyDatabase -import com.walletconnect.notify.common.storage.data.dao.ActiveSubscriptions -import com.walletconnect.notify.data.storage.NotificationsRepository -import com.walletconnect.notify.data.storage.RegisteredAccountsRepository -import com.walletconnect.notify.data.storage.SubscriptionRepository +import com.reown.notify.NotifyDatabase +import com.reown.notify.common.storage.data.dao.ActiveSubscriptions +import com.reown.notify.data.storage.NotificationsRepository +import com.reown.notify.data.storage.RegisteredAccountsRepository +import com.reown.notify.data.storage.SubscriptionRepository import org.koin.core.qualifier.named import org.koin.core.scope.Scope import org.koin.dsl.module diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/RequestModule.kt b/protocol/notify/src/main/kotlin/com/reown/notify/di/RequestModule.kt similarity index 85% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/di/RequestModule.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/di/RequestModule.kt index 7eb408897..c7aa13832 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/RequestModule.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/di/RequestModule.kt @@ -1,10 +1,10 @@ @file:JvmSynthetic -package com.walletconnect.notify.di +package com.reown.notify.di import com.reown.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.notify.engine.requests.OnMessageUseCase -import com.walletconnect.notify.engine.requests.OnSubscriptionsChangedUseCase +import com.reown.notify.engine.requests.OnMessageUseCase +import com.reown.notify.engine.requests.OnSubscriptionsChangedUseCase import org.koin.core.qualifier.named import org.koin.dsl.module diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/ResponseModule.kt b/protocol/notify/src/main/kotlin/com/reown/notify/di/ResponseModule.kt similarity index 79% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/di/ResponseModule.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/di/ResponseModule.kt index c3c65bc72..4a32a44b3 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/di/ResponseModule.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/di/ResponseModule.kt @@ -1,13 +1,13 @@ @file:JvmSynthetic -package com.walletconnect.notify.di +package com.reown.notify.di import com.reown.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.notify.engine.responses.OnDeleteResponseUseCase -import com.walletconnect.notify.engine.responses.OnGetNotificationsResponseUseCase -import com.walletconnect.notify.engine.responses.OnSubscribeResponseUseCase -import com.walletconnect.notify.engine.responses.OnUpdateResponseUseCase -import com.walletconnect.notify.engine.responses.OnWatchSubscriptionsResponseUseCase +import com.reown.notify.engine.responses.OnDeleteResponseUseCase +import com.reown.notify.engine.responses.OnGetNotificationsResponseUseCase +import com.reown.notify.engine.responses.OnSubscribeResponseUseCase +import com.reown.notify.engine.responses.OnUpdateResponseUseCase +import com.reown.notify.engine.responses.OnWatchSubscriptionsResponseUseCase import org.koin.core.qualifier.named import org.koin.dsl.module diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/NotifyEngine.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/NotifyEngine.kt similarity index 84% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/NotifyEngine.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/NotifyEngine.kt index 81bfe239a..9e67b1919 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/NotifyEngine.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/NotifyEngine.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine +package com.reown.notify.engine import com.reown.android.internal.common.model.ConnectionState import com.reown.android.internal.common.model.SDKError @@ -11,26 +11,26 @@ import com.reown.android.internal.common.scope import com.reown.android.pairing.handler.PairingControllerInterface import com.reown.android.push.notifications.DecryptMessageUseCaseInterface import com.reown.android.relay.WSSConnectionState -import com.walletconnect.notify.common.JsonRpcMethod -import com.walletconnect.notify.engine.calls.DeleteSubscriptionUseCaseInterface -import com.walletconnect.notify.engine.calls.GetActiveSubscriptionsUseCaseInterface -import com.walletconnect.notify.engine.calls.GetAllActiveSubscriptionsUseCase -import com.walletconnect.notify.engine.calls.GetNotificationHistoryUseCaseInterface -import com.walletconnect.notify.engine.calls.GetNotificationTypesUseCaseInterface -import com.walletconnect.notify.engine.calls.IsRegisteredUseCaseInterface -import com.walletconnect.notify.engine.calls.PrepareRegistrationUseCaseInterface -import com.walletconnect.notify.engine.calls.RegisterUseCaseInterface -import com.walletconnect.notify.engine.calls.SubscribeToDappUseCaseInterface -import com.walletconnect.notify.engine.calls.UnregisterUseCaseInterface -import com.walletconnect.notify.engine.calls.UpdateSubscriptionUseCaseInterface -import com.walletconnect.notify.engine.domain.WatchSubscriptionsForEveryRegisteredAccountUseCase -import com.walletconnect.notify.engine.requests.OnMessageUseCase -import com.walletconnect.notify.engine.requests.OnSubscriptionsChangedUseCase -import com.walletconnect.notify.engine.responses.OnDeleteResponseUseCase -import com.walletconnect.notify.engine.responses.OnGetNotificationsResponseUseCase -import com.walletconnect.notify.engine.responses.OnSubscribeResponseUseCase -import com.walletconnect.notify.engine.responses.OnUpdateResponseUseCase -import com.walletconnect.notify.engine.responses.OnWatchSubscriptionsResponseUseCase +import com.reown.notify.common.JsonRpcMethod +import com.reown.notify.engine.calls.DeleteSubscriptionUseCaseInterface +import com.reown.notify.engine.calls.GetActiveSubscriptionsUseCaseInterface +import com.reown.notify.engine.calls.GetAllActiveSubscriptionsUseCase +import com.reown.notify.engine.calls.GetNotificationHistoryUseCaseInterface +import com.reown.notify.engine.calls.GetNotificationTypesUseCaseInterface +import com.reown.notify.engine.calls.IsRegisteredUseCaseInterface +import com.reown.notify.engine.calls.PrepareRegistrationUseCaseInterface +import com.reown.notify.engine.calls.RegisterUseCaseInterface +import com.reown.notify.engine.calls.SubscribeToDappUseCaseInterface +import com.reown.notify.engine.calls.UnregisterUseCaseInterface +import com.reown.notify.engine.calls.UpdateSubscriptionUseCaseInterface +import com.reown.notify.engine.domain.WatchSubscriptionsForEveryRegisteredAccountUseCase +import com.reown.notify.engine.requests.OnMessageUseCase +import com.reown.notify.engine.requests.OnSubscriptionsChangedUseCase +import com.reown.notify.engine.responses.OnDeleteResponseUseCase +import com.reown.notify.engine.responses.OnGetNotificationsResponseUseCase +import com.reown.notify.engine.responses.OnSubscribeResponseUseCase +import com.reown.notify.engine.responses.OnUpdateResponseUseCase +import com.reown.notify.engine.responses.OnWatchSubscriptionsResponseUseCase import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.flow.MutableSharedFlow diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/DecryptNotifyMessageUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/DecryptNotifyMessageUseCase.kt similarity index 91% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/DecryptNotifyMessageUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/DecryptNotifyMessageUseCase.kt index 2f3248e29..1f84dee2b 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/DecryptNotifyMessageUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/DecryptNotifyMessageUseCase.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.calls +package com.reown.notify.engine.calls import com.reown.android.Core import com.reown.android.internal.common.crypto.codec.Codec @@ -16,11 +16,11 @@ import com.reown.android.internal.common.storage.rpc.JsonRpcHistory import com.reown.android.push.notifications.DecryptMessageUseCaseInterface import com.reown.foundation.common.model.Topic import com.reown.foundation.util.Logger -import com.walletconnect.notify.common.model.Notification -import com.walletconnect.notify.common.model.NotificationMessage -import com.walletconnect.notify.common.model.toCore -import com.walletconnect.notify.data.jwt.message.MessageRequestJwtClaim -import com.walletconnect.notify.data.storage.NotificationsRepository +import com.reown.notify.common.model.Notification +import com.reown.notify.common.model.NotificationMessage +import com.reown.notify.common.model.toCore +import com.reown.notify.data.jwt.message.MessageRequestJwtClaim +import com.reown.notify.data.storage.NotificationsRepository import kotlinx.coroutines.supervisorScope import org.bouncycastle.util.encoders.Base64 import kotlin.reflect.safeCast diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/DeleteSubscriptionUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/DeleteSubscriptionUseCase.kt similarity index 85% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/DeleteSubscriptionUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/DeleteSubscriptionUseCase.kt index 5e1eaedff..aefce8e79 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/DeleteSubscriptionUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/DeleteSubscriptionUseCase.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.calls +package com.reown.notify.engine.calls import com.reown.android.internal.common.model.AppMetaDataType import com.reown.android.internal.common.model.IrnParams @@ -12,16 +12,16 @@ import com.reown.android.internal.common.storage.metadata.MetadataStorageReposit import com.reown.android.internal.utils.monthInSeconds import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl -import com.walletconnect.notify.common.model.DeleteSubscription -import com.walletconnect.notify.common.model.NotifyRpc -import com.walletconnect.notify.common.model.Subscription -import com.walletconnect.notify.common.model.TimeoutInfo -import com.walletconnect.notify.data.storage.SubscriptionRepository -import com.walletconnect.notify.engine.blockingCallsDefaultTimeout -import com.walletconnect.notify.engine.blockingCallsDelayInterval -import com.walletconnect.notify.engine.domain.FetchDidJwtInteractor -import com.walletconnect.notify.engine.responses.OnDeleteResponseUseCase -import com.walletconnect.notify.engine.validateTimeout +import com.reown.notify.common.model.DeleteSubscription +import com.reown.notify.common.model.NotifyRpc +import com.reown.notify.common.model.Subscription +import com.reown.notify.common.model.TimeoutInfo +import com.reown.notify.data.storage.SubscriptionRepository +import com.reown.notify.engine.blockingCallsDefaultTimeout +import com.reown.notify.engine.blockingCallsDelayInterval +import com.reown.notify.engine.domain.FetchDidJwtInteractor +import com.reown.notify.engine.responses.OnDeleteResponseUseCase +import com.reown.notify.engine.validateTimeout import kotlinx.coroutines.TimeoutCancellationException import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableStateFlow diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetActiveSubscriptionsUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/GetActiveSubscriptionsUseCase.kt similarity index 86% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetActiveSubscriptionsUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/GetActiveSubscriptionsUseCase.kt index 7cedb57e6..f0b89cd51 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetActiveSubscriptionsUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/GetActiveSubscriptionsUseCase.kt @@ -1,13 +1,13 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.calls +package com.reown.notify.engine.calls import com.reown.android.internal.common.model.AccountId import com.reown.android.internal.common.model.AppMetaDataType import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.notify.common.model.Subscription -import com.walletconnect.notify.data.storage.SubscriptionRepository -import com.walletconnect.notify.engine.validateTimeout +import com.reown.notify.common.model.Subscription +import com.reown.notify.data.storage.SubscriptionRepository +import com.reown.notify.engine.validateTimeout import kotlinx.coroutines.TimeoutCancellationException import kotlinx.coroutines.withTimeout import kotlin.time.Duration diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetAllActiveSubscriptionsUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/GetAllActiveSubscriptionsUseCase.kt similarity index 82% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetAllActiveSubscriptionsUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/GetAllActiveSubscriptionsUseCase.kt index c9b64160b..cac3efb47 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetAllActiveSubscriptionsUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/GetAllActiveSubscriptionsUseCase.kt @@ -1,11 +1,11 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.calls +package com.reown.notify.engine.calls import com.reown.android.internal.common.model.AppMetaDataType import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface -import com.walletconnect.notify.common.model.Subscription -import com.walletconnect.notify.data.storage.SubscriptionRepository +import com.reown.notify.common.model.Subscription +import com.reown.notify.data.storage.SubscriptionRepository internal class GetAllActiveSubscriptionsUseCase( private val subscriptionRepository: SubscriptionRepository, diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetNotificationHistoryUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/GetNotificationHistoryUseCase.kt similarity index 88% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetNotificationHistoryUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/GetNotificationHistoryUseCase.kt index 42115cc7b..552f2cc34 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetNotificationHistoryUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/GetNotificationHistoryUseCase.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.calls +package com.reown.notify.engine.calls import com.reown.android.internal.common.model.AppMetaData import com.reown.android.internal.common.model.AppMetaDataType @@ -14,16 +14,16 @@ import com.reown.android.internal.utils.fiveMinutesInSeconds import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger -import com.walletconnect.notify.common.model.GetNotificationHistory -import com.walletconnect.notify.common.model.NotifyRpc -import com.walletconnect.notify.common.model.TimeoutInfo -import com.walletconnect.notify.data.storage.NotificationsRepository -import com.walletconnect.notify.data.storage.SubscriptionRepository -import com.walletconnect.notify.engine.blockingCallsDefaultTimeout -import com.walletconnect.notify.engine.blockingCallsDelayInterval -import com.walletconnect.notify.engine.domain.FetchDidJwtInteractor -import com.walletconnect.notify.engine.responses.OnGetNotificationsResponseUseCase -import com.walletconnect.notify.engine.validateTimeout +import com.reown.notify.common.model.GetNotificationHistory +import com.reown.notify.common.model.NotifyRpc +import com.reown.notify.common.model.TimeoutInfo +import com.reown.notify.data.storage.NotificationsRepository +import com.reown.notify.data.storage.SubscriptionRepository +import com.reown.notify.engine.blockingCallsDefaultTimeout +import com.reown.notify.engine.blockingCallsDelayInterval +import com.reown.notify.engine.domain.FetchDidJwtInteractor +import com.reown.notify.engine.responses.OnGetNotificationsResponseUseCase +import com.reown.notify.engine.validateTimeout import kotlinx.coroutines.TimeoutCancellationException import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableStateFlow diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetNotificationTypesUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/GetNotificationTypesUseCase.kt similarity index 90% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetNotificationTypesUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/GetNotificationTypesUseCase.kt index 2588da90d..7aef6ceb5 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/GetNotificationTypesUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/GetNotificationTypesUseCase.kt @@ -1,10 +1,10 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.calls +package com.reown.notify.engine.calls import com.reown.android.internal.common.explorer.domain.usecase.GetNotifyConfigUseCase -import com.walletconnect.notify.common.model.NotificationType -import com.walletconnect.notify.engine.validateTimeout +import com.reown.notify.common.model.NotificationType +import com.reown.notify.engine.validateTimeout import kotlinx.coroutines.TimeoutCancellationException import kotlinx.coroutines.withTimeout import kotlin.time.Duration diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/IsRegisteredUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/IsRegisteredUseCase.kt similarity index 85% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/IsRegisteredUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/IsRegisteredUseCase.kt index 6ae4e4595..117b4fa39 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/IsRegisteredUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/IsRegisteredUseCase.kt @@ -1,11 +1,11 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.calls +package com.reown.notify.engine.calls import com.reown.android.internal.common.model.AccountId import com.reown.android.keyserver.domain.IdentitiesInteractor -import com.walletconnect.notify.data.storage.RegisteredAccountsRepository -import com.walletconnect.notify.engine.domain.createAuthorizationReCaps +import com.reown.notify.data.storage.RegisteredAccountsRepository +import com.reown.notify.engine.domain.createAuthorizationReCaps internal class IsRegisteredUseCase( private val registeredAccountsRepository: RegisteredAccountsRepository, diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/PrepareRegistrationUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/PrepareRegistrationUseCase.kt similarity index 91% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/PrepareRegistrationUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/PrepareRegistrationUseCase.kt index a56ed4f21..aa9672f83 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/PrepareRegistrationUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/PrepareRegistrationUseCase.kt @@ -1,14 +1,14 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.calls +package com.reown.notify.engine.calls import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository import com.reown.android.internal.common.model.AccountId import com.reown.android.internal.common.signing.cacao.toCAIP222Message import com.reown.android.keyserver.domain.IdentitiesInteractor import com.reown.foundation.util.Logger -import com.walletconnect.notify.common.model.CacaoPayloadWithIdentityPrivateKey -import com.walletconnect.notify.engine.domain.createAuthorizationReCaps +import com.reown.notify.common.model.CacaoPayloadWithIdentityPrivateKey +import com.reown.notify.engine.domain.createAuthorizationReCaps internal class PrepareRegistrationUseCase( private val identitiesInteractor: IdentitiesInteractor, diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/RegisterUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/RegisterUseCase.kt similarity index 91% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/RegisterUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/RegisterUseCase.kt index 2428e0ee7..de5a53007 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/RegisterUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/RegisterUseCase.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.calls +package com.reown.notify.engine.calls import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository import com.reown.android.internal.common.model.AccountId @@ -10,9 +10,9 @@ import com.reown.android.internal.common.signing.cacao.CacaoType import com.reown.android.internal.common.signing.cacao.CacaoVerifier import com.reown.android.internal.common.signing.cacao.Issuer import com.reown.android.keyserver.domain.IdentitiesInteractor -import com.walletconnect.notify.common.model.CacaoPayloadWithIdentityPrivateKey -import com.walletconnect.notify.data.storage.RegisteredAccountsRepository -import com.walletconnect.notify.engine.domain.WatchSubscriptionsUseCase +import com.reown.notify.common.model.CacaoPayloadWithIdentityPrivateKey +import com.reown.notify.data.storage.RegisteredAccountsRepository +import com.reown.notify.engine.domain.WatchSubscriptionsUseCase import kotlinx.coroutines.supervisorScope internal class RegisterUseCase( diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/SubscribeToDappUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/SubscribeToDappUseCase.kt similarity index 87% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/SubscribeToDappUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/SubscribeToDappUseCase.kt index 8bdece618..721ef4f3c 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/SubscribeToDappUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/SubscribeToDappUseCase.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.calls +package com.reown.notify.engine.calls import android.net.Uri import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository @@ -22,19 +22,19 @@ import com.reown.foundation.common.model.PublicKey import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger -import com.walletconnect.notify.common.model.CreateSubscription -import com.walletconnect.notify.common.model.NotifyRpc -import com.walletconnect.notify.common.model.Scope -import com.walletconnect.notify.common.model.Subscription -import com.walletconnect.notify.common.model.TimeoutInfo -import com.walletconnect.notify.data.storage.SubscriptionRepository -import com.walletconnect.notify.engine.blockingCallsDefaultTimeout -import com.walletconnect.notify.engine.blockingCallsDelayInterval -import com.walletconnect.notify.engine.domain.ExtractMetadataFromConfigUseCase -import com.walletconnect.notify.engine.domain.ExtractPublicKeysFromDidJsonUseCase -import com.walletconnect.notify.engine.domain.FetchDidJwtInteractor -import com.walletconnect.notify.engine.responses.OnSubscribeResponseUseCase -import com.walletconnect.notify.engine.validateTimeout +import com.reown.notify.common.model.CreateSubscription +import com.reown.notify.common.model.NotifyRpc +import com.reown.notify.common.model.Scope +import com.reown.notify.common.model.Subscription +import com.reown.notify.common.model.TimeoutInfo +import com.reown.notify.data.storage.SubscriptionRepository +import com.reown.notify.engine.blockingCallsDefaultTimeout +import com.reown.notify.engine.blockingCallsDelayInterval +import com.reown.notify.engine.domain.ExtractMetadataFromConfigUseCase +import com.reown.notify.engine.domain.ExtractPublicKeysFromDidJsonUseCase +import com.reown.notify.engine.domain.FetchDidJwtInteractor +import com.reown.notify.engine.responses.OnSubscribeResponseUseCase +import com.reown.notify.engine.validateTimeout import kotlinx.coroutines.TimeoutCancellationException import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableStateFlow diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/UnregisterUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/UnregisterUseCase.kt similarity index 87% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/UnregisterUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/UnregisterUseCase.kt index b0567433e..75ee98052 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/UnregisterUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/UnregisterUseCase.kt @@ -1,15 +1,15 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.calls +package com.reown.notify.engine.calls import com.reown.android.internal.common.model.AccountId import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.reown.android.keyserver.domain.IdentitiesInteractor import com.reown.foundation.common.model.Topic -import com.walletconnect.notify.data.storage.NotificationsRepository -import com.walletconnect.notify.data.storage.RegisteredAccountsRepository -import com.walletconnect.notify.data.storage.SubscriptionRepository -import com.walletconnect.notify.engine.domain.StopWatchingSubscriptionsUseCase +import com.reown.notify.data.storage.NotificationsRepository +import com.reown.notify.data.storage.RegisteredAccountsRepository +import com.reown.notify.data.storage.SubscriptionRepository +import com.reown.notify.engine.domain.StopWatchingSubscriptionsUseCase import kotlinx.coroutines.supervisorScope internal class UnregisterUseCase( diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/UpdateSubscriptionUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/UpdateSubscriptionUseCase.kt similarity index 86% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/UpdateSubscriptionUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/UpdateSubscriptionUseCase.kt index 8e6b3c74a..d7aa7f4da 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/calls/UpdateSubscriptionUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/calls/UpdateSubscriptionUseCase.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.calls +package com.reown.notify.engine.calls import com.reown.android.internal.common.model.AppMetaData import com.reown.android.internal.common.model.AppMetaDataType @@ -13,15 +13,15 @@ import com.reown.android.internal.common.storage.metadata.MetadataStorageReposit import com.reown.android.internal.utils.thirtySeconds import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl -import com.walletconnect.notify.common.model.NotifyRpc -import com.walletconnect.notify.common.model.TimeoutInfo -import com.walletconnect.notify.common.model.UpdateSubscription -import com.walletconnect.notify.data.storage.SubscriptionRepository -import com.walletconnect.notify.engine.blockingCallsDefaultTimeout -import com.walletconnect.notify.engine.blockingCallsDelayInterval -import com.walletconnect.notify.engine.domain.FetchDidJwtInteractor -import com.walletconnect.notify.engine.responses.OnUpdateResponseUseCase -import com.walletconnect.notify.engine.validateTimeout +import com.reown.notify.common.model.NotifyRpc +import com.reown.notify.common.model.TimeoutInfo +import com.reown.notify.common.model.UpdateSubscription +import com.reown.notify.data.storage.SubscriptionRepository +import com.reown.notify.engine.blockingCallsDefaultTimeout +import com.reown.notify.engine.blockingCallsDelayInterval +import com.reown.notify.engine.domain.FetchDidJwtInteractor +import com.reown.notify.engine.responses.OnUpdateResponseUseCase +import com.reown.notify.engine.validateTimeout import kotlinx.coroutines.TimeoutCancellationException import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableStateFlow diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/ExtractMetadataFromConfigUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/ExtractMetadataFromConfigUseCase.kt similarity index 92% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/ExtractMetadataFromConfigUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/ExtractMetadataFromConfigUseCase.kt index 6120f4395..79cd01a4e 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/ExtractMetadataFromConfigUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/ExtractMetadataFromConfigUseCase.kt @@ -1,12 +1,12 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.domain +package com.reown.notify.engine.domain import android.net.Uri import com.reown.android.internal.common.explorer.data.model.ImageUrl import com.reown.android.internal.common.explorer.domain.usecase.GetNotifyConfigUseCase import com.reown.android.internal.common.model.AppMetaData -import com.walletconnect.notify.common.model.Scope +import com.reown.notify.common.model.Scope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/ExtractPublicKeysFromDidJsonUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/ExtractPublicKeysFromDidJsonUseCase.kt similarity index 91% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/ExtractPublicKeysFromDidJsonUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/ExtractPublicKeysFromDidJsonUseCase.kt index fdf776073..c9037573a 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/ExtractPublicKeysFromDidJsonUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/ExtractPublicKeysFromDidJsonUseCase.kt @@ -1,15 +1,15 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.domain +package com.reown.notify.engine.domain import android.net.Uri import android.util.Base64 import com.reown.android.internal.common.json_rpc.data.JsonRpcSerializer import com.reown.foundation.common.model.PublicKey -import com.walletconnect.notify.client.InvalidDidJsonFileException -import com.walletconnect.notify.data.wellknown.did.DidJsonDTO -import com.walletconnect.notify.data.wellknown.did.VerificationMethodDTO -import com.walletconnect.notify.engine.calls.DidJsonPublicKeyPair +import com.reown.notify.client.InvalidDidJsonFileException +import com.reown.notify.data.wellknown.did.DidJsonDTO +import com.reown.notify.data.wellknown.did.VerificationMethodDTO +import com.reown.notify.engine.calls.DidJsonPublicKeyPair import com.walletconnect.util.bytesToHex import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/FetchDidJwtInteractor.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/FetchDidJwtInteractor.kt similarity index 89% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/FetchDidJwtInteractor.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/FetchDidJwtInteractor.kt index b55305fa5..13b9c0257 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/FetchDidJwtInteractor.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/FetchDidJwtInteractor.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.domain +package com.reown.notify.engine.domain import com.reown.android.internal.common.jwt.did.EncodeDidJwtPayloadUseCase import com.reown.android.internal.common.jwt.did.encodeDidJwt @@ -9,13 +9,13 @@ import com.reown.android.internal.common.model.DidJwt import com.reown.android.keyserver.domain.IdentitiesInteractor import com.reown.foundation.common.model.PrivateKey import com.reown.foundation.common.model.PublicKey -import com.walletconnect.notify.data.jwt.delete.EncodeDeleteRequestJwtUseCase -import com.walletconnect.notify.data.jwt.getNotifications.EncodeGetNotificationsRequestJwtUseCase -import com.walletconnect.notify.data.jwt.message.EncodeMessageResponseJwtUseCase -import com.walletconnect.notify.data.jwt.subscription.EncodeSubscriptionRequestJwtUseCase -import com.walletconnect.notify.data.jwt.subscriptionsChanged.EncodeSubscriptionsChangedResponseJwtUseCase -import com.walletconnect.notify.data.jwt.update.EncodeUpdateRequestJwtUseCase -import com.walletconnect.notify.data.jwt.watchSubscriptions.EncodeWatchSubscriptionsRequestJwtUseCase +import com.reown.notify.data.jwt.delete.EncodeDeleteRequestJwtUseCase +import com.reown.notify.data.jwt.getNotifications.EncodeGetNotificationsRequestJwtUseCase +import com.reown.notify.data.jwt.message.EncodeMessageResponseJwtUseCase +import com.reown.notify.data.jwt.subscription.EncodeSubscriptionRequestJwtUseCase +import com.reown.notify.data.jwt.subscriptionsChanged.EncodeSubscriptionsChangedResponseJwtUseCase +import com.reown.notify.data.jwt.update.EncodeUpdateRequestJwtUseCase +import com.reown.notify.data.jwt.watchSubscriptions.EncodeWatchSubscriptionsRequestJwtUseCase import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.supervisorScope import kotlinx.coroutines.withContext diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/FindRequestedSubscriptionUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/FindRequestedSubscriptionUseCase.kt similarity index 90% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/FindRequestedSubscriptionUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/FindRequestedSubscriptionUseCase.kt index ad72b6497..183e88739 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/FindRequestedSubscriptionUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/FindRequestedSubscriptionUseCase.kt @@ -1,9 +1,9 @@ -package com.walletconnect.notify.engine.domain +package com.reown.notify.engine.domain import com.reown.android.internal.common.model.AppMetaDataType import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface import com.reown.foundation.util.jwt.encodeEd25519DidKey -import com.walletconnect.notify.common.model.Subscription +import com.reown.notify.common.model.Subscription import kotlinx.coroutines.supervisorScope internal class FindRequestedSubscriptionUseCase( diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/GenerateAppropriateUriUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/GenerateAppropriateUriUseCase.kt similarity index 86% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/GenerateAppropriateUriUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/GenerateAppropriateUriUseCase.kt index bb2b63d4f..dfbc8a693 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/GenerateAppropriateUriUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/GenerateAppropriateUriUseCase.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.domain +package com.reown.notify.engine.domain import android.net.Uri diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/GetSelfKeyForWatchSubscriptionUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/GetSelfKeyForWatchSubscriptionUseCase.kt similarity index 94% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/GetSelfKeyForWatchSubscriptionUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/GetSelfKeyForWatchSubscriptionUseCase.kt index 8f22fa44b..7500981b3 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/GetSelfKeyForWatchSubscriptionUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/GetSelfKeyForWatchSubscriptionUseCase.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.domain +package com.reown.notify.engine.domain import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository import com.reown.android.internal.common.model.AccountId diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/SetActiveSubscriptionsUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/SetActiveSubscriptionsUseCase.kt similarity index 91% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/SetActiveSubscriptionsUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/SetActiveSubscriptionsUseCase.kt index c634ea69b..59927232f 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/SetActiveSubscriptionsUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/SetActiveSubscriptionsUseCase.kt @@ -1,4 +1,4 @@ -package com.walletconnect.notify.engine.domain +package com.reown.notify.engine.domain import androidx.core.net.toUri import com.reown.android.internal.common.crypto.sha256 @@ -13,10 +13,10 @@ import com.reown.android.internal.common.storage.key_chain.KeyStore import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface import com.reown.foundation.common.model.Topic import com.reown.foundation.util.jwt.decodeEd25519DidKey -import com.walletconnect.notify.common.model.Scope -import com.walletconnect.notify.common.model.ServerSubscription -import com.walletconnect.notify.common.model.Subscription -import com.walletconnect.notify.data.storage.SubscriptionRepository +import com.reown.notify.common.model.Scope +import com.reown.notify.common.model.ServerSubscription +import com.reown.notify.common.model.Subscription +import com.reown.notify.data.storage.SubscriptionRepository import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/StopWatchingSubscriptionsUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/StopWatchingSubscriptionsUseCase.kt similarity index 88% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/StopWatchingSubscriptionsUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/StopWatchingSubscriptionsUseCase.kt index 9e63b5d60..6f3347530 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/StopWatchingSubscriptionsUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/StopWatchingSubscriptionsUseCase.kt @@ -1,10 +1,10 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.domain +package com.reown.notify.engine.domain import com.reown.android.internal.common.model.AccountId import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface -import com.walletconnect.notify.data.storage.RegisteredAccountsRepository +import com.reown.notify.data.storage.RegisteredAccountsRepository import kotlinx.coroutines.supervisorScope internal class StopWatchingSubscriptionsUseCase( diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/Utils.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/Utils.kt similarity index 85% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/Utils.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/Utils.kt index c6bed3684..98c72b66c 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/Utils.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/Utils.kt @@ -1,4 +1,4 @@ -package com.walletconnect.notify.engine.domain +package com.reown.notify.engine.domain fun createAuthorizationReCaps(): String { // {"att":{"https://notify.walletconnect.com":{"manage/all-apps-notifications":[{}]}}} diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/WatchSubscriptionsForEveryRegisteredAccountUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/WatchSubscriptionsForEveryRegisteredAccountUseCase.kt similarity index 88% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/WatchSubscriptionsForEveryRegisteredAccountUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/WatchSubscriptionsForEveryRegisteredAccountUseCase.kt index 582f30a11..a937d6d02 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/WatchSubscriptionsForEveryRegisteredAccountUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/WatchSubscriptionsForEveryRegisteredAccountUseCase.kt @@ -1,9 +1,9 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.domain +package com.reown.notify.engine.domain import com.reown.foundation.util.Logger -import com.walletconnect.notify.data.storage.RegisteredAccountsRepository +import com.reown.notify.data.storage.RegisteredAccountsRepository import kotlinx.coroutines.supervisorScope internal class WatchSubscriptionsForEveryRegisteredAccountUseCase( diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/WatchSubscriptionsUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/WatchSubscriptionsUseCase.kt similarity index 92% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/WatchSubscriptionsUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/WatchSubscriptionsUseCase.kt index c132ea63c..d4438c872 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/domain/WatchSubscriptionsUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/WatchSubscriptionsUseCase.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.domain +package com.reown.notify.engine.domain import com.reown.android.internal.common.crypto.kmr.KeyManagementRepository import com.reown.android.internal.common.model.AccountId @@ -12,9 +12,9 @@ import com.reown.android.internal.common.model.params.CoreNotifyParams import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.reown.android.internal.utils.thirtySeconds import com.reown.foundation.common.model.Ttl -import com.walletconnect.notify.common.NotifyServerUrl -import com.walletconnect.notify.common.model.NotifyRpc -import com.walletconnect.notify.data.storage.RegisteredAccountsRepository +import com.reown.notify.common.NotifyServerUrl +import com.reown.notify.common.model.NotifyRpc +import com.reown.notify.data.storage.RegisteredAccountsRepository import kotlinx.coroutines.supervisorScope internal class WatchSubscriptionsUseCase( diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/requests/OnMessageUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/requests/OnMessageUseCase.kt similarity index 90% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/requests/OnMessageUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/requests/OnMessageUseCase.kt index 73259b609..9e38089cb 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/requests/OnMessageUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/requests/OnMessageUseCase.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.requests +package com.reown.notify.engine.requests import com.reown.android.internal.common.jwt.did.extractVerifiedDidJwtClaims import com.reown.android.internal.common.model.AppMetaData @@ -19,13 +19,13 @@ import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger import com.reown.foundation.util.jwt.decodeDidWeb import com.reown.foundation.util.jwt.decodeEd25519DidKey -import com.walletconnect.notify.common.convertToUTF8 -import com.walletconnect.notify.common.model.Notification -import com.walletconnect.notify.common.model.NotificationMessage -import com.walletconnect.notify.data.jwt.message.MessageRequestJwtClaim -import com.walletconnect.notify.data.storage.NotificationsRepository -import com.walletconnect.notify.data.storage.SubscriptionRepository -import com.walletconnect.notify.engine.domain.FetchDidJwtInteractor +import com.reown.notify.common.convertToUTF8 +import com.reown.notify.common.model.Notification +import com.reown.notify.common.model.NotificationMessage +import com.reown.notify.data.jwt.message.MessageRequestJwtClaim +import com.reown.notify.data.storage.NotificationsRepository +import com.reown.notify.data.storage.SubscriptionRepository +import com.reown.notify.engine.domain.FetchDidJwtInteractor import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/requests/OnSubscriptionsChangedUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/requests/OnSubscriptionsChangedUseCase.kt similarity index 87% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/requests/OnSubscriptionsChangedUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/requests/OnSubscriptionsChangedUseCase.kt index 6c8a5a896..eedb46921 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/requests/OnSubscriptionsChangedUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/requests/OnSubscriptionsChangedUseCase.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.requests +package com.reown.notify.engine.requests import com.reown.android.internal.common.jwt.did.extractVerifiedDidJwtClaims import com.reown.android.internal.common.model.AccountId @@ -17,14 +17,14 @@ import com.reown.foundation.common.model.Ttl import com.reown.foundation.util.Logger import com.reown.foundation.util.jwt.decodeDidPkh import com.reown.foundation.util.jwt.decodeEd25519DidKey -import com.walletconnect.notify.common.NotifyServerUrl -import com.walletconnect.notify.common.model.SubscriptionChanged -import com.walletconnect.notify.data.jwt.subscriptionsChanged.SubscriptionsChangedRequestJwtClaim -import com.walletconnect.notify.data.storage.RegisteredAccountsRepository -import com.walletconnect.notify.engine.domain.ExtractPublicKeysFromDidJsonUseCase -import com.walletconnect.notify.engine.domain.FetchDidJwtInteractor -import com.walletconnect.notify.engine.domain.SetActiveSubscriptionsUseCase -import com.walletconnect.notify.engine.domain.WatchSubscriptionsForEveryRegisteredAccountUseCase +import com.reown.notify.common.NotifyServerUrl +import com.reown.notify.common.model.SubscriptionChanged +import com.reown.notify.data.jwt.subscriptionsChanged.SubscriptionsChangedRequestJwtClaim +import com.reown.notify.data.storage.RegisteredAccountsRepository +import com.reown.notify.engine.domain.ExtractPublicKeysFromDidJsonUseCase +import com.reown.notify.engine.domain.FetchDidJwtInteractor +import com.reown.notify.engine.domain.SetActiveSubscriptionsUseCase +import com.reown.notify.engine.domain.WatchSubscriptionsForEveryRegisteredAccountUseCase import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnDeleteResponseUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/responses/OnDeleteResponseUseCase.kt similarity index 88% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnDeleteResponseUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/responses/OnDeleteResponseUseCase.kt index 514defb28..571ff55bc 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnDeleteResponseUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/responses/OnDeleteResponseUseCase.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.responses +package com.reown.notify.engine.responses import com.reown.android.internal.common.JsonRpcResponse import com.reown.android.internal.common.jwt.did.extractVerifiedDidJwtClaims @@ -11,10 +11,10 @@ import com.reown.android.internal.common.model.type.EngineEvent import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterface import com.reown.foundation.util.Logger import com.reown.foundation.util.jwt.decodeDidPkh -import com.walletconnect.notify.common.model.DeleteSubscription -import com.walletconnect.notify.data.jwt.delete.DeleteResponseJwtClaim -import com.walletconnect.notify.data.storage.NotificationsRepository -import com.walletconnect.notify.engine.domain.SetActiveSubscriptionsUseCase +import com.reown.notify.common.model.DeleteSubscription +import com.reown.notify.data.jwt.delete.DeleteResponseJwtClaim +import com.reown.notify.data.storage.NotificationsRepository +import com.reown.notify.engine.domain.SetActiveSubscriptionsUseCase import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnGetNotificationsResponseUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/responses/OnGetNotificationsResponseUseCase.kt similarity index 86% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnGetNotificationsResponseUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/responses/OnGetNotificationsResponseUseCase.kt index 5c3394f53..a84e1e390 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnGetNotificationsResponseUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/responses/OnGetNotificationsResponseUseCase.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.responses +package com.reown.notify.engine.responses import com.reown.android.internal.common.JsonRpcResponse import com.reown.android.internal.common.jwt.did.extractVerifiedDidJwtClaims @@ -12,13 +12,13 @@ import com.reown.android.internal.common.model.params.CoreNotifyParams import com.reown.android.internal.common.model.type.EngineEvent import com.reown.android.internal.common.storage.metadata.MetadataStorageRepositoryInterface import com.reown.foundation.util.Logger -import com.walletconnect.notify.common.convertToUTF8 -import com.walletconnect.notify.common.model.GetNotificationHistory -import com.walletconnect.notify.common.model.Notification -import com.walletconnect.notify.common.model.NotificationMessage -import com.walletconnect.notify.data.jwt.getNotifications.GetNotificationsResponseJwtClaim -import com.walletconnect.notify.data.storage.NotificationsRepository -import com.walletconnect.notify.data.storage.SubscriptionRepository +import com.reown.notify.common.convertToUTF8 +import com.reown.notify.common.model.GetNotificationHistory +import com.reown.notify.common.model.Notification +import com.reown.notify.common.model.NotificationMessage +import com.reown.notify.data.jwt.getNotifications.GetNotificationsResponseJwtClaim +import com.reown.notify.data.storage.NotificationsRepository +import com.reown.notify.data.storage.SubscriptionRepository import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnSubscribeResponseUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/responses/OnSubscribeResponseUseCase.kt similarity index 86% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnSubscribeResponseUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/responses/OnSubscribeResponseUseCase.kt index 47b0e00a0..b2908586f 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnSubscribeResponseUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/responses/OnSubscribeResponseUseCase.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.responses +package com.reown.notify.engine.responses import com.reown.android.internal.common.JsonRpcResponse import com.reown.android.internal.common.jwt.did.extractVerifiedDidJwtClaims @@ -12,12 +12,12 @@ import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterf import com.reown.foundation.common.model.Topic import com.reown.foundation.util.Logger import com.reown.foundation.util.jwt.decodeDidPkh -import com.walletconnect.notify.common.model.CreateSubscription -import com.walletconnect.notify.data.jwt.subscription.SubscriptionRequestJwtClaim -import com.walletconnect.notify.data.jwt.subscription.SubscriptionResponseJwtClaim -import com.walletconnect.notify.data.storage.SubscriptionRepository -import com.walletconnect.notify.engine.domain.FindRequestedSubscriptionUseCase -import com.walletconnect.notify.engine.domain.SetActiveSubscriptionsUseCase +import com.reown.notify.common.model.CreateSubscription +import com.reown.notify.data.jwt.subscription.SubscriptionRequestJwtClaim +import com.reown.notify.data.jwt.subscription.SubscriptionResponseJwtClaim +import com.reown.notify.data.storage.SubscriptionRepository +import com.reown.notify.engine.domain.FindRequestedSubscriptionUseCase +import com.reown.notify.engine.domain.SetActiveSubscriptionsUseCase import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnUpdateResponseUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/responses/OnUpdateResponseUseCase.kt similarity index 84% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnUpdateResponseUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/responses/OnUpdateResponseUseCase.kt index b1e0bce3c..2d811a6b0 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnUpdateResponseUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/responses/OnUpdateResponseUseCase.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.responses +package com.reown.notify.engine.responses import com.reown.android.internal.common.JsonRpcResponse import com.reown.android.internal.common.jwt.did.extractVerifiedDidJwtClaims @@ -11,12 +11,12 @@ import com.reown.android.internal.common.model.params.CoreNotifyParams import com.reown.android.internal.common.model.type.EngineEvent import com.reown.foundation.util.Logger import com.reown.foundation.util.jwt.decodeDidPkh -import com.walletconnect.notify.common.model.CreateSubscription -import com.walletconnect.notify.common.model.UpdateSubscription -import com.walletconnect.notify.data.jwt.update.UpdateRequestJwtClaim -import com.walletconnect.notify.data.jwt.update.UpdateResponseJwtClaim -import com.walletconnect.notify.engine.domain.FindRequestedSubscriptionUseCase -import com.walletconnect.notify.engine.domain.SetActiveSubscriptionsUseCase +import com.reown.notify.common.model.CreateSubscription +import com.reown.notify.common.model.UpdateSubscription +import com.reown.notify.data.jwt.update.UpdateRequestJwtClaim +import com.reown.notify.data.jwt.update.UpdateResponseJwtClaim +import com.reown.notify.engine.domain.FindRequestedSubscriptionUseCase +import com.reown.notify.engine.domain.SetActiveSubscriptionsUseCase import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow diff --git a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnWatchSubscriptionsResponseUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/responses/OnWatchSubscriptionsResponseUseCase.kt similarity index 86% rename from protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnWatchSubscriptionsResponseUseCase.kt rename to protocol/notify/src/main/kotlin/com/reown/notify/engine/responses/OnWatchSubscriptionsResponseUseCase.kt index 7c11164a0..fc0a4a3f3 100644 --- a/protocol/notify/src/main/kotlin/com/walletconnect/notify/engine/responses/OnWatchSubscriptionsResponseUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/responses/OnWatchSubscriptionsResponseUseCase.kt @@ -1,6 +1,6 @@ @file:JvmSynthetic -package com.walletconnect.notify.engine.responses +package com.reown.notify.engine.responses import com.reown.android.internal.common.JsonRpcResponse import com.reown.android.internal.common.jwt.did.extractVerifiedDidJwtClaims @@ -11,13 +11,13 @@ import com.reown.android.internal.common.model.type.EngineEvent import com.reown.foundation.util.Logger import com.reown.foundation.util.jwt.decodeDidPkh import com.reown.foundation.util.jwt.decodeEd25519DidKey -import com.walletconnect.notify.common.NotifyServerUrl -import com.walletconnect.notify.common.model.SubscriptionChanged -import com.walletconnect.notify.data.jwt.watchSubscriptions.WatchSubscriptionsResponseJwtClaim -import com.walletconnect.notify.data.storage.RegisteredAccountsRepository -import com.walletconnect.notify.engine.domain.ExtractPublicKeysFromDidJsonUseCase -import com.walletconnect.notify.engine.domain.SetActiveSubscriptionsUseCase -import com.walletconnect.notify.engine.domain.WatchSubscriptionsForEveryRegisteredAccountUseCase +import com.reown.notify.common.NotifyServerUrl +import com.reown.notify.common.model.SubscriptionChanged +import com.reown.notify.data.jwt.watchSubscriptions.WatchSubscriptionsResponseJwtClaim +import com.reown.notify.data.storage.RegisteredAccountsRepository +import com.reown.notify.engine.domain.ExtractPublicKeysFromDidJsonUseCase +import com.reown.notify.engine.domain.SetActiveSubscriptionsUseCase +import com.reown.notify.engine.domain.WatchSubscriptionsForEveryRegisteredAccountUseCase import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow diff --git a/protocol/notify/src/main/sqldelight/com/walletconnect/notify/common/storage/data/dao/ActiveSubscriptions.sq b/protocol/notify/src/main/sqldelight/com/reown/notify/common/storage/data/dao/ActiveSubscriptions.sq similarity index 100% rename from protocol/notify/src/main/sqldelight/com/walletconnect/notify/common/storage/data/dao/ActiveSubscriptions.sq rename to protocol/notify/src/main/sqldelight/com/reown/notify/common/storage/data/dao/ActiveSubscriptions.sq diff --git a/protocol/notify/src/main/sqldelight/com/walletconnect/notify/common/storage/data/dao/Notifications.sq b/protocol/notify/src/main/sqldelight/com/reown/notify/common/storage/data/dao/Notifications.sq similarity index 100% rename from protocol/notify/src/main/sqldelight/com/walletconnect/notify/common/storage/data/dao/Notifications.sq rename to protocol/notify/src/main/sqldelight/com/reown/notify/common/storage/data/dao/Notifications.sq diff --git a/protocol/notify/src/main/sqldelight/com/walletconnect/notify/common/storage/data/dao/RegisteredAccounts.sq b/protocol/notify/src/main/sqldelight/com/reown/notify/common/storage/data/dao/RegisteredAccounts.sq similarity index 100% rename from protocol/notify/src/main/sqldelight/com/walletconnect/notify/common/storage/data/dao/RegisteredAccounts.sq rename to protocol/notify/src/main/sqldelight/com/reown/notify/common/storage/data/dao/RegisteredAccounts.sq diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/WalletKitApplication.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/WalletKitApplication.kt index d4dbfec36..a2dfb1222 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/WalletKitApplication.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/WalletKitApplication.kt @@ -22,9 +22,9 @@ import com.reown.android.internal.common.di.AndroidCommonDITags import com.reown.android.internal.common.wcKoinApp import com.reown.android.utils.cacao.sign import com.reown.foundation.util.Logger -import com.walletconnect.notify.client.Notify -import com.walletconnect.notify.client.NotifyClient -import com.walletconnect.notify.client.cacao.CacaoSigner +import com.reown.notify.client.Notify +import com.reown.notify.client.NotifyClient +import com.reown.notify.client.cacao.CacaoSigner import com.walletconnect.sample.common.initBeagle import com.walletconnect.sample.common.tag import com.walletconnect.sample.wallet.domain.EthAccountDelegate diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/NotificationHandler.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/NotificationHandler.kt index 0a04459b3..25afa3c49 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/NotificationHandler.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/NotificationHandler.kt @@ -17,8 +17,8 @@ import androidx.core.graphics.drawable.toBitmap import coil.ImageLoader import coil.request.ImageRequest import com.reown.android.Core -import com.walletconnect.notify.client.Notify -import com.walletconnect.notify.client.NotifyClient +import com.reown.notify.client.Notify +import com.reown.notify.client.NotifyClient import com.walletconnect.sample.wallet.R import com.walletconnect.sample.wallet.ui.WalletKitActivity import kotlinx.coroutines.CoroutineScope diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/NotifyDelegate.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/NotifyDelegate.kt index 517c6a31c..d67b3acd8 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/NotifyDelegate.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/NotifyDelegate.kt @@ -1,7 +1,7 @@ package com.walletconnect.sample.wallet.domain -import com.walletconnect.notify.client.Notify -import com.walletconnect.notify.client.NotifyClient +import com.reown.notify.client.Notify +import com.reown.notify.client.NotifyClient import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/subscriptions/ActiveSubscriptionsUI.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/subscriptions/ActiveSubscriptionsUI.kt index 0d2019d60..9b6767c82 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/subscriptions/ActiveSubscriptionsUI.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/subscriptions/ActiveSubscriptionsUI.kt @@ -1,6 +1,6 @@ package com.walletconnect.sample.wallet.ui.common.subscriptions -import com.walletconnect.notify.client.Notify +import com.reown.notify.client.Notify import com.walletconnect.sample.wallet.ui.common.ImageUrl import com.walletconnect.sample.wallet.ui.common.toImageUrl diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/bottomsheet_routes/update_subscription/UpdateSubscriptionViewModel.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/bottomsheet_routes/update_subscription/UpdateSubscriptionViewModel.kt index 9d9cf1209..ace93e91d 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/bottomsheet_routes/update_subscription/UpdateSubscriptionViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/bottomsheet_routes/update_subscription/UpdateSubscriptionViewModel.kt @@ -3,8 +3,8 @@ package com.walletconnect.sample.wallet.ui.routes.bottomsheet_routes.update_subs import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope -import com.walletconnect.notify.client.Notify -import com.walletconnect.notify.client.NotifyClient +import com.reown.notify.client.Notify +import com.reown.notify.client.NotifyClient import com.walletconnect.sample.wallet.domain.EthAccountDelegate import com.walletconnect.sample.wallet.domain.NotifyDelegate import com.walletconnect.sample.wallet.ui.common.subscriptions.ActiveSubscriptionsUI diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/InboxRoute.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/InboxRoute.kt index 444d5c471..12167a37a 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/InboxRoute.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/InboxRoute.kt @@ -34,7 +34,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.tooling.preview.PreviewParameterProvider import androidx.compose.ui.unit.dp import androidx.navigation.NavHostController -import com.walletconnect.notify.client.InvalidDidJsonFileException +import com.reown.notify.client.InvalidDidJsonFileException import com.walletconnect.sample.common.ui.WCTopAppBar import com.walletconnect.sample.common.ui.theme.PreviewTheme import com.walletconnect.sample.common.ui.theme.UiModePreview diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/InboxViewModel.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/InboxViewModel.kt index 1b085b500..9be71a7d0 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/InboxViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/InboxViewModel.kt @@ -8,8 +8,8 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.viewModelScope import com.reown.android.CoreClient import com.reown.android.internal.common.explorer.data.model.Project -import com.walletconnect.notify.client.Notify -import com.walletconnect.notify.client.NotifyClient +import com.reown.notify.client.Notify +import com.reown.notify.client.NotifyClient import com.walletconnect.sample.wallet.domain.EthAccountDelegate import com.walletconnect.sample.wallet.domain.NotifyDelegate import com.walletconnect.sample.wallet.ui.common.ImageUrl diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/notifications/NotificationsViewModel.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/notifications/NotificationsViewModel.kt index 131f06d98..f409fd40d 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/notifications/NotificationsViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/notifications/NotificationsViewModel.kt @@ -5,8 +5,8 @@ package com.walletconnect.sample.wallet.ui.routes.composable_routes.notification import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope -import com.walletconnect.notify.client.Notify -import com.walletconnect.notify.client.NotifyClient +import com.reown.notify.client.Notify +import com.reown.notify.client.NotifyClient import com.walletconnect.sample.wallet.domain.EthAccountDelegate import com.walletconnect.sample.wallet.domain.NotifyDelegate import com.walletconnect.sample.wallet.domain.model.NotificationUI From 13f0e1bc81a549f459f9744a9a9a4649137df655 Mon Sep 17 00:00:00 2001 From: kubel Date: Thu, 5 Sep 2024 07:42:45 +0200 Subject: [PATCH 19/51] Migrate web3wallet to walletkit --- core/bom/build.gradle.kts | 2 +- product/{web3wallet => walletkit}/.gitignore | 0 product/{web3wallet => walletkit}/ReadMe.md | 0 product/{web3wallet => walletkit}/build.gradle.kts | 2 +- .../src/main/AndroidManifest.xml | 2 +- .../kotlin/com/reown/walletkit}/client/ClientMapper.kt | 2 +- .../src/main/kotlin/com/reown/walletkit}/client/Wallet.kt | 2 +- .../main/kotlin/com/reown/walletkit}/client/WalletKit.kt | 2 +- .../main/kotlin/com/reown/walletkit}/utils/CacaoSigner.kt | 4 ++-- product/walletkit/web3wallet-rules.pro | 4 ++++ product/web3wallet/web3wallet-rules.pro | 4 ---- sample/wallet/build.gradle.kts | 4 ++-- sample/wallet/proguard-rules.pro | 8 ++++---- .../walletconnect/sample/wallet/WalletKitApplication.kt | 4 ++-- .../com/walletconnect/sample/wallet/domain/WCDelegate.kt | 4 ++-- .../walletconnect/sample/wallet/ui/WalletKitActivity.kt | 2 +- .../walletconnect/sample/wallet/ui/Web3WalletViewModel.kt | 4 ++-- .../walletconnect/sample/wallet/ui/common/Namespaces.kt | 2 +- .../walletconnect/sample/wallet/ui/common/peer/PeerUI.kt | 2 +- .../connection_details/ConnectionDetailsRoute.kt | 4 ++-- .../routes/composable_routes/connections/ConnectionUI.kt | 2 +- .../composable_routes/connections/ConnectionsViewModel.kt | 2 +- .../session_authenticate/SessionAuthenticateUI.kt | 2 +- .../session_authenticate/SessionAuthenticateViewModel.kt | 6 +++--- .../dialog_routes/session_proposal/SessionProposalUI.kt | 2 +- .../session_proposal/SessionProposalViewModel.kt | 4 ++-- .../session_request/SessionRequestViewModel.kt | 6 +++--- .../sample/wallet/domain/EthAccountDelegateTest.kt | 2 +- 28 files changed, 42 insertions(+), 42 deletions(-) rename product/{web3wallet => walletkit}/.gitignore (100%) rename product/{web3wallet => walletkit}/ReadMe.md (100%) rename product/{web3wallet => walletkit}/build.gradle.kts (97%) rename product/{web3wallet => walletkit}/src/main/AndroidManifest.xml (72%) rename product/{web3wallet/src/main/kotlin/com/walletconnect/web3/wallet => walletkit/src/main/kotlin/com/reown/walletkit}/client/ClientMapper.kt (99%) rename product/{web3wallet/src/main/kotlin/com/walletconnect/web3/wallet => walletkit/src/main/kotlin/com/reown/walletkit}/client/Wallet.kt (99%) rename product/{web3wallet/src/main/kotlin/com/walletconnect/web3/wallet => walletkit/src/main/kotlin/com/reown/walletkit}/client/WalletKit.kt (99%) rename product/{web3wallet/src/main/kotlin/com/walletconnect/web3/wallet => walletkit/src/main/kotlin/com/reown/walletkit}/utils/CacaoSigner.kt (85%) create mode 100644 product/walletkit/web3wallet-rules.pro delete mode 100644 product/web3wallet/web3wallet-rules.pro diff --git a/core/bom/build.gradle.kts b/core/bom/build.gradle.kts index dfe3ee844..c494b1de3 100644 --- a/core/bom/build.gradle.kts +++ b/core/bom/build.gradle.kts @@ -17,6 +17,6 @@ dependencies { api(project(":protocol:sign")) api(project(":protocol:notify")) api(project(":product:web3modal")) - api(project(":product:web3wallet")) + api(project(":product:walletkit")) } } \ No newline at end of file diff --git a/product/web3wallet/.gitignore b/product/walletkit/.gitignore similarity index 100% rename from product/web3wallet/.gitignore rename to product/walletkit/.gitignore diff --git a/product/web3wallet/ReadMe.md b/product/walletkit/ReadMe.md similarity index 100% rename from product/web3wallet/ReadMe.md rename to product/walletkit/ReadMe.md diff --git a/product/web3wallet/build.gradle.kts b/product/walletkit/build.gradle.kts similarity index 97% rename from product/web3wallet/build.gradle.kts rename to product/walletkit/build.gradle.kts index 784a92487..7746b3929 100644 --- a/product/web3wallet/build.gradle.kts +++ b/product/walletkit/build.gradle.kts @@ -13,7 +13,7 @@ project.apply { } android { - namespace = "com.walletconnect.web3.wallet" + namespace = "com.reown.walletkit" compileSdk = COMPILE_SDK defaultConfig { diff --git a/product/web3wallet/src/main/AndroidManifest.xml b/product/walletkit/src/main/AndroidManifest.xml similarity index 72% rename from product/web3wallet/src/main/AndroidManifest.xml rename to product/walletkit/src/main/AndroidManifest.xml index e94e2a41a..9bb540c41 100644 --- a/product/web3wallet/src/main/AndroidManifest.xml +++ b/product/walletkit/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.reown.walletkit"> \ No newline at end of file diff --git a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/ClientMapper.kt b/product/walletkit/src/main/kotlin/com/reown/walletkit/client/ClientMapper.kt similarity index 99% rename from product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/ClientMapper.kt rename to product/walletkit/src/main/kotlin/com/reown/walletkit/client/ClientMapper.kt index 2fd620328..2946b1ee2 100644 --- a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/ClientMapper.kt +++ b/product/walletkit/src/main/kotlin/com/reown/walletkit/client/ClientMapper.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.wallet.client +package com.reown.walletkit.client import com.reown.android.internal.common.signing.cacao.CacaoType import com.reown.sign.client.Sign diff --git a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/Wallet.kt b/product/walletkit/src/main/kotlin/com/reown/walletkit/client/Wallet.kt similarity index 99% rename from product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/Wallet.kt rename to product/walletkit/src/main/kotlin/com/reown/walletkit/client/Wallet.kt index 16fa58858..bf6ad5217 100644 --- a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/Wallet.kt +++ b/product/walletkit/src/main/kotlin/com/reown/walletkit/client/Wallet.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.wallet.client +package com.reown.walletkit.client import androidx.annotation.Keep import com.reown.android.Core diff --git a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/WalletKit.kt b/product/walletkit/src/main/kotlin/com/reown/walletkit/client/WalletKit.kt similarity index 99% rename from product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/WalletKit.kt rename to product/walletkit/src/main/kotlin/com/reown/walletkit/client/WalletKit.kt index d3bf6ca41..bfdfc8d4e 100644 --- a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/WalletKit.kt +++ b/product/walletkit/src/main/kotlin/com/reown/walletkit/client/WalletKit.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.wallet.client +package com.reown.walletkit.client import com.reown.android.Core import com.reown.android.CoreInterface diff --git a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/utils/CacaoSigner.kt b/product/walletkit/src/main/kotlin/com/reown/walletkit/utils/CacaoSigner.kt similarity index 85% rename from product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/utils/CacaoSigner.kt rename to product/walletkit/src/main/kotlin/com/reown/walletkit/utils/CacaoSigner.kt index 3976c335f..4551ae884 100644 --- a/product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/utils/CacaoSigner.kt +++ b/product/walletkit/src/main/kotlin/com/reown/walletkit/utils/CacaoSigner.kt @@ -1,10 +1,10 @@ @file:JvmSynthetic -package com.walletconnect.web3.wallet.utils +package com.reown.walletkit.utils import com.reown.android.cacao.signature.ISignatureType import com.reown.android.utils.cacao.CacaoSignerInterface -import com.walletconnect.web3.wallet.client.Wallet +import com.reown.walletkit.client.Wallet /// Only added to have backwards compatibility. Newer SDKs should only add CacaoSigner object below. diff --git a/product/walletkit/web3wallet-rules.pro b/product/walletkit/web3wallet-rules.pro new file mode 100644 index 000000000..d7bb92f85 --- /dev/null +++ b/product/walletkit/web3wallet-rules.pro @@ -0,0 +1,4 @@ +-keep class com.reown.walletkit.client.Wallet$Model$Cacao$Signature { *; } +-keep class com.reown.walletkit.client.Wallet$Model$Cacao { *; } +-keep class com.reown.walletkit.client.Wallet$Model { *; } +-keep class com.reown.walletkit.client.Wallet { *; } \ No newline at end of file diff --git a/product/web3wallet/web3wallet-rules.pro b/product/web3wallet/web3wallet-rules.pro deleted file mode 100644 index 733da187b..000000000 --- a/product/web3wallet/web3wallet-rules.pro +++ /dev/null @@ -1,4 +0,0 @@ --keep class com.walletconnect.web3.wallet.client.Wallet$Model$Cacao$Signature { *; } --keep class com.walletconnect.web3.wallet.client.Wallet$Model$Cacao { *; } --keep class com.walletconnect.web3.wallet.client.Wallet$Model { *; } --keep class com.walletconnect.web3.wallet.client.Wallet { *; } \ No newline at end of file diff --git a/sample/wallet/build.gradle.kts b/sample/wallet/build.gradle.kts index 13de64347..71e751f64 100644 --- a/sample/wallet/build.gradle.kts +++ b/sample/wallet/build.gradle.kts @@ -123,11 +123,11 @@ dependencies { // WalletConnect debugImplementation(project(":core:android")) - debugImplementation(project(":product:web3wallet")) + debugImplementation(project(":product:walletkit")) debugImplementation(project(":protocol:notify")) internalImplementation(project(":core:android")) - internalImplementation(project(":product:web3wallet")) + internalImplementation(project(":product:walletkit")) internalImplementation(project(":protocol:notify")) releaseImplementation(platform("com.walletconnect:android-bom:$BOM_VERSION")) diff --git a/sample/wallet/proguard-rules.pro b/sample/wallet/proguard-rules.pro index 4ba904ad8..25ef9e66e 100644 --- a/sample/wallet/proguard-rules.pro +++ b/sample/wallet/proguard-rules.pro @@ -1,7 +1,7 @@ -keepnames class com.fasterxml.jackson.** { *; } -dontwarn com.fasterxml.jackson.databind.** --keep class com.walletconnect.web3.wallet.client.Wallet$Model$Cacao$Signature { *; } --keep class com.walletconnect.web3.wallet.client.Wallet$Model$Cacao { *; } --keep class com.walletconnect.web3.wallet.client.Wallet$Model { *; } --keep class com.walletconnect.web3.wallet.client.Wallet { *; } \ No newline at end of file +-keep class com.reown.walletkit.client.Wallet$Model$Cacao$Signature { *; } +-keep class com.reown.walletkit.client.Wallet$Model$Cacao { *; } +-keep class com.reown.walletkit.client.Wallet$Model { *; } +-keep class com.reown.walletkit.client.Wallet { *; } \ No newline at end of file diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/WalletKitApplication.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/WalletKitApplication.kt index a2dfb1222..51e8a059b 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/WalletKitApplication.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/WalletKitApplication.kt @@ -34,8 +34,8 @@ import com.walletconnect.sample.wallet.domain.mixPanel import com.walletconnect.sample.wallet.ui.state.ConnectionState import com.walletconnect.sample.wallet.ui.state.connectionStateFlow import com.walletconnect.util.hexToBytes -import com.walletconnect.web3.wallet.client.Wallet -import com.walletconnect.web3.wallet.client.WalletKit +import com.reown.walletkit.client.Wallet +import com.reown.walletkit.client.WalletKit import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/WCDelegate.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/WCDelegate.kt index cfb8c98de..ec8da3c6c 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/WCDelegate.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/WCDelegate.kt @@ -3,8 +3,8 @@ package com.walletconnect.sample.wallet.domain import android.util.Log import com.reown.android.Core import com.reown.android.CoreClient -import com.walletconnect.web3.wallet.client.Wallet -import com.walletconnect.web3.wallet.client.WalletKit +import com.reown.walletkit.client.Wallet +import com.reown.walletkit.client.WalletKit import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/WalletKitActivity.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/WalletKitActivity.kt index c8edae63f..1062db6f7 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/WalletKitActivity.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/WalletKitActivity.kt @@ -32,7 +32,7 @@ import com.walletconnect.sample.wallet.domain.NotifyDelegate import com.walletconnect.sample.wallet.ui.routes.Route import com.walletconnect.sample.wallet.ui.routes.composable_routes.connections.ConnectionsViewModel import com.walletconnect.sample.wallet.ui.routes.host.WalletSampleHost -import com.walletconnect.web3.wallet.client.WalletKit +import com.reown.walletkit.client.WalletKit import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.flow.launchIn diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletViewModel.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletViewModel.kt index 4bf3b8c3a..b96bf9aa1 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletViewModel.kt @@ -12,8 +12,8 @@ import com.walletconnect.sample.wallet.domain.ISSUER import com.walletconnect.sample.wallet.domain.WCDelegate import com.walletconnect.sample.wallet.ui.state.ConnectionState import com.walletconnect.sample.wallet.ui.state.PairingEvent -import com.walletconnect.web3.wallet.client.Wallet -import com.walletconnect.web3.wallet.client.WalletKit +import com.reown.walletkit.client.Wallet +import com.reown.walletkit.client.WalletKit import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/Namespaces.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/Namespaces.kt index b5ca32d26..a6adfcd43 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/Namespaces.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/Namespaces.kt @@ -1,6 +1,6 @@ package com.walletconnect.sample.wallet.ui.common -import com.walletconnect.web3.wallet.client.Wallet +import com.reown.walletkit.client.Wallet fun getAllMethodsByChainId(namespace: Wallet.Model.Namespace.Proposal, chainId: String): List { return namespace.methods.takeIf { namespace.chains != null && namespace.chains!!.contains(chainId) } ?: emptyList() diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/peer/PeerUI.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/peer/PeerUI.kt index 3c008c4d6..a78a021f2 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/peer/PeerUI.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/peer/PeerUI.kt @@ -5,7 +5,7 @@ import com.walletconnect.sample.common.ui.theme.mismatch_color import com.walletconnect.sample.common.ui.theme.unverified_color import com.walletconnect.sample.common.ui.theme.verified_color import com.walletconnect.sample.wallet.R -import com.walletconnect.web3.wallet.client.Wallet +import com.reown.walletkit.client.Wallet data class PeerUI( diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt index 27fd1ecbc..544e446bb 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt @@ -63,8 +63,8 @@ import com.walletconnect.sample.wallet.ui.common.getAllMethodsByChainId import com.walletconnect.sample.wallet.ui.routes.composable_routes.connections.ConnectionType import com.walletconnect.sample.wallet.ui.routes.composable_routes.connections.ConnectionUI import com.walletconnect.sample.wallet.ui.routes.composable_routes.connections.ConnectionsViewModel -import com.walletconnect.web3.wallet.client.Wallet -import com.walletconnect.web3.wallet.client.WalletKit +import com.reown.walletkit.client.Wallet +import com.reown.walletkit.client.WalletKit import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionUI.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionUI.kt index 5e1d8accf..73e8f84f8 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionUI.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionUI.kt @@ -1,6 +1,6 @@ package com.walletconnect.sample.wallet.ui.routes.composable_routes.connections -import com.walletconnect.web3.wallet.client.Wallet +import com.reown.walletkit.client.Wallet data class ConnectionUI( val id: Int, diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionsViewModel.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionsViewModel.kt index d338c2d61..05fe9b96a 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionsViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionsViewModel.kt @@ -8,7 +8,7 @@ import androidx.lifecycle.viewModelScope import com.walletconnect.sample.wallet.domain.ACCOUNTS_1_EIP155_ADDRESS import com.walletconnect.sample.wallet.domain.ACCOUNTS_2_EIP155_ADDRESS import com.walletconnect.sample.wallet.domain.WCDelegate -import com.walletconnect.web3.wallet.client.WalletKit +import com.reown.walletkit.client.WalletKit import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateUI.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateUI.kt index 57a2cea29..5959726b1 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateUI.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateUI.kt @@ -3,7 +3,7 @@ package com.walletconnect.sample.wallet.ui.routes.dialog_routes.session_authenti import com.walletconnect.sample.wallet.domain.ACCOUNTS_1_EIP155_ADDRESS import com.walletconnect.sample.wallet.ui.common.peer.PeerContextUI import com.walletconnect.sample.wallet.ui.common.peer.PeerUI -import com.walletconnect.web3.wallet.client.Wallet +import com.reown.walletkit.client.Wallet data class SessionAuthenticateUI( val peerUI: PeerUI, diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt index 8d6198c92..24b9b507e 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt @@ -12,9 +12,9 @@ import com.walletconnect.sample.wallet.domain.WCDelegate import com.walletconnect.sample.wallet.ui.common.peer.PeerUI import com.walletconnect.sample.wallet.ui.common.peer.toPeerUI import com.walletconnect.util.hexToBytes -import com.walletconnect.web3.wallet.client.Wallet -import com.walletconnect.web3.wallet.client.WalletKit -import com.walletconnect.web3.wallet.utils.CacaoSigner +import com.reown.walletkit.client.Wallet +import com.reown.walletkit.client.WalletKit +import com.reown.walletkit.utils.CacaoSigner class SessionAuthenticateViewModel : ViewModel() { val sessionAuthenticateUI: SessionAuthenticateUI? get() = generateAuthRequestUI() diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalUI.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalUI.kt index a8728f9f3..d4e0a7ac4 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalUI.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalUI.kt @@ -4,7 +4,7 @@ import com.walletconnect.sample.wallet.domain.ACCOUNTS_1_EIP155_ADDRESS import com.walletconnect.sample.wallet.domain.ACCOUNTS_2_EIP155_ADDRESS import com.walletconnect.sample.wallet.ui.common.peer.PeerContextUI import com.walletconnect.sample.wallet.ui.common.peer.PeerUI -import com.walletconnect.web3.wallet.client.Wallet +import com.reown.walletkit.client.Wallet data class SessionProposalUI( val peerUI: PeerUI, diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalViewModel.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalViewModel.kt index cdae31eb4..d63523021 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalViewModel.kt @@ -6,8 +6,8 @@ import com.google.firebase.ktx.Firebase import com.walletconnect.sample.wallet.domain.WCDelegate import com.walletconnect.sample.wallet.ui.common.peer.PeerUI import com.walletconnect.sample.wallet.ui.common.peer.toPeerUI -import com.walletconnect.web3.wallet.client.Wallet -import com.walletconnect.web3.wallet.client.WalletKit +import com.reown.walletkit.client.Wallet +import com.reown.walletkit.client.WalletKit import timber.log.Timber class SessionProposalViewModel : ViewModel() { diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt index cdd217840..3149cdc68 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt @@ -14,9 +14,9 @@ import com.walletconnect.sample.wallet.domain.WCDelegate import com.walletconnect.sample.wallet.ui.common.peer.PeerUI import com.walletconnect.sample.wallet.ui.common.peer.toPeerUI import com.walletconnect.util.hexToBytes -import com.walletconnect.web3.wallet.client.Wallet -import com.walletconnect.web3.wallet.client.WalletKit -import com.walletconnect.web3.wallet.utils.CacaoSigner +import com.reown.walletkit.client.Wallet +import com.reown.walletkit.client.WalletKit +import com.reown.walletkit.utils.CacaoSigner import org.json.JSONArray import org.web3j.utils.Numeric.hexStringToByteArray diff --git a/sample/wallet/src/test/kotlin/com/walletconnect/sample/wallet/domain/EthAccountDelegateTest.kt b/sample/wallet/src/test/kotlin/com/walletconnect/sample/wallet/domain/EthAccountDelegateTest.kt index 4a9fa7f88..ae3db535a 100644 --- a/sample/wallet/src/test/kotlin/com/walletconnect/sample/wallet/domain/EthAccountDelegateTest.kt +++ b/sample/wallet/src/test/kotlin/com/walletconnect/sample/wallet/domain/EthAccountDelegateTest.kt @@ -5,7 +5,7 @@ import com.reown.android.internal.common.model.ProjectId import com.reown.android.internal.common.signing.message.MessageSignatureVerifier import com.reown.android.utils.cacao.sign import com.walletconnect.util.hexToBytes -import com.walletconnect.web3.wallet.utils.CacaoSigner +import com.reown.walletkit.utils.CacaoSigner import junit.framework.TestCase.assertEquals import junit.framework.TestCase.assertFalse import junit.framework.TestCase.assertTrue From 847ff78c14114fc8e6888b72b26854d14547bdfd Mon Sep 17 00:00:00 2001 From: kubel Date: Thu, 5 Sep 2024 08:02:45 +0200 Subject: [PATCH 20/51] Migrate web3modal to appkit --- core/bom/build.gradle.kts | 2 +- product/{web3modal => appkit}/.gitignore | 0 product/{web3modal => appkit}/ReadMe.md | 0 .../{web3modal => appkit}/build.gradle.kts | 2 +- .../kotlin/com/reown/appkit}/ui/TestUtils.kt | 6 +- .../components/internal/AppKitTopBarTest.kt | 10 ++-- .../internal/root/AppKitRootStateTest.kt | 6 +- .../internal/root/AppKitRootTest.kt | 12 ++-- .../src/main/AndroidManifest.xml | 0 .../kotlin/com/reown/appkit}/client/AppKit.kt | 28 ++++----- .../com/reown/appkit}/client/ClientMapper.kt | 8 +-- .../kotlin/com/reown/appkit}/client/Modal.kt | 6 +- .../com/reown/appkit/client/models/Account.kt | 8 +++ .../reown/appkit}/client/models/Exceptions.kt | 2 +- .../reown/appkit}/client/models/Session.kt | 4 +- .../appkit}/client/models/request/Request.kt | 2 +- .../models/request/SentRequestResult.kt | 4 +- .../appkit}/data/BalanceRpcRepository.kt | 12 ++-- .../appkit}/data/BlockchainRepository.kt | 8 +-- .../appkit}/data/json_rpc/JsonRpcMethod.kt | 2 +- .../data/json_rpc/balance/BalanceRpc.kt | 4 +- .../json_rpc/balance/BalanceRpcResponse.kt | 2 +- .../reown/appkit}/data/model/IdentityDTO.kt | 2 +- .../appkit}/data/network/BalanceService.kt | 6 +- .../appkit}/data/network/BlockchainService.kt | 4 +- .../com/reown/appkit}/di/AppKitDITags.kt | 2 +- .../com/reown/appkit}/di/BalanceRpcModule.kt | 8 +-- .../reown/appkit}/di/BlockchainApiModule.kt | 8 +-- .../com/reown/appkit}/di/EngineModule.kt | 8 +-- .../com/reown/appkit}/di/Web3ModalModule.kt | 26 ++++----- .../appkit}/domain/RecentWalletsRepository.kt | 2 +- .../reown/appkit}/domain/SessionRepository.kt | 6 +- .../appkit}/domain/delegate/AppKitDelegate.kt | 22 +++---- .../reown/appkit}/domain/model/AccountData.kt | 4 +- .../com/reown/appkit}/domain/model/Balance.kt | 4 +- .../reown/appkit}/domain/model/Exceptions.kt | 4 +- .../reown/appkit}/domain/model/Identity.kt | 2 +- .../com/reown/appkit}/domain/model/Session.kt | 2 +- .../usecase/ConnectionEventRepository.kt | 2 +- .../usecase/DeleteSessionDataUseCase.kt | 4 +- .../domain/usecase/GetEthBalanceUseCase.kt | 6 +- .../domain/usecase/GetIdentityUseCase.kt | 6 +- .../domain/usecase/GetRecentWalletUseCase.kt | 4 +- .../domain/usecase/GetSelectedChainUseCase.kt | 4 +- .../domain/usecase/GetSessionUseCase.kt | 4 +- .../usecase/ObserveSelectedChainUseCase.kt | 4 +- .../domain/usecase/ObserveSessionUseCase.kt | 4 +- .../usecase/SaveChainSelectionUseCase.kt | 4 +- .../domain/usecase/SaveRecentWalletUseCase.kt | 4 +- .../domain/usecase/SaveSessionUseCase.kt | 6 +- .../com/reown/appkit}/engine/AppKitEngine.kt | 54 +++++++++--------- .../appkit}/engine/coinbase/CoinbaseClient.kt | 14 ++--- .../appkit}/engine/coinbase/CoinbaseMapper.kt | 2 +- .../appkit}/engine/coinbase/CoinbaseResult.kt | 2 +- .../appkit}/presets/AppKitChainsPresets.kt | 6 +- .../kotlin/com/reown/appkit}/ui/AppKit.kt | 8 +-- .../com/reown/appkit}/ui/AppKitEvents.kt | 2 +- .../com/reown/appkit}/ui/AppKitSheet.kt | 8 +-- .../com/reown/appkit}/ui/AppKitState.kt | 2 +- .../com/reown/appkit}/ui/AppKitTheme.kt | 12 ++-- .../kotlin/com/reown/appkit}/ui/AppKitView.kt | 6 +- .../com/reown/appkit}/ui/AppKitViewModel.kt | 6 +- .../ui/components/ComponentDelegate.kt | 4 +- .../ui/components/button/AccountButton.kt | 36 ++++++------ .../ui/components/button/AppKitState.kt | 30 +++++----- .../ui/components/button/ConnectButton.kt | 18 +++--- .../ui/components/button/LoadingButton.kt | 16 +++--- .../ui/components/button/NetworkButton.kt | 16 +++--- .../ui/components/button/Web3Button.kt | 2 +- .../components/button/views/AccountButton.kt | 10 ++-- .../components/button/views/ConnectButton.kt | 10 ++-- .../ui/components/button/views/Web3Button.kt | 12 ++-- .../ui/components/internal/AppKitComponent.kt | 24 ++++---- .../ui/components/internal/AppKitStates.kt | 12 ++-- .../ui/components/internal/AppKitTopBar.kt | 16 +++--- .../ui/components/internal/Orientation.kt | 2 +- .../internal/commons/ContentDescription.kt | 2 +- .../components/internal/commons/Dividers.kt | 4 +- .../ui/components/internal/commons/Help.kt | 10 ++-- .../ui/components/internal/commons/Icons.kt | 10 ++-- .../ui/components/internal/commons/Label.kt | 8 +-- .../components/internal/commons/ListSelect.kt | 10 ++-- .../ui/components/internal/commons/Loading.kt | 10 ++-- .../ui/components/internal/commons/Spacers.kt | 2 +- .../ui/components/internal/commons/Surface.kt | 2 +- .../components/internal/commons/TestTags.kt | 5 ++ .../ui/components/internal/commons/Wallets.kt | 16 +++--- .../internal/commons/account/AccountImage.kt | 8 +-- .../internal/commons/account/AccountName.kt | 18 +++--- .../internal/commons/button/Button.kt | 12 ++-- .../internal/commons/button/ButtonStyle.kt | 4 +- .../internal/commons/button/ChipButton.kt | 12 ++-- .../internal/commons/button/LinkButton.kt | 4 +- .../internal/commons/entry/AccountEntry.kt | 18 +++--- .../internal/commons/entry/ActionEntry.kt | 16 +++--- .../internal/commons/entry/BaseEntry.kt | 6 +- .../internal/commons/entry/StoreEntry.kt | 16 +++--- .../internal/commons/inputs/BaseTextInput.kt | 4 +- .../internal/commons/inputs/InputCancel.kt | 12 ++-- .../internal/commons/inputs/InputState.kt | 2 +- .../internal/commons/inputs/SearchInput.kt | 12 ++-- .../commons/network/ChainNetworkIcons.kt | 14 ++--- .../commons/network/ChainNetworkItem.kt | 16 +++--- .../internal/commons/switch/PlatformTabRow.kt | 14 ++--- .../ui/components/internal/email/InputBox.kt | 8 +-- .../internal/email/code/CodeInput.kt | 4 +- .../internal/email/code/CodeInputState.kt | 4 +- .../internal/email/input/EmailInput.kt | 12 ++-- .../internal/email/input/EmailInputState.kt | 4 +- .../ui/components/internal/root/AppKitRoot.kt | 30 +++++----- .../internal/root/AppKitRootState.kt | 6 +- .../internal/snackbar/ModalSnackBar.kt | 12 ++-- .../internal/snackbar/ModalSnackbarHost.kt | 2 +- .../internal/snackbar/SnackBarEvent.kt | 2 +- .../internal/snackbar/SnackBarState.kt | 2 +- .../walletconnect/WalletConnectListSelect.kt | 12 ++-- .../walletconnect/WalletConnectLogo.kt | 12 ++-- .../com/reown/appkit}/ui/model/UiState.kt | 6 +- .../reown/appkit}/ui/navigation/NavUtils.kt | 2 +- .../reown/appkit}/ui/navigation/Navigator.kt | 4 +- .../com/reown/appkit}/ui/navigation/Route.kt | 2 +- .../ui/navigation/account/Navigation.kt | 14 ++--- .../connection/RedirectNavigation.kt | 10 ++-- .../reown/appkit}/ui/previews/PreviewData.kt | 6 +- .../com/reown/appkit}/ui/previews/Previews.kt | 14 ++--- .../routes/account/AccountNavigationGraph.kt | 18 +++--- .../ui/routes/account/AccountViewModel.kt | 44 +++++++------- .../ui/routes/account/account/AccountRoute.kt | 52 ++++++++--------- .../chain_redirect/ChainRedirectState.kt | 2 +- .../chain_redirect/ChainSwitchRedirect.kt | 30 +++++----- .../change_network/ChangeNetworkRoute.kt | 26 ++++----- .../siwe_fallback/SIWEFallbackRoute.kt | 10 ++-- .../what_is_network/WhatIsNetworkRoute.kt | 22 +++---- .../appkit}/ui/routes/common/WhatIsNetwork.kt | 20 +++---- .../routes/connect/ConnectNavigationGraph.kt | 28 ++++----- .../ui/routes/connect/ConnectViewModel.kt | 30 +++++----- .../ui/routes/connect/ParingController.kt | 8 +-- .../ui/routes/connect/WalletDataSource.kt | 8 +-- .../connect/all_wallets/AllWalletsRoute.kt | 40 ++++++------- .../choose_network/ChooseNetworkRoute.kt | 14 ++--- .../connect_wallet/ConnectWalletRoute.kt | 26 ++++----- .../connect/get_wallet/GetAWalletRoute.kt | 16 +++--- .../routes/connect/redirect/RedirectState.kt | 2 +- .../connect/redirect/RedirectWalletScreen.kt | 52 ++++++++--------- .../routes/connect/scan_code/ScanCodeRoute.kt | 22 +++---- .../connect/what_is_wallet/WhatIsWallet.kt | 24 ++++---- .../reown/appkit}/ui/theme/AppKitColors.kt | 4 +- .../appkit}/ui/theme/CustomComposition.kt | 4 +- .../com/reown/appkit}/ui/theme/Theme.kt | 2 +- .../com/reown/appkit}/ui/theme/Typography.kt | 2 +- .../com/reown/appkit}/ui/utils/Lifecycle.kt | 4 +- .../com/reown/appkit}/ui/utils/Modifier.kt | 2 +- .../com/reown/appkit}/ui/utils/Navigation.kt | 2 +- .../com/reown/appkit}/utils/ChainPresets.kt | 4 +- .../com/reown/appkit}/utils/EthUtils.kt | 2 +- .../kotlin/com/reown/appkit}/utils/Image.kt | 2 +- .../com/reown/appkit}/utils/ParamsUtils.kt | 4 +- .../com/reown/appkit}/utils/SessionUtils.kt | 12 ++-- .../com/reown/appkit}/utils/ViewUtils.kt | 6 +- .../res/drawable-night/wallet_placeholder.xml | 0 .../src/main/res/drawable/browser.xml | 0 .../src/main/res/drawable/dao.xml | 0 .../src/main/res/drawable/defi.xml | 0 .../src/main/res/drawable/defi_alt.xml | 0 .../src/main/res/drawable/eth.xml | 0 .../src/main/res/drawable/ic_all_wallets.xml | 0 .../src/main/res/drawable/ic_browser.xml | 0 .../src/main/res/drawable/ic_check.xml | 0 .../src/main/res/drawable/ic_chevron_left.xml | 0 .../main/res/drawable/ic_chevron_right.xml | 0 .../src/main/res/drawable/ic_close.xml | 0 .../src/main/res/drawable/ic_compass.xml | 0 .../src/main/res/drawable/ic_copy.xml | 0 .../src/main/res/drawable/ic_disconnect.xml | 0 .../src/main/res/drawable/ic_email.xml | 0 .../src/main/res/drawable/ic_error.xml | 0 .../main/res/drawable/ic_external_link.xml | 0 .../main/res/drawable/ic_forward_chevron.xml | 0 .../main/res/drawable/ic_google_playstore.xml | 0 .../src/main/res/drawable/ic_info.xml | 0 .../src/main/res/drawable/ic_mobile.xml | 0 .../main/res/drawable/ic_question_mark.xml | 0 .../src/main/res/drawable/ic_retry.xml | 0 .../src/main/res/drawable/ic_scan.xml | 0 .../src/main/res/drawable/ic_scan_qr.xml | 0 .../src/main/res/drawable/ic_search.xml | 0 .../main/res/drawable/ic_select_network.xml | 0 .../src/main/res/drawable/ic_success.xml | 0 .../src/main/res/drawable/ic_swap.xml | 0 .../src/main/res/drawable/ic_wallet.xml | 0 .../res/drawable/ic_wallet_connect_logo.xml | 0 .../drawable/ic_wallet_connect_qr_logo.xml | 0 .../src/main/res/drawable/ic_web.xml | 0 .../src/main/res/drawable/layers.xml | 0 .../src/main/res/drawable/lock.xml | 0 .../src/main/res/drawable/login.xml | 0 .../src/main/res/drawable/network.xml | 0 .../src/main/res/drawable/nft.xml | 0 .../src/main/res/drawable/noun.xml | 0 .../src/main/res/drawable/profile.xml | 0 .../src/main/res/drawable/system.xml | 0 .../main/res/drawable/wallet_placeholder.xml | 0 .../main/res/drawable/walletconnect_blue.xml | 0 .../src/main/res/layout/view_button.xml | 0 .../src/main/res/layout/view_web3modal.xml | 0 .../main/res/navigation/web3modal_graph.xml | 2 +- .../src/main/res/values/attrs.xml | 0 .../src/main/res/values/theme.xml | 0 .../ui/components/buttons/ButtonsTest.kt | 14 ++--- .../components/internal/ModalSnackBarTest.kt | 12 ++-- .../ui/routes/account/AccountRouteTest.kt | 20 +++---- .../routes/account/ChainSwitchRedirectTest.kt | 12 ++-- .../routes/account/ChangeNetworkRouteTest.kt | 18 +++--- .../routes/account/WhatIsNetworkRouteTest.kt | 10 ++-- .../ui/routes/connect/AllWalletsRouteTest.kt | 12 ++-- .../connect/ConnectYourWalletRouteTest.kt | 12 ++-- .../ui/routes/connect/GetAWalletRouteTest.kt | 12 ++-- .../routes/connect/RedirectWalletRouteTest.kt | 16 +++--- .../ui/routes/connect/ScanCodeRouteTest.kt | 10 ++-- .../ui/routes/connect/WhatIsWalletTest.kt | 10 ++-- .../com/reown/appkit}/utils/Dispatchers.kt | 2 +- .../reown/appkit}/utils/PaparazziUtilts.kt | 12 ++-- ...ntRoute with Error UiState in DarkMode.png | Bin ...tRoute with Error UiState in Landscape.png | Bin ...tRoute with Error UiState in LightMode.png | Bin ...Route with Loading UiState in DarkMode.png | Bin ...oute with Loading UiState in Landscape.png | Bin ...oute with Loading UiState in LightMode.png | Bin ...Route with Success UiState in DarkMode.png | Bin ...oute with Success UiState in Landscape.png | Bin ...oute with Success UiState in LightMode.png | Bin ...witchRedirect with Decline in DarkMode.png | Bin ...itchRedirect with Decline in LightMode.png | Bin ...witchRedirect with Loading in DarkMode.png | Bin ...itchRedirect with Loading in LightMode.png | Bin ...st_test ChangeNetworkRoute in DarkMode.png | Bin ...t_test ChangeNetworkRoute in Landscape.png | Bin ...t_test ChangeNetworkRoute in LightMode.png | Bin ...outeTest_test WhatIsWallet in DarkMode.png | Bin ...uteTest_test WhatIsWallet in Landscape.png | Bin ...uteTest_test WhatIsWallet in LightMode.png | Bin ...onsTest_test AccountButton in DarkMode.png | Bin ...nsTest_test AccountButton in LightMode.png | Bin ...onsTest_test ConnectButton in DarkMode.png | Bin ...nsTest_test ConnectButton in LightMode.png | Bin ...BarTest_test ModalSnackBar in DarkMode.png | Bin ...arTest_test ModalSnackBar in LightMode.png | Bin ...alletsRoute with EmptyList in DarkMode.png | Bin ...lletsRoute with EmptyList in Landscape.png | Bin ...lletsRoute with EmptyList in LightMode.png | Bin ...sRoute with Loaded Wallets in DarkMode.png | Bin ...Route with Loaded Wallets in Landscape.png | Bin ...Route with Loaded Wallets in LightMode.png | Bin ...sRoute with Loading Append in DarkMode.png | Bin ...Route with Loading Append in Landscape.png | Bin ...Route with Loading Append in LightMode.png | Bin ...sRoute with LoadingRefresh in DarkMode.png | Bin ...Route with LoadingRefresh in Landscape.png | Bin ...Route with LoadingRefresh in LightMode.png | Bin ...llWalletsRoute with Search in DarkMode.png | Bin ...lWalletsRoute with Search in Landscape.png | Bin ...lWalletsRoute with Search in LightMode.png | Bin ...rWallet with Error UiState in DarkMode.png | Bin ...Wallet with Error UiState in LightMode.png | Bin ...allet with Loading UiState in DarkMode.png | Bin ...llet with Loading UiState in LightMode.png | Bin ...allet with Success UiState in DarkMode.png | Bin ...llet with Success UiState in LightMode.png | Bin ...eTest_test GetAWalletRoute in DarkMode.png | Bin ...Test_test GetAWalletRoute in Landscape.png | Bin ...Test_test GetAWalletRoute in LightMode.png | Bin ...uteTest_test ScanCodeRoute in DarkMode.png | Bin ...teTest_test ScanCodeRoute in Landscape.png | Bin ...teTest_test ScanCodeRoute in LightMode.png | Bin ...tRoute with Loading state in DarkMode .png | Bin ...Route with Loading state in Landscape .png | Bin ...Route with Loading state in LightMode .png | Bin ...ectWalletRoute with NotDetected state .png | Bin ...te with NotDetected state in DarkMode .png | Bin ...e with NotDetected state in Landscape .png | Bin ...RedirectWalletRoute with Reject state .png | Bin ...etRoute with Reject state in DarkMode .png | Bin ...tRoute with Reject state in Landscape .png | Bin ...lletTest_test WhatIsWallet in DarkMode.png | Bin ...letTest_test WhatIsWallet in Landscape.png | Bin ...letTest_test WhatIsWallet in LightMode.png | Bin .../web3/modal/client/models/Account.kt | 8 --- .../components/internal/commons/TestTags.kt | 5 -- sample/dapp/build.gradle.kts | 4 +- .../sample/dapp/DappSampleApp.kt | 8 +-- .../sample/dapp/domain/DappDelegate.kt | 4 +- .../sample/dapp/ui/DappSampleNavGraph.kt | 2 +- .../account/AccountViewModel.kt | 8 +-- .../chain_selection/ChainSelectionRoute.kt | 4 +- .../ChainSelectionViewModel.kt | 4 +- .../ui/routes/host/DappSampleViewModel.kt | 2 +- sample/modal/build.gradle.kts | 4 +- .../walletconnect/sample/modal/AppKitApp.kt | 8 +-- .../sample/modal/MainActivity.kt | 6 +- .../sample/modal/ModalSampleDelegate.kt | 4 +- .../sample/modal/compose/ComposeActivity.kt | 2 +- .../sample/modal/compose/HomeScreen.kt | 14 ++--- .../modal/kotlindsl/KotlinDSLActivity.kt | 2 +- .../sample/modal/ui/LabScreen.kt | 18 +++--- .../sample/modal/ui/PredifinedThemes.kt | 2 +- .../sample/modal/view/ViewActivity.kt | 2 +- .../src/main/res/layout/activity_view.xml | 2 +- .../src/main/res/layout/fragment_home.xml | 6 +- 308 files changed, 946 insertions(+), 946 deletions(-) rename product/{web3modal => appkit}/.gitignore (100%) rename product/{web3modal => appkit}/ReadMe.md (100%) rename product/{web3modal => appkit}/build.gradle.kts (98%) rename product/{web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal => appkit/src/androidTest/kotlin/com/reown/appkit}/ui/TestUtils.kt (86%) rename product/{web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal => appkit/src/androidTest/kotlin/com/reown/appkit}/ui/components/internal/AppKitTopBarTest.kt (77%) rename product/{web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal => appkit/src/androidTest/kotlin/com/reown/appkit}/ui/components/internal/root/AppKitRootStateTest.kt (95%) rename product/{web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal => appkit/src/androidTest/kotlin/com/reown/appkit}/ui/components/internal/root/AppKitRootTest.kt (88%) rename product/{web3modal => appkit}/src/main/AndroidManifest.xml (100%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/client/AppKit.kt (92%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/client/ClientMapper.kt (96%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/client/Modal.kt (97%) create mode 100644 product/appkit/src/main/kotlin/com/reown/appkit/client/models/Account.kt rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/client/models/Exceptions.kt (84%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/client/models/Session.kt (82%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/client/models/request/Request.kt (62%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/client/models/request/SentRequestResult.kt (85%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/data/BalanceRpcRepository.kt (67%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/data/BlockchainRepository.kt (72%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/data/json_rpc/JsonRpcMethod.kt (68%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/data/json_rpc/balance/BalanceRpc.kt (80%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/data/json_rpc/balance/BalanceRpcResponse.kt (89%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/data/model/IdentityDTO.kt (77%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/data/network/BalanceService.kt (58%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/data/network/BlockchainService.kt (77%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/di/AppKitDITags.kt (75%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/di/BalanceRpcModule.kt (80%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/di/BlockchainApiModule.kt (78%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/di/EngineModule.kt (79%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/di/Web3ModalModule.kt (68%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/domain/RecentWalletsRepository.kt (89%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/domain/SessionRepository.kt (91%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/domain/delegate/AppKitDelegate.kt (90%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/domain/model/AccountData.kt (58%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/domain/model/Balance.kt (85%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/domain/model/Exceptions.kt (57%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/domain/model/Identity.kt (62%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/domain/model/Session.kt (90%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/domain/usecase/ConnectionEventRepository.kt (94%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/domain/usecase/DeleteSessionDataUseCase.kt (60%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/domain/usecase/GetEthBalanceUseCase.kt (67%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/domain/usecase/GetIdentityUseCase.kt (63%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/domain/usecase/GetRecentWalletUseCase.kt (55%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/domain/usecase/GetSelectedChainUseCase.kt (68%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/domain/usecase/GetSessionUseCase.kt (63%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/domain/usecase/ObserveSelectedChainUseCase.kt (63%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/domain/usecase/ObserveSessionUseCase.kt (54%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/domain/usecase/SaveChainSelectionUseCase.kt (63%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/domain/usecase/SaveRecentWalletUseCase.kt (58%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/domain/usecase/SaveSessionUseCase.kt (50%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/engine/AppKitEngine.kt (88%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/engine/coinbase/CoinbaseClient.kt (93%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/engine/coinbase/CoinbaseMapper.kt (99%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/engine/coinbase/CoinbaseResult.kt (76%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/presets/AppKitChainsPresets.kt (97%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/AppKit.kt (91%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/AppKitEvents.kt (82%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/AppKitSheet.kt (97%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/AppKitState.kt (84%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/AppKitTheme.kt (94%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/AppKitView.kt (91%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/AppKitViewModel.kt (90%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/ComponentDelegate.kt (91%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/button/AccountButton.kt (84%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/button/AppKitState.kt (85%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/button/ConnectButton.kt (78%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/button/LoadingButton.kt (55%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/button/NetworkButton.kt (64%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/button/Web3Button.kt (93%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/button/views/AccountButton.kt (80%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/button/views/ConnectButton.kt (79%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/button/views/Web3Button.kt (80%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/AppKitComponent.kt (84%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/AppKitStates.kt (73%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/AppKitTopBar.kt (70%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/Orientation.kt (94%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/ContentDescription.kt (90%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/Dividers.kt (68%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/Help.kt (92%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/Icons.kt (96%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/Label.kt (92%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/ListSelect.kt (88%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/Loading.kt (93%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/Spacers.kt (89%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/Surface.kt (87%) create mode 100644 product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/TestTags.kt rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/Wallets.kt (93%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/account/AccountImage.kt (91%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/account/AccountName.kt (71%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/button/Button.kt (92%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/button/ButtonStyle.kt (95%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/button/ChipButton.kt (88%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/button/LinkButton.kt (79%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/entry/AccountEntry.kt (83%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/entry/ActionEntry.kt (82%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/entry/BaseEntry.kt (85%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/entry/StoreEntry.kt (83%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/inputs/BaseTextInput.kt (95%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/inputs/InputCancel.kt (80%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/inputs/InputState.kt (94%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/inputs/SearchInput.kt (94%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/network/ChainNetworkIcons.kt (92%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/network/ChainNetworkItem.kt (86%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/commons/switch/PlatformTabRow.kt (91%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/email/InputBox.kt (80%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/email/code/CodeInput.kt (97%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/email/code/CodeInputState.kt (87%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/email/input/EmailInput.kt (87%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/email/input/EmailInputState.kt (88%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/root/AppKitRoot.kt (79%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/root/AppKitRootState.kt (91%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/snackbar/ModalSnackBar.kt (90%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/snackbar/ModalSnackbarHost.kt (96%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/snackbar/SnackBarEvent.kt (83%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/snackbar/SnackBarState.kt (97%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/walletconnect/WalletConnectListSelect.kt (67%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/components/internal/walletconnect/WalletConnectLogo.kt (81%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/model/UiState.kt (85%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/navigation/NavUtils.kt (83%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/navigation/Navigator.kt (95%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/navigation/Route.kt (94%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/navigation/account/Navigation.kt (70%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/navigation/connection/RedirectNavigation.kt (77%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/previews/PreviewData.kt (96%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/previews/Previews.kt (82%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/routes/account/AccountNavigationGraph.kt (65%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/routes/account/AccountViewModel.kt (82%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/routes/account/account/AccountRoute.kt (69%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/routes/account/chain_redirect/ChainRedirectState.kt (65%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/routes/account/chain_redirect/ChainSwitchRedirect.kt (84%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/routes/account/change_network/ChangeNetworkRoute.kt (76%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/routes/account/siwe_fallback/SIWEFallbackRoute.kt (95%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/routes/account/what_is_network/WhatIsNetworkRoute.kt (74%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/routes/common/WhatIsNetwork.kt (74%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/routes/connect/ConnectNavigationGraph.kt (64%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/routes/connect/ConnectViewModel.kt (91%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/routes/connect/ParingController.kt (93%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/routes/connect/WalletDataSource.kt (96%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/routes/connect/all_wallets/AllWalletsRoute.kt (87%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/routes/connect/choose_network/ChooseNetworkRoute.kt (83%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/routes/connect/connect_wallet/ConnectWalletRoute.kt (77%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/routes/connect/get_wallet/GetAWalletRoute.kt (79%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/routes/connect/redirect/RedirectState.kt (73%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/routes/connect/redirect/RedirectWalletScreen.kt (89%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/routes/connect/scan_code/ScanCodeRoute.kt (87%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/routes/connect/what_is_wallet/WhatIsWallet.kt (76%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/theme/AppKitColors.kt (98%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/theme/CustomComposition.kt (80%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/theme/Theme.kt (95%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/theme/Typography.kt (98%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/utils/Lifecycle.kt (91%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/utils/Modifier.kt (81%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/ui/utils/Navigation.kt (98%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/utils/ChainPresets.kt (96%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/utils/EthUtils.kt (92%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/utils/Image.kt (93%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/utils/ParamsUtils.kt (93%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/utils/SessionUtils.kt (91%) rename product/{web3modal/src/main/kotlin/com/walletconnect/web3/modal => appkit/src/main/kotlin/com/reown/appkit}/utils/ViewUtils.kt (57%) rename product/{web3modal => appkit}/src/main/res/drawable-night/wallet_placeholder.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/browser.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/dao.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/defi.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/defi_alt.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/eth.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_all_wallets.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_browser.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_check.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_chevron_left.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_chevron_right.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_close.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_compass.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_copy.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_disconnect.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_email.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_error.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_external_link.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_forward_chevron.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_google_playstore.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_info.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_mobile.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_question_mark.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_retry.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_scan.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_scan_qr.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_search.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_select_network.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_success.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_swap.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_wallet.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_wallet_connect_logo.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_wallet_connect_qr_logo.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/ic_web.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/layers.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/lock.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/login.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/network.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/nft.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/noun.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/profile.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/system.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/wallet_placeholder.xml (100%) rename product/{web3modal => appkit}/src/main/res/drawable/walletconnect_blue.xml (100%) rename product/{web3modal => appkit}/src/main/res/layout/view_button.xml (100%) rename product/{web3modal => appkit}/src/main/res/layout/view_web3modal.xml (100%) rename product/{web3modal => appkit}/src/main/res/navigation/web3modal_graph.xml (82%) rename product/{web3modal => appkit}/src/main/res/values/attrs.xml (100%) rename product/{web3modal => appkit}/src/main/res/values/theme.xml (100%) rename product/{web3modal/src/test/kotlin/com/walletconnect/web3/modal => appkit/src/test/kotlin/com/reown/appkit}/ui/components/buttons/ButtonsTest.kt (83%) rename product/{web3modal/src/test/kotlin/com/walletconnect/web3/modal => appkit/src/test/kotlin/com/reown/appkit}/ui/components/internal/ModalSnackBarTest.kt (75%) rename product/{web3modal/src/test/kotlin/com/walletconnect/web3/modal => appkit/src/test/kotlin/com/reown/appkit}/ui/routes/account/AccountRouteTest.kt (89%) rename product/{web3modal/src/test/kotlin/com/walletconnect/web3/modal => appkit/src/test/kotlin/com/reown/appkit}/ui/routes/account/ChainSwitchRedirectTest.kt (75%) rename product/{web3modal/src/test/kotlin/com/walletconnect/web3/modal => appkit/src/test/kotlin/com/reown/appkit}/ui/routes/account/ChangeNetworkRouteTest.kt (80%) rename product/{web3modal/src/test/kotlin/com/walletconnect/web3/modal => appkit/src/test/kotlin/com/reown/appkit}/ui/routes/account/WhatIsNetworkRouteTest.kt (75%) rename product/{web3modal/src/test/kotlin/com/walletconnect/web3/modal => appkit/src/test/kotlin/com/reown/appkit}/ui/routes/connect/AllWalletsRouteTest.kt (94%) rename product/{web3modal/src/test/kotlin/com/walletconnect/web3/modal => appkit/src/test/kotlin/com/reown/appkit}/ui/routes/connect/ConnectYourWalletRouteTest.kt (88%) rename product/{web3modal/src/test/kotlin/com/walletconnect/web3/modal => appkit/src/test/kotlin/com/reown/appkit}/ui/routes/connect/GetAWalletRouteTest.kt (72%) rename product/{web3modal/src/test/kotlin/com/walletconnect/web3/modal => appkit/src/test/kotlin/com/reown/appkit}/ui/routes/connect/RedirectWalletRouteTest.kt (86%) rename product/{web3modal/src/test/kotlin/com/walletconnect/web3/modal => appkit/src/test/kotlin/com/reown/appkit}/ui/routes/connect/ScanCodeRouteTest.kt (81%) rename product/{web3modal/src/test/kotlin/com/walletconnect/web3/modal => appkit/src/test/kotlin/com/reown/appkit}/ui/routes/connect/WhatIsWalletTest.kt (77%) rename product/{web3modal/src/test/kotlin/com/walletconnect/web3/modal => appkit/src/test/kotlin/com/reown/appkit}/utils/Dispatchers.kt (94%) rename product/{web3modal/src/test/kotlin/com/walletconnect/web3/modal => appkit/src/test/kotlin/com/reown/appkit}/utils/PaparazziUtilts.kt (91%) rename product/{web3modal => appkit}/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in DarkMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in Landscape.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in LightMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in DarkMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in Landscape.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in LightMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in DarkMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in Landscape.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in LightMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Decline in DarkMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Decline in LightMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Loading in DarkMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Loading in LightMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in DarkMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in Landscape.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in LightMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in DarkMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in Landscape.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in LightMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test AccountButton in DarkMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test AccountButton in LightMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test ConnectButton in DarkMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test ConnectButton in LightMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/component/internal/snackbar/images/com.walletconnect.web3.modal.ui.components.internal_ModalSnackBarTest_test ModalSnackBar in DarkMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/component/internal/snackbar/images/com.walletconnect.web3.modal.ui.components.internal_ModalSnackBarTest_test ModalSnackBar in LightMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in DarkMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in Landscape.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in LightMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in DarkMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in Landscape.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in LightMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in DarkMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in Landscape.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in LightMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in DarkMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in Landscape.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in LightMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in DarkMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in Landscape.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in LightMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Error UiState in DarkMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Error UiState in LightMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Loading UiState in DarkMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Loading UiState in LightMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Success UiState in DarkMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Success UiState in LightMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in DarkMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in Landscape.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in LightMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in DarkMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in Landscape.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in LightMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in DarkMode .png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in Landscape .png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in LightMode .png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state .png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state in DarkMode .png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state in Landscape .png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state .png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state in DarkMode .png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state in Landscape .png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in DarkMode.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in Landscape.png (100%) rename product/{web3modal => appkit}/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in LightMode.png (100%) delete mode 100644 product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Account.kt delete mode 100644 product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/TestTags.kt diff --git a/core/bom/build.gradle.kts b/core/bom/build.gradle.kts index c494b1de3..c13a6119a 100644 --- a/core/bom/build.gradle.kts +++ b/core/bom/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { api(project(":core:modal")) api(project(":protocol:sign")) api(project(":protocol:notify")) - api(project(":product:web3modal")) + api(project(":product:appkit")) api(project(":product:walletkit")) } } \ No newline at end of file diff --git a/product/web3modal/.gitignore b/product/appkit/.gitignore similarity index 100% rename from product/web3modal/.gitignore rename to product/appkit/.gitignore diff --git a/product/web3modal/ReadMe.md b/product/appkit/ReadMe.md similarity index 100% rename from product/web3modal/ReadMe.md rename to product/appkit/ReadMe.md diff --git a/product/web3modal/build.gradle.kts b/product/appkit/build.gradle.kts similarity index 98% rename from product/web3modal/build.gradle.kts rename to product/appkit/build.gradle.kts index 3048423f0..fb94bb65a 100644 --- a/product/web3modal/build.gradle.kts +++ b/product/appkit/build.gradle.kts @@ -14,7 +14,7 @@ project.apply { } android { - namespace = "com.walletconnect.web3.modal" + namespace = "com.reown.appkit" compileSdk = COMPILE_SDK defaultConfig { diff --git a/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/TestUtils.kt b/product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/TestUtils.kt similarity index 86% rename from product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/TestUtils.kt rename to product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/TestUtils.kt index 1cb3be060..28ebcbc60 100644 --- a/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/TestUtils.kt +++ b/product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/TestUtils.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui +package com.reown.appkit.ui import androidx.compose.runtime.Composable import androidx.compose.runtime.remember @@ -8,8 +8,8 @@ import androidx.navigation.compose.ComposeNavigator import androidx.navigation.compose.composable import androidx.navigation.createGraph import androidx.navigation.testing.TestNavHostController -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.navigation.addTitleArg +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.navigation.addTitleArg @Composable fun rememberTestNavController(): TestNavHostController { diff --git a/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitTopBarTest.kt b/product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/components/internal/AppKitTopBarTest.kt similarity index 77% rename from product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitTopBarTest.kt rename to product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/components/internal/AppKitTopBarTest.kt index adf34fe96..8388e523d 100644 --- a/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitTopBarTest.kt +++ b/product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/components/internal/AppKitTopBarTest.kt @@ -1,14 +1,14 @@ -package com.walletconnect.web3.modal.ui.components.internal +package com.reown.appkit.ui.components.internal import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.test.onNodeWithContentDescription import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick -import com.walletconnect.web3.modal.ui.components.internal.commons.BackArrowIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.ContentDescription -import com.walletconnect.web3.modal.ui.components.internal.commons.TestTags -import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition +import com.reown.appkit.ui.components.internal.commons.BackArrowIcon +import com.reown.appkit.ui.components.internal.commons.ContentDescription +import com.reown.appkit.ui.components.internal.commons.TestTags +import com.reown.appkit.ui.theme.ProvideAppKitThemeComposition import org.junit.Rule import org.junit.Test import org.junit.Assert.* diff --git a/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootStateTest.kt b/product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/components/internal/root/AppKitRootStateTest.kt similarity index 95% rename from product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootStateTest.kt rename to product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/components/internal/root/AppKitRootStateTest.kt index f7eca0222..65516141b 100644 --- a/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootStateTest.kt +++ b/product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/components/internal/root/AppKitRootStateTest.kt @@ -1,11 +1,11 @@ -package com.walletconnect.web3.modal.ui.components.internal.root +package com.reown.appkit.ui.components.internal.root import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.collectAsState import androidx.compose.runtime.remember import androidx.compose.ui.test.junit4.createComposeRule -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.rememberTestNavController +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.rememberTestNavController import kotlinx.coroutines.test.runTest import org.junit.Assert.assertEquals import org.junit.Rule diff --git a/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootTest.kt b/product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/components/internal/root/AppKitRootTest.kt similarity index 88% rename from product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootTest.kt rename to product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/components/internal/root/AppKitRootTest.kt index 77ac9e28c..f71b472ec 100644 --- a/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootTest.kt +++ b/product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/components/internal/root/AppKitRootTest.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.root +package com.reown.appkit.ui.components.internal.root import androidx.compose.foundation.layout.Box import androidx.compose.runtime.LaunchedEffect @@ -6,11 +6,11 @@ import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.test.onNodeWithContentDescription import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.onNodeWithText -import com.walletconnect.web3.modal.ui.components.internal.commons.ContentDescription -import com.walletconnect.web3.modal.ui.components.internal.commons.TestTags -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.rememberTestNavController -import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition +import com.reown.appkit.ui.components.internal.commons.ContentDescription +import com.reown.appkit.ui.components.internal.commons.TestTags +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.rememberTestNavController +import com.reown.appkit.ui.theme.ProvideAppKitThemeComposition import org.junit.Rule import org.junit.Test diff --git a/product/web3modal/src/main/AndroidManifest.xml b/product/appkit/src/main/AndroidManifest.xml similarity index 100% rename from product/web3modal/src/main/AndroidManifest.xml rename to product/appkit/src/main/AndroidManifest.xml diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/AppKit.kt b/product/appkit/src/main/kotlin/com/reown/appkit/client/AppKit.kt similarity index 92% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/AppKit.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/client/AppKit.kt index d9e5e04e2..ee8f12fa6 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/AppKit.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/client/AppKit.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.client +package com.reown.appkit.client import androidx.activity.ComponentActivity import com.reown.android.internal.common.di.AndroidCommonDITags @@ -10,16 +10,16 @@ import com.reown.sign.client.Sign import com.reown.sign.client.SignClient import com.reown.sign.common.exceptions.SignClientAlreadyInitializedException import com.walletconnect.util.Empty -import com.walletconnect.web3.modal.client.models.Account -import com.walletconnect.web3.modal.client.models.Session -import com.walletconnect.web3.modal.client.models.AppKitClientAlreadyInitializedException -import com.walletconnect.web3.modal.client.models.request.Request -import com.walletconnect.web3.modal.client.models.request.SentRequestResult -import com.walletconnect.web3.modal.di.appKitModule -import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate -import com.walletconnect.web3.modal.domain.model.Session.WalletConnect -import com.walletconnect.web3.modal.domain.model.toModalError -import com.walletconnect.web3.modal.engine.AppKitEngine +import com.reown.appkit.client.models.Account +import com.reown.appkit.client.models.Session +import com.reown.appkit.client.models.AppKitClientAlreadyInitializedException +import com.reown.appkit.client.models.request.Request +import com.reown.appkit.client.models.request.SentRequestResult +import com.reown.appkit.di.appKitModule +import com.reown.appkit.domain.delegate.AppKitDelegate +import com.reown.appkit.domain.model.Session.WalletConnect +import com.reown.appkit.domain.model.toModalError +import com.reown.appkit.engine.AppKitEngine import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import org.jetbrains.annotations.ApiStatus.Experimental @@ -221,7 +221,7 @@ object AppKit { @Deprecated( message = "Modal.Params.Request is deprecated", - replaceWith = ReplaceWith("com.walletconnect.web3.modal.client.models.Request") + replaceWith = ReplaceWith("com.reown.appkit.client.models.Request") ) fun request( request: Modal.Params.Request, @@ -302,7 +302,7 @@ object AppKit { */ @Deprecated( message = "Getting active session is replaced with getAccount()", - replaceWith = ReplaceWith("com.walletconnect.web3.modal.client.AppKit.getAccount()"), + replaceWith = ReplaceWith("com.reown.appkit.client.AppKit.getAccount()"), level = DeprecationLevel.WARNING ) internal fun getActiveSessionByTopic(topic: String) = SignClient.getActiveSessionByTopic(topic)?.toModal() @@ -313,7 +313,7 @@ object AppKit { */ @Deprecated( message = "Getting active session is replaced with getAccount()", - replaceWith = ReplaceWith("com.walletconnect.web3.modal.client.AppKit.getAccount()"), + replaceWith = ReplaceWith("com.reown.appkit.client.AppKit.getAccount()"), level = DeprecationLevel.WARNING ) fun getActiveSession(): Modal.Model.Session? { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/ClientMapper.kt b/product/appkit/src/main/kotlin/com/reown/appkit/client/ClientMapper.kt similarity index 96% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/ClientMapper.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/client/ClientMapper.kt index 79cf32204..5a9818a79 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/ClientMapper.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/client/ClientMapper.kt @@ -1,10 +1,10 @@ -package com.walletconnect.web3.modal.client +package com.reown.appkit.client import com.reown.android.internal.common.signing.cacao.Cacao import com.reown.sign.client.Sign -import com.walletconnect.web3.modal.client.models.Account -import com.walletconnect.web3.modal.client.models.Session -import com.walletconnect.web3.modal.client.models.request.Request +import com.reown.appkit.client.models.Account +import com.reown.appkit.client.models.Session +import com.reown.appkit.client.models.request.Request import java.text.SimpleDateFormat import java.util.Calendar diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/Modal.kt b/product/appkit/src/main/kotlin/com/reown/appkit/client/Modal.kt similarity index 97% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/Modal.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/client/Modal.kt index 51545041a..57e285117 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/Modal.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/client/Modal.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.client +package com.reown.appkit.client import androidx.annotation.DrawableRes import androidx.annotation.Keep @@ -57,7 +57,7 @@ object Modal { @Deprecated( message = "Converted to sealed class to support multiple connectors", - replaceWith = ReplaceWith("com.walletconnect.web3.modal.client.models.Request"), + replaceWith = ReplaceWith("com.reown.appkit.client.models.Request"), level = DeprecationLevel.WARNING ) data class Request( @@ -186,7 +186,7 @@ object Modal { @Deprecated( message = "Converted to sealed class to support multiple connectors", - replaceWith = ReplaceWith("com.walletconnect.web3.modal.client.models.SentRequestResult"), + replaceWith = ReplaceWith("com.reown.appkit.client.models.SentRequestResult"), level = DeprecationLevel.WARNING ) data class SentRequest( diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/client/models/Account.kt b/product/appkit/src/main/kotlin/com/reown/appkit/client/models/Account.kt new file mode 100644 index 000000000..958cbee42 --- /dev/null +++ b/product/appkit/src/main/kotlin/com/reown/appkit/client/models/Account.kt @@ -0,0 +1,8 @@ +package com.reown.appkit.client.models + +import com.reown.appkit.client.Modal + +data class Account( + val address: String, + val chain: Modal.Model.Chain +) \ No newline at end of file diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Exceptions.kt b/product/appkit/src/main/kotlin/com/reown/appkit/client/models/Exceptions.kt similarity index 84% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Exceptions.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/client/models/Exceptions.kt index 878185a34..0d2bd34a9 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Exceptions.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/client/models/Exceptions.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.client.models +package com.reown.appkit.client.models import com.reown.android.internal.common.exception.WalletConnectException diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Session.kt b/product/appkit/src/main/kotlin/com/reown/appkit/client/models/Session.kt similarity index 82% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Session.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/client/models/Session.kt index 2b7bb3a1b..707d9b88d 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Session.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/client/models/Session.kt @@ -1,7 +1,7 @@ -package com.walletconnect.web3.modal.client.models +package com.reown.appkit.client.models import com.reown.android.Core -import com.walletconnect.web3.modal.client.Modal +import com.reown.appkit.client.Modal sealed class Session { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/request/Request.kt b/product/appkit/src/main/kotlin/com/reown/appkit/client/models/request/Request.kt similarity index 62% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/request/Request.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/client/models/request/Request.kt index 94f9aec12..cd2943244 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/request/Request.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/client/models/request/Request.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.client.models.request +package com.reown.appkit.client.models.request data class Request( val method: String, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/request/SentRequestResult.kt b/product/appkit/src/main/kotlin/com/reown/appkit/client/models/request/SentRequestResult.kt similarity index 85% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/request/SentRequestResult.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/client/models/request/SentRequestResult.kt index 626de4bbc..466fde7e3 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/request/SentRequestResult.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/client/models/request/SentRequestResult.kt @@ -1,7 +1,7 @@ -package com.walletconnect.web3.modal.client.models.request +package com.reown.appkit.client.models.request import com.reown.sign.client.Sign -import com.walletconnect.web3.modal.engine.coinbase.CoinbaseResult +import com.reown.appkit.engine.coinbase.CoinbaseResult sealed class SentRequestResult { abstract val method: String diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/BalanceRpcRepository.kt b/product/appkit/src/main/kotlin/com/reown/appkit/data/BalanceRpcRepository.kt similarity index 67% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/BalanceRpcRepository.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/data/BalanceRpcRepository.kt index 55851ea06..bd312faf5 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/BalanceRpcRepository.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/data/BalanceRpcRepository.kt @@ -1,11 +1,11 @@ -package com.walletconnect.web3.modal.data +package com.reown.appkit.data import com.reown.foundation.util.Logger -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.data.json_rpc.balance.BalanceRequest -import com.walletconnect.web3.modal.data.json_rpc.balance.BalanceRpcResponse -import com.walletconnect.web3.modal.data.network.BalanceService -import com.walletconnect.web3.modal.domain.model.Balance +import com.reown.appkit.client.Modal +import com.reown.appkit.data.json_rpc.balance.BalanceRequest +import com.reown.appkit.data.json_rpc.balance.BalanceRpcResponse +import com.reown.appkit.data.network.BalanceService +import com.reown.appkit.domain.model.Balance internal class BalanceRpcRepository( private val balanceService: BalanceService, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/BlockchainRepository.kt b/product/appkit/src/main/kotlin/com/reown/appkit/data/BlockchainRepository.kt similarity index 72% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/BlockchainRepository.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/data/BlockchainRepository.kt index 37b49776e..d1e8e9127 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/BlockchainRepository.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/data/BlockchainRepository.kt @@ -1,9 +1,9 @@ -package com.walletconnect.web3.modal.data +package com.reown.appkit.data import com.reown.android.internal.common.model.ProjectId -import com.walletconnect.web3.modal.data.model.IdentityDTO -import com.walletconnect.web3.modal.data.network.BlockchainService -import com.walletconnect.web3.modal.domain.model.Identity +import com.reown.appkit.data.model.IdentityDTO +import com.reown.appkit.data.network.BlockchainService +import com.reown.appkit.domain.model.Identity internal class BlockchainRepository( private val blockchainService: BlockchainService, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/json_rpc/JsonRpcMethod.kt b/product/appkit/src/main/kotlin/com/reown/appkit/data/json_rpc/JsonRpcMethod.kt similarity index 68% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/json_rpc/JsonRpcMethod.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/data/json_rpc/JsonRpcMethod.kt index 78aa3cbc8..44978ddce 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/json_rpc/JsonRpcMethod.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/data/json_rpc/JsonRpcMethod.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.data.json_rpc +package com.reown.appkit.data.json_rpc internal object JsonRpcMethod { @get:JvmSynthetic diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/json_rpc/balance/BalanceRpc.kt b/product/appkit/src/main/kotlin/com/reown/appkit/data/json_rpc/balance/BalanceRpc.kt similarity index 80% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/json_rpc/balance/BalanceRpc.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/data/json_rpc/balance/BalanceRpc.kt index 3c31bfa89..74fc14e1e 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/json_rpc/balance/BalanceRpc.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/data/json_rpc/balance/BalanceRpc.kt @@ -1,9 +1,9 @@ -package com.walletconnect.web3.modal.data.json_rpc.balance +package com.reown.appkit.data.json_rpc.balance import com.squareup.moshi.Json import com.squareup.moshi.JsonClass import com.walletconnect.util.generateId -import com.walletconnect.web3.modal.data.json_rpc.JsonRpcMethod +import com.reown.appkit.data.json_rpc.JsonRpcMethod @JsonClass(generateAdapter = true) internal data class BalanceRequest( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/json_rpc/balance/BalanceRpcResponse.kt b/product/appkit/src/main/kotlin/com/reown/appkit/data/json_rpc/balance/BalanceRpcResponse.kt similarity index 89% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/json_rpc/balance/BalanceRpcResponse.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/data/json_rpc/balance/BalanceRpcResponse.kt index bf5217979..627bf85c3 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/json_rpc/balance/BalanceRpcResponse.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/data/json_rpc/balance/BalanceRpcResponse.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.data.json_rpc.balance +package com.reown.appkit.data.json_rpc.balance import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/model/IdentityDTO.kt b/product/appkit/src/main/kotlin/com/reown/appkit/data/model/IdentityDTO.kt similarity index 77% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/model/IdentityDTO.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/data/model/IdentityDTO.kt index 6b8a40805..84e41e47f 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/model/IdentityDTO.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/data/model/IdentityDTO.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.data.model +package com.reown.appkit.data.model import com.squareup.moshi.Json diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/network/BalanceService.kt b/product/appkit/src/main/kotlin/com/reown/appkit/data/network/BalanceService.kt similarity index 58% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/network/BalanceService.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/data/network/BalanceService.kt index 14a7a0eb8..856e64dda 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/network/BalanceService.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/data/network/BalanceService.kt @@ -1,7 +1,7 @@ -package com.walletconnect.web3.modal.data.network +package com.reown.appkit.data.network -import com.walletconnect.web3.modal.data.json_rpc.balance.BalanceRequest -import com.walletconnect.web3.modal.data.json_rpc.balance.BalanceRpcResponse +import com.reown.appkit.data.json_rpc.balance.BalanceRequest +import com.reown.appkit.data.json_rpc.balance.BalanceRpcResponse import retrofit2.Response import retrofit2.http.Body import retrofit2.http.POST diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/network/BlockchainService.kt b/product/appkit/src/main/kotlin/com/reown/appkit/data/network/BlockchainService.kt similarity index 77% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/network/BlockchainService.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/data/network/BlockchainService.kt index 48cca5788..6f56860b1 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/network/BlockchainService.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/data/network/BlockchainService.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.data.network +package com.reown.appkit.data.network -import com.walletconnect.web3.modal.data.model.IdentityDTO +import com.reown.appkit.data.model.IdentityDTO import retrofit2.Response import retrofit2.http.GET import retrofit2.http.Path diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/AppKitDITags.kt b/product/appkit/src/main/kotlin/com/reown/appkit/di/AppKitDITags.kt similarity index 75% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/AppKitDITags.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/di/AppKitDITags.kt index 56c1ce33f..2df13c1e9 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/AppKitDITags.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/di/AppKitDITags.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.di +package com.reown.appkit.di internal enum class AppKitDITags { BALANCE_RPC_RETROFIT, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BalanceRpcModule.kt b/product/appkit/src/main/kotlin/com/reown/appkit/di/BalanceRpcModule.kt similarity index 80% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BalanceRpcModule.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/di/BalanceRpcModule.kt index ba42e566f..7e0d8d8c1 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BalanceRpcModule.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/di/BalanceRpcModule.kt @@ -1,9 +1,9 @@ -package com.walletconnect.web3.modal.di +package com.reown.appkit.di import com.reown.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.web3.modal.data.BalanceRpcRepository -import com.walletconnect.web3.modal.data.network.BalanceService -import com.walletconnect.web3.modal.domain.usecase.GetEthBalanceUseCase +import com.reown.appkit.data.BalanceRpcRepository +import com.reown.appkit.data.network.BalanceService +import com.reown.appkit.domain.usecase.GetEthBalanceUseCase import org.koin.core.qualifier.named import org.koin.dsl.module import retrofit2.Retrofit diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BlockchainApiModule.kt b/product/appkit/src/main/kotlin/com/reown/appkit/di/BlockchainApiModule.kt similarity index 78% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BlockchainApiModule.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/di/BlockchainApiModule.kt index 97343f215..9a8035f18 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BlockchainApiModule.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/di/BlockchainApiModule.kt @@ -1,9 +1,9 @@ -package com.walletconnect.web3.modal.di +package com.reown.appkit.di import com.reown.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.web3.modal.data.BlockchainRepository -import com.walletconnect.web3.modal.data.network.BlockchainService -import com.walletconnect.web3.modal.domain.usecase.GetIdentityUseCase +import com.reown.appkit.data.BlockchainRepository +import com.reown.appkit.data.network.BlockchainService +import com.reown.appkit.domain.usecase.GetIdentityUseCase import org.koin.core.qualifier.named import org.koin.dsl.module import retrofit2.Retrofit diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/EngineModule.kt b/product/appkit/src/main/kotlin/com/reown/appkit/di/EngineModule.kt similarity index 79% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/EngineModule.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/di/EngineModule.kt index b26f4560e..216a5da30 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/EngineModule.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/di/EngineModule.kt @@ -1,10 +1,10 @@ -package com.walletconnect.web3.modal.di +package com.reown.appkit.di import android.content.Context import com.reown.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.web3.modal.domain.usecase.ConnectionEventRepository -import com.walletconnect.web3.modal.engine.AppKitEngine -import com.walletconnect.web3.modal.engine.coinbase.CoinbaseClient +import com.reown.appkit.domain.usecase.ConnectionEventRepository +import com.reown.appkit.engine.AppKitEngine +import com.reown.appkit.engine.coinbase.CoinbaseClient import org.koin.android.ext.koin.androidContext import org.koin.core.qualifier.named import org.koin.dsl.module diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/Web3ModalModule.kt b/product/appkit/src/main/kotlin/com/reown/appkit/di/Web3ModalModule.kt similarity index 68% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/Web3ModalModule.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/di/Web3ModalModule.kt index 24f249621..ed7f08f89 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/Web3ModalModule.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/di/Web3ModalModule.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.di +package com.reown.appkit.di import android.content.Context import androidx.datastore.core.DataStore @@ -7,18 +7,18 @@ import androidx.datastore.preferences.preferencesDataStore import com.squareup.moshi.Moshi import com.squareup.moshi.adapters.PolymorphicJsonAdapterFactory import com.reown.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.web3.modal.domain.RecentWalletsRepository -import com.walletconnect.web3.modal.domain.SessionRepository -import com.walletconnect.web3.modal.domain.model.Session -import com.walletconnect.web3.modal.domain.usecase.DeleteSessionDataUseCase -import com.walletconnect.web3.modal.domain.usecase.GetRecentWalletUseCase -import com.walletconnect.web3.modal.domain.usecase.GetSelectedChainUseCase -import com.walletconnect.web3.modal.domain.usecase.GetSessionUseCase -import com.walletconnect.web3.modal.domain.usecase.ObserveSelectedChainUseCase -import com.walletconnect.web3.modal.domain.usecase.ObserveSessionUseCase -import com.walletconnect.web3.modal.domain.usecase.SaveChainSelectionUseCase -import com.walletconnect.web3.modal.domain.usecase.SaveRecentWalletUseCase -import com.walletconnect.web3.modal.domain.usecase.SaveSessionUseCase +import com.reown.appkit.domain.RecentWalletsRepository +import com.reown.appkit.domain.SessionRepository +import com.reown.appkit.domain.model.Session +import com.reown.appkit.domain.usecase.DeleteSessionDataUseCase +import com.reown.appkit.domain.usecase.GetRecentWalletUseCase +import com.reown.appkit.domain.usecase.GetSelectedChainUseCase +import com.reown.appkit.domain.usecase.GetSessionUseCase +import com.reown.appkit.domain.usecase.ObserveSelectedChainUseCase +import com.reown.appkit.domain.usecase.ObserveSessionUseCase +import com.reown.appkit.domain.usecase.SaveChainSelectionUseCase +import com.reown.appkit.domain.usecase.SaveRecentWalletUseCase +import com.reown.appkit.domain.usecase.SaveSessionUseCase import org.koin.android.ext.koin.androidContext import org.koin.core.qualifier.named import org.koin.dsl.module diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/RecentWalletsRepository.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/RecentWalletsRepository.kt similarity index 89% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/RecentWalletsRepository.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/RecentWalletsRepository.kt index fb6c8fbea..412dd9f93 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/RecentWalletsRepository.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/RecentWalletsRepository.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.domain +package com.reown.appkit.domain import android.content.SharedPreferences diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/SessionRepository.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/SessionRepository.kt similarity index 91% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/SessionRepository.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/SessionRepository.kt index 824dbdbcb..5d7d90027 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/SessionRepository.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/SessionRepository.kt @@ -1,12 +1,12 @@ -package com.walletconnect.web3.modal.domain +package com.reown.appkit.domain import androidx.datastore.core.DataStore import androidx.datastore.preferences.core.Preferences import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.stringPreferencesKey import com.squareup.moshi.Moshi -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.domain.model.Session +import com.reown.appkit.client.AppKit +import com.reown.appkit.domain.model.Session import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.map diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/delegate/AppKitDelegate.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/delegate/AppKitDelegate.kt similarity index 90% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/delegate/AppKitDelegate.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/delegate/AppKitDelegate.kt index cda5e0a80..876a15f4c 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/delegate/AppKitDelegate.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/delegate/AppKitDelegate.kt @@ -1,16 +1,16 @@ -package com.walletconnect.web3.modal.domain.delegate +package com.reown.appkit.domain.delegate import com.reown.android.internal.common.wcKoinApp -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.domain.model.Session -import com.walletconnect.web3.modal.domain.usecase.DeleteSessionDataUseCase -import com.walletconnect.web3.modal.domain.usecase.SaveChainSelectionUseCase -import com.walletconnect.web3.modal.domain.usecase.SaveSessionUseCase -import com.walletconnect.web3.modal.utils.EthUtils -import com.walletconnect.web3.modal.utils.getAddress -import com.walletconnect.web3.modal.utils.getSelectedChain -import com.walletconnect.web3.modal.utils.toSession +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.domain.model.Session +import com.reown.appkit.domain.usecase.DeleteSessionDataUseCase +import com.reown.appkit.domain.usecase.SaveChainSelectionUseCase +import com.reown.appkit.domain.usecase.SaveSessionUseCase +import com.reown.appkit.utils.EthUtils +import com.reown.appkit.utils.getAddress +import com.reown.appkit.utils.getSelectedChain +import com.reown.appkit.utils.toSession import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/AccountData.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/model/AccountData.kt similarity index 58% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/AccountData.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/model/AccountData.kt index 6de7345dc..304188a9a 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/AccountData.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/model/AccountData.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.domain.model +package com.reown.appkit.domain.model -import com.walletconnect.web3.modal.client.Modal +import com.reown.appkit.client.Modal internal data class AccountData( val address: String, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/Balance.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/model/Balance.kt similarity index 85% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/Balance.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/model/Balance.kt index f1d19a981..3fbc9983f 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/Balance.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/model/Balance.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.domain.model +package com.reown.appkit.domain.model -import com.walletconnect.web3.modal.client.Modal +import com.reown.appkit.client.Modal import java.math.BigDecimal internal data class Balance( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/Exceptions.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/model/Exceptions.kt similarity index 57% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/Exceptions.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/model/Exceptions.kt index 0413eefdf..221c2a4b0 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/Exceptions.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/model/Exceptions.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.domain.model +package com.reown.appkit.domain.model -import com.walletconnect.web3.modal.client.Modal +import com.reown.appkit.client.Modal object InvalidSessionException: Throwable("Session topic is missing") diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/Identity.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/model/Identity.kt similarity index 62% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/Identity.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/model/Identity.kt index 2bb8ebef8..04275c602 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/Identity.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/model/Identity.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.domain.model +package com.reown.appkit.domain.model data class Identity( val name: String? = null, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/Session.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/model/Session.kt similarity index 90% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/Session.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/model/Session.kt index f8c4fda20..b23c2a4b9 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/Session.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/model/Session.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.domain.model +package com.reown.appkit.domain.model import com.squareup.moshi.JsonClass diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/ConnectionEventRepository.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/ConnectionEventRepository.kt similarity index 94% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/ConnectionEventRepository.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/ConnectionEventRepository.kt index 7cf2b616f..39ee854f3 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/ConnectionEventRepository.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/ConnectionEventRepository.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.domain.usecase +package com.reown.appkit.domain.usecase import android.content.SharedPreferences diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/DeleteSessionDataUseCase.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/DeleteSessionDataUseCase.kt similarity index 60% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/DeleteSessionDataUseCase.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/DeleteSessionDataUseCase.kt index 3919968ec..98a22c683 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/DeleteSessionDataUseCase.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/DeleteSessionDataUseCase.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.domain.usecase +package com.reown.appkit.domain.usecase -import com.walletconnect.web3.modal.domain.SessionRepository +import com.reown.appkit.domain.SessionRepository internal class DeleteSessionDataUseCase( private val repository: SessionRepository diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetEthBalanceUseCase.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetEthBalanceUseCase.kt similarity index 67% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetEthBalanceUseCase.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetEthBalanceUseCase.kt index f13df64bb..deb47babc 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetEthBalanceUseCase.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetEthBalanceUseCase.kt @@ -1,7 +1,7 @@ -package com.walletconnect.web3.modal.domain.usecase +package com.reown.appkit.domain.usecase -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.data.BalanceRpcRepository +import com.reown.appkit.client.Modal +import com.reown.appkit.data.BalanceRpcRepository internal class GetEthBalanceUseCase( private val balanceRpcRepository: BalanceRpcRepository, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetIdentityUseCase.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetIdentityUseCase.kt similarity index 63% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetIdentityUseCase.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetIdentityUseCase.kt index 7d9da34e5..aeb005a62 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetIdentityUseCase.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetIdentityUseCase.kt @@ -1,7 +1,7 @@ -package com.walletconnect.web3.modal.domain.usecase +package com.reown.appkit.domain.usecase -import com.walletconnect.web3.modal.data.BlockchainRepository -import com.walletconnect.web3.modal.domain.model.Identity +import com.reown.appkit.data.BlockchainRepository +import com.reown.appkit.domain.model.Identity internal class GetIdentityUseCase( private val blockchainRepository: BlockchainRepository diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetRecentWalletUseCase.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetRecentWalletUseCase.kt similarity index 55% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetRecentWalletUseCase.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetRecentWalletUseCase.kt index c197e059e..2a64af3b2 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetRecentWalletUseCase.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetRecentWalletUseCase.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.domain.usecase +package com.reown.appkit.domain.usecase -import com.walletconnect.web3.modal.domain.RecentWalletsRepository +import com.reown.appkit.domain.RecentWalletsRepository internal class GetRecentWalletUseCase(private val repository: RecentWalletsRepository) { operator fun invoke() = repository.getRecentWalletId() diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetSelectedChainUseCase.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetSelectedChainUseCase.kt similarity index 68% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetSelectedChainUseCase.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetSelectedChainUseCase.kt index cdfedd650..5d080b87e 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetSelectedChainUseCase.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetSelectedChainUseCase.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.domain.usecase +package com.reown.appkit.domain.usecase -import com.walletconnect.web3.modal.domain.SessionRepository +import com.reown.appkit.domain.SessionRepository import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetSessionUseCase.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetSessionUseCase.kt similarity index 63% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetSessionUseCase.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetSessionUseCase.kt index 478a93d44..24a244e8c 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetSessionUseCase.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetSessionUseCase.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.domain.usecase +package com.reown.appkit.domain.usecase -import com.walletconnect.web3.modal.domain.SessionRepository +import com.reown.appkit.domain.SessionRepository import kotlinx.coroutines.runBlocking internal class GetSessionUseCase( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/ObserveSelectedChainUseCase.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/ObserveSelectedChainUseCase.kt similarity index 63% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/ObserveSelectedChainUseCase.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/ObserveSelectedChainUseCase.kt index e9ac3fd9b..cee459df9 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/ObserveSelectedChainUseCase.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/ObserveSelectedChainUseCase.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.domain.usecase +package com.reown.appkit.domain.usecase -import com.walletconnect.web3.modal.domain.SessionRepository +import com.reown.appkit.domain.SessionRepository import kotlinx.coroutines.flow.map internal class ObserveSelectedChainUseCase( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/ObserveSessionUseCase.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/ObserveSessionUseCase.kt similarity index 54% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/ObserveSessionUseCase.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/ObserveSessionUseCase.kt index 25e7f5d4c..63dbcb2ae 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/ObserveSessionUseCase.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/ObserveSessionUseCase.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.domain.usecase +package com.reown.appkit.domain.usecase -import com.walletconnect.web3.modal.domain.SessionRepository +import com.reown.appkit.domain.SessionRepository internal class ObserveSessionUseCase( private val repository: SessionRepository diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/SaveChainSelectionUseCase.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/SaveChainSelectionUseCase.kt similarity index 63% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/SaveChainSelectionUseCase.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/SaveChainSelectionUseCase.kt index 50a41cdb6..870985bb7 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/SaveChainSelectionUseCase.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/SaveChainSelectionUseCase.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.domain.usecase +package com.reown.appkit.domain.usecase -import com.walletconnect.web3.modal.domain.SessionRepository +import com.reown.appkit.domain.SessionRepository internal class SaveChainSelectionUseCase( private val repository: SessionRepository diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/SaveRecentWalletUseCase.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/SaveRecentWalletUseCase.kt similarity index 58% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/SaveRecentWalletUseCase.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/SaveRecentWalletUseCase.kt index e3e50ed9e..e5163c237 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/SaveRecentWalletUseCase.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/SaveRecentWalletUseCase.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.domain.usecase +package com.reown.appkit.domain.usecase -import com.walletconnect.web3.modal.domain.RecentWalletsRepository +import com.reown.appkit.domain.RecentWalletsRepository internal class SaveRecentWalletUseCase( private val repository: RecentWalletsRepository diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/SaveSessionUseCase.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/SaveSessionUseCase.kt similarity index 50% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/SaveSessionUseCase.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/SaveSessionUseCase.kt index 03100bab1..43c447172 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/SaveSessionUseCase.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/SaveSessionUseCase.kt @@ -1,7 +1,7 @@ -package com.walletconnect.web3.modal.domain.usecase +package com.reown.appkit.domain.usecase -import com.walletconnect.web3.modal.domain.SessionRepository -import com.walletconnect.web3.modal.domain.model.Session +import com.reown.appkit.domain.SessionRepository +import com.reown.appkit.domain.model.Session internal class SaveSessionUseCase( private val repository: SessionRepository diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/AppKitEngine.kt b/product/appkit/src/main/kotlin/com/reown/appkit/engine/AppKitEngine.kt similarity index 88% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/AppKitEngine.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/engine/AppKitEngine.kt index 413350508..822bc45a6 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/AppKitEngine.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/engine/AppKitEngine.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.engine +package com.reown.appkit.engine import android.content.Context import android.content.Intent @@ -16,32 +16,32 @@ import com.reown.foundation.util.Logger import com.reown.sign.client.Sign import com.reown.sign.client.SignClient import com.walletconnect.util.Empty -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.client.models.Account -import com.walletconnect.web3.modal.client.models.CoinbaseClientAlreadyInitializedException -import com.walletconnect.web3.modal.client.models.request.Request -import com.walletconnect.web3.modal.client.models.request.SentRequestResult -import com.walletconnect.web3.modal.client.models.request.toSentRequest -import com.walletconnect.web3.modal.client.toCoinbaseSession -import com.walletconnect.web3.modal.client.toModal -import com.walletconnect.web3.modal.client.toSession -import com.walletconnect.web3.modal.client.toSign -import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate -import com.walletconnect.web3.modal.domain.model.InvalidSessionException -import com.walletconnect.web3.modal.domain.model.Session -import com.walletconnect.web3.modal.domain.usecase.ConnectionEventRepository -import com.walletconnect.web3.modal.domain.usecase.DeleteSessionDataUseCase -import com.walletconnect.web3.modal.domain.usecase.GetSelectedChainUseCase -import com.walletconnect.web3.modal.domain.usecase.GetSessionUseCase -import com.walletconnect.web3.modal.domain.usecase.SaveSessionUseCase -import com.walletconnect.web3.modal.engine.coinbase.COINBASE_WALLET_ID -import com.walletconnect.web3.modal.engine.coinbase.CoinbaseClient -import com.walletconnect.web3.modal.utils.getSelectedChain -import com.walletconnect.web3.modal.utils.toAccount -import com.walletconnect.web3.modal.utils.toChain -import com.walletconnect.web3.modal.utils.toConnectorType -import com.walletconnect.web3.modal.utils.toSession +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.client.models.Account +import com.reown.appkit.client.models.CoinbaseClientAlreadyInitializedException +import com.reown.appkit.client.models.request.Request +import com.reown.appkit.client.models.request.SentRequestResult +import com.reown.appkit.client.models.request.toSentRequest +import com.reown.appkit.client.toCoinbaseSession +import com.reown.appkit.client.toModal +import com.reown.appkit.client.toSession +import com.reown.appkit.client.toSign +import com.reown.appkit.domain.delegate.AppKitDelegate +import com.reown.appkit.domain.model.InvalidSessionException +import com.reown.appkit.domain.model.Session +import com.reown.appkit.domain.usecase.ConnectionEventRepository +import com.reown.appkit.domain.usecase.DeleteSessionDataUseCase +import com.reown.appkit.domain.usecase.GetSelectedChainUseCase +import com.reown.appkit.domain.usecase.GetSessionUseCase +import com.reown.appkit.domain.usecase.SaveSessionUseCase +import com.reown.appkit.engine.coinbase.COINBASE_WALLET_ID +import com.reown.appkit.engine.coinbase.CoinbaseClient +import com.reown.appkit.utils.getSelectedChain +import com.reown.appkit.utils.toAccount +import com.reown.appkit.utils.toChain +import com.reown.appkit.utils.toConnectorType +import com.reown.appkit.utils.toSession import kotlinx.coroutines.launch internal class AppKitEngine( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/coinbase/CoinbaseClient.kt b/product/appkit/src/main/kotlin/com/reown/appkit/engine/coinbase/CoinbaseClient.kt similarity index 93% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/coinbase/CoinbaseClient.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/engine/coinbase/CoinbaseClient.kt index ac05192f5..e7aba5dd4 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/coinbase/CoinbaseClient.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/engine/coinbase/CoinbaseClient.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.engine.coinbase +package com.reown.appkit.engine.coinbase import android.content.Context import android.content.Intent @@ -23,12 +23,12 @@ import com.reown.android.internal.common.modal.data.model.Wallet import com.reown.android.internal.common.model.AppMetaData import com.reown.android.internal.common.wcKoinApp import com.walletconnect.util.Empty -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.models.Account -import com.walletconnect.web3.modal.client.models.request.Request -import com.walletconnect.web3.modal.domain.model.Session -import com.walletconnect.web3.modal.domain.usecase.GetSelectedChainUseCase -import com.walletconnect.web3.modal.utils.toChain +import com.reown.appkit.client.Modal +import com.reown.appkit.client.models.Account +import com.reown.appkit.client.models.request.Request +import com.reown.appkit.domain.model.Session +import com.reown.appkit.domain.usecase.GetSelectedChainUseCase +import com.reown.appkit.utils.toChain internal const val COINBASE_WALLET_ID = "fd20dc426fb37566d803205b19bbc1d4096b248ac04548e3cfb6b3a38bd033aa" diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/coinbase/CoinbaseMapper.kt b/product/appkit/src/main/kotlin/com/reown/appkit/engine/coinbase/CoinbaseMapper.kt similarity index 99% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/coinbase/CoinbaseMapper.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/engine/coinbase/CoinbaseMapper.kt index 8680e1f02..8328d1679 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/coinbase/CoinbaseMapper.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/engine/coinbase/CoinbaseMapper.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.engine.coinbase +package com.reown.appkit.engine.coinbase import com.coinbase.android.nativesdk.message.request.AddChainNativeCurrency import com.coinbase.android.nativesdk.message.request.WatchAssetOptions diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/coinbase/CoinbaseResult.kt b/product/appkit/src/main/kotlin/com/reown/appkit/engine/coinbase/CoinbaseResult.kt similarity index 76% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/coinbase/CoinbaseResult.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/engine/coinbase/CoinbaseResult.kt index 8de6082d0..ba153d7e9 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/coinbase/CoinbaseResult.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/engine/coinbase/CoinbaseResult.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.engine.coinbase +package com.reown.appkit.engine.coinbase sealed class CoinbaseResult { data class Result(val value: String) : CoinbaseResult() diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/presets/AppKitChainsPresets.kt b/product/appkit/src/main/kotlin/com/reown/appkit/presets/AppKitChainsPresets.kt similarity index 97% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/presets/AppKitChainsPresets.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/presets/AppKitChainsPresets.kt index 8a0f04aac..c5b137751 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/presets/AppKitChainsPresets.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/presets/AppKitChainsPresets.kt @@ -1,7 +1,7 @@ -package com.walletconnect.web3.modal.presets +package com.reown.appkit.presets -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.utils.EthUtils +import com.reown.appkit.client.Modal +import com.reown.appkit.utils.EthUtils object AppKitChainsPresets { val ethToken = Modal.Model.Token(name = "Ether", symbol = "ETH", decimal = 18) diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKit.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKit.kt similarity index 91% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKit.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKit.kt index f4b817daf..4313f4163 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKit.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKit.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalMaterialNavigationApi::class) -package com.walletconnect.web3.modal.ui +package com.reown.appkit.ui import android.annotation.SuppressLint import android.os.Bundle @@ -13,9 +13,9 @@ import androidx.navigation.fragment.dialog import androidx.navigation.navArgument import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi import com.google.accompanist.navigation.material.bottomSheet -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.AppKitComponent -import com.walletconnect.web3.modal.ui.navigation.Route +import com.reown.appkit.R +import com.reown.appkit.ui.components.internal.AppKitComponent +import com.reown.appkit.ui.navigation.Route internal const val CHOOSE_NETWORK_KEY = "chooseNetwork" private const val CHOOSE_NETWORK_ARG = "{chooseNetwork}" diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitEvents.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitEvents.kt similarity index 82% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitEvents.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitEvents.kt index f6a7d277a..69b627304 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitEvents.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitEvents.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui +package com.reown.appkit.ui sealed class AppKitEvents { object SessionApproved: AppKitEvents() diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitSheet.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitSheet.kt similarity index 97% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitSheet.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitSheet.kt index 551ae2e82..4576f32dc 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitSheet.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitSheet.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalAnimationApi::class) -package com.walletconnect.web3.modal.ui +package com.reown.appkit.ui import android.app.Dialog import android.content.Context @@ -29,9 +29,9 @@ import com.google.accompanist.navigation.animation.rememberAnimatedNavController import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.reown.modal.utils.theme.toComposeColor -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.AppKitComponent -import com.walletconnect.web3.modal.ui.theme.ColorPalette +import com.reown.appkit.R +import com.reown.appkit.ui.components.internal.AppKitComponent +import com.reown.appkit.ui.theme.ColorPalette class AppKitSheet : BottomSheetDialogFragment() { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitState.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitState.kt similarity index 84% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitState.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitState.kt index e33f78a7e..e30c1ee7e 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitState.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitState.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui +package com.reown.appkit.ui internal sealed class AppKitState { object Connect : AppKitState() diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitTheme.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitTheme.kt similarity index 94% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitTheme.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitTheme.kt index efc87ac86..fe90502ab 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitTheme.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitTheme.kt @@ -1,13 +1,13 @@ -package com.walletconnect.web3.modal.ui +package com.reown.appkit.ui import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.graphics.Color -import com.walletconnect.web3.modal.ui.theme.ColorPalette -import com.walletconnect.web3.modal.ui.theme.CustomComposition -import com.walletconnect.web3.modal.ui.theme.LocalCustomComposition -import com.walletconnect.web3.modal.ui.theme.defaultDarkAppKitColors -import com.walletconnect.web3.modal.ui.theme.defaultLightAppKitColors +import com.reown.appkit.ui.theme.ColorPalette +import com.reown.appkit.ui.theme.CustomComposition +import com.reown.appkit.ui.theme.LocalCustomComposition +import com.reown.appkit.ui.theme.defaultDarkAppKitColors +import com.reown.appkit.ui.theme.defaultLightAppKitColors @Composable fun AppKitTheme( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitView.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitView.kt similarity index 91% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitView.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitView.kt index b3cb175a8..076dac613 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitView.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitView.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui +package com.reown.appkit.ui import android.content.Context import android.util.AttributeSet @@ -6,8 +6,8 @@ import android.view.LayoutInflater import android.widget.FrameLayout import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ViewCompositionStrategy -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.AppKitComponent +import com.reown.appkit.R +import com.reown.appkit.ui.components.internal.AppKitComponent class AppKitView @JvmOverloads constructor( context: Context, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitViewModel.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitViewModel.kt similarity index 90% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitViewModel.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitViewModel.kt index 08f248e14..a3912a660 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitViewModel.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitViewModel.kt @@ -1,10 +1,10 @@ -package com.walletconnect.web3.modal.ui +package com.reown.appkit.ui import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.reown.android.internal.common.wcKoinApp -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.engine.AppKitEngine +import com.reown.appkit.client.AppKit +import com.reown.appkit.engine.AppKitEngine import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/ComponentDelegate.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/ComponentDelegate.kt similarity index 91% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/ComponentDelegate.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/ComponentDelegate.kt index f1cbc8e38..fe30971fa 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/ComponentDelegate.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/ComponentDelegate.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.ui.components +package com.reown.appkit.ui.components -import com.walletconnect.web3.modal.client.AppKit +import com.reown.appkit.client.AppKit import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.onEach diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AccountButton.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/AccountButton.kt similarity index 84% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AccountButton.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/AccountButton.kt index 285e9ed9c..2bb56a04c 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AccountButton.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/AccountButton.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.button +package com.reown.appkit.ui.components.button import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -22,23 +22,23 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.ui.components.internal.commons.HorizontalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.TransparentSurface -import com.walletconnect.web3.modal.ui.components.internal.commons.account.generateAvatarColors -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonSize -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonStyle -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ImageButton -import com.walletconnect.web3.modal.ui.components.internal.commons.button.TextButton -import com.walletconnect.web3.modal.ui.components.internal.commons.network.CircleNetworkImage -import com.walletconnect.web3.modal.ui.previews.ComponentPreview -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition -import com.walletconnect.web3.modal.ui.theme.AppKitTheme -import com.walletconnect.web3.modal.utils.getImageData -import com.walletconnect.web3.modal.utils.toVisibleAddress +import com.reown.appkit.R +import com.reown.appkit.client.Modal +import com.reown.appkit.ui.components.internal.commons.HorizontalSpacer +import com.reown.appkit.ui.components.internal.commons.TransparentSurface +import com.reown.appkit.ui.components.internal.commons.account.generateAvatarColors +import com.reown.appkit.ui.components.internal.commons.button.ButtonSize +import com.reown.appkit.ui.components.internal.commons.button.ButtonStyle +import com.reown.appkit.ui.components.internal.commons.button.ImageButton +import com.reown.appkit.ui.components.internal.commons.button.TextButton +import com.reown.appkit.ui.components.internal.commons.network.CircleNetworkImage +import com.reown.appkit.ui.previews.ComponentPreview +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.ProvideAppKitThemeComposition +import com.reown.appkit.ui.theme.AppKitTheme +import com.reown.appkit.utils.getImageData +import com.reown.appkit.utils.toVisibleAddress enum class AccountButtonType { NORMAL, MIXED diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AppKitState.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/AppKitState.kt similarity index 85% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AppKitState.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/AppKitState.kt index 2ce94091e..5f63fd031 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AppKitState.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/AppKitState.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.button +package com.reown.appkit.ui.components.button import androidx.compose.runtime.Composable import androidx.compose.runtime.remember @@ -10,20 +10,20 @@ import com.reown.android.pulse.model.EventType import com.reown.android.pulse.model.properties.Properties import com.reown.android.pulse.model.properties.Props import com.reown.foundation.util.Logger -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.domain.model.Session -import com.walletconnect.web3.modal.domain.usecase.GetEthBalanceUseCase -import com.walletconnect.web3.modal.domain.usecase.GetSessionUseCase -import com.walletconnect.web3.modal.domain.usecase.ObserveSelectedChainUseCase -import com.walletconnect.web3.modal.domain.usecase.ObserveSessionUseCase -import com.walletconnect.web3.modal.engine.AppKitEngine -import com.walletconnect.web3.modal.ui.components.ComponentDelegate -import com.walletconnect.web3.modal.ui.components.ComponentEvent -import com.walletconnect.web3.modal.ui.openAppKit -import com.walletconnect.web3.modal.utils.getChainNetworkImageUrl -import com.walletconnect.web3.modal.utils.getChains -import com.walletconnect.web3.modal.utils.getSelectedChain +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.domain.model.Session +import com.reown.appkit.domain.usecase.GetEthBalanceUseCase +import com.reown.appkit.domain.usecase.GetSessionUseCase +import com.reown.appkit.domain.usecase.ObserveSelectedChainUseCase +import com.reown.appkit.domain.usecase.ObserveSessionUseCase +import com.reown.appkit.engine.AppKitEngine +import com.reown.appkit.ui.components.ComponentDelegate +import com.reown.appkit.ui.components.ComponentEvent +import com.reown.appkit.ui.openAppKit +import com.reown.appkit.utils.getChainNetworkImageUrl +import com.reown.appkit.utils.getChains +import com.reown.appkit.utils.getSelectedChain import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.SharingStarted diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/ConnectButton.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/ConnectButton.kt similarity index 78% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/ConnectButton.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/ConnectButton.kt index 06db57c80..5aaa063b9 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/ConnectButton.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/ConnectButton.kt @@ -1,17 +1,17 @@ -package com.walletconnect.web3.modal.ui.components.button +package com.reown.appkit.ui.components.button import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.components.internal.commons.LoadingSpinner -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonSize -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonStyle -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ImageButton -import com.walletconnect.web3.modal.ui.components.internal.commons.button.TextButton -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition +import com.reown.appkit.ui.components.internal.commons.LoadingSpinner +import com.reown.appkit.ui.components.internal.commons.button.ButtonSize +import com.reown.appkit.ui.components.internal.commons.button.ButtonStyle +import com.reown.appkit.ui.components.internal.commons.button.ImageButton +import com.reown.appkit.ui.components.internal.commons.button.TextButton +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.ProvideAppKitThemeComposition enum class ConnectButtonSize { NORMAL, SMALL diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/LoadingButton.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/LoadingButton.kt similarity index 55% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/LoadingButton.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/LoadingButton.kt index 763d52214..f7b0ba03b 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/LoadingButton.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/LoadingButton.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.button +package com.reown.appkit.ui.components.button import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.width @@ -6,13 +6,13 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.components.internal.commons.LoadingSpinner -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonSize -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonStyle -import com.walletconnect.web3.modal.ui.components.internal.commons.button.StyledButton -import com.walletconnect.web3.modal.ui.previews.ComponentPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition +import com.reown.appkit.ui.components.internal.commons.LoadingSpinner +import com.reown.appkit.ui.components.internal.commons.button.ButtonSize +import com.reown.appkit.ui.components.internal.commons.button.ButtonStyle +import com.reown.appkit.ui.components.internal.commons.button.StyledButton +import com.reown.appkit.ui.previews.ComponentPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.ProvideAppKitThemeComposition @Composable internal fun LoadingButton() { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/NetworkButton.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/NetworkButton.kt similarity index 64% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/NetworkButton.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/NetworkButton.kt index 1b5ccd875..3c97eef9d 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/NetworkButton.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/NetworkButton.kt @@ -1,16 +1,16 @@ -package com.walletconnect.web3.modal.ui.components.button +package com.reown.appkit.ui.components.button import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.components.internal.commons.SelectNetworkIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonSize -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonStyle -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ImageButton -import com.walletconnect.web3.modal.ui.components.internal.commons.network.CircleNetworkImage -import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition -import com.walletconnect.web3.modal.utils.getImageData +import com.reown.appkit.ui.components.internal.commons.SelectNetworkIcon +import com.reown.appkit.ui.components.internal.commons.button.ButtonSize +import com.reown.appkit.ui.components.internal.commons.button.ButtonStyle +import com.reown.appkit.ui.components.internal.commons.button.ImageButton +import com.reown.appkit.ui.components.internal.commons.network.CircleNetworkImage +import com.reown.appkit.ui.theme.ProvideAppKitThemeComposition +import com.reown.appkit.utils.getImageData @Composable fun NetworkButton( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/Web3Button.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/Web3Button.kt similarity index 93% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/Web3Button.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/Web3Button.kt index 6edcfd859..1e92a3b9f 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/Web3Button.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/Web3Button.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.button +package com.reown.appkit.ui.components.button import androidx.compose.animation.AnimatedContent import androidx.compose.runtime.Composable diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/AccountButton.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/views/AccountButton.kt similarity index 80% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/AccountButton.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/views/AccountButton.kt index 08b632a9b..73db9c3dc 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/AccountButton.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/views/AccountButton.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.button.views +package com.reown.appkit.ui.components.button.views import android.content.Context import android.util.AttributeSet @@ -7,10 +7,10 @@ import android.widget.FrameLayout import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ViewCompositionStrategy import androidx.navigation.findNavController -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.button.AccountButton -import com.walletconnect.web3.modal.ui.components.button.rememberAppKitState -import com.walletconnect.web3.modal.utils.toAccountButtonType +import com.reown.appkit.R +import com.reown.appkit.ui.components.button.AccountButton +import com.reown.appkit.ui.components.button.rememberAppKitState +import com.reown.appkit.utils.toAccountButtonType class AccountButton @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/ConnectButton.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/views/ConnectButton.kt similarity index 79% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/ConnectButton.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/views/ConnectButton.kt index 6d219bfe0..25fcbd151 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/ConnectButton.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/views/ConnectButton.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.button.views +package com.reown.appkit.ui.components.button.views import android.content.Context import android.util.AttributeSet @@ -7,10 +7,10 @@ import android.widget.FrameLayout import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ViewCompositionStrategy import androidx.navigation.findNavController -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.button.ConnectButton -import com.walletconnect.web3.modal.ui.components.button.rememberAppKitState -import com.walletconnect.web3.modal.utils.toConnectButtonSize +import com.reown.appkit.R +import com.reown.appkit.ui.components.button.ConnectButton +import com.reown.appkit.ui.components.button.rememberAppKitState +import com.reown.appkit.utils.toConnectButtonSize class ConnectButton @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/Web3Button.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/views/Web3Button.kt similarity index 80% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/Web3Button.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/views/Web3Button.kt index 8d16b4e71..89de4170e 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/Web3Button.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/views/Web3Button.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.button.views +package com.reown.appkit.ui.components.button.views import android.content.Context import android.util.AttributeSet @@ -7,11 +7,11 @@ import android.widget.FrameLayout import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ViewCompositionStrategy import androidx.navigation.findNavController -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.button.Web3Button -import com.walletconnect.web3.modal.ui.components.button.rememberAppKitState -import com.walletconnect.web3.modal.utils.toAccountButtonType -import com.walletconnect.web3.modal.utils.toConnectButtonSize +import com.reown.appkit.R +import com.reown.appkit.ui.components.button.Web3Button +import com.reown.appkit.ui.components.button.rememberAppKitState +import com.reown.appkit.utils.toAccountButtonType +import com.reown.appkit.utils.toConnectButtonSize class Web3Button @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitComponent.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/AppKitComponent.kt similarity index 84% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitComponent.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/AppKitComponent.kt index 81f69c60b..89025fcfe 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitComponent.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/AppKitComponent.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalAnimationApi::class) -package com.walletconnect.web3.modal.ui.components.internal +package com.reown.appkit.ui.components.internal import android.annotation.SuppressLint import androidx.compose.animation.AnimatedContent @@ -20,17 +20,17 @@ import androidx.compose.ui.Modifier import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavHostController import com.google.accompanist.navigation.animation.rememberAnimatedNavController -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate -import com.walletconnect.web3.modal.ui.AppKitState -import com.walletconnect.web3.modal.ui.AppKitViewModel -import com.walletconnect.web3.modal.ui.components.internal.root.AppKitRoot -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.routes.account.AccountNavGraph -import com.walletconnect.web3.modal.ui.routes.connect.ConnectionNavGraph -import com.walletconnect.web3.modal.ui.utils.ComposableLifecycleEffect -import com.walletconnect.web3.modal.ui.utils.toComponentEvent +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.domain.delegate.AppKitDelegate +import com.reown.appkit.ui.AppKitState +import com.reown.appkit.ui.AppKitViewModel +import com.reown.appkit.ui.components.internal.root.AppKitRoot +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.routes.account.AccountNavGraph +import com.reown.appkit.ui.routes.connect.ConnectionNavGraph +import com.reown.appkit.ui.utils.ComposableLifecycleEffect +import com.reown.appkit.ui.utils.toComponentEvent import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitStates.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/AppKitStates.kt similarity index 73% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitStates.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/AppKitStates.kt index 1694226e8..2da30ac9b 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitStates.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/AppKitStates.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal +package com.reown.appkit.ui.components.internal import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -11,11 +11,11 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.reown.modal.ui.components.common.VerticalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.LoadingSpinner -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonSize -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonStyle -import com.walletconnect.web3.modal.ui.components.internal.commons.button.TryAgainButton -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.components.internal.commons.LoadingSpinner +import com.reown.appkit.ui.components.internal.commons.button.ButtonSize +import com.reown.appkit.ui.components.internal.commons.button.ButtonStyle +import com.reown.appkit.ui.components.internal.commons.button.TryAgainButton +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun LoadingModalState() { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitTopBar.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/AppKitTopBar.kt similarity index 70% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitTopBar.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/AppKitTopBar.kt index 0392e78be..6bf18e584 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitTopBar.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/AppKitTopBar.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal +package com.reown.appkit.ui.components.internal import androidx.compose.foundation.layout.* import androidx.compose.material.Text @@ -8,13 +8,13 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.testTag import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme -import com.walletconnect.web3.modal.ui.components.internal.commons.BackArrowIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.CloseIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.QuestionMarkIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.TestTags -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme +import com.reown.appkit.ui.components.internal.commons.BackArrowIcon +import com.reown.appkit.ui.components.internal.commons.CloseIcon +import com.reown.appkit.ui.components.internal.commons.QuestionMarkIcon +import com.reown.appkit.ui.components.internal.commons.TestTags +import com.reown.appkit.ui.previews.MultipleComponentsPreview @Composable internal fun AppKitTopBar( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/Orientation.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/Orientation.kt similarity index 94% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/Orientation.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/Orientation.kt index 5495b6f89..193af8723 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/Orientation.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/Orientation.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal +package com.reown.appkit.ui.components.internal import android.content.res.Configuration import androidx.compose.runtime.Composable diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/ContentDescription.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/ContentDescription.kt similarity index 90% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/ContentDescription.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/ContentDescription.kt index c89e9a38e..2ba17b674 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/ContentDescription.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/ContentDescription.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons +package com.reown.appkit.ui.components.internal.commons enum class ContentDescription(val description: String) { BACK_ARROW("BackArrow"), diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Dividers.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Dividers.kt similarity index 68% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Dividers.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Dividers.kt index 6b84dc2d1..8ccd0d153 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Dividers.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Dividers.kt @@ -1,9 +1,9 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons +package com.reown.appkit.ui.components.internal.commons import androidx.compose.material.Divider import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun FullWidthDivider(modifier: Modifier = Modifier) { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Help.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Help.kt similarity index 92% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Help.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Help.kt index 0b81a32c7..bb9e6a740 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Help.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Help.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons +package com.reown.appkit.ui.components.internal.commons import androidx.compose.foundation.Image import androidx.compose.foundation.clickable @@ -19,10 +19,10 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.previews.ComponentPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.R +import com.reown.appkit.ui.previews.ComponentPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun HelpSection( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Icons.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Icons.kt similarity index 96% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Icons.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Icons.kt index 07b28de8d..14fa77dda 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Icons.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Icons.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons +package com.reown.appkit.ui.components.internal.commons import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -15,10 +15,10 @@ import androidx.compose.ui.res.vectorResource import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.reown.modal.ui.components.common.roundedClickable -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.R +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun BackArrowIcon( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Label.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Label.kt similarity index 92% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Label.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Label.kt index a730f7a6e..9aed4fd03 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Label.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Label.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons +package com.reown.appkit.ui.components.internal.commons import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -11,9 +11,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun AllLabel(isEnabled: Boolean = true) { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/ListSelect.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/ListSelect.kt similarity index 88% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/ListSelect.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/ListSelect.kt index 4b283efec..f7ed3088b 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/ListSelect.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/ListSelect.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons +package com.reown.appkit.ui.components.internal.commons import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -15,10 +15,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clipToBounds import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.components.internal.walletconnect.WalletConnectLogo -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.components.internal.walletconnect.WalletConnectLogo +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun ListSelectRow( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Loading.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Loading.kt similarity index 93% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Loading.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Loading.kt index 4f8da099a..34d8ec019 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Loading.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Loading.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons +package com.reown.appkit.ui.components.internal.commons import androidx.compose.animation.core.LinearEasing import androidx.compose.animation.core.RepeatMode @@ -35,10 +35,10 @@ import androidx.compose.ui.graphics.drawscope.Stroke import androidx.compose.ui.graphics.nativeCanvas import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.components.internal.commons.network.HexagonShape -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.components.internal.commons.network.HexagonShape +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun LoadingSpinner( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Spacers.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Spacers.kt similarity index 89% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Spacers.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Spacers.kt index 5a093755a..0562b08c4 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Spacers.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Spacers.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons +package com.reown.appkit.ui.components.internal.commons import androidx.compose.foundation.layout.* import androidx.compose.runtime.Composable diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Surface.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Surface.kt similarity index 87% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Surface.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Surface.kt index b8f98cd94..96812c9a4 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Surface.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Surface.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons +package com.reown.appkit.ui.components.internal.commons import androidx.compose.material.Surface import androidx.compose.runtime.Composable diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/TestTags.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/TestTags.kt new file mode 100644 index 000000000..0fef15179 --- /dev/null +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/TestTags.kt @@ -0,0 +1,5 @@ +package com.reown.appkit.ui.components.internal.commons + +internal object TestTags { + const val TITLE = "Title" +} diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Wallets.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Wallets.kt similarity index 93% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Wallets.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Wallets.kt index 598818904..6fa0b6312 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Wallets.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Wallets.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons +package com.reown.appkit.ui.components.internal.commons import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -32,13 +32,13 @@ import androidx.compose.ui.unit.dp import coil.compose.AsyncImage import coil.request.ImageRequest import com.reown.android.internal.common.modal.data.model.Wallet -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.testWallets -import com.walletconnect.web3.modal.ui.theme.AppKitTheme -import com.walletconnect.web3.modal.utils.grayColorFilter -import com.walletconnect.web3.modal.utils.imageHeaders +import com.reown.appkit.R +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.testWallets +import com.reown.appkit.ui.theme.AppKitTheme +import com.reown.appkit.utils.grayColorFilter +import com.reown.appkit.utils.imageHeaders @Composable internal fun MultipleWalletIcon(wallets: List) { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/account/AccountImage.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/account/AccountImage.kt similarity index 91% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/account/AccountImage.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/account/AccountImage.kt index d2db57adb..1936205c4 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/account/AccountImage.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/account/AccountImage.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.account +package com.reown.appkit.ui.components.internal.commons.account import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -14,9 +14,9 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp import coil.compose.AsyncImage import coil.request.ImageRequest -import com.walletconnect.web3.modal.ui.previews.ComponentPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.previews.ComponentPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme import kotlin.math.roundToInt @Composable diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/account/AccountName.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/account/AccountName.kt similarity index 71% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/account/AccountName.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/account/AccountName.kt index 55e22e975..6a07b0850 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/account/AccountName.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/account/AccountName.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.account +package com.reown.appkit.ui.components.internal.commons.account import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding @@ -12,14 +12,14 @@ import androidx.compose.ui.platform.LocalClipboardManager import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.unit.dp import com.reown.modal.ui.components.common.roundedClickable -import com.walletconnect.web3.modal.domain.model.AccountData -import com.walletconnect.web3.modal.domain.model.Identity -import com.walletconnect.web3.modal.ui.components.internal.commons.CopyIcon -import com.walletconnect.web3.modal.ui.previews.ComponentPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.accountDataPreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme -import com.walletconnect.web3.modal.utils.toVisibleAddress +import com.reown.appkit.domain.model.AccountData +import com.reown.appkit.domain.model.Identity +import com.reown.appkit.ui.components.internal.commons.CopyIcon +import com.reown.appkit.ui.previews.ComponentPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.accountDataPreview +import com.reown.appkit.ui.theme.AppKitTheme +import com.reown.appkit.utils.toVisibleAddress @Composable internal fun AccountName(accountData: AccountData) { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/Button.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/button/Button.kt similarity index 92% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/Button.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/button/Button.kt index 110d48a11..9e2e6cbe2 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/Button.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/button/Button.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.button +package com.reown.appkit.ui.components.internal.commons.button import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -20,11 +20,11 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.tooling.preview.PreviewParameterProvider import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.components.internal.commons.HorizontalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.RetryIcon -import com.walletconnect.web3.modal.ui.previews.ComponentPreview -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview +import com.reown.appkit.ui.components.internal.commons.HorizontalSpacer +import com.reown.appkit.ui.components.internal.commons.RetryIcon +import com.reown.appkit.ui.previews.ComponentPreview +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview @Composable internal fun TryAgainButton( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/ButtonStyle.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/button/ButtonStyle.kt similarity index 95% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/ButtonStyle.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/button/ButtonStyle.kt index ff1a45ec3..865297eeb 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/ButtonStyle.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/button/ButtonStyle.kt @@ -1,11 +1,11 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.button +package com.reown.appkit.ui.components.internal.commons.button import androidx.compose.foundation.layout.PaddingValues import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.theme.AppKitTheme internal data class ButtonData( val size: ButtonSize, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/ChipButton.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/button/ChipButton.kt similarity index 88% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/ChipButton.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/button/ChipButton.kt index ae20a5cbc..30f06891b 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/ChipButton.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/button/ChipButton.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.button +package com.reown.appkit.ui.components.internal.commons.button import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -20,11 +20,11 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.tooling.preview.PreviewParameterProvider import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.components.internal.commons.CompassIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.ExternalIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.HorizontalSpacer -import com.walletconnect.web3.modal.ui.previews.ComponentPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview +import com.reown.appkit.ui.components.internal.commons.CompassIcon +import com.reown.appkit.ui.components.internal.commons.ExternalIcon +import com.reown.appkit.ui.components.internal.commons.HorizontalSpacer +import com.reown.appkit.ui.previews.ComponentPreview +import com.reown.appkit.ui.previews.UiModePreview @Composable internal fun ChipButton( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/LinkButton.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/button/LinkButton.kt similarity index 79% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/LinkButton.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/button/LinkButton.kt index a4e92c64f..59edbc6d0 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/LinkButton.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/button/LinkButton.kt @@ -1,10 +1,10 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.button +package com.reown.appkit.ui.components.internal.commons.button import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.components.internal.commons.HorizontalSpacer +import com.reown.appkit.ui.components.internal.commons.HorizontalSpacer @Composable internal fun LinkButton( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/AccountEntry.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/AccountEntry.kt similarity index 83% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/AccountEntry.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/AccountEntry.kt index d6461b549..ece50fbbe 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/AccountEntry.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/AccountEntry.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.entry +package com.reown.appkit.ui.components.internal.commons.entry import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -13,14 +13,14 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp import androidx.core.content.ContextCompat -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.commons.ChevronRightIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.HorizontalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.LoadingSpinner -import com.walletconnect.web3.modal.ui.components.internal.commons.network.CircleNetworkImage -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.R +import com.reown.appkit.ui.components.internal.commons.ChevronRightIcon +import com.reown.appkit.ui.components.internal.commons.HorizontalSpacer +import com.reown.appkit.ui.components.internal.commons.LoadingSpinner +import com.reown.appkit.ui.components.internal.commons.network.CircleNetworkImage +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme internal enum class AccountEntryState { LOADING, NEXT, INFO diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/ActionEntry.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/ActionEntry.kt similarity index 82% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/ActionEntry.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/ActionEntry.kt index c5245a823..b4b2088cf 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/ActionEntry.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/ActionEntry.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.entry +package com.reown.appkit.ui.components.internal.commons.entry import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -17,13 +17,13 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.components.internal.commons.CopyIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.HorizontalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonSize -import com.walletconnect.web3.modal.ui.components.internal.commons.button.LinkButton -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.components.internal.commons.CopyIcon +import com.reown.appkit.ui.components.internal.commons.HorizontalSpacer +import com.reown.appkit.ui.components.internal.commons.button.ButtonSize +import com.reown.appkit.ui.components.internal.commons.button.LinkButton +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun ActionEntry( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/BaseEntry.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/BaseEntry.kt similarity index 85% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/BaseEntry.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/BaseEntry.kt index 3a8a45f64..bedf8f14b 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/BaseEntry.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/BaseEntry.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.entry +package com.reown.appkit.ui.components.internal.commons.entry import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.padding @@ -7,8 +7,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.components.internal.commons.TransparentSurface -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.components.internal.commons.TransparentSurface +import com.reown.appkit.ui.theme.AppKitTheme internal data class EntryColors( val background: Color, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/StoreEntry.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/StoreEntry.kt similarity index 83% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/StoreEntry.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/StoreEntry.kt index 1c17b5cc0..889dbd4fb 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/StoreEntry.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/StoreEntry.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.entry +package com.reown.appkit.ui.components.internal.commons.entry import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -17,13 +17,13 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.components.internal.commons.ForwardIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.HorizontalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.TransparentSurface -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.testWallets -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.components.internal.commons.ForwardIcon +import com.reown.appkit.ui.components.internal.commons.HorizontalSpacer +import com.reown.appkit.ui.components.internal.commons.TransparentSurface +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.testWallets +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun StoreEntry( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/BaseTextInput.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/BaseTextInput.kt similarity index 95% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/BaseTextInput.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/BaseTextInput.kt index 9ebae7299..cf7b88ca1 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/BaseTextInput.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/BaseTextInput.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.inputs +package com.reown.appkit.ui.components.internal.commons.inputs import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -17,7 +17,7 @@ import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.SolidColor import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun BaseTextInput( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/InputCancel.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/InputCancel.kt similarity index 80% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/InputCancel.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/InputCancel.kt index 7656b154a..ae3656694 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/InputCancel.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/InputCancel.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.inputs +package com.reown.appkit.ui.components.internal.commons.inputs import androidx.compose.foundation.Image import androidx.compose.foundation.clickable @@ -13,11 +13,11 @@ import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.vectorResource import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.commons.ContentDescription -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.R +import com.reown.appkit.ui.components.internal.commons.ContentDescription +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun InputCancel( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/InputState.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/InputState.kt similarity index 94% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/InputState.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/InputState.kt index 63bb09bce..ad1a980fd 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/InputState.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/InputState.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.inputs +package com.reown.appkit.ui.components.internal.commons.inputs import androidx.compose.ui.focus.FocusManager import com.walletconnect.util.Empty diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/SearchInput.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/SearchInput.kt similarity index 94% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/SearchInput.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/SearchInput.kt index 1c9bc18de..a1f9e5a9a 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/SearchInput.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/SearchInput.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.inputs +package com.reown.appkit.ui.components.internal.commons.inputs import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -33,11 +33,11 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider import androidx.compose.ui.unit.dp import com.reown.modal.ui.components.common.HorizontalSpacer import com.walletconnect.util.Empty -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.commons.ContentDescription -import com.walletconnect.web3.modal.ui.previews.ComponentPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.R +import com.reown.appkit.ui.components.internal.commons.ContentDescription +import com.reown.appkit.ui.previews.ComponentPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/network/ChainNetworkIcons.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/network/ChainNetworkIcons.kt similarity index 92% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/network/ChainNetworkIcons.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/network/ChainNetworkIcons.kt index f80d9e963..c743cb4f9 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/network/ChainNetworkIcons.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/network/ChainNetworkIcons.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.network +package com.reown.appkit.ui.components.internal.commons.network import android.graphics.drawable.Drawable import androidx.compose.foundation.border @@ -28,12 +28,12 @@ import androidx.compose.ui.unit.dp import androidx.core.content.ContextCompat import coil.compose.AsyncImage import coil.request.ImageRequest -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme -import com.walletconnect.web3.modal.utils.grayColorFilter -import com.walletconnect.web3.modal.utils.imageHeaders +import com.reown.appkit.R +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme +import com.reown.appkit.utils.grayColorFilter +import com.reown.appkit.utils.imageHeaders import kotlin.math.cos import kotlin.math.sin diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/network/ChainNetworkItem.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/network/ChainNetworkItem.kt similarity index 86% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/network/ChainNetworkItem.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/network/ChainNetworkItem.kt index 0d8fb700b..caa6b23ba 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/network/ChainNetworkItem.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/network/ChainNetworkItem.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.network +package com.reown.appkit.ui.components.internal.commons.network import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -16,13 +16,13 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.ui.components.internal.commons.TransparentSurface -import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.R +import com.reown.appkit.client.Modal +import com.reown.appkit.ui.components.internal.commons.TransparentSurface +import com.reown.appkit.ui.components.internal.commons.VerticalSpacer +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun ChainNetworkItem( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/switch/PlatformTabRow.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/switch/PlatformTabRow.kt similarity index 91% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/switch/PlatformTabRow.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/switch/PlatformTabRow.kt index 27dbfb39f..a568aa72d 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/switch/PlatformTabRow.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/switch/PlatformTabRow.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.switch +package com.reown.appkit.ui.components.internal.commons.switch import androidx.compose.animation.core.animateDp import androidx.compose.animation.core.spring @@ -33,12 +33,12 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex -import com.walletconnect.web3.modal.ui.components.internal.commons.HorizontalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.MobileIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.WebIcon -import com.walletconnect.web3.modal.ui.previews.ComponentPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.components.internal.commons.HorizontalSpacer +import com.reown.appkit.ui.components.internal.commons.MobileIcon +import com.reown.appkit.ui.components.internal.commons.WebIcon +import com.reown.appkit.ui.previews.ComponentPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme internal enum class PlatformTab( val value: Int, val label: String diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/InputBox.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/InputBox.kt similarity index 80% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/InputBox.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/InputBox.kt index 971f5a1f1..854f5d1df 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/InputBox.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/InputBox.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.email +package com.reown.appkit.ui.components.internal.email import androidx.compose.animation.animateContentSize import androidx.compose.foundation.layout.Column @@ -11,9 +11,9 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.inputs.InputState -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.components.internal.commons.VerticalSpacer +import com.reown.appkit.ui.components.internal.commons.inputs.InputState +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun InputValidationBox( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/code/CodeInput.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/code/CodeInput.kt similarity index 97% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/code/CodeInput.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/code/CodeInput.kt index a4c3fca20..c22d6bc52 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/code/CodeInput.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/code/CodeInput.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.email.code +package com.reown.appkit.ui.components.internal.email.code import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.RepeatMode @@ -38,7 +38,7 @@ import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.dp import com.walletconnect.util.Empty -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun CodeInput(codeInputState: CodeInputState) { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/code/CodeInputState.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/code/CodeInputState.kt similarity index 87% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/code/CodeInputState.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/code/CodeInputState.kt index e3603e858..f357947b7 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/code/CodeInputState.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/code/CodeInputState.kt @@ -1,11 +1,11 @@ -package com.walletconnect.web3.modal.ui.components.internal.email.code +package com.reown.appkit.ui.components.internal.email.code import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.focus.FocusManager import androidx.compose.ui.platform.LocalFocusManager -import com.walletconnect.web3.modal.ui.components.internal.commons.inputs.InputState +import com.reown.appkit.ui.components.internal.commons.inputs.InputState import kotlinx.coroutines.CoroutineScope @Composable diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/input/EmailInput.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/input/EmailInput.kt similarity index 87% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/input/EmailInput.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/input/EmailInput.kt index e64f9efad..dc8e70ee8 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/input/EmailInput.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/input/EmailInput.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.email.input +package com.reown.appkit.ui.components.internal.email.input import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Row @@ -18,11 +18,11 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.dp import com.reown.modal.ui.components.common.HorizontalSpacer import com.reown.modal.ui.components.common.roundedClickable -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.commons.ContentDescription -import com.walletconnect.web3.modal.ui.components.internal.commons.LoadingSpinner -import com.walletconnect.web3.modal.ui.components.internal.commons.inputs.BaseTextInput -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.R +import com.reown.appkit.ui.components.internal.commons.ContentDescription +import com.reown.appkit.ui.components.internal.commons.LoadingSpinner +import com.reown.appkit.ui.components.internal.commons.inputs.BaseTextInput +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun EmailInput( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/input/EmailInputState.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/input/EmailInputState.kt similarity index 88% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/input/EmailInputState.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/input/EmailInputState.kt index ca3347fdc..7db84e0e7 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/input/EmailInputState.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/input/EmailInputState.kt @@ -1,11 +1,11 @@ -package com.walletconnect.web3.modal.ui.components.internal.email.input +package com.reown.appkit.ui.components.internal.email.input import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.focus.FocusManager import androidx.compose.ui.platform.LocalFocusManager -import com.walletconnect.web3.modal.ui.components.internal.commons.inputs.InputState +import com.reown.appkit.ui.components.internal.commons.inputs.InputState import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.update diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRoot.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/root/AppKitRoot.kt similarity index 79% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRoot.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/root/AppKitRoot.kt index 81a2da04a..5ff15d395 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRoot.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/root/AppKitRoot.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalComposeUiApi::class) -package com.walletconnect.web3.modal.ui.components.internal.root +package com.reown.appkit.ui.components.internal.root import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -21,20 +21,20 @@ import androidx.compose.ui.unit.dp import androidx.navigation.NavHostController import androidx.navigation.compose.rememberNavController import com.reown.modal.ui.components.common.roundedClickable -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate -import com.walletconnect.web3.modal.ui.components.internal.AppKitTopBar -import com.walletconnect.web3.modal.ui.components.internal.commons.BackArrowIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.FullWidthDivider -import com.walletconnect.web3.modal.ui.components.internal.commons.QuestionMarkIcon -import com.walletconnect.web3.modal.ui.components.internal.snackbar.ModalSnackBarHost -import com.walletconnect.web3.modal.ui.components.internal.snackbar.SnackBarState -import com.walletconnect.web3.modal.ui.components.internal.snackbar.rememberSnackBarState -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.client.Modal +import com.reown.appkit.domain.delegate.AppKitDelegate +import com.reown.appkit.ui.components.internal.AppKitTopBar +import com.reown.appkit.ui.components.internal.commons.BackArrowIcon +import com.reown.appkit.ui.components.internal.commons.FullWidthDivider +import com.reown.appkit.ui.components.internal.commons.QuestionMarkIcon +import com.reown.appkit.ui.components.internal.snackbar.ModalSnackBarHost +import com.reown.appkit.ui.components.internal.snackbar.SnackBarState +import com.reown.appkit.ui.components.internal.snackbar.rememberSnackBarState +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.ProvideAppKitThemeComposition +import com.reown.appkit.ui.theme.AppKitTheme import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.filterIsInstance import kotlinx.coroutines.flow.onEach diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootState.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/root/AppKitRootState.kt similarity index 91% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootState.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/root/AppKitRootState.kt index 2945c8dd7..34e02a278 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootState.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/root/AppKitRootState.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.root +package com.reown.appkit.ui.components.internal.root import androidx.compose.runtime.Composable import androidx.compose.runtime.remember @@ -9,8 +9,8 @@ import com.reown.android.internal.common.wcKoinApp import com.reown.android.pulse.domain.SendEventInterface import com.reown.android.pulse.model.EventType import com.reown.android.pulse.model.properties.Props -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.navigation.getTitleArg +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.navigation.getTitleArg import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/ModalSnackBar.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/snackbar/ModalSnackBar.kt similarity index 90% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/ModalSnackBar.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/snackbar/ModalSnackBar.kt index 279f2da5d..51c4f3b1f 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/ModalSnackBar.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/snackbar/ModalSnackBar.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.snackbar +package com.reown.appkit.ui.components.internal.snackbar import androidx.compose.animation.animateContentSize import androidx.compose.foundation.background @@ -20,11 +20,11 @@ import androidx.compose.ui.res.vectorResource import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.tooling.preview.PreviewParameterProvider import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.commons.HorizontalSpacer -import com.walletconnect.web3.modal.ui.previews.ComponentPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.R +import com.reown.appkit.ui.components.internal.commons.HorizontalSpacer +import com.reown.appkit.ui.previews.ComponentPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun ModalSnackBar( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/ModalSnackbarHost.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/snackbar/ModalSnackbarHost.kt similarity index 96% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/ModalSnackbarHost.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/snackbar/ModalSnackbarHost.kt index 297017f32..1c0f2f157 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/ModalSnackbarHost.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/snackbar/ModalSnackbarHost.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.snackbar +package com.reown.appkit.ui.components.internal.snackbar import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.fadeIn diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/SnackBarEvent.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/snackbar/SnackBarEvent.kt similarity index 83% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/SnackBarEvent.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/snackbar/SnackBarEvent.kt index 7df5d9d31..b564b9efc 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/SnackBarEvent.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/snackbar/SnackBarEvent.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.snackbar +package com.reown.appkit.ui.components.internal.snackbar internal enum class SnackBarEventType { SUCCESS, INFO, ERROR diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/SnackBarState.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/snackbar/SnackBarState.kt similarity index 97% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/SnackBarState.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/snackbar/SnackBarState.kt index 227e7132a..625af7eea 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/SnackBarState.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/snackbar/SnackBarState.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.snackbar +package com.reown.appkit.ui.components.internal.snackbar import androidx.compose.runtime.Composable import androidx.compose.runtime.Stable diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/walletconnect/WalletConnectListSelect.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/walletconnect/WalletConnectListSelect.kt similarity index 67% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/walletconnect/WalletConnectListSelect.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/walletconnect/WalletConnectListSelect.kt index 5fca062eb..a92adcc1b 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/walletconnect/WalletConnectListSelect.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/walletconnect/WalletConnectListSelect.kt @@ -1,14 +1,14 @@ -package com.walletconnect.web3.modal.ui.components.internal.walletconnect +package com.reown.appkit.ui.components.internal.walletconnect import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.runtime.Composable import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.components.internal.commons.ListSelectRow -import com.walletconnect.web3.modal.ui.components.internal.commons.AllWalletsIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.TextLabel -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview +import com.reown.appkit.ui.components.internal.commons.ListSelectRow +import com.reown.appkit.ui.components.internal.commons.AllWalletsIcon +import com.reown.appkit.ui.components.internal.commons.TextLabel +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview fun LazyListScope.allWallets(text: String, isEnabled: Boolean = true, onClick: () -> Unit) { item { WalletConnectAll(text = text, isEnabled = isEnabled, onClick = onClick) } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/walletconnect/WalletConnectLogo.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/walletconnect/WalletConnectLogo.kt similarity index 81% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/walletconnect/WalletConnectLogo.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/walletconnect/WalletConnectLogo.kt index 03362e9c6..5af89e875 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/walletconnect/WalletConnectLogo.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/walletconnect/WalletConnectLogo.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.walletconnect +package com.reown.appkit.ui.components.internal.walletconnect import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -13,11 +13,11 @@ import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.vectorResource import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.commons.ContentDescription -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.R +import com.reown.appkit.ui.components.internal.commons.ContentDescription +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun WalletConnectLogo( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/model/UiState.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/model/UiState.kt similarity index 85% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/model/UiState.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/model/UiState.kt index 225793f1d..3bc8d9a57 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/model/UiState.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/model/UiState.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.model +package com.reown.appkit.ui.model import androidx.compose.animation.AnimatedContent import androidx.compose.animation.fadeIn @@ -9,8 +9,8 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import com.reown.modal.ui.model.UiState -import com.walletconnect.web3.modal.ui.components.internal.ErrorModalState -import com.walletconnect.web3.modal.ui.components.internal.LoadingModalState +import com.reown.appkit.ui.components.internal.ErrorModalState +import com.reown.appkit.ui.components.internal.LoadingModalState import kotlinx.coroutines.flow.StateFlow @Composable diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/NavUtils.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/NavUtils.kt similarity index 83% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/NavUtils.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/NavUtils.kt index b5de9a164..0f72f9fb9 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/NavUtils.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/NavUtils.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.navigation +package com.reown.appkit.ui.navigation import androidx.navigation.NavBackStackEntry diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/Navigator.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/Navigator.kt similarity index 95% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/Navigator.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/Navigator.kt index 0fbee267d..0eb5051e9 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/Navigator.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/Navigator.kt @@ -1,10 +1,10 @@ -package com.walletconnect.web3.modal.ui.navigation +package com.reown.appkit.ui.navigation import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.rememberCoroutineScope import androidx.navigation.NavController -import com.walletconnect.web3.modal.ui.components.internal.snackbar.LocalSnackBarHandler +import com.reown.appkit.ui.components.internal.snackbar.LocalSnackBarHandler import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/Route.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/Route.kt similarity index 94% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/Route.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/Route.kt index 22cf16c96..3ece6dd53 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/Route.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/Route.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.navigation +package com.reown.appkit.ui.navigation //Todo Think about split it into own graphs routes diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/account/Navigation.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/account/Navigation.kt similarity index 70% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/account/Navigation.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/account/Navigation.kt index 827aea882..427f6ffd1 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/account/Navigation.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/account/Navigation.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalAnimationApi::class) -package com.walletconnect.web3.modal.ui.navigation.account +package com.reown.appkit.ui.navigation.account import androidx.compose.animation.ExperimentalAnimationApi import androidx.navigation.NavGraphBuilder @@ -8,12 +8,12 @@ import androidx.navigation.NavType import com.google.accompanist.navigation.animation.composable import androidx.navigation.navArgument import com.walletconnect.util.Empty -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.navigation.addTitleArg -import com.walletconnect.web3.modal.ui.routes.account.AccountViewModel -import com.walletconnect.web3.modal.ui.routes.account.chain_redirect.ChainSwitchRedirectRoute +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.navigation.addTitleArg +import com.reown.appkit.ui.routes.account.AccountViewModel +import com.reown.appkit.ui.routes.account.chain_redirect.ChainSwitchRedirectRoute private const val CHAIN_ID_KEY = "chainId" private const val CHAIN_ID_ARG = "{chainId}" diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/connection/RedirectNavigation.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/connection/RedirectNavigation.kt similarity index 77% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/connection/RedirectNavigation.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/connection/RedirectNavigation.kt index 071a96af2..602399b82 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/connection/RedirectNavigation.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/connection/RedirectNavigation.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalAnimationApi::class) -package com.walletconnect.web3.modal.ui.navigation.connection +package com.reown.appkit.ui.navigation.connection import androidx.compose.animation.ExperimentalAnimationApi import androidx.navigation.NavGraphBuilder @@ -9,10 +9,10 @@ import androidx.navigation.navArgument import com.google.accompanist.navigation.animation.composable import com.reown.android.internal.common.modal.data.model.Wallet import com.walletconnect.util.Empty -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.navigation.addTitleArg -import com.walletconnect.web3.modal.ui.routes.connect.ConnectViewModel -import com.walletconnect.web3.modal.ui.routes.connect.redirect.RedirectWalletRoute +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.navigation.addTitleArg +import com.reown.appkit.ui.routes.connect.ConnectViewModel +import com.reown.appkit.ui.routes.connect.redirect.RedirectWalletRoute import timber.log.Timber private const val WALLET_ID_KEY = "walletId" diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/previews/PreviewData.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/previews/PreviewData.kt similarity index 96% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/previews/PreviewData.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/previews/PreviewData.kt index 12a285c4d..c84e68574 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/previews/PreviewData.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/previews/PreviewData.kt @@ -1,9 +1,9 @@ -package com.walletconnect.web3.modal.ui.previews +package com.reown.appkit.ui.previews import androidx.compose.ui.tooling.preview.PreviewParameterProvider import com.reown.android.internal.common.modal.data.model.Wallet -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.domain.model.AccountData +import com.reown.appkit.client.Modal +import com.reown.appkit.domain.model.AccountData private val metaMask: Wallet get() = Wallet(id = "1", name = "MetaMask", homePage = "", order = "", imageUrl = "", mobileLink = "metamask://", webAppLink = "", playStore = "", linkMode = "").apply { isRecent = true } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/previews/Previews.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/previews/Previews.kt similarity index 82% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/previews/Previews.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/previews/Previews.kt index 96c4205e3..7ce71c4ed 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/previews/Previews.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/previews/Previews.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.previews +package com.reown.appkit.ui.previews import android.content.res.Configuration.UI_MODE_NIGHT_NO import android.content.res.Configuration.UI_MODE_NIGHT_YES @@ -14,12 +14,12 @@ import androidx.compose.ui.unit.dp import androidx.navigation.compose.rememberNavController import com.reown.android.internal.common.model.ProjectId import com.reown.android.internal.common.wcKoinApp -import com.walletconnect.web3.modal.ui.components.internal.root.AppKitRoot -import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer -import com.walletconnect.web3.modal.ui.components.internal.root.rememberAppKitRootState -import com.walletconnect.web3.modal.ui.components.internal.snackbar.rememberSnackBarState -import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.components.internal.root.AppKitRoot +import com.reown.appkit.ui.components.internal.commons.VerticalSpacer +import com.reown.appkit.ui.components.internal.root.rememberAppKitRootState +import com.reown.appkit.ui.components.internal.snackbar.rememberSnackBarState +import com.reown.appkit.ui.theme.ProvideAppKitThemeComposition +import com.reown.appkit.ui.theme.AppKitTheme import org.koin.dsl.module @Composable diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountNavigationGraph.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/AccountNavigationGraph.kt similarity index 65% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountNavigationGraph.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/AccountNavigationGraph.kt index dce5e4d11..e97fd242f 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountNavigationGraph.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/AccountNavigationGraph.kt @@ -1,16 +1,16 @@ -package com.walletconnect.web3.modal.ui.routes.account +package com.reown.appkit.ui.routes.account import androidx.compose.runtime.Composable import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavHostController -import com.walletconnect.web3.modal.ui.navigation.ConsumeNavigationEventsEffect -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.navigation.account.chainSwitchRoute -import com.walletconnect.web3.modal.ui.routes.account.account.AccountRoute -import com.walletconnect.web3.modal.ui.routes.account.change_network.ChangeNetworkRoute -import com.walletconnect.web3.modal.ui.routes.account.what_is_network.WhatIsNetworkRoute -import com.walletconnect.web3.modal.ui.utils.AnimatedNavGraph -import com.walletconnect.web3.modal.ui.utils.animatedComposable +import com.reown.appkit.ui.navigation.ConsumeNavigationEventsEffect +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.navigation.account.chainSwitchRoute +import com.reown.appkit.ui.routes.account.account.AccountRoute +import com.reown.appkit.ui.routes.account.change_network.ChangeNetworkRoute +import com.reown.appkit.ui.routes.account.what_is_network.WhatIsNetworkRoute +import com.reown.appkit.ui.utils.AnimatedNavGraph +import com.reown.appkit.ui.utils.animatedComposable @Composable internal fun AccountNavGraph( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountViewModel.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/AccountViewModel.kt similarity index 82% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountViewModel.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/AccountViewModel.kt index 79255105e..f6cde9fd3 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountViewModel.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/AccountViewModel.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.account +package com.reown.appkit.ui.routes.account import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -9,27 +9,27 @@ import com.reown.android.pulse.model.properties.Properties import com.reown.android.pulse.model.properties.Props import com.reown.foundation.util.Logger import com.reown.modal.ui.model.UiState -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.models.request.Request -import com.walletconnect.web3.modal.client.models.request.SentRequestResult -import com.walletconnect.web3.modal.domain.model.AccountData -import com.walletconnect.web3.modal.domain.model.Session -import com.walletconnect.web3.modal.domain.usecase.GetEthBalanceUseCase -import com.walletconnect.web3.modal.domain.usecase.GetIdentityUseCase -import com.walletconnect.web3.modal.domain.usecase.ObserveSelectedChainUseCase -import com.walletconnect.web3.modal.domain.usecase.ObserveSessionUseCase -import com.walletconnect.web3.modal.domain.usecase.SaveChainSelectionUseCase -import com.walletconnect.web3.modal.domain.usecase.SaveSessionUseCase -import com.walletconnect.web3.modal.engine.AppKitEngine -import com.walletconnect.web3.modal.engine.coinbase.CoinbaseResult -import com.walletconnect.web3.modal.ui.navigation.Navigator -import com.walletconnect.web3.modal.ui.navigation.NavigatorImpl -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.navigation.account.toChainSwitchPath -import com.walletconnect.web3.modal.utils.EthUtils -import com.walletconnect.web3.modal.utils.createAddEthChainParams -import com.walletconnect.web3.modal.utils.createSwitchChainParams -import com.walletconnect.web3.modal.utils.getChains +import com.reown.appkit.client.Modal +import com.reown.appkit.client.models.request.Request +import com.reown.appkit.client.models.request.SentRequestResult +import com.reown.appkit.domain.model.AccountData +import com.reown.appkit.domain.model.Session +import com.reown.appkit.domain.usecase.GetEthBalanceUseCase +import com.reown.appkit.domain.usecase.GetIdentityUseCase +import com.reown.appkit.domain.usecase.ObserveSelectedChainUseCase +import com.reown.appkit.domain.usecase.ObserveSessionUseCase +import com.reown.appkit.domain.usecase.SaveChainSelectionUseCase +import com.reown.appkit.domain.usecase.SaveSessionUseCase +import com.reown.appkit.engine.AppKitEngine +import com.reown.appkit.engine.coinbase.CoinbaseResult +import com.reown.appkit.ui.navigation.Navigator +import com.reown.appkit.ui.navigation.NavigatorImpl +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.navigation.account.toChainSwitchPath +import com.reown.appkit.utils.EthUtils +import com.reown.appkit.utils.createAddEthChainParams +import com.reown.appkit.utils.createSwitchChainParams +import com.reown.appkit.utils.getChains import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.catch diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/account/AccountRoute.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/account/AccountRoute.kt similarity index 69% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/account/AccountRoute.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/account/AccountRoute.kt index b479f1005..cab51fd0c 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/account/AccountRoute.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/account/AccountRoute.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.account.account +package com.reown.appkit.ui.routes.account.account import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -15,31 +15,31 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.unit.dp import androidx.navigation.NavController -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.domain.model.AccountData -import com.walletconnect.web3.modal.domain.model.Balance -import com.walletconnect.web3.modal.ui.components.internal.commons.CloseIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.CompassIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.DisconnectIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.ExternalIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.account.AccountName -import com.walletconnect.web3.modal.ui.components.internal.commons.account.AccountImage -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonSize -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonStyle -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ChipButton -import com.walletconnect.web3.modal.ui.components.internal.commons.entry.AccountEntry -import com.walletconnect.web3.modal.ui.components.internal.commons.entry.AccountEntryState -import com.walletconnect.web3.modal.ui.components.internal.commons.network.CircleNetworkImage -import com.walletconnect.web3.modal.ui.model.UiStateBuilder -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.AppKitPreview -import com.walletconnect.web3.modal.ui.previews.ethereumChain -import com.walletconnect.web3.modal.ui.routes.account.AccountViewModel -import com.walletconnect.web3.modal.ui.previews.accountDataPreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme -import com.walletconnect.web3.modal.utils.getImageData +import com.reown.appkit.client.Modal +import com.reown.appkit.domain.model.AccountData +import com.reown.appkit.domain.model.Balance +import com.reown.appkit.ui.components.internal.commons.CloseIcon +import com.reown.appkit.ui.components.internal.commons.CompassIcon +import com.reown.appkit.ui.components.internal.commons.DisconnectIcon +import com.reown.appkit.ui.components.internal.commons.ExternalIcon +import com.reown.appkit.ui.components.internal.commons.VerticalSpacer +import com.reown.appkit.ui.components.internal.commons.account.AccountName +import com.reown.appkit.ui.components.internal.commons.account.AccountImage +import com.reown.appkit.ui.components.internal.commons.button.ButtonSize +import com.reown.appkit.ui.components.internal.commons.button.ButtonStyle +import com.reown.appkit.ui.components.internal.commons.button.ChipButton +import com.reown.appkit.ui.components.internal.commons.entry.AccountEntry +import com.reown.appkit.ui.components.internal.commons.entry.AccountEntryState +import com.reown.appkit.ui.components.internal.commons.network.CircleNetworkImage +import com.reown.appkit.ui.model.UiStateBuilder +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.AppKitPreview +import com.reown.appkit.ui.previews.ethereumChain +import com.reown.appkit.ui.routes.account.AccountViewModel +import com.reown.appkit.ui.previews.accountDataPreview +import com.reown.appkit.ui.theme.AppKitTheme +import com.reown.appkit.utils.getImageData @Composable internal fun AccountRoute( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/chain_redirect/ChainRedirectState.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/chain_redirect/ChainRedirectState.kt similarity index 65% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/chain_redirect/ChainRedirectState.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/chain_redirect/ChainRedirectState.kt index 1f193650d..9fd9c8df3 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/chain_redirect/ChainRedirectState.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/chain_redirect/ChainRedirectState.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.account.chain_redirect +package com.reown.appkit.ui.routes.account.chain_redirect internal sealed class ChainRedirectState { object Loading : ChainRedirectState() diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/chain_redirect/ChainSwitchRedirect.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/chain_redirect/ChainSwitchRedirect.kt similarity index 84% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/chain_redirect/ChainSwitchRedirect.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/chain_redirect/ChainSwitchRedirect.kt index 7f20c0bac..e1a14d3b4 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/chain_redirect/ChainSwitchRedirect.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/chain_redirect/ChainSwitchRedirect.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.account.chain_redirect +package com.reown.appkit.ui.routes.account.chain_redirect import androidx.compose.animation.AnimatedContent import androidx.compose.animation.AnimatedVisibility @@ -20,20 +20,20 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate -import com.walletconnect.web3.modal.ui.components.internal.commons.DeclinedIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.LoadingHexagonBorder -import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.button.TryAgainButton -import com.walletconnect.web3.modal.ui.components.internal.commons.network.HexagonNetworkImage -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.AppKitPreview -import com.walletconnect.web3.modal.ui.previews.testChains -import com.walletconnect.web3.modal.ui.routes.account.AccountViewModel -import com.walletconnect.web3.modal.ui.theme.AppKitTheme -import com.walletconnect.web3.modal.utils.getImageData -import com.walletconnect.web3.modal.utils.toSession +import com.reown.appkit.client.Modal +import com.reown.appkit.domain.delegate.AppKitDelegate +import com.reown.appkit.ui.components.internal.commons.DeclinedIcon +import com.reown.appkit.ui.components.internal.commons.LoadingHexagonBorder +import com.reown.appkit.ui.components.internal.commons.VerticalSpacer +import com.reown.appkit.ui.components.internal.commons.button.TryAgainButton +import com.reown.appkit.ui.components.internal.commons.network.HexagonNetworkImage +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.AppKitPreview +import com.reown.appkit.ui.previews.testChains +import com.reown.appkit.ui.routes.account.AccountViewModel +import com.reown.appkit.ui.theme.AppKitTheme +import com.reown.appkit.utils.getImageData +import com.reown.appkit.utils.toSession import kotlinx.coroutines.launch @Composable diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/change_network/ChangeNetworkRoute.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/change_network/ChangeNetworkRoute.kt similarity index 76% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/change_network/ChangeNetworkRoute.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/change_network/ChangeNetworkRoute.kt index 99f1101ea..34bff4bf2 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/change_network/ChangeNetworkRoute.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/change_network/ChangeNetworkRoute.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.account.change_network +package com.reown.appkit.ui.routes.account.change_network import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -13,18 +13,18 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.ui.components.internal.commons.NetworkBottomSection -import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.network.ChainNetworkItem -import com.walletconnect.web3.modal.ui.model.UiStateBuilder -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.AppKitPreview -import com.walletconnect.web3.modal.ui.previews.ethereumChain -import com.walletconnect.web3.modal.ui.previews.testChains -import com.walletconnect.web3.modal.ui.routes.account.AccountViewModel -import com.walletconnect.web3.modal.utils.getChainNetworkImageUrl +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.ui.components.internal.commons.NetworkBottomSection +import com.reown.appkit.ui.components.internal.commons.VerticalSpacer +import com.reown.appkit.ui.components.internal.commons.network.ChainNetworkItem +import com.reown.appkit.ui.model.UiStateBuilder +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.AppKitPreview +import com.reown.appkit.ui.previews.ethereumChain +import com.reown.appkit.ui.previews.testChains +import com.reown.appkit.ui.routes.account.AccountViewModel +import com.reown.appkit.utils.getChainNetworkImageUrl @Composable internal fun ChangeNetworkRoute( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/siwe_fallback/SIWEFallbackRoute.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/siwe_fallback/SIWEFallbackRoute.kt similarity index 95% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/siwe_fallback/SIWEFallbackRoute.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/siwe_fallback/SIWEFallbackRoute.kt index b294f1e9c..ebe4be785 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/siwe_fallback/SIWEFallbackRoute.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/siwe_fallback/SIWEFallbackRoute.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.account.siwe_fallback +package com.reown.appkit.ui.routes.account.siwe_fallback import androidx.compose.animation.AnimatedContent import androidx.compose.foundation.background @@ -32,10 +32,10 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.WalletImageWithLoader -import com.walletconnect.web3.modal.ui.routes.connect.ConnectViewModel -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.components.internal.commons.VerticalSpacer +import com.reown.appkit.ui.components.internal.commons.WalletImageWithLoader +import com.reown.appkit.ui.routes.connect.ConnectViewModel +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun SIWEFallbackRoute( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/what_is_network/WhatIsNetworkRoute.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/what_is_network/WhatIsNetworkRoute.kt similarity index 74% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/what_is_network/WhatIsNetworkRoute.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/what_is_network/WhatIsNetworkRoute.kt index 6d7213d01..1081da838 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/what_is_network/WhatIsNetworkRoute.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/what_is_network/WhatIsNetworkRoute.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.account.what_is_network +package com.reown.appkit.ui.routes.account.what_is_network import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues @@ -12,16 +12,16 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.commons.ExternalIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.HelpSection -import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonSize -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonStyle -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ImageButton -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.AppKitPreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.R +import com.reown.appkit.ui.components.internal.commons.ExternalIcon +import com.reown.appkit.ui.components.internal.commons.HelpSection +import com.reown.appkit.ui.components.internal.commons.VerticalSpacer +import com.reown.appkit.ui.components.internal.commons.button.ButtonSize +import com.reown.appkit.ui.components.internal.commons.button.ButtonStyle +import com.reown.appkit.ui.components.internal.commons.button.ImageButton +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.AppKitPreview +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun WhatIsNetworkRoute() { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/common/WhatIsNetwork.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/common/WhatIsNetwork.kt similarity index 74% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/common/WhatIsNetwork.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/common/WhatIsNetwork.kt index 1e92cec6d..093d1f185 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/common/WhatIsNetwork.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/common/WhatIsNetwork.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.common +package com.reown.appkit.ui.routes.common import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -9,15 +9,15 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.commons.ExternalIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.HelpSection -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonSize -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonStyle -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ImageButton -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.AppKitPreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.R +import com.reown.appkit.ui.components.internal.commons.ExternalIcon +import com.reown.appkit.ui.components.internal.commons.HelpSection +import com.reown.appkit.ui.components.internal.commons.button.ButtonSize +import com.reown.appkit.ui.components.internal.commons.button.ButtonStyle +import com.reown.appkit.ui.components.internal.commons.button.ImageButton +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.AppKitPreview +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun WhatIsNetworkRoute() { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectNavigationGraph.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/ConnectNavigationGraph.kt similarity index 64% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectNavigationGraph.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/ConnectNavigationGraph.kt index bace95d4d..7b8dd3749 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectNavigationGraph.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/ConnectNavigationGraph.kt @@ -1,21 +1,21 @@ -package com.walletconnect.web3.modal.ui.routes.connect +package com.reown.appkit.ui.routes.connect import androidx.compose.runtime.Composable import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavHostController -import com.walletconnect.web3.modal.ui.navigation.ConsumeNavigationEventsEffect -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.navigation.connection.redirectRoute -import com.walletconnect.web3.modal.ui.routes.account.siwe_fallback.SIWEFallbackRoute -import com.walletconnect.web3.modal.ui.routes.common.WhatIsNetworkRoute -import com.walletconnect.web3.modal.ui.routes.connect.all_wallets.AllWalletsRoute -import com.walletconnect.web3.modal.ui.routes.connect.choose_network.ChooseNetworkRoute -import com.walletconnect.web3.modal.ui.routes.connect.connect_wallet.ConnectWalletRoute -import com.walletconnect.web3.modal.ui.routes.connect.get_wallet.GetAWalletRoute -import com.walletconnect.web3.modal.ui.routes.connect.scan_code.ScanQRCodeRoute -import com.walletconnect.web3.modal.ui.routes.connect.what_is_wallet.WhatIsWallet -import com.walletconnect.web3.modal.ui.utils.AnimatedNavGraph -import com.walletconnect.web3.modal.ui.utils.animatedComposable +import com.reown.appkit.ui.navigation.ConsumeNavigationEventsEffect +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.navigation.connection.redirectRoute +import com.reown.appkit.ui.routes.account.siwe_fallback.SIWEFallbackRoute +import com.reown.appkit.ui.routes.common.WhatIsNetworkRoute +import com.reown.appkit.ui.routes.connect.all_wallets.AllWalletsRoute +import com.reown.appkit.ui.routes.connect.choose_network.ChooseNetworkRoute +import com.reown.appkit.ui.routes.connect.connect_wallet.ConnectWalletRoute +import com.reown.appkit.ui.routes.connect.get_wallet.GetAWalletRoute +import com.reown.appkit.ui.routes.connect.scan_code.ScanQRCodeRoute +import com.reown.appkit.ui.routes.connect.what_is_wallet.WhatIsWallet +import com.reown.appkit.ui.utils.AnimatedNavGraph +import com.reown.appkit.ui.utils.animatedComposable @Composable internal fun ConnectionNavGraph( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectViewModel.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/ConnectViewModel.kt similarity index 91% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectViewModel.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/ConnectViewModel.kt index ccc6ee4cc..2de1b93c1 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectViewModel.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/ConnectViewModel.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.connect +package com.reown.appkit.ui.routes.connect import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -12,20 +12,20 @@ import com.reown.android.pulse.model.properties.Props import com.reown.foundation.util.Logger import com.reown.modal.ui.model.LoadingState import com.reown.modal.ui.model.UiState -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.client.models.request.Request -import com.walletconnect.web3.modal.client.models.request.SentRequestResult -import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate -import com.walletconnect.web3.modal.domain.usecase.ObserveSelectedChainUseCase -import com.walletconnect.web3.modal.domain.usecase.SaveChainSelectionUseCase -import com.walletconnect.web3.modal.domain.usecase.SaveRecentWalletUseCase -import com.walletconnect.web3.modal.engine.AppKitEngine -import com.walletconnect.web3.modal.ui.navigation.Navigator -import com.walletconnect.web3.modal.ui.navigation.NavigatorImpl -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.navigation.connection.toRedirectPath -import com.walletconnect.web3.modal.utils.getSelectedChain +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.client.models.request.Request +import com.reown.appkit.client.models.request.SentRequestResult +import com.reown.appkit.domain.delegate.AppKitDelegate +import com.reown.appkit.domain.usecase.ObserveSelectedChainUseCase +import com.reown.appkit.domain.usecase.SaveChainSelectionUseCase +import com.reown.appkit.domain.usecase.SaveRecentWalletUseCase +import com.reown.appkit.engine.AppKitEngine +import com.reown.appkit.ui.navigation.Navigator +import com.reown.appkit.ui.navigation.NavigatorImpl +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.navigation.connection.toRedirectPath +import com.reown.appkit.utils.getSelectedChain import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ParingController.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/ParingController.kt similarity index 93% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ParingController.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/ParingController.kt index 0d3931177..d0974a761 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ParingController.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/ParingController.kt @@ -1,11 +1,11 @@ -package com.walletconnect.web3.modal.ui.routes.connect +package com.reown.appkit.ui.routes.connect import com.reown.android.Core import com.reown.android.CoreClient import com.reown.android.internal.common.wcKoinApp -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.toModel -import com.walletconnect.web3.modal.engine.AppKitEngine +import com.reown.appkit.client.Modal +import com.reown.appkit.client.toModel +import com.reown.appkit.engine.AppKitEngine internal interface ParingController { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/WalletDataSource.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/WalletDataSource.kt similarity index 96% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/WalletDataSource.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/WalletDataSource.kt index 6ed044c4c..70cd22f41 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/WalletDataSource.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/WalletDataSource.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.connect +package com.reown.appkit.ui.routes.connect import com.reown.android.internal.common.modal.data.model.Wallet import com.reown.android.internal.common.modal.domain.usecase.GetInstalledWalletsIdsUseCaseInterface @@ -6,9 +6,9 @@ import com.reown.android.internal.common.modal.domain.usecase.GetSampleWalletsUs import com.reown.android.internal.common.modal.domain.usecase.GetWalletsUseCaseInterface import com.reown.android.internal.common.wcKoinApp import com.walletconnect.util.Empty -import com.walletconnect.web3.modal.domain.usecase.GetRecentWalletUseCase -import com.walletconnect.web3.modal.engine.AppKitEngine -import com.walletconnect.web3.modal.engine.coinbase.COINBASE_WALLET_ID +import com.reown.appkit.domain.usecase.GetRecentWalletUseCase +import com.reown.appkit.engine.AppKitEngine +import com.reown.appkit.engine.coinbase.COINBASE_WALLET_ID import com.reown.modal.ui.model.LoadingState import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.combine diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/all_wallets/AllWalletsRoute.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/all_wallets/AllWalletsRoute.kt similarity index 87% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/all_wallets/AllWalletsRoute.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/all_wallets/AllWalletsRoute.kt index 5706b3f41..79446df7a 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/all_wallets/AllWalletsRoute.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/all_wallets/AllWalletsRoute.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.connect.all_wallets +package com.reown.appkit.ui.routes.connect.all_wallets import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -51,26 +51,26 @@ import androidx.compose.ui.unit.sp import com.reown.android.internal.common.modal.data.model.Wallet import com.reown.modal.utils.isLandscape import com.walletconnect.util.Empty -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.commons.ContentDescription -import com.walletconnect.web3.modal.ui.components.internal.commons.HorizontalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.LoadingSpinner -import com.walletconnect.web3.modal.ui.components.internal.commons.ScanQRIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.TransparentSurface -import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.inputs.SearchInput -import com.walletconnect.web3.modal.ui.components.internal.commons.inputs.SearchState -import com.walletconnect.web3.modal.ui.components.internal.commons.inputs.SearchStatePreviewProvider -import com.walletconnect.web3.modal.ui.components.internal.commons.walletsGridItems +import com.reown.appkit.R +import com.reown.appkit.ui.components.internal.commons.ContentDescription +import com.reown.appkit.ui.components.internal.commons.HorizontalSpacer +import com.reown.appkit.ui.components.internal.commons.LoadingSpinner +import com.reown.appkit.ui.components.internal.commons.ScanQRIcon +import com.reown.appkit.ui.components.internal.commons.TransparentSurface +import com.reown.appkit.ui.components.internal.commons.VerticalSpacer +import com.reown.appkit.ui.components.internal.commons.inputs.SearchInput +import com.reown.appkit.ui.components.internal.commons.inputs.SearchState +import com.reown.appkit.ui.components.internal.commons.inputs.SearchStatePreviewProvider +import com.reown.appkit.ui.components.internal.commons.walletsGridItems import com.reown.modal.ui.model.LoadingState -import com.walletconnect.web3.modal.ui.previews.ComponentPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.AppKitPreview -import com.walletconnect.web3.modal.ui.previews.testWallets -import com.walletconnect.web3.modal.ui.routes.connect.ConnectViewModel -import com.walletconnect.web3.modal.ui.routes.connect.WalletsData -import com.walletconnect.web3.modal.ui.theme.AppKitTheme -import com.walletconnect.web3.modal.ui.utils.conditionalModifier +import com.reown.appkit.ui.previews.ComponentPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.AppKitPreview +import com.reown.appkit.ui.previews.testWallets +import com.reown.appkit.ui.routes.connect.ConnectViewModel +import com.reown.appkit.ui.routes.connect.WalletsData +import com.reown.appkit.ui.theme.AppKitTheme +import com.reown.appkit.ui.utils.conditionalModifier import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.filter import kotlinx.coroutines.launch diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/choose_network/ChooseNetworkRoute.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/choose_network/ChooseNetworkRoute.kt similarity index 83% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/choose_network/ChooseNetworkRoute.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/choose_network/ChooseNetworkRoute.kt index bc75467ef..6c017c6e2 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/choose_network/ChooseNetworkRoute.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/choose_network/ChooseNetworkRoute.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.connect.choose_network +package com.reown.appkit.ui.routes.connect.choose_network import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -13,12 +13,12 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.ui.components.internal.commons.NetworkBottomSection -import com.walletconnect.web3.modal.ui.components.internal.commons.network.ChainNetworkItem -import com.walletconnect.web3.modal.ui.routes.connect.ConnectViewModel -import com.walletconnect.web3.modal.utils.getChainNetworkImageUrl +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.ui.components.internal.commons.NetworkBottomSection +import com.reown.appkit.ui.components.internal.commons.network.ChainNetworkItem +import com.reown.appkit.ui.routes.connect.ConnectViewModel +import com.reown.appkit.utils.getChainNetworkImageUrl @Composable internal fun ChooseNetworkRoute( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/connect_wallet/ConnectWalletRoute.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/connect_wallet/ConnectWalletRoute.kt similarity index 77% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/connect_wallet/ConnectWalletRoute.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/connect_wallet/ConnectWalletRoute.kt index fb5c556f1..058aacbf3 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/connect_wallet/ConnectWalletRoute.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/connect_wallet/ConnectWalletRoute.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.connect.connect_wallet +package com.reown.appkit.ui.routes.connect.connect_wallet import androidx.compose.foundation.border import androidx.compose.foundation.layout.* @@ -11,18 +11,18 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp import com.reown.android.internal.common.modal.data.model.Wallet -import com.walletconnect.web3.modal.ui.components.internal.ErrorModalState -import com.walletconnect.web3.modal.ui.components.internal.commons.InstalledWalletIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.ListSelectRow -import com.walletconnect.web3.modal.ui.components.internal.commons.RecentLabel -import com.walletconnect.web3.modal.ui.components.internal.commons.WalletImage -import com.walletconnect.web3.modal.ui.components.internal.walletconnect.allWallets -import com.walletconnect.web3.modal.ui.model.UiStateBuilder -import com.walletconnect.web3.modal.ui.previews.ConnectYourWalletPreviewProvider -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.AppKitPreview -import com.walletconnect.web3.modal.ui.routes.connect.ConnectViewModel -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.components.internal.ErrorModalState +import com.reown.appkit.ui.components.internal.commons.InstalledWalletIcon +import com.reown.appkit.ui.components.internal.commons.ListSelectRow +import com.reown.appkit.ui.components.internal.commons.RecentLabel +import com.reown.appkit.ui.components.internal.commons.WalletImage +import com.reown.appkit.ui.components.internal.walletconnect.allWallets +import com.reown.appkit.ui.model.UiStateBuilder +import com.reown.appkit.ui.previews.ConnectYourWalletPreviewProvider +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.AppKitPreview +import com.reown.appkit.ui.routes.connect.ConnectViewModel +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun ConnectWalletRoute( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/get_wallet/GetAWalletRoute.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/get_wallet/GetAWalletRoute.kt similarity index 79% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/get_wallet/GetAWalletRoute.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/get_wallet/GetAWalletRoute.kt index 75e5a00e6..6cecefeae 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/get_wallet/GetAWalletRoute.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/get_wallet/GetAWalletRoute.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.connect.get_wallet +package com.reown.appkit.ui.routes.connect.get_wallet import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxWidth @@ -14,13 +14,13 @@ import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.unit.dp import com.reown.android.internal.common.modal.data.model.Wallet import com.reown.modal.utils.openPlayStore -import com.walletconnect.web3.modal.ui.components.internal.commons.AllWalletsIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.ExternalIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.ListSelectRow -import com.walletconnect.web3.modal.ui.components.internal.commons.WalletImage -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.AppKitPreview -import com.walletconnect.web3.modal.ui.previews.testWallets +import com.reown.appkit.ui.components.internal.commons.AllWalletsIcon +import com.reown.appkit.ui.components.internal.commons.ExternalIcon +import com.reown.appkit.ui.components.internal.commons.ListSelectRow +import com.reown.appkit.ui.components.internal.commons.WalletImage +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.AppKitPreview +import com.reown.appkit.ui.previews.testWallets @Composable internal fun GetAWalletRoute(wallets: List) { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/redirect/RedirectState.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/redirect/RedirectState.kt similarity index 73% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/redirect/RedirectState.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/redirect/RedirectState.kt index 5c219408f..25441cc1c 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/redirect/RedirectState.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/redirect/RedirectState.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.connect.redirect +package com.reown.appkit.ui.routes.connect.redirect sealed class RedirectState { object Loading: RedirectState() diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/redirect/RedirectWalletScreen.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/redirect/RedirectWalletScreen.kt similarity index 89% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/redirect/RedirectWalletScreen.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/redirect/RedirectWalletScreen.kt index 8d15e2a4d..1cf4af83e 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/redirect/RedirectWalletScreen.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/redirect/RedirectWalletScreen.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.connect.redirect +package com.reown.appkit.ui.routes.connect.redirect import androidx.compose.animation.AnimatedContent import androidx.compose.foundation.background @@ -35,31 +35,31 @@ import com.reown.modal.utils.openMobileLink import com.reown.modal.utils.openPlayStore import com.reown.modal.utils.openWebAppLink import com.walletconnect.util.Empty -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate -import com.walletconnect.web3.modal.engine.coinbase.isCoinbaseWallet -import com.walletconnect.web3.modal.ui.components.internal.OrientationBox -import com.walletconnect.web3.modal.ui.components.internal.commons.DeclinedIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.ExternalIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.RoundedWalletImage -import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.WalletImageWithLoader -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonSize -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonStyle -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ChipButton -import com.walletconnect.web3.modal.ui.components.internal.commons.button.TryAgainButton -import com.walletconnect.web3.modal.ui.components.internal.commons.entry.CopyActionEntry -import com.walletconnect.web3.modal.ui.components.internal.commons.entry.StoreEntry -import com.walletconnect.web3.modal.ui.components.internal.commons.switch.PlatformTab -import com.walletconnect.web3.modal.ui.components.internal.commons.switch.PlatformTabRow -import com.walletconnect.web3.modal.ui.components.internal.commons.switch.rememberWalletPlatformTabs -import com.walletconnect.web3.modal.ui.components.internal.snackbar.LocalSnackBarHandler -import com.walletconnect.web3.modal.ui.previews.Landscape -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.AppKitPreview -import com.walletconnect.web3.modal.ui.previews.testWallets -import com.walletconnect.web3.modal.ui.routes.connect.ConnectViewModel -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.client.Modal +import com.reown.appkit.domain.delegate.AppKitDelegate +import com.reown.appkit.engine.coinbase.isCoinbaseWallet +import com.reown.appkit.ui.components.internal.OrientationBox +import com.reown.appkit.ui.components.internal.commons.DeclinedIcon +import com.reown.appkit.ui.components.internal.commons.ExternalIcon +import com.reown.appkit.ui.components.internal.commons.RoundedWalletImage +import com.reown.appkit.ui.components.internal.commons.VerticalSpacer +import com.reown.appkit.ui.components.internal.commons.WalletImageWithLoader +import com.reown.appkit.ui.components.internal.commons.button.ButtonSize +import com.reown.appkit.ui.components.internal.commons.button.ButtonStyle +import com.reown.appkit.ui.components.internal.commons.button.ChipButton +import com.reown.appkit.ui.components.internal.commons.button.TryAgainButton +import com.reown.appkit.ui.components.internal.commons.entry.CopyActionEntry +import com.reown.appkit.ui.components.internal.commons.entry.StoreEntry +import com.reown.appkit.ui.components.internal.commons.switch.PlatformTab +import com.reown.appkit.ui.components.internal.commons.switch.PlatformTabRow +import com.reown.appkit.ui.components.internal.commons.switch.rememberWalletPlatformTabs +import com.reown.appkit.ui.components.internal.snackbar.LocalSnackBarHandler +import com.reown.appkit.ui.previews.Landscape +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.AppKitPreview +import com.reown.appkit.ui.previews.testWallets +import com.reown.appkit.ui.routes.connect.ConnectViewModel +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun RedirectWalletRoute( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/scan_code/ScanCodeRoute.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/scan_code/ScanCodeRoute.kt similarity index 87% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/scan_code/ScanCodeRoute.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/scan_code/ScanCodeRoute.kt index 818f8ebba..52619680f 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/scan_code/ScanCodeRoute.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/scan_code/ScanCodeRoute.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.connect.scan_code +package com.reown.appkit.ui.routes.connect.scan_code import androidx.compose.foundation.background import androidx.compose.foundation.isSystemInDarkTheme @@ -29,16 +29,16 @@ import androidx.compose.ui.unit.dp import com.reown.android.pulse.model.ConnectionMethod import com.reown.modal.ui.components.qr.QrCodeType import com.reown.modal.ui.components.qr.WalletConnectQRCode -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate -import com.walletconnect.web3.modal.ui.components.internal.OrientationBox -import com.walletconnect.web3.modal.ui.components.internal.commons.entry.CopyActionEntry -import com.walletconnect.web3.modal.ui.components.internal.snackbar.LocalSnackBarHandler -import com.walletconnect.web3.modal.ui.previews.Landscape -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.AppKitPreview -import com.walletconnect.web3.modal.ui.routes.connect.ConnectViewModel -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.client.Modal +import com.reown.appkit.domain.delegate.AppKitDelegate +import com.reown.appkit.ui.components.internal.OrientationBox +import com.reown.appkit.ui.components.internal.commons.entry.CopyActionEntry +import com.reown.appkit.ui.components.internal.snackbar.LocalSnackBarHandler +import com.reown.appkit.ui.previews.Landscape +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.AppKitPreview +import com.reown.appkit.ui.routes.connect.ConnectViewModel +import com.reown.appkit.ui.theme.AppKitTheme import kotlinx.coroutines.flow.filter @Composable diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/what_is_wallet/WhatIsWallet.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/what_is_wallet/WhatIsWallet.kt similarity index 76% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/what_is_wallet/WhatIsWallet.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/what_is_wallet/WhatIsWallet.kt index f06cf0847..e3abea0a3 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/what_is_wallet/WhatIsWallet.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/what_is_wallet/WhatIsWallet.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.connect.what_is_wallet +package com.reown.appkit.ui.routes.connect.what_is_wallet import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues @@ -14,17 +14,17 @@ import com.reown.android.internal.common.wcKoinApp import com.reown.android.pulse.domain.SendEventInterface import com.reown.android.pulse.model.EventType import com.reown.android.pulse.model.properties.Props -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.commons.HelpSection -import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.WalletIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonSize -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonStyle -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ImageButton -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.AppKitPreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.R +import com.reown.appkit.ui.components.internal.commons.HelpSection +import com.reown.appkit.ui.components.internal.commons.VerticalSpacer +import com.reown.appkit.ui.components.internal.commons.WalletIcon +import com.reown.appkit.ui.components.internal.commons.button.ButtonSize +import com.reown.appkit.ui.components.internal.commons.button.ButtonStyle +import com.reown.appkit.ui.components.internal.commons.button.ImageButton +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.AppKitPreview +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun WhatIsWallet( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/AppKitColors.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/theme/AppKitColors.kt similarity index 98% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/AppKitColors.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/theme/AppKitColors.kt index 80db5894f..ceb7c6095 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/AppKitColors.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/theme/AppKitColors.kt @@ -1,9 +1,9 @@ -package com.walletconnect.web3.modal.ui.theme +package com.reown.appkit.ui.theme import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color -import com.walletconnect.web3.modal.ui.AppKitTheme +import com.reown.appkit.ui.AppKitTheme internal data class AppKitColors( val accent100: Color, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/CustomComposition.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/theme/CustomComposition.kt similarity index 80% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/CustomComposition.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/theme/CustomComposition.kt index c2e8d3cea..25a65e04a 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/CustomComposition.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/theme/CustomComposition.kt @@ -1,7 +1,7 @@ -package com.walletconnect.web3.modal.ui.theme +package com.reown.appkit.ui.theme import androidx.compose.runtime.compositionLocalOf -import com.walletconnect.web3.modal.ui.AppKitTheme +import com.reown.appkit.ui.AppKitTheme internal data class CustomComposition( val mode: AppKitTheme.Mode = AppKitTheme.Mode.AUTO, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/Theme.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/theme/Theme.kt similarity index 95% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/Theme.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/theme/Theme.kt index 4636a002d..1a4988992 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/Theme.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/theme/Theme.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.theme +package com.reown.appkit.ui.theme import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/Typography.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/theme/Typography.kt similarity index 98% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/Typography.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/theme/Typography.kt index 865e3276e..284331191 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/Typography.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/theme/Typography.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.theme +package com.reown.appkit.ui.theme import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/utils/Lifecycle.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/utils/Lifecycle.kt similarity index 91% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/utils/Lifecycle.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/utils/Lifecycle.kt index 017cb533f..eaf235438 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/utils/Lifecycle.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/utils/Lifecycle.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.utils +package com.reown.appkit.ui.utils import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect @@ -6,7 +6,7 @@ import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleEventObserver import androidx.lifecycle.LifecycleOwner -import com.walletconnect.web3.modal.ui.components.ComponentDelegate +import com.reown.appkit.ui.components.ComponentDelegate @Composable internal fun ComposableLifecycleEffect( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/utils/Modifier.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/utils/Modifier.kt similarity index 81% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/utils/Modifier.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/utils/Modifier.kt index cfb4017b2..a0baadce4 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/utils/Modifier.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/utils/Modifier.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.utils +package com.reown.appkit.ui.utils import androidx.compose.ui.Modifier diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/utils/Navigation.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/utils/Navigation.kt similarity index 98% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/utils/Navigation.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/utils/Navigation.kt index 461ad3f4d..2de98d98c 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/utils/Navigation.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/utils/Navigation.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalAnimationApi::class) -package com.walletconnect.web3.modal.ui.utils +package com.reown.appkit.ui.utils import androidx.compose.animation.AnimatedVisibilityScope import androidx.compose.animation.ExperimentalAnimationApi diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/ChainPresets.kt b/product/appkit/src/main/kotlin/com/reown/appkit/utils/ChainPresets.kt similarity index 96% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/ChainPresets.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/utils/ChainPresets.kt index 8803757fb..fa37446a6 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/ChainPresets.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/utils/ChainPresets.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.utils +package com.reown.appkit.utils -import com.walletconnect.web3.modal.client.Modal +import com.reown.appkit.client.Modal internal fun Modal.Model.ChainImage.getImageData() = when(this) { is Modal.Model.ChainImage.Asset -> id diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/EthUtils.kt b/product/appkit/src/main/kotlin/com/reown/appkit/utils/EthUtils.kt similarity index 92% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/EthUtils.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/utils/EthUtils.kt index c6ef624d3..61eab756e 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/EthUtils.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/utils/EthUtils.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.utils +package com.reown.appkit.utils object EthUtils { const val walletSwitchEthChain = "wallet_switchEthereumChain" diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/Image.kt b/product/appkit/src/main/kotlin/com/reown/appkit/utils/Image.kt similarity index 93% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/Image.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/utils/Image.kt index e25b3700c..6cf544860 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/Image.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/utils/Image.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.utils +package com.reown.appkit.utils import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.ColorMatrix diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/ParamsUtils.kt b/product/appkit/src/main/kotlin/com/reown/appkit/utils/ParamsUtils.kt similarity index 93% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/ParamsUtils.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/utils/ParamsUtils.kt index 943cbd417..288994e5d 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/ParamsUtils.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/utils/ParamsUtils.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.utils +package com.reown.appkit.utils -import com.walletconnect.web3.modal.client.Modal +import com.reown.appkit.client.Modal import org.intellij.lang.annotations.Language internal fun createAddEthChainParams(chain: Modal.Model.Chain): String { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/SessionUtils.kt b/product/appkit/src/main/kotlin/com/reown/appkit/utils/SessionUtils.kt similarity index 91% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/SessionUtils.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/utils/SessionUtils.kt index 44d2f8a33..4f1a81f84 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/SessionUtils.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/utils/SessionUtils.kt @@ -1,13 +1,13 @@ -package com.walletconnect.web3.modal.utils +package com.reown.appkit.utils import com.reown.android.internal.utils.CoreValidator import com.reown.sign.client.Sign import com.walletconnect.util.Empty -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.client.models.Account -import com.walletconnect.web3.modal.client.toModal -import com.walletconnect.web3.modal.domain.model.Session +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.client.models.Account +import com.reown.appkit.client.toModal +import com.reown.appkit.domain.model.Session internal fun String.toVisibleAddress() = "${take(4)}...${takeLast(4)}" diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/ViewUtils.kt b/product/appkit/src/main/kotlin/com/reown/appkit/utils/ViewUtils.kt similarity index 57% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/ViewUtils.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/utils/ViewUtils.kt index 0e0e1a291..bc83447b3 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/ViewUtils.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/utils/ViewUtils.kt @@ -1,7 +1,7 @@ -package com.walletconnect.web3.modal.utils +package com.reown.appkit.utils -import com.walletconnect.web3.modal.ui.components.button.AccountButtonType -import com.walletconnect.web3.modal.ui.components.button.ConnectButtonSize +import com.reown.appkit.ui.components.button.AccountButtonType +import com.reown.appkit.ui.components.button.ConnectButtonSize internal fun Int.toConnectButtonSize() = when (this) { 1 -> ConnectButtonSize.SMALL diff --git a/product/web3modal/src/main/res/drawable-night/wallet_placeholder.xml b/product/appkit/src/main/res/drawable-night/wallet_placeholder.xml similarity index 100% rename from product/web3modal/src/main/res/drawable-night/wallet_placeholder.xml rename to product/appkit/src/main/res/drawable-night/wallet_placeholder.xml diff --git a/product/web3modal/src/main/res/drawable/browser.xml b/product/appkit/src/main/res/drawable/browser.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/browser.xml rename to product/appkit/src/main/res/drawable/browser.xml diff --git a/product/web3modal/src/main/res/drawable/dao.xml b/product/appkit/src/main/res/drawable/dao.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/dao.xml rename to product/appkit/src/main/res/drawable/dao.xml diff --git a/product/web3modal/src/main/res/drawable/defi.xml b/product/appkit/src/main/res/drawable/defi.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/defi.xml rename to product/appkit/src/main/res/drawable/defi.xml diff --git a/product/web3modal/src/main/res/drawable/defi_alt.xml b/product/appkit/src/main/res/drawable/defi_alt.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/defi_alt.xml rename to product/appkit/src/main/res/drawable/defi_alt.xml diff --git a/product/web3modal/src/main/res/drawable/eth.xml b/product/appkit/src/main/res/drawable/eth.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/eth.xml rename to product/appkit/src/main/res/drawable/eth.xml diff --git a/product/web3modal/src/main/res/drawable/ic_all_wallets.xml b/product/appkit/src/main/res/drawable/ic_all_wallets.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_all_wallets.xml rename to product/appkit/src/main/res/drawable/ic_all_wallets.xml diff --git a/product/web3modal/src/main/res/drawable/ic_browser.xml b/product/appkit/src/main/res/drawable/ic_browser.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_browser.xml rename to product/appkit/src/main/res/drawable/ic_browser.xml diff --git a/product/web3modal/src/main/res/drawable/ic_check.xml b/product/appkit/src/main/res/drawable/ic_check.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_check.xml rename to product/appkit/src/main/res/drawable/ic_check.xml diff --git a/product/web3modal/src/main/res/drawable/ic_chevron_left.xml b/product/appkit/src/main/res/drawable/ic_chevron_left.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_chevron_left.xml rename to product/appkit/src/main/res/drawable/ic_chevron_left.xml diff --git a/product/web3modal/src/main/res/drawable/ic_chevron_right.xml b/product/appkit/src/main/res/drawable/ic_chevron_right.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_chevron_right.xml rename to product/appkit/src/main/res/drawable/ic_chevron_right.xml diff --git a/product/web3modal/src/main/res/drawable/ic_close.xml b/product/appkit/src/main/res/drawable/ic_close.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_close.xml rename to product/appkit/src/main/res/drawable/ic_close.xml diff --git a/product/web3modal/src/main/res/drawable/ic_compass.xml b/product/appkit/src/main/res/drawable/ic_compass.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_compass.xml rename to product/appkit/src/main/res/drawable/ic_compass.xml diff --git a/product/web3modal/src/main/res/drawable/ic_copy.xml b/product/appkit/src/main/res/drawable/ic_copy.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_copy.xml rename to product/appkit/src/main/res/drawable/ic_copy.xml diff --git a/product/web3modal/src/main/res/drawable/ic_disconnect.xml b/product/appkit/src/main/res/drawable/ic_disconnect.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_disconnect.xml rename to product/appkit/src/main/res/drawable/ic_disconnect.xml diff --git a/product/web3modal/src/main/res/drawable/ic_email.xml b/product/appkit/src/main/res/drawable/ic_email.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_email.xml rename to product/appkit/src/main/res/drawable/ic_email.xml diff --git a/product/web3modal/src/main/res/drawable/ic_error.xml b/product/appkit/src/main/res/drawable/ic_error.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_error.xml rename to product/appkit/src/main/res/drawable/ic_error.xml diff --git a/product/web3modal/src/main/res/drawable/ic_external_link.xml b/product/appkit/src/main/res/drawable/ic_external_link.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_external_link.xml rename to product/appkit/src/main/res/drawable/ic_external_link.xml diff --git a/product/web3modal/src/main/res/drawable/ic_forward_chevron.xml b/product/appkit/src/main/res/drawable/ic_forward_chevron.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_forward_chevron.xml rename to product/appkit/src/main/res/drawable/ic_forward_chevron.xml diff --git a/product/web3modal/src/main/res/drawable/ic_google_playstore.xml b/product/appkit/src/main/res/drawable/ic_google_playstore.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_google_playstore.xml rename to product/appkit/src/main/res/drawable/ic_google_playstore.xml diff --git a/product/web3modal/src/main/res/drawable/ic_info.xml b/product/appkit/src/main/res/drawable/ic_info.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_info.xml rename to product/appkit/src/main/res/drawable/ic_info.xml diff --git a/product/web3modal/src/main/res/drawable/ic_mobile.xml b/product/appkit/src/main/res/drawable/ic_mobile.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_mobile.xml rename to product/appkit/src/main/res/drawable/ic_mobile.xml diff --git a/product/web3modal/src/main/res/drawable/ic_question_mark.xml b/product/appkit/src/main/res/drawable/ic_question_mark.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_question_mark.xml rename to product/appkit/src/main/res/drawable/ic_question_mark.xml diff --git a/product/web3modal/src/main/res/drawable/ic_retry.xml b/product/appkit/src/main/res/drawable/ic_retry.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_retry.xml rename to product/appkit/src/main/res/drawable/ic_retry.xml diff --git a/product/web3modal/src/main/res/drawable/ic_scan.xml b/product/appkit/src/main/res/drawable/ic_scan.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_scan.xml rename to product/appkit/src/main/res/drawable/ic_scan.xml diff --git a/product/web3modal/src/main/res/drawable/ic_scan_qr.xml b/product/appkit/src/main/res/drawable/ic_scan_qr.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_scan_qr.xml rename to product/appkit/src/main/res/drawable/ic_scan_qr.xml diff --git a/product/web3modal/src/main/res/drawable/ic_search.xml b/product/appkit/src/main/res/drawable/ic_search.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_search.xml rename to product/appkit/src/main/res/drawable/ic_search.xml diff --git a/product/web3modal/src/main/res/drawable/ic_select_network.xml b/product/appkit/src/main/res/drawable/ic_select_network.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_select_network.xml rename to product/appkit/src/main/res/drawable/ic_select_network.xml diff --git a/product/web3modal/src/main/res/drawable/ic_success.xml b/product/appkit/src/main/res/drawable/ic_success.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_success.xml rename to product/appkit/src/main/res/drawable/ic_success.xml diff --git a/product/web3modal/src/main/res/drawable/ic_swap.xml b/product/appkit/src/main/res/drawable/ic_swap.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_swap.xml rename to product/appkit/src/main/res/drawable/ic_swap.xml diff --git a/product/web3modal/src/main/res/drawable/ic_wallet.xml b/product/appkit/src/main/res/drawable/ic_wallet.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_wallet.xml rename to product/appkit/src/main/res/drawable/ic_wallet.xml diff --git a/product/web3modal/src/main/res/drawable/ic_wallet_connect_logo.xml b/product/appkit/src/main/res/drawable/ic_wallet_connect_logo.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_wallet_connect_logo.xml rename to product/appkit/src/main/res/drawable/ic_wallet_connect_logo.xml diff --git a/product/web3modal/src/main/res/drawable/ic_wallet_connect_qr_logo.xml b/product/appkit/src/main/res/drawable/ic_wallet_connect_qr_logo.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_wallet_connect_qr_logo.xml rename to product/appkit/src/main/res/drawable/ic_wallet_connect_qr_logo.xml diff --git a/product/web3modal/src/main/res/drawable/ic_web.xml b/product/appkit/src/main/res/drawable/ic_web.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_web.xml rename to product/appkit/src/main/res/drawable/ic_web.xml diff --git a/product/web3modal/src/main/res/drawable/layers.xml b/product/appkit/src/main/res/drawable/layers.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/layers.xml rename to product/appkit/src/main/res/drawable/layers.xml diff --git a/product/web3modal/src/main/res/drawable/lock.xml b/product/appkit/src/main/res/drawable/lock.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/lock.xml rename to product/appkit/src/main/res/drawable/lock.xml diff --git a/product/web3modal/src/main/res/drawable/login.xml b/product/appkit/src/main/res/drawable/login.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/login.xml rename to product/appkit/src/main/res/drawable/login.xml diff --git a/product/web3modal/src/main/res/drawable/network.xml b/product/appkit/src/main/res/drawable/network.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/network.xml rename to product/appkit/src/main/res/drawable/network.xml diff --git a/product/web3modal/src/main/res/drawable/nft.xml b/product/appkit/src/main/res/drawable/nft.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/nft.xml rename to product/appkit/src/main/res/drawable/nft.xml diff --git a/product/web3modal/src/main/res/drawable/noun.xml b/product/appkit/src/main/res/drawable/noun.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/noun.xml rename to product/appkit/src/main/res/drawable/noun.xml diff --git a/product/web3modal/src/main/res/drawable/profile.xml b/product/appkit/src/main/res/drawable/profile.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/profile.xml rename to product/appkit/src/main/res/drawable/profile.xml diff --git a/product/web3modal/src/main/res/drawable/system.xml b/product/appkit/src/main/res/drawable/system.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/system.xml rename to product/appkit/src/main/res/drawable/system.xml diff --git a/product/web3modal/src/main/res/drawable/wallet_placeholder.xml b/product/appkit/src/main/res/drawable/wallet_placeholder.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/wallet_placeholder.xml rename to product/appkit/src/main/res/drawable/wallet_placeholder.xml diff --git a/product/web3modal/src/main/res/drawable/walletconnect_blue.xml b/product/appkit/src/main/res/drawable/walletconnect_blue.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/walletconnect_blue.xml rename to product/appkit/src/main/res/drawable/walletconnect_blue.xml diff --git a/product/web3modal/src/main/res/layout/view_button.xml b/product/appkit/src/main/res/layout/view_button.xml similarity index 100% rename from product/web3modal/src/main/res/layout/view_button.xml rename to product/appkit/src/main/res/layout/view_button.xml diff --git a/product/web3modal/src/main/res/layout/view_web3modal.xml b/product/appkit/src/main/res/layout/view_web3modal.xml similarity index 100% rename from product/web3modal/src/main/res/layout/view_web3modal.xml rename to product/appkit/src/main/res/layout/view_web3modal.xml diff --git a/product/web3modal/src/main/res/navigation/web3modal_graph.xml b/product/appkit/src/main/res/navigation/web3modal_graph.xml similarity index 82% rename from product/web3modal/src/main/res/navigation/web3modal_graph.xml rename to product/appkit/src/main/res/navigation/web3modal_graph.xml index e1029a32d..92a84e415 100644 --- a/product/web3modal/src/main/res/navigation/web3modal_graph.xml +++ b/product/appkit/src/main/res/navigation/web3modal_graph.xml @@ -6,6 +6,6 @@ + android:name="com.reown.appkit.ui.AppKitSheet" /> diff --git a/product/web3modal/src/main/res/values/attrs.xml b/product/appkit/src/main/res/values/attrs.xml similarity index 100% rename from product/web3modal/src/main/res/values/attrs.xml rename to product/appkit/src/main/res/values/attrs.xml diff --git a/product/web3modal/src/main/res/values/theme.xml b/product/appkit/src/main/res/values/theme.xml similarity index 100% rename from product/web3modal/src/main/res/values/theme.xml rename to product/appkit/src/main/res/values/theme.xml diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/components/buttons/ButtonsTest.kt b/product/appkit/src/test/kotlin/com/reown/appkit/ui/components/buttons/ButtonsTest.kt similarity index 83% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/components/buttons/ButtonsTest.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/ui/components/buttons/ButtonsTest.kt index 8004b0b71..d5f8e1b9e 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/components/buttons/ButtonsTest.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/ui/components/buttons/ButtonsTest.kt @@ -1,12 +1,12 @@ -package com.walletconnect.web3.modal.ui.components.buttons +package com.reown.appkit.ui.components.buttons import com.android.resources.NightMode -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.presets.AppKitChainsPresets -import com.walletconnect.web3.modal.ui.components.button.AccountButtonState -import com.walletconnect.web3.modal.ui.components.button.ConnectButton -import com.walletconnect.web3.modal.ui.components.button.ConnectButtonSize -import com.walletconnect.web3.modal.utils.ScreenShotTest +import com.reown.appkit.client.Modal +import com.reown.appkit.presets.AppKitChainsPresets +import com.reown.appkit.ui.components.button.AccountButtonState +import com.reown.appkit.ui.components.button.ConnectButton +import com.reown.appkit.ui.components.button.ConnectButtonSize +import com.reown.appkit.utils.ScreenShotTest import org.junit.Test internal class ButtonsTest : ScreenShotTest("component/button") { diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/components/internal/ModalSnackBarTest.kt b/product/appkit/src/test/kotlin/com/reown/appkit/ui/components/internal/ModalSnackBarTest.kt similarity index 75% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/components/internal/ModalSnackBarTest.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/ui/components/internal/ModalSnackBarTest.kt index f32b87ef5..b045db4af 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/components/internal/ModalSnackBarTest.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/ui/components/internal/ModalSnackBarTest.kt @@ -1,11 +1,11 @@ -package com.walletconnect.web3.modal.ui.components.internal +package com.reown.appkit.ui.components.internal import com.android.resources.NightMode -import com.walletconnect.web3.modal.ui.components.internal.snackbar.ModalSnackBar -import com.walletconnect.web3.modal.ui.components.internal.snackbar.SnackBarEvent -import com.walletconnect.web3.modal.ui.components.internal.snackbar.SnackBarEventType -import com.walletconnect.web3.modal.ui.components.internal.snackbar.SnackbarDuration -import com.walletconnect.web3.modal.utils.ScreenShotTest +import com.reown.appkit.ui.components.internal.snackbar.ModalSnackBar +import com.reown.appkit.ui.components.internal.snackbar.SnackBarEvent +import com.reown.appkit.ui.components.internal.snackbar.SnackBarEventType +import com.reown.appkit.ui.components.internal.snackbar.SnackbarDuration +import com.reown.appkit.utils.ScreenShotTest import org.junit.Test internal class ModalSnackBarTest : ScreenShotTest("component/internal/snackbar") { diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountRouteTest.kt b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/account/AccountRouteTest.kt similarity index 89% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountRouteTest.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/account/AccountRouteTest.kt index 121f66d65..69c787e95 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountRouteTest.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/account/AccountRouteTest.kt @@ -1,19 +1,19 @@ -package com.walletconnect.web3.modal.ui.routes.account +package com.reown.appkit.ui.routes.account import androidx.navigation.NavController import com.android.resources.NightMode import com.android.resources.ScreenOrientation import com.reown.android.internal.common.wcKoinApp import com.reown.modal.ui.model.UiState -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.domain.model.AccountData -import com.walletconnect.web3.modal.domain.model.Balance -import com.walletconnect.web3.modal.domain.usecase.GetSelectedChainUseCase -import com.walletconnect.web3.modal.presets.AppKitChainsPresets -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.routes.account.account.AccountRoute -import com.walletconnect.web3.modal.utils.ScreenShotTest +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.domain.model.AccountData +import com.reown.appkit.domain.model.Balance +import com.reown.appkit.domain.usecase.GetSelectedChainUseCase +import com.reown.appkit.presets.AppKitChainsPresets +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.routes.account.account.AccountRoute +import com.reown.appkit.utils.ScreenShotTest import io.mockk.every import io.mockk.mockk import kotlinx.coroutines.flow.StateFlow diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/ChainSwitchRedirectTest.kt b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/account/ChainSwitchRedirectTest.kt similarity index 75% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/ChainSwitchRedirectTest.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/account/ChainSwitchRedirectTest.kt index ba912be89..6c6918a6e 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/ChainSwitchRedirectTest.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/account/ChainSwitchRedirectTest.kt @@ -1,11 +1,11 @@ -package com.walletconnect.web3.modal.ui.routes.account +package com.reown.appkit.ui.routes.account import com.android.resources.NightMode -import com.walletconnect.web3.modal.presets.AppKitChainsPresets -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.routes.account.chain_redirect.ChainRedirectState -import com.walletconnect.web3.modal.ui.routes.account.chain_redirect.ChainSwitchRedirectScreen -import com.walletconnect.web3.modal.utils.ScreenShotTest +import com.reown.appkit.presets.AppKitChainsPresets +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.routes.account.chain_redirect.ChainRedirectState +import com.reown.appkit.ui.routes.account.chain_redirect.ChainSwitchRedirectScreen +import com.reown.appkit.utils.ScreenShotTest import org.junit.Ignore import org.junit.Test diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/ChangeNetworkRouteTest.kt b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/account/ChangeNetworkRouteTest.kt similarity index 80% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/ChangeNetworkRouteTest.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/account/ChangeNetworkRouteTest.kt index e14f6c4c0..3f75e176b 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/ChangeNetworkRouteTest.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/account/ChangeNetworkRouteTest.kt @@ -1,17 +1,17 @@ -package com.walletconnect.web3.modal.ui.routes.account +package com.reown.appkit.ui.routes.account import com.android.resources.NightMode import com.android.resources.ScreenOrientation import com.reown.android.internal.common.wcKoinApp import com.reown.modal.ui.model.UiState -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.domain.model.AccountData -import com.walletconnect.web3.modal.domain.usecase.GetSelectedChainUseCase -import com.walletconnect.web3.modal.presets.AppKitChainsPresets -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.routes.account.change_network.ChangeNetworkRoute -import com.walletconnect.web3.modal.utils.ScreenShotTest +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.domain.model.AccountData +import com.reown.appkit.domain.usecase.GetSelectedChainUseCase +import com.reown.appkit.presets.AppKitChainsPresets +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.routes.account.change_network.ChangeNetworkRoute +import com.reown.appkit.utils.ScreenShotTest import io.mockk.every import io.mockk.mockk import kotlinx.coroutines.flow.StateFlow diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/WhatIsNetworkRouteTest.kt b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/account/WhatIsNetworkRouteTest.kt similarity index 75% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/WhatIsNetworkRouteTest.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/account/WhatIsNetworkRouteTest.kt index 559fa6923..5dd86ce39 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/WhatIsNetworkRouteTest.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/account/WhatIsNetworkRouteTest.kt @@ -1,11 +1,11 @@ -package com.walletconnect.web3.modal.ui.routes.account +package com.reown.appkit.ui.routes.account import com.android.resources.NightMode import com.android.resources.ScreenOrientation -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.routes.account.what_is_network.WhatIsNetworkRoute -import com.walletconnect.web3.modal.utils.MainDispatcherRule -import com.walletconnect.web3.modal.utils.ScreenShotTest +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.routes.account.what_is_network.WhatIsNetworkRoute +import com.reown.appkit.utils.MainDispatcherRule +import com.reown.appkit.utils.ScreenShotTest import org.junit.Ignore import org.junit.Rule import org.junit.Test diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/AllWalletsRouteTest.kt b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/AllWalletsRouteTest.kt similarity index 94% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/AllWalletsRouteTest.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/AllWalletsRouteTest.kt index dd8d3be51..a7d2f162f 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/AllWalletsRouteTest.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/AllWalletsRouteTest.kt @@ -1,14 +1,14 @@ -package com.walletconnect.web3.modal.ui.routes.connect +package com.reown.appkit.ui.routes.connect import com.android.resources.NightMode import com.android.resources.ScreenOrientation import com.reown.modal.ui.model.LoadingState import com.walletconnect.util.Empty -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.previews.testWallets -import com.walletconnect.web3.modal.ui.routes.connect.all_wallets.AllWalletsRoute -import com.walletconnect.web3.modal.utils.MainDispatcherRule -import com.walletconnect.web3.modal.utils.ScreenShotTest +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.previews.testWallets +import com.reown.appkit.ui.routes.connect.all_wallets.AllWalletsRoute +import com.reown.appkit.utils.MainDispatcherRule +import com.reown.appkit.utils.ScreenShotTest import io.mockk.every import io.mockk.mockk import kotlinx.coroutines.flow.StateFlow diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectYourWalletRouteTest.kt b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/ConnectYourWalletRouteTest.kt similarity index 88% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectYourWalletRouteTest.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/ConnectYourWalletRouteTest.kt index 217504191..58269c1e8 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectYourWalletRouteTest.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/ConnectYourWalletRouteTest.kt @@ -1,13 +1,13 @@ -package com.walletconnect.web3.modal.ui.routes.connect +package com.reown.appkit.ui.routes.connect import com.android.resources.NightMode import com.reown.android.internal.common.modal.data.model.Wallet import com.reown.modal.ui.model.UiState -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.previews.testWallets -import com.walletconnect.web3.modal.ui.routes.connect.connect_wallet.ConnectWalletRoute -import com.walletconnect.web3.modal.utils.MainDispatcherRule -import com.walletconnect.web3.modal.utils.ScreenShotTest +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.previews.testWallets +import com.reown.appkit.ui.routes.connect.connect_wallet.ConnectWalletRoute +import com.reown.appkit.utils.MainDispatcherRule +import com.reown.appkit.utils.ScreenShotTest import io.mockk.every import io.mockk.mockk import kotlinx.coroutines.flow.StateFlow diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/GetAWalletRouteTest.kt b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/GetAWalletRouteTest.kt similarity index 72% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/GetAWalletRouteTest.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/GetAWalletRouteTest.kt index 04c746b14..a49aa8da2 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/GetAWalletRouteTest.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/GetAWalletRouteTest.kt @@ -1,12 +1,12 @@ -package com.walletconnect.web3.modal.ui.routes.connect +package com.reown.appkit.ui.routes.connect import com.android.resources.NightMode import com.android.resources.ScreenOrientation -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.previews.testWallets -import com.walletconnect.web3.modal.ui.routes.connect.get_wallet.GetAWalletRoute -import com.walletconnect.web3.modal.utils.MainDispatcherRule -import com.walletconnect.web3.modal.utils.ScreenShotTest +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.previews.testWallets +import com.reown.appkit.ui.routes.connect.get_wallet.GetAWalletRoute +import com.reown.appkit.utils.MainDispatcherRule +import com.reown.appkit.utils.ScreenShotTest import org.junit.Ignore import org.junit.Rule import org.junit.Test diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/RedirectWalletRouteTest.kt b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/RedirectWalletRouteTest.kt similarity index 86% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/RedirectWalletRouteTest.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/RedirectWalletRouteTest.kt index 5d35e136d..8c47be874 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/RedirectWalletRouteTest.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/RedirectWalletRouteTest.kt @@ -1,14 +1,14 @@ -package com.walletconnect.web3.modal.ui.routes.connect +package com.reown.appkit.ui.routes.connect import com.android.resources.NightMode import com.android.resources.ScreenOrientation -import com.walletconnect.web3.modal.ui.components.internal.commons.switch.PlatformTab -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.previews.testWallets -import com.walletconnect.web3.modal.ui.routes.connect.redirect.RedirectState -import com.walletconnect.web3.modal.ui.routes.connect.redirect.RedirectWalletScreen -import com.walletconnect.web3.modal.utils.MainDispatcherRule -import com.walletconnect.web3.modal.utils.ScreenShotTest +import com.reown.appkit.ui.components.internal.commons.switch.PlatformTab +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.previews.testWallets +import com.reown.appkit.ui.routes.connect.redirect.RedirectState +import com.reown.appkit.ui.routes.connect.redirect.RedirectWalletScreen +import com.reown.appkit.utils.MainDispatcherRule +import com.reown.appkit.utils.ScreenShotTest import org.junit.Ignore import org.junit.Rule import org.junit.Test diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ScanCodeRouteTest.kt b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/ScanCodeRouteTest.kt similarity index 81% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ScanCodeRouteTest.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/ScanCodeRouteTest.kt index 3f7328a74..db8c45350 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ScanCodeRouteTest.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/ScanCodeRouteTest.kt @@ -1,11 +1,11 @@ -package com.walletconnect.web3.modal.ui.routes.connect +package com.reown.appkit.ui.routes.connect import com.android.resources.NightMode import com.android.resources.ScreenOrientation -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.routes.connect.scan_code.ScanQRCodeRoute -import com.walletconnect.web3.modal.utils.MainDispatcherRule -import com.walletconnect.web3.modal.utils.ScreenShotTest +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.routes.connect.scan_code.ScanQRCodeRoute +import com.reown.appkit.utils.MainDispatcherRule +import com.reown.appkit.utils.ScreenShotTest import io.mockk.every import io.mockk.mockk import org.junit.Before diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/WhatIsWalletTest.kt b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/WhatIsWalletTest.kt similarity index 77% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/WhatIsWalletTest.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/WhatIsWalletTest.kt index 65b240dd0..f938ec371 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/WhatIsWalletTest.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/WhatIsWalletTest.kt @@ -1,12 +1,12 @@ -package com.walletconnect.web3.modal.ui.routes.connect +package com.reown.appkit.ui.routes.connect import androidx.navigation.NavController import com.android.resources.NightMode import com.android.resources.ScreenOrientation -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.routes.connect.what_is_wallet.WhatIsWallet -import com.walletconnect.web3.modal.utils.MainDispatcherRule -import com.walletconnect.web3.modal.utils.ScreenShotTest +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.routes.connect.what_is_wallet.WhatIsWallet +import com.reown.appkit.utils.MainDispatcherRule +import com.reown.appkit.utils.ScreenShotTest import io.mockk.mockk import org.junit.Ignore import org.junit.Rule diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/utils/Dispatchers.kt b/product/appkit/src/test/kotlin/com/reown/appkit/utils/Dispatchers.kt similarity index 94% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/utils/Dispatchers.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/utils/Dispatchers.kt index 6f188e5f2..bb20d1288 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/utils/Dispatchers.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/utils/Dispatchers.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalCoroutinesApi::class) -package com.walletconnect.web3.modal.utils +package com.reown.appkit.utils import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/utils/PaparazziUtilts.kt b/product/appkit/src/test/kotlin/com/reown/appkit/utils/PaparazziUtilts.kt similarity index 91% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/utils/PaparazziUtilts.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/utils/PaparazziUtilts.kt index 34f07bfb6..175d76e51 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/utils/PaparazziUtilts.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/utils/PaparazziUtilts.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.utils +package com.reown.appkit.utils import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -25,11 +25,11 @@ import com.android.resources.NightMode import com.android.resources.ScreenOrientation import com.reown.android.internal.common.model.ProjectId import com.reown.android.internal.common.wcKoinApp -import com.walletconnect.web3.modal.ui.components.internal.root.AppKitRoot -import com.walletconnect.web3.modal.ui.components.internal.root.rememberAppKitRootState -import com.walletconnect.web3.modal.ui.components.internal.snackbar.rememberSnackBarState -import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.components.internal.root.AppKitRoot +import com.reown.appkit.ui.components.internal.root.rememberAppKitRootState +import com.reown.appkit.ui.components.internal.snackbar.rememberSnackBarState +import com.reown.appkit.ui.theme.ProvideAppKitThemeComposition +import com.reown.appkit.ui.theme.AppKitTheme import org.junit.Rule import org.koin.dsl.module import java.io.File diff --git a/product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in DarkMode.png b/product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in DarkMode.png rename to product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in Landscape.png b/product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in Landscape.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in Landscape.png rename to product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in Landscape.png diff --git a/product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in LightMode.png b/product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in LightMode.png rename to product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in LightMode.png diff --git a/product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in DarkMode.png b/product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in DarkMode.png rename to product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in Landscape.png b/product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in Landscape.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in Landscape.png rename to product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in Landscape.png diff --git a/product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in LightMode.png b/product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in LightMode.png rename to product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in LightMode.png diff --git a/product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in DarkMode.png b/product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in DarkMode.png rename to product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in Landscape.png b/product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in Landscape.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in Landscape.png rename to product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in Landscape.png diff --git a/product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in LightMode.png b/product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in LightMode.png rename to product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in LightMode.png diff --git a/product/web3modal/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Decline in DarkMode.png b/product/appkit/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Decline in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Decline in DarkMode.png rename to product/appkit/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Decline in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Decline in LightMode.png b/product/appkit/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Decline in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Decline in LightMode.png rename to product/appkit/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Decline in LightMode.png diff --git a/product/web3modal/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Loading in DarkMode.png b/product/appkit/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Loading in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Loading in DarkMode.png rename to product/appkit/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Loading in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Loading in LightMode.png b/product/appkit/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Loading in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Loading in LightMode.png rename to product/appkit/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Loading in LightMode.png diff --git a/product/web3modal/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in DarkMode.png b/product/appkit/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in DarkMode.png rename to product/appkit/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in Landscape.png b/product/appkit/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in Landscape.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in Landscape.png rename to product/appkit/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in Landscape.png diff --git a/product/web3modal/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in LightMode.png b/product/appkit/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in LightMode.png rename to product/appkit/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in LightMode.png diff --git a/product/web3modal/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in DarkMode.png b/product/appkit/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in DarkMode.png rename to product/appkit/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in Landscape.png b/product/appkit/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in Landscape.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in Landscape.png rename to product/appkit/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in Landscape.png diff --git a/product/web3modal/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in LightMode.png b/product/appkit/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in LightMode.png rename to product/appkit/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in LightMode.png diff --git a/product/web3modal/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test AccountButton in DarkMode.png b/product/appkit/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test AccountButton in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test AccountButton in DarkMode.png rename to product/appkit/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test AccountButton in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test AccountButton in LightMode.png b/product/appkit/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test AccountButton in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test AccountButton in LightMode.png rename to product/appkit/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test AccountButton in LightMode.png diff --git a/product/web3modal/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test ConnectButton in DarkMode.png b/product/appkit/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test ConnectButton in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test ConnectButton in DarkMode.png rename to product/appkit/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test ConnectButton in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test ConnectButton in LightMode.png b/product/appkit/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test ConnectButton in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test ConnectButton in LightMode.png rename to product/appkit/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test ConnectButton in LightMode.png diff --git a/product/web3modal/src/test/snapshots/component/internal/snackbar/images/com.walletconnect.web3.modal.ui.components.internal_ModalSnackBarTest_test ModalSnackBar in DarkMode.png b/product/appkit/src/test/snapshots/component/internal/snackbar/images/com.walletconnect.web3.modal.ui.components.internal_ModalSnackBarTest_test ModalSnackBar in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/component/internal/snackbar/images/com.walletconnect.web3.modal.ui.components.internal_ModalSnackBarTest_test ModalSnackBar in DarkMode.png rename to product/appkit/src/test/snapshots/component/internal/snackbar/images/com.walletconnect.web3.modal.ui.components.internal_ModalSnackBarTest_test ModalSnackBar in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/component/internal/snackbar/images/com.walletconnect.web3.modal.ui.components.internal_ModalSnackBarTest_test ModalSnackBar in LightMode.png b/product/appkit/src/test/snapshots/component/internal/snackbar/images/com.walletconnect.web3.modal.ui.components.internal_ModalSnackBarTest_test ModalSnackBar in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/component/internal/snackbar/images/com.walletconnect.web3.modal.ui.components.internal_ModalSnackBarTest_test ModalSnackBar in LightMode.png rename to product/appkit/src/test/snapshots/component/internal/snackbar/images/com.walletconnect.web3.modal.ui.components.internal_ModalSnackBarTest_test ModalSnackBar in LightMode.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in DarkMode.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in DarkMode.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in Landscape.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in Landscape.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in Landscape.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in Landscape.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in LightMode.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in LightMode.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in LightMode.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in DarkMode.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in DarkMode.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in Landscape.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in Landscape.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in Landscape.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in Landscape.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in LightMode.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in LightMode.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in LightMode.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in DarkMode.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in DarkMode.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in Landscape.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in Landscape.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in Landscape.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in Landscape.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in LightMode.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in LightMode.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in LightMode.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in DarkMode.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in DarkMode.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in Landscape.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in Landscape.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in Landscape.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in Landscape.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in LightMode.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in LightMode.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in LightMode.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in DarkMode.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in DarkMode.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in Landscape.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in Landscape.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in Landscape.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in Landscape.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in LightMode.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in LightMode.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in LightMode.png diff --git a/product/web3modal/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Error UiState in DarkMode.png b/product/appkit/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Error UiState in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Error UiState in DarkMode.png rename to product/appkit/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Error UiState in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Error UiState in LightMode.png b/product/appkit/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Error UiState in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Error UiState in LightMode.png rename to product/appkit/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Error UiState in LightMode.png diff --git a/product/web3modal/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Loading UiState in DarkMode.png b/product/appkit/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Loading UiState in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Loading UiState in DarkMode.png rename to product/appkit/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Loading UiState in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Loading UiState in LightMode.png b/product/appkit/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Loading UiState in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Loading UiState in LightMode.png rename to product/appkit/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Loading UiState in LightMode.png diff --git a/product/web3modal/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Success UiState in DarkMode.png b/product/appkit/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Success UiState in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Success UiState in DarkMode.png rename to product/appkit/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Success UiState in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Success UiState in LightMode.png b/product/appkit/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Success UiState in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Success UiState in LightMode.png rename to product/appkit/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Success UiState in LightMode.png diff --git a/product/web3modal/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in DarkMode.png b/product/appkit/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in DarkMode.png rename to product/appkit/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in Landscape.png b/product/appkit/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in Landscape.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in Landscape.png rename to product/appkit/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in Landscape.png diff --git a/product/web3modal/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in LightMode.png b/product/appkit/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in LightMode.png rename to product/appkit/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in LightMode.png diff --git a/product/web3modal/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in DarkMode.png b/product/appkit/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in DarkMode.png rename to product/appkit/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in Landscape.png b/product/appkit/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in Landscape.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in Landscape.png rename to product/appkit/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in Landscape.png diff --git a/product/web3modal/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in LightMode.png b/product/appkit/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in LightMode.png rename to product/appkit/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in LightMode.png diff --git a/product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in DarkMode .png b/product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in DarkMode .png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in DarkMode .png rename to product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in DarkMode .png diff --git a/product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in Landscape .png b/product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in Landscape .png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in Landscape .png rename to product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in Landscape .png diff --git a/product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in LightMode .png b/product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in LightMode .png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in LightMode .png rename to product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in LightMode .png diff --git a/product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state .png b/product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state .png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state .png rename to product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state .png diff --git a/product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state in DarkMode .png b/product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state in DarkMode .png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state in DarkMode .png rename to product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state in DarkMode .png diff --git a/product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state in Landscape .png b/product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state in Landscape .png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state in Landscape .png rename to product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state in Landscape .png diff --git a/product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state .png b/product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state .png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state .png rename to product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state .png diff --git a/product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state in DarkMode .png b/product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state in DarkMode .png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state in DarkMode .png rename to product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state in DarkMode .png diff --git a/product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state in Landscape .png b/product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state in Landscape .png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state in Landscape .png rename to product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state in Landscape .png diff --git a/product/web3modal/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in DarkMode.png b/product/appkit/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in DarkMode.png rename to product/appkit/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in Landscape.png b/product/appkit/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in Landscape.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in Landscape.png rename to product/appkit/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in Landscape.png diff --git a/product/web3modal/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in LightMode.png b/product/appkit/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in LightMode.png rename to product/appkit/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in LightMode.png diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Account.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Account.kt deleted file mode 100644 index 7a45f221e..000000000 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Account.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.walletconnect.web3.modal.client.models - -import com.walletconnect.web3.modal.client.Modal - -data class Account( - val address: String, - val chain: Modal.Model.Chain -) \ No newline at end of file diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/TestTags.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/TestTags.kt deleted file mode 100644 index 174291916..000000000 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/TestTags.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons - -internal object TestTags { - const val TITLE = "Title" -} diff --git a/sample/dapp/build.gradle.kts b/sample/dapp/build.gradle.kts index 24f41755b..3d39625dc 100644 --- a/sample/dapp/build.gradle.kts +++ b/sample/dapp/build.gradle.kts @@ -97,11 +97,11 @@ dependencies { implementation(libs.bundles.firebase) debugImplementation(project(":core:android")) - debugImplementation(project(":product:web3modal")) + debugImplementation(project(":product:appkit")) debugImplementation(project(":protocol:sign")) internalImplementation(project(":core:android")) - internalImplementation(project(":product:web3modal")) + internalImplementation(project(":product:appkit")) internalImplementation(project(":protocol:sign")) releaseImplementation(platform("com.walletconnect:android-bom:$BOM_VERSION")) diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/DappSampleApp.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/DappSampleApp.kt index 822413c64..71c3c3032 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/DappSampleApp.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/DappSampleApp.kt @@ -9,10 +9,10 @@ import com.reown.android.CoreClient import com.walletconnect.sample.common.tag import com.walletconnect.util.bytesToHex import com.walletconnect.util.randomBytes -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.presets.AppKitChainsPresets -import com.walletconnect.web3.modal.utils.EthUtils +import com.reown.appkit.client.AppKit +import com.reown.appkit.client.Modal +import com.reown.appkit.presets.AppKitChainsPresets +import com.reown.appkit.utils.EthUtils import timber.log.Timber import com.walletconnect.sample.common.BuildConfig as CommonBuildConfig diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/domain/DappDelegate.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/domain/DappDelegate.kt index 72ac61571..f0d63647c 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/domain/DappDelegate.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/domain/DappDelegate.kt @@ -3,8 +3,8 @@ package com.walletconnect.sample.dapp.domain import com.reown.android.Core import com.reown.android.CoreClient import com.walletconnect.sample.common.tag -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.client.Modal import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/DappSampleNavGraph.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/DappSampleNavGraph.kt index 53281a656..285133ba4 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/DappSampleNavGraph.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/DappSampleNavGraph.kt @@ -21,7 +21,7 @@ import com.walletconnect.sample.dapp.ui.routes.Route import com.walletconnect.sample.dapp.ui.routes.composable_routes.account.AccountRoute import com.walletconnect.sample.dapp.ui.routes.composable_routes.chain_selection.ChainSelectionRoute import com.walletconnect.sample.dapp.ui.routes.composable_routes.session.SessionRoute -import com.walletconnect.web3.modal.ui.appKitGraph +import com.reown.appkit.ui.appKitGraph @SuppressLint("RestrictedApi") @Composable diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/account/AccountViewModel.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/account/AccountViewModel.kt index ace074728..c04e98461 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/account/AccountViewModel.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/account/AccountViewModel.kt @@ -13,10 +13,10 @@ import com.walletconnect.sample.common.getPersonalSignBody import com.walletconnect.sample.dapp.domain.DappDelegate import com.walletconnect.sample.dapp.ui.DappSampleEvents import com.walletconnect.sample.dapp.ui.accountArg -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.models.Session -import com.walletconnect.web3.modal.client.models.request.Request +import com.reown.appkit.client.AppKit +import com.reown.appkit.client.Modal +import com.reown.appkit.client.models.Session +import com.reown.appkit.client.models.request.Request import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharedFlow diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt index 76bbad425..4b8053a1a 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt @@ -72,8 +72,8 @@ import com.walletconnect.sample.common.ui.toColor import com.walletconnect.sample.dapp.BuildConfig import com.walletconnect.sample.dapp.ui.DappSampleEvents import com.walletconnect.sample.dapp.ui.routes.Route -import com.walletconnect.web3.modal.ui.components.button.rememberAppKitState -import com.walletconnect.web3.modal.ui.openAppKit +import com.reown.appkit.ui.components.button.rememberAppKitState +import com.reown.appkit.ui.openAppKit import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt index ea78487dc..827fac0b5 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt @@ -14,8 +14,8 @@ import com.reown.sign.client.Sign import com.reown.sign.client.SignClient import com.walletconnect.util.bytesToHex import com.walletconnect.util.randomBytes -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.client.Modal import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/host/DappSampleViewModel.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/host/DappSampleViewModel.kt index ad577968a..c4913df82 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/host/DappSampleViewModel.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/host/DappSampleViewModel.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.walletconnect.sample.dapp.domain.DappDelegate import com.walletconnect.sample.dapp.ui.DappSampleEvents -import com.walletconnect.web3.modal.client.Modal +import com.reown.appkit.client.Modal import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.merge diff --git a/sample/modal/build.gradle.kts b/sample/modal/build.gradle.kts index 197205a3b..fce8f916c 100644 --- a/sample/modal/build.gradle.kts +++ b/sample/modal/build.gradle.kts @@ -90,10 +90,10 @@ dependencies { api(libs.bundles.androidxNavigation) debugImplementation(project(":core:android")) - debugImplementation(project(":product:web3modal")) + debugImplementation(project(":product:appkit")) internalImplementation(project(":core:android")) - internalImplementation(project(":product:web3modal")) + internalImplementation(project(":product:appkit")) releaseImplementation(platform("com.walletconnect:android-bom:$BOM_VERSION")) releaseImplementation("com.walletconnect:android-core") diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/AppKitApp.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/AppKitApp.kt index 10aae3c44..b4541e621 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/AppKitApp.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/AppKitApp.kt @@ -10,10 +10,10 @@ import com.reown.android.relay.ConnectionType import com.walletconnect.sample.common.tag import com.walletconnect.util.bytesToHex import com.walletconnect.util.randomBytes -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.presets.AppKitChainsPresets -import com.walletconnect.web3.modal.utils.EthUtils +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.presets.AppKitChainsPresets +import com.reown.appkit.utils.EthUtils import timber.log.Timber import com.walletconnect.sample.common.BuildConfig as CommonBuildConfig diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/MainActivity.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/MainActivity.kt index 1a17bf993..53433f34f 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/MainActivity.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/MainActivity.kt @@ -76,9 +76,9 @@ import com.walletconnect.sample.modal.ui.predefinedRedDarkTheme import com.walletconnect.sample.modal.ui.predefinedRedLightTheme import com.walletconnect.sample.modal.ui.theme.WalletConnectTheme import com.walletconnect.sample.modal.view.ViewActivity -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.ui.AppKitTheme -import com.walletconnect.web3.modal.ui.appKitGraph +import com.reown.appkit.client.AppKit +import com.reown.appkit.ui.AppKitTheme +import com.reown.appkit.ui.appKitGraph import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ModalSampleDelegate.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ModalSampleDelegate.kt index 652e8c135..dfebece6a 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ModalSampleDelegate.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ModalSampleDelegate.kt @@ -1,8 +1,8 @@ package com.walletconnect.sample.modal import com.walletconnect.sample.common.tag -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/ComposeActivity.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/ComposeActivity.kt index 718651b30..278600c9c 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/ComposeActivity.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/ComposeActivity.kt @@ -29,7 +29,7 @@ import com.google.accompanist.navigation.material.ExperimentalMaterialNavigation import com.google.accompanist.navigation.material.ModalBottomSheetLayout import com.walletconnect.sample.modal.common.Route import com.walletconnect.sample.modal.ui.theme.WalletConnectTheme -import com.walletconnect.web3.modal.ui.appKitGraph +import com.reown.appkit.ui.appKitGraph class ComposeActivity : ComponentActivity() { diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/HomeScreen.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/HomeScreen.kt index 76f84f887..4ce033e2f 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/HomeScreen.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/HomeScreen.kt @@ -10,13 +10,13 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.navigation.NavController -import com.walletconnect.web3.modal.ui.components.button.AccountButton -import com.walletconnect.web3.modal.ui.components.button.AccountButtonType -import com.walletconnect.web3.modal.ui.components.button.ConnectButton -import com.walletconnect.web3.modal.ui.components.button.ConnectButtonSize -import com.walletconnect.web3.modal.ui.components.button.NetworkButton -import com.walletconnect.web3.modal.ui.components.button.Web3Button -import com.walletconnect.web3.modal.ui.components.button.rememberAppKitState +import com.reown.appkit.ui.components.button.AccountButton +import com.reown.appkit.ui.components.button.AccountButtonType +import com.reown.appkit.ui.components.button.ConnectButton +import com.reown.appkit.ui.components.button.ConnectButtonSize +import com.reown.appkit.ui.components.button.NetworkButton +import com.reown.appkit.ui.components.button.Web3Button +import com.reown.appkit.ui.components.button.rememberAppKitState @Composable fun HomeScreen(navController: NavController) { diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/kotlindsl/KotlinDSLActivity.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/kotlindsl/KotlinDSLActivity.kt index dba6afb52..096cac793 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/kotlindsl/KotlinDSLActivity.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/kotlindsl/KotlinDSLActivity.kt @@ -7,7 +7,7 @@ import androidx.navigation.fragment.NavHostFragment import androidx.navigation.fragment.fragment import com.walletconnect.sample.modal.common.Route import com.walletconnect.sample.modal.R -import com.walletconnect.web3.modal.ui.appKit +import com.reown.appkit.ui.appKit class KotlinDSLActivity : AppCompatActivity(R.layout.activity_kotlin_dsl) { diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/LabScreen.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/LabScreen.kt index d2574ad2e..18f526269 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/LabScreen.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/LabScreen.kt @@ -19,15 +19,15 @@ import com.walletconnect.sample.common.getEthSignTypedData import com.walletconnect.sample.common.getPersonalSignBody import com.walletconnect.sample.common.ui.commons.BlueButton import com.walletconnect.sample.modal.ModalSampleDelegate -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.client.models.request.Request -import com.walletconnect.web3.modal.client.models.request.SentRequestResult -import com.walletconnect.web3.modal.ui.AppKitTheme -import com.walletconnect.web3.modal.ui.components.button.AccountButtonType -import com.walletconnect.web3.modal.ui.components.button.NetworkButton -import com.walletconnect.web3.modal.ui.components.button.Web3Button -import com.walletconnect.web3.modal.ui.components.button.rememberAppKitState +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.client.models.request.Request +import com.reown.appkit.client.models.request.SentRequestResult +import com.reown.appkit.ui.AppKitTheme +import com.reown.appkit.ui.components.button.AccountButtonType +import com.reown.appkit.ui.components.button.NetworkButton +import com.reown.appkit.ui.components.button.Web3Button +import com.reown.appkit.ui.components.button.rememberAppKitState import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/PredifinedThemes.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/PredifinedThemes.kt index 164ac248a..572aa26be 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/PredifinedThemes.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/PredifinedThemes.kt @@ -1,7 +1,7 @@ package com.walletconnect.sample.modal.ui import androidx.compose.ui.graphics.Color -import com.walletconnect.web3.modal.ui.AppKitTheme +import com.reown.appkit.ui.AppKitTheme val predefinedOrangeLightTheme = AppKitTheme.provideLightAppKitColors( accent100 = Color(0xFFFFA500), diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/view/ViewActivity.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/view/ViewActivity.kt index 4a4ecb2ec..6f9e02783 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/view/ViewActivity.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/view/ViewActivity.kt @@ -3,7 +3,7 @@ package com.walletconnect.sample.modal.view import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import com.walletconnect.sample.modal.R -import com.walletconnect.web3.modal.ui.AppKitView +import com.reown.appkit.ui.AppKitView class ViewActivity: AppCompatActivity(R.layout.activity_view) { diff --git a/sample/modal/src/main/res/layout/activity_view.xml b/sample/modal/src/main/res/layout/activity_view.xml index 2edde0de1..79aadb46a 100644 --- a/sample/modal/src/main/res/layout/activity_view.xml +++ b/sample/modal/src/main/res/layout/activity_view.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - From 1e2ee7c2214ea19250bd850b0c4aee0cd0fd5264 Mon Sep 17 00:00:00 2001 From: kubel Date: Thu, 5 Sep 2024 08:28:43 +0200 Subject: [PATCH 21/51] Migrate sample wallet --- core/android/src/main/AndroidManifest.xml | 6 ++-- .../GetSamplesWalletsUseCaseInterface.kt | 6 ++-- sample/dapp/src/main/AndroidManifest.xml | 6 ++-- .../chain_selection/ChainSelectionRoute.kt | 6 ++-- sample/modal/src/main/AndroidManifest.xml | 6 ++-- sample/wallet/build.gradle.kts | 4 +-- sample/wallet/src/main/AndroidManifest.xml | 8 ++--- .../sample/wallet/WalletKitApplication.kt | 14 ++++---- .../sample/wallet/WalletKitMessageService.kt} | 6 ++-- .../wallet/domain/EthAccountDelegate.kt | 2 +- .../sample/wallet/domain/MixPanelDelegate.kt | 2 +- .../wallet/domain/NotificationHandler.kt | 6 ++-- .../sample/wallet/domain/NotifyDelegate.kt | 2 +- .../sample/wallet/domain/TestAccounts.kt | 2 +- .../sample/wallet/domain/WCDelegate.kt | 2 +- .../wallet/domain/model/NotificationUI.kt | 2 +- .../sample/wallet/ui/NotifyEvent.kt | 2 +- .../sample/wallet/ui/WalletKitActivity.kt | 10 +++--- .../sample/wallet/ui/Web3WalletEvent.kt | 2 +- .../sample/wallet/ui/Web3WalletNavGraph.kt | 36 +++++++++---------- .../sample/wallet/ui/Web3WalletViewModel.kt | 10 +++--- .../sample/wallet/ui/common/Buttons.kt | 4 +-- .../sample/wallet/ui/common/Content.kt | 2 +- .../sample/wallet/ui/common/ImageUrl.kt | 2 +- .../sample/wallet/ui/common/InnerContent.kt | 2 +- .../sample/wallet/ui/common/Namespaces.kt | 2 +- .../wallet/ui/common/SemiTransparentDialog.kt | 2 +- .../wallet/ui/common/blue/BlueLabelRow.kt | 2 +- .../wallet/ui/common/blue/BlueLabelText.kt | 2 +- .../ui/common/blue/BlueLabelTextsSection.kt | 4 +-- .../ui/common/generated/ButtonWithLoader.kt | 2 +- .../ui/common/generated/CancelButton.kt | 2 +- .../wallet/ui/common/generated/CloseButton.kt | 4 +-- .../wallet/ui/common/generated/GetStarted.kt | 2 +- .../wallet/ui/common/generated/Welcome.kt | 2 +- .../wallet/ui/common/peer/PeerSection.kt | 4 +-- .../sample/wallet/ui/common/peer/PeerUI.kt | 4 +-- .../subscriptions/ActiveSubscriptionsUI.kt | 6 ++-- .../common/subscriptions/NotificationIcon.kt | 4 +-- .../common/subscriptions/SubscriptionIcon.kt | 6 ++-- .../sample/wallet/ui/routes/Route.kt | 2 +- .../scan_uri/QrCodeAnalyzer.kt | 2 +- .../scan_uri/ScanUriRoute.kt | 6 ++-- .../UpdateSubscriptionRoute.kt | 4 +-- .../UpdateSubscriptionViewModel.kt | 10 +++--- .../ConnectionDetailsRoute.kt | 20 +++++------ .../connections/ConnectionUI.kt | 2 +- .../connections/ConnectionsButton.kt | 4 +-- .../connections/ConnectionsRoute.kt | 8 ++--- .../connections/ConnectionsViewModel.kt | 8 ++--- .../get_started/GetStartedRoute.kt | 10 +++--- .../composable_routes/inbox/InboxRoute.kt | 14 ++++---- .../composable_routes/inbox/InboxViewModel.kt | 14 ++++---- .../LazyColumnSurroundedWithFogVertically.kt | 2 +- .../inbox/discover/DiscoverTab.kt | 10 +++--- .../inbox/discover/ExplorerApp.kt | 4 +-- .../subscriptions/ActiveSubscriptions.kt | 12 +++---- .../subscriptions/NoActiveSubscriptions.kt | 4 +-- .../inbox/subscriptions/SubscriptionsTab.kt | 6 ++-- .../notifications/NotificationsHeader.kt | 8 ++--- .../notifications/NotificationsOptionsMenu.kt | 4 +-- .../notifications/NotificationsViewModel.kt | 12 +++---- .../NotificiationsScreenRoute.kt | 18 +++++----- .../composable_routes/settings/SettingUI.kt | 2 +- .../settings/SettingsRoute.kt | 6 ++-- .../settings/SettingsViewModel.kt | 4 +-- .../dialog_routes/paste_uri/PasteUriRoute.kt | 4 +-- .../SessionAuthenticateRoute.kt | 18 +++++----- .../SessionAuthenticateUI.kt | 8 ++--- .../SessionAuthenticateViewModel.kt | 12 +++---- .../session_proposal/SessionProposalRoute.kt | 26 +++++++------- .../session_proposal/SessionProposalUI.kt | 10 +++--- .../SessionProposalViewModel.kt | 8 ++--- .../session_request/SessionRequestRoute.kt | 22 ++++++------ .../session_request/SessionRequestUI.kt | 6 ++-- .../SessionRequestViewModel.kt | 10 +++--- .../snackbar_message/SnackbarMessageRoute.kt | 2 +- .../sample/wallet/ui/routes/host/BottomBar.kt | 6 ++-- .../wallet/ui/routes/host/WalletSampleHost.kt | 16 ++++----- .../sample/wallet/ui/state/ConnectionState.kt | 2 +- .../sample/wallet/ui/state/PairingEvent.kt | 2 +- .../src/main/res/navigation/nav_graph.xml | 2 +- .../wallet/domain/EthAccountDelegateTest.kt | 2 +- 83 files changed, 275 insertions(+), 275 deletions(-) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/WalletKitApplication.kt (96%) rename sample/wallet/src/main/kotlin/com/{walletconnect/sample/wallet/Web3WalletMessageService.kt => reown/sample/wallet/WalletKitMessageService.kt} (88%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/domain/EthAccountDelegate.kt (98%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/domain/MixPanelDelegate.kt (64%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/domain/NotificationHandler.kt (98%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/domain/NotifyDelegate.kt (96%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/domain/TestAccounts.kt (95%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/domain/WCDelegate.kt (98%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/domain/model/NotificationUI.kt (81%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/NotifyEvent.kt (76%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/WalletKitActivity.kt (96%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/Web3WalletEvent.kt (91%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/Web3WalletNavGraph.kt (81%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/Web3WalletViewModel.kt (95%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/common/Buttons.kt (95%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/common/Content.kt (97%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/common/ImageUrl.kt (85%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/common/InnerContent.kt (95%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/common/Namespaces.kt (94%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/common/SemiTransparentDialog.kt (94%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/common/blue/BlueLabelRow.kt (90%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/common/blue/BlueLabelText.kt (95%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/common/blue/BlueLabelTextsSection.kt (94%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/common/generated/ButtonWithLoader.kt (97%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/common/generated/CancelButton.kt (96%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/common/generated/CloseButton.kt (77%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/common/generated/GetStarted.kt (97%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/common/generated/Welcome.kt (97%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/common/peer/PeerSection.kt (98%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/common/peer/PeerUI.kt (96%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/common/subscriptions/ActiveSubscriptionsUI.kt (85%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/common/subscriptions/NotificationIcon.kt (93%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/common/subscriptions/SubscriptionIcon.kt (91%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/Route.kt (94%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/bottomsheet_routes/scan_uri/QrCodeAnalyzer.kt (96%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/bottomsheet_routes/scan_uri/ScanUriRoute.kt (97%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/bottomsheet_routes/update_subscription/UpdateSubscriptionRoute.kt (98%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/bottomsheet_routes/update_subscription/UpdateSubscriptionViewModel.kt (91%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt (96%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/composable_routes/connections/ConnectionUI.kt (80%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/composable_routes/connections/ConnectionsButton.kt (94%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/composable_routes/connections/ConnectionsRoute.kt (97%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/composable_routes/connections/ConnectionsViewModel.kt (92%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/composable_routes/get_started/GetStartedRoute.kt (87%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/composable_routes/inbox/InboxRoute.kt (94%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/composable_routes/inbox/InboxViewModel.kt (95%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/composable_routes/inbox/LazyColumnSurroundedWithFogVertically.kt (97%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/composable_routes/inbox/discover/DiscoverTab.kt (96%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/composable_routes/inbox/discover/ExplorerApp.kt (77%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/composable_routes/inbox/subscriptions/ActiveSubscriptions.kt (93%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/composable_routes/inbox/subscriptions/NoActiveSubscriptions.kt (97%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/composable_routes/inbox/subscriptions/SubscriptionsTab.kt (71%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/composable_routes/notifications/NotificationsHeader.kt (95%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/composable_routes/notifications/NotificationsOptionsMenu.kt (97%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/composable_routes/notifications/NotificationsViewModel.kt (95%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/composable_routes/notifications/NotificiationsScreenRoute.kt (95%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/composable_routes/settings/SettingUI.kt (76%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/composable_routes/settings/SettingsRoute.kt (97%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/composable_routes/settings/SettingsViewModel.kt (84%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/dialog_routes/paste_uri/PasteUriRoute.kt (97%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateRoute.kt (94%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateUI.kt (86%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt (93%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalRoute.kt (94%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalUI.kt (89%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalViewModel.kt (93%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestRoute.kt (93%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestUI.kt (61%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt (95%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/dialog_routes/snackbar_message/SnackbarMessageRoute.kt (95%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/host/BottomBar.kt (96%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/routes/host/WalletSampleHost.kt (94%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/state/ConnectionState.kt (86%) rename sample/wallet/src/main/kotlin/com/{walletconnect => reown}/sample/wallet/ui/state/PairingEvent.kt (76%) rename sample/wallet/src/test/kotlin/com/{walletconnect => reown}/sample/wallet/domain/EthAccountDelegateTest.kt (97%) diff --git a/core/android/src/main/AndroidManifest.xml b/core/android/src/main/AndroidManifest.xml index 365b9af23..095d9237b 100644 --- a/core/android/src/main/AndroidManifest.xml +++ b/core/android/src/main/AndroidManifest.xml @@ -3,9 +3,9 @@ package="com.reown.android"> - - - + + + diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/modal/domain/usecase/GetSamplesWalletsUseCaseInterface.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/domain/usecase/GetSamplesWalletsUseCaseInterface.kt index 31c2275fe..4b96ca4da 100644 --- a/core/android/src/main/kotlin/com/reown/android/internal/common/modal/domain/usecase/GetSamplesWalletsUseCaseInterface.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/domain/usecase/GetSamplesWalletsUseCaseInterface.kt @@ -13,9 +13,9 @@ internal class GetSampleWalletsUseCase( ) : GetSampleWalletsUseCaseInterface { override suspend fun invoke(): List { val samples = mapOf( - "com.walletconnect.sample.wallet.debug" to SampleWalletDebug, - "com.walletconnect.sample.wallet.internal" to SampleWalletInternal, - "com.walletconnect.sample.wallet" to SampleWalletRelease, + "com.reown.sample.wallet.debug" to SampleWalletDebug, + "com.reown.sample.wallet.internal" to SampleWalletInternal, + "com.reown.sample.wallet" to SampleWalletRelease, "com.walletconnect.web3wallet.rnsample.internal" to RNSampleWallet, "com.walletconnect.flutterwallet" to FLSampleWallet, "com.walletconnect.flutterwallet.internal" to FLSampleWalletInternal diff --git a/sample/dapp/src/main/AndroidManifest.xml b/sample/dapp/src/main/AndroidManifest.xml index 55a113003..839c47653 100644 --- a/sample/dapp/src/main/AndroidManifest.xml +++ b/sample/dapp/src/main/AndroidManifest.xml @@ -14,9 +14,9 @@ - - - + + + diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt index 4b8053a1a..dbe09f675 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt @@ -619,9 +619,9 @@ private class ChainSelectionStateProvider : PreviewParameterProvider - - - + + + diff --git a/sample/wallet/build.gradle.kts b/sample/wallet/build.gradle.kts index 71e751f64..68982bcab 100644 --- a/sample/wallet/build.gradle.kts +++ b/sample/wallet/build.gradle.kts @@ -8,12 +8,12 @@ plugins { } android { - namespace = "com.walletconnect.sample.wallet" + namespace = "com.reown.sample.wallet" compileSdk = COMPILE_SDK // hash of all sdk versions from Versions.kt defaultConfig { - applicationId = "com.walletconnect.sample.wallet" + applicationId = "com.reown.sample.wallet" minSdk = MIN_SDK targetSdk = TARGET_SDK versionName = SAMPLE_VERSION_NAME diff --git a/sample/wallet/src/main/AndroidManifest.xml b/sample/wallet/src/main/AndroidManifest.xml index 05c488796..bf4f07c9d 100644 --- a/sample/wallet/src/main/AndroidManifest.xml +++ b/sample/wallet/src/main/AndroidManifest.xml @@ -8,7 +8,7 @@ @@ -64,7 +64,7 @@ diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/WalletKitApplication.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitApplication.kt similarity index 96% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/WalletKitApplication.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitApplication.kt index 51e8a059b..bb2b1022f 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/WalletKitApplication.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitApplication.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet +package com.reown.sample.wallet import android.app.Application import android.content.ClipData @@ -27,12 +27,12 @@ import com.reown.notify.client.NotifyClient import com.reown.notify.client.cacao.CacaoSigner import com.walletconnect.sample.common.initBeagle import com.walletconnect.sample.common.tag -import com.walletconnect.sample.wallet.domain.EthAccountDelegate -import com.walletconnect.sample.wallet.domain.NotificationHandler -import com.walletconnect.sample.wallet.domain.NotifyDelegate -import com.walletconnect.sample.wallet.domain.mixPanel -import com.walletconnect.sample.wallet.ui.state.ConnectionState -import com.walletconnect.sample.wallet.ui.state.connectionStateFlow +import com.reown.sample.wallet.domain.EthAccountDelegate +import com.reown.sample.wallet.domain.NotificationHandler +import com.reown.sample.wallet.domain.NotifyDelegate +import com.reown.sample.wallet.domain.mixPanel +import com.reown.sample.wallet.ui.state.ConnectionState +import com.reown.sample.wallet.ui.state.connectionStateFlow import com.walletconnect.util.hexToBytes import com.reown.walletkit.client.Wallet import com.reown.walletkit.client.WalletKit diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/Web3WalletMessageService.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitMessageService.kt similarity index 88% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/Web3WalletMessageService.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitMessageService.kt index d4f4de5eb..051ec354b 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/Web3WalletMessageService.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitMessageService.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet +package com.reown.sample.wallet import android.annotation.SuppressLint import com.google.firebase.messaging.RemoteMessage @@ -7,12 +7,12 @@ import com.reown.android.internal.common.di.AndroidCommonDITags import com.reown.android.internal.common.wcKoinApp import com.reown.android.push.notifications.PushMessagingService import com.reown.foundation.util.Logger -import com.walletconnect.sample.wallet.domain.NotificationHandler +import com.reown.sample.wallet.domain.NotificationHandler import kotlinx.coroutines.runBlocking import org.koin.core.qualifier.named @SuppressLint("MissingFirebaseInstanceTokenRefresh") -class Web3WalletMessageService : PushMessagingService() { +class WalletKitMessageService : PushMessagingService() { private val logger: Logger by lazy { wcKoinApp.koin.get(named(AndroidCommonDITags.LOGGER)) } override fun onMessage(message: Core.Model.Message, originalMessage: RemoteMessage) { diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/EthAccountDelegate.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/EthAccountDelegate.kt similarity index 98% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/EthAccountDelegate.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/EthAccountDelegate.kt index 6f313f61e..eff070699 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/EthAccountDelegate.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/EthAccountDelegate.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.domain +package com.reown.sample.wallet.domain import android.app.Application import android.content.Context diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/MixPanelDelegate.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/MixPanelDelegate.kt similarity index 64% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/MixPanelDelegate.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/MixPanelDelegate.kt index 2eafcabbc..49c006382 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/MixPanelDelegate.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/MixPanelDelegate.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.domain +package com.reown.sample.wallet.domain import com.mixpanel.android.mpmetrics.MixpanelAPI diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/NotificationHandler.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/NotificationHandler.kt similarity index 98% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/NotificationHandler.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/NotificationHandler.kt index 25afa3c49..8d76bed62 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/NotificationHandler.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/NotificationHandler.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalCoroutinesApi::class, FlowPreview::class) -package com.walletconnect.sample.wallet.domain +package com.reown.sample.wallet.domain import android.app.NotificationChannel import android.app.NotificationManager @@ -19,8 +19,8 @@ import coil.request.ImageRequest import com.reown.android.Core import com.reown.notify.client.Notify import com.reown.notify.client.NotifyClient -import com.walletconnect.sample.wallet.R -import com.walletconnect.sample.wallet.ui.WalletKitActivity +import com.reown.sample.wallet.R +import com.reown.sample.wallet.ui.WalletKitActivity import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/NotifyDelegate.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/NotifyDelegate.kt similarity index 96% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/NotifyDelegate.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/NotifyDelegate.kt index d67b3acd8..ae565d0e6 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/NotifyDelegate.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/NotifyDelegate.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.domain +package com.reown.sample.wallet.domain import com.reown.notify.client.Notify import com.reown.notify.client.NotifyClient diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/TestAccounts.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/TestAccounts.kt similarity index 95% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/TestAccounts.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/TestAccounts.kt index 566adaf4d..11ed0af27 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/TestAccounts.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/TestAccounts.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.domain +package com.reown.sample.wallet.domain import com.walletconnect.sample.common.Chains import com.walletconnect.util.hexToBytes diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/WCDelegate.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/WCDelegate.kt similarity index 98% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/WCDelegate.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/WCDelegate.kt index ec8da3c6c..64e7b500e 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/WCDelegate.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/WCDelegate.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.domain +package com.reown.sample.wallet.domain import android.util.Log import com.reown.android.Core diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/model/NotificationUI.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/model/NotificationUI.kt similarity index 81% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/model/NotificationUI.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/model/NotificationUI.kt index 0f8800af1..fc7f254b9 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/domain/model/NotificationUI.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/model/NotificationUI.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.domain.model +package com.reown.sample.wallet.domain.model data class NotificationUI( val id: String, diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/NotifyEvent.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/NotifyEvent.kt similarity index 76% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/NotifyEvent.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/NotifyEvent.kt index d6dc60c52..416b51085 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/NotifyEvent.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/NotifyEvent.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui +package com.reown.sample.wallet.ui sealed interface NotifyEvent diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/WalletKitActivity.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt similarity index 96% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/WalletKitActivity.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt index 1062db6f7..9cb8c554e 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/WalletKitActivity.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt @@ -4,7 +4,7 @@ ExperimentalAnimationApi::class ) -package com.walletconnect.sample.wallet.ui +package com.reown.sample.wallet.ui import android.content.Intent import android.content.pm.PackageManager @@ -28,10 +28,10 @@ import com.google.accompanist.navigation.animation.rememberAnimatedNavController import com.google.accompanist.navigation.material.BottomSheetNavigator import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi import com.walletconnect.sample.common.ui.theme.WCSampleAppTheme -import com.walletconnect.sample.wallet.domain.NotifyDelegate -import com.walletconnect.sample.wallet.ui.routes.Route -import com.walletconnect.sample.wallet.ui.routes.composable_routes.connections.ConnectionsViewModel -import com.walletconnect.sample.wallet.ui.routes.host.WalletSampleHost +import com.reown.sample.wallet.domain.NotifyDelegate +import com.reown.sample.wallet.ui.routes.Route +import com.reown.sample.wallet.ui.routes.composable_routes.connections.ConnectionsViewModel +import com.reown.sample.wallet.ui.routes.host.WalletSampleHost import com.reown.walletkit.client.WalletKit import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletEvent.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/Web3WalletEvent.kt similarity index 91% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletEvent.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/Web3WalletEvent.kt index f9efae1d0..d0ed7c5fd 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletEvent.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/Web3WalletEvent.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui +package com.reown.sample.wallet.ui sealed interface Web3WalletEvent diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletNavGraph.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/Web3WalletNavGraph.kt similarity index 81% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletNavGraph.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/Web3WalletNavGraph.kt index 9cbf559e9..2ea2566d1 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletNavGraph.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/Web3WalletNavGraph.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalAnimationApi::class) -package com.walletconnect.sample.wallet.ui +package com.reown.sample.wallet.ui import android.annotation.SuppressLint import androidx.compose.animation.AnimatedContentTransitionScope @@ -29,23 +29,23 @@ import com.google.accompanist.navigation.material.BottomSheetNavigator import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi import com.google.accompanist.navigation.material.ModalBottomSheetLayout import com.google.accompanist.navigation.material.bottomSheet -import com.walletconnect.sample.wallet.domain.WCDelegate -import com.walletconnect.sample.wallet.ui.routes.Route -import com.walletconnect.sample.wallet.ui.routes.bottomsheet_routes.scan_uri.ScanUriRoute -import com.walletconnect.sample.wallet.ui.routes.bottomsheet_routes.update_subscription.UpdateSubscriptionRoute -import com.walletconnect.sample.wallet.ui.routes.composable_routes.connection_details.ConnectionDetailsRoute -import com.walletconnect.sample.wallet.ui.routes.composable_routes.connections.ConnectionsRoute -import com.walletconnect.sample.wallet.ui.routes.composable_routes.connections.ConnectionsViewModel -import com.walletconnect.sample.wallet.ui.routes.composable_routes.get_started.GetStartedRoute -import com.walletconnect.sample.wallet.ui.routes.composable_routes.inbox.InboxRoute -import com.walletconnect.sample.wallet.ui.routes.composable_routes.inbox.InboxViewModel -import com.walletconnect.sample.wallet.ui.routes.composable_routes.notifications.NotificationsScreenRoute -import com.walletconnect.sample.wallet.ui.routes.composable_routes.settings.SettingsRoute -import com.walletconnect.sample.wallet.ui.routes.dialog_routes.paste_uri.PasteUriRoute -import com.walletconnect.sample.wallet.ui.routes.dialog_routes.session_authenticate.SessionAuthenticateRoute -import com.walletconnect.sample.wallet.ui.routes.dialog_routes.session_proposal.SessionProposalRoute -import com.walletconnect.sample.wallet.ui.routes.dialog_routes.session_request.SessionRequestRoute -import com.walletconnect.sample.wallet.ui.routes.dialog_routes.snackbar_message.SnackbarMessageRoute +import com.reown.sample.wallet.domain.WCDelegate +import com.reown.sample.wallet.ui.routes.Route +import com.reown.sample.wallet.ui.routes.bottomsheet_routes.scan_uri.ScanUriRoute +import com.reown.sample.wallet.ui.routes.bottomsheet_routes.update_subscription.UpdateSubscriptionRoute +import com.reown.sample.wallet.ui.routes.composable_routes.connection_details.ConnectionDetailsRoute +import com.reown.sample.wallet.ui.routes.composable_routes.connections.ConnectionsRoute +import com.reown.sample.wallet.ui.routes.composable_routes.connections.ConnectionsViewModel +import com.reown.sample.wallet.ui.routes.composable_routes.get_started.GetStartedRoute +import com.reown.sample.wallet.ui.routes.composable_routes.inbox.InboxRoute +import com.reown.sample.wallet.ui.routes.composable_routes.inbox.InboxViewModel +import com.reown.sample.wallet.ui.routes.composable_routes.notifications.NotificationsScreenRoute +import com.reown.sample.wallet.ui.routes.composable_routes.settings.SettingsRoute +import com.reown.sample.wallet.ui.routes.dialog_routes.paste_uri.PasteUriRoute +import com.reown.sample.wallet.ui.routes.dialog_routes.session_authenticate.SessionAuthenticateRoute +import com.reown.sample.wallet.ui.routes.dialog_routes.session_proposal.SessionProposalRoute +import com.reown.sample.wallet.ui.routes.dialog_routes.session_request.SessionRequestRoute +import com.reown.sample.wallet.ui.routes.dialog_routes.snackbar_message.SnackbarMessageRoute @SuppressLint("RestrictedApi") @ExperimentalMaterialNavigationApi diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletViewModel.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/Web3WalletViewModel.kt similarity index 95% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletViewModel.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/Web3WalletViewModel.kt index b96bf9aa1..be5549ef3 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/Web3WalletViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/Web3WalletViewModel.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui +package com.reown.sample.wallet.ui import android.util.Log import androidx.lifecycle.ViewModel @@ -8,10 +8,10 @@ import com.google.firebase.ktx.Firebase import com.reown.android.Core import com.reown.android.internal.common.exception.InvalidProjectIdException import com.reown.android.internal.common.exception.ProjectIdDoesNotExistException -import com.walletconnect.sample.wallet.domain.ISSUER -import com.walletconnect.sample.wallet.domain.WCDelegate -import com.walletconnect.sample.wallet.ui.state.ConnectionState -import com.walletconnect.sample.wallet.ui.state.PairingEvent +import com.reown.sample.wallet.domain.ISSUER +import com.reown.sample.wallet.domain.WCDelegate +import com.reown.sample.wallet.ui.state.ConnectionState +import com.reown.sample.wallet.ui.state.PairingEvent import com.reown.walletkit.client.Wallet import com.reown.walletkit.client.WalletKit import kotlinx.coroutines.delay diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/Buttons.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/Buttons.kt similarity index 95% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/Buttons.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/Buttons.kt index bba05f920..92cea5f57 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/Buttons.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/Buttons.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.common +package com.reown.sample.wallet.ui.common import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Row @@ -15,7 +15,7 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.walletconnect.sample.wallet.ui.common.generated.ButtonWithLoader +import com.reown.sample.wallet.ui.common.generated.ButtonWithLoader @Composable diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/Content.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/Content.kt similarity index 97% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/Content.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/Content.kt index ae41f1dfb..6d00cf8d5 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/Content.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/Content.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.common +package com.reown.sample.wallet.ui.common import androidx.compose.foundation.background import androidx.compose.foundation.layout.* diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/ImageUrl.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/ImageUrl.kt similarity index 85% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/ImageUrl.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/ImageUrl.kt index 3f1594d41..8fda9e151 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/ImageUrl.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/ImageUrl.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.common +package com.reown.sample.wallet.ui.common data class ImageUrl( val small: String, diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/InnerContent.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/InnerContent.kt similarity index 95% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/InnerContent.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/InnerContent.kt index d260094aa..63ccfd6ee 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/InnerContent.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/InnerContent.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.common +package com.reown.sample.wallet.ui.common import androidx.compose.foundation.background import androidx.compose.foundation.border diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/Namespaces.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/Namespaces.kt similarity index 94% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/Namespaces.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/Namespaces.kt index a6adfcd43..8ce342969 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/Namespaces.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/Namespaces.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.common +package com.reown.sample.wallet.ui.common import com.reown.walletkit.client.Wallet diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/SemiTransparentDialog.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/SemiTransparentDialog.kt similarity index 94% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/SemiTransparentDialog.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/SemiTransparentDialog.kt index 35b647c83..f91a3c42b 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/SemiTransparentDialog.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/SemiTransparentDialog.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.common +package com.reown.sample.wallet.ui.common import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/blue/BlueLabelRow.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/blue/BlueLabelRow.kt similarity index 90% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/blue/BlueLabelRow.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/blue/BlueLabelRow.kt index f12b640b4..f6f5d3ecb 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/blue/BlueLabelRow.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/blue/BlueLabelRow.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.common.blue +package com.reown.sample.wallet.ui.common.blue import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/blue/BlueLabelText.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/blue/BlueLabelText.kt similarity index 95% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/blue/BlueLabelText.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/blue/BlueLabelText.kt index 0198e6ede..5de0efd9d 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/blue/BlueLabelText.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/blue/BlueLabelText.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.common.blue +package com.reown.sample.wallet.ui.common.blue import androidx.compose.foundation.background import androidx.compose.foundation.layout.padding diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/blue/BlueLabelTextsSection.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/blue/BlueLabelTextsSection.kt similarity index 94% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/blue/BlueLabelTextsSection.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/blue/BlueLabelTextsSection.kt index 9b5ef54ae..adb62ca57 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/blue/BlueLabelTextsSection.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/blue/BlueLabelTextsSection.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.common.blue +package com.reown.sample.wallet.ui.common.blue import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.height @@ -11,7 +11,7 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.walletconnect.sample.wallet.ui.common.InnerContent +import com.reown.sample.wallet.ui.common.InnerContent import com.walletconnect.sample.common.ui.themedColor @Composable diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/generated/ButtonWithLoader.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/generated/ButtonWithLoader.kt similarity index 97% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/generated/ButtonWithLoader.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/generated/ButtonWithLoader.kt index f68af8ef1..ae0c5cc75 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/generated/ButtonWithLoader.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/generated/ButtonWithLoader.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.common.generated +package com.reown.sample.wallet.ui.common.generated import androidx.compose.animation.AnimatedContent import androidx.compose.foundation.background diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/generated/CancelButton.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/generated/CancelButton.kt similarity index 96% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/generated/CancelButton.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/generated/CancelButton.kt index a7d872d52..02617bf2d 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/generated/CancelButton.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/generated/CancelButton.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.common.generated +package com.reown.sample.wallet.ui.common.generated import androidx.compose.foundation.background import androidx.compose.foundation.layout.* diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/generated/CloseButton.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/generated/CloseButton.kt similarity index 77% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/generated/CloseButton.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/generated/CloseButton.kt index 1a6c2afe6..a849d0ee5 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/generated/CloseButton.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/generated/CloseButton.kt @@ -1,10 +1,10 @@ -package com.walletconnect.sample.wallet.ui.common.generated +package com.reown.sample.wallet.ui.common.generated import androidx.compose.foundation.Image import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource -import com.walletconnect.sample.wallet.R +import com.reown.sample.wallet.R @Composable fun CloseButton(modifier: Modifier = Modifier) { diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/generated/GetStarted.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/generated/GetStarted.kt similarity index 97% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/generated/GetStarted.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/generated/GetStarted.kt index 245c3c310..152263ada 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/generated/GetStarted.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/generated/GetStarted.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.common.generated +package com.reown.sample.wallet.ui.common.generated import androidx.compose.foundation.layout.* import androidx.compose.material.Text diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/generated/Welcome.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/generated/Welcome.kt similarity index 97% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/generated/Welcome.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/generated/Welcome.kt index 2b9cd8550..ba536ca44 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/generated/Welcome.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/generated/Welcome.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.common.generated +package com.reown.sample.wallet.ui.common.generated import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/peer/PeerSection.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/peer/PeerSection.kt similarity index 98% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/peer/PeerSection.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/peer/PeerSection.kt index b6c1022c6..6e1b9ee40 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/peer/PeerSection.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/peer/PeerSection.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.common.peer +package com.reown.sample.wallet.ui.common.peer import android.net.Uri import androidx.compose.foundation.Image @@ -32,7 +32,7 @@ import androidx.compose.ui.unit.sp import coil.compose.rememberAsyncImagePainter import coil.request.ImageRequest import com.walletconnect.sample.common.ui.themedColor -import com.walletconnect.sample.wallet.R +import com.reown.sample.wallet.R @Composable diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/peer/PeerUI.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/peer/PeerUI.kt similarity index 96% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/peer/PeerUI.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/peer/PeerUI.kt index a78a021f2..4af6b30b3 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/peer/PeerUI.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/peer/PeerUI.kt @@ -1,10 +1,10 @@ -package com.walletconnect.sample.wallet.ui.common.peer +package com.reown.sample.wallet.ui.common.peer import androidx.compose.ui.graphics.Color import com.walletconnect.sample.common.ui.theme.mismatch_color import com.walletconnect.sample.common.ui.theme.unverified_color import com.walletconnect.sample.common.ui.theme.verified_color -import com.walletconnect.sample.wallet.R +import com.reown.sample.wallet.R import com.reown.walletkit.client.Wallet diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/subscriptions/ActiveSubscriptionsUI.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/subscriptions/ActiveSubscriptionsUI.kt similarity index 85% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/subscriptions/ActiveSubscriptionsUI.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/subscriptions/ActiveSubscriptionsUI.kt index 9b6767c82..74f83ae89 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/subscriptions/ActiveSubscriptionsUI.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/subscriptions/ActiveSubscriptionsUI.kt @@ -1,8 +1,8 @@ -package com.walletconnect.sample.wallet.ui.common.subscriptions +package com.reown.sample.wallet.ui.common.subscriptions import com.reown.notify.client.Notify -import com.walletconnect.sample.wallet.ui.common.ImageUrl -import com.walletconnect.sample.wallet.ui.common.toImageUrl +import com.reown.sample.wallet.ui.common.ImageUrl +import com.reown.sample.wallet.ui.common.toImageUrl data class ActiveSubscriptionsUI( val topic: String, diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/subscriptions/NotificationIcon.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/subscriptions/NotificationIcon.kt similarity index 93% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/subscriptions/NotificationIcon.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/subscriptions/NotificationIcon.kt index b7df02f7a..e631f8757 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/subscriptions/NotificationIcon.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/subscriptions/NotificationIcon.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.common.subscriptions +package com.reown.sample.wallet.ui.common.subscriptions import androidx.compose.foundation.background import androidx.compose.foundation.layout.size @@ -15,7 +15,7 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import coil.compose.AsyncImage import coil.request.ImageRequest -import com.walletconnect.sample.wallet.R +import com.reown.sample.wallet.R @Composable fun NotificationIcon(size: Dp, url: String?) { diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/subscriptions/SubscriptionIcon.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/subscriptions/SubscriptionIcon.kt similarity index 91% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/subscriptions/SubscriptionIcon.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/subscriptions/SubscriptionIcon.kt index 57493305b..e5f541336 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/common/subscriptions/SubscriptionIcon.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/subscriptions/SubscriptionIcon.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.common.subscriptions +package com.reown.sample.wallet.ui.common.subscriptions import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -17,8 +17,8 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import coil.compose.AsyncImage import coil.request.ImageRequest -import com.walletconnect.sample.wallet.R -import com.walletconnect.sample.wallet.ui.common.ImageUrl +import com.reown.sample.wallet.R +import com.reown.sample.wallet.ui.common.ImageUrl @Composable diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/Route.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/Route.kt similarity index 94% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/Route.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/Route.kt index 59fa263b1..591f9e0b6 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/Route.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/Route.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.routes +package com.reown.sample.wallet.ui.routes import androidx.navigation.NavController diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/bottomsheet_routes/scan_uri/QrCodeAnalyzer.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/bottomsheet_routes/scan_uri/QrCodeAnalyzer.kt similarity index 96% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/bottomsheet_routes/scan_uri/QrCodeAnalyzer.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/bottomsheet_routes/scan_uri/QrCodeAnalyzer.kt index 0ff9f1c86..d7745435c 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/bottomsheet_routes/scan_uri/QrCodeAnalyzer.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/bottomsheet_routes/scan_uri/QrCodeAnalyzer.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.routes.bottomsheet_routes.scan_uri +package com.reown.sample.wallet.ui.routes.bottomsheet_routes.scan_uri import androidx.camera.core.ExperimentalGetImage import androidx.camera.core.ImageAnalysis diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/bottomsheet_routes/scan_uri/ScanUriRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/bottomsheet_routes/scan_uri/ScanUriRoute.kt similarity index 97% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/bottomsheet_routes/scan_uri/ScanUriRoute.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/bottomsheet_routes/scan_uri/ScanUriRoute.kt index c324c2bdf..cb6f5bd0d 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/bottomsheet_routes/scan_uri/ScanUriRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/bottomsheet_routes/scan_uri/ScanUriRoute.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalMaterialNavigationApi::class, ExperimentalMaterialApi::class, ExperimentalMaterialNavigationApi::class) -package com.walletconnect.sample.wallet.ui.routes.bottomsheet_routes.scan_uri +package com.reown.sample.wallet.ui.routes.bottomsheet_routes.scan_uri import android.Manifest import android.content.pm.PackageManager @@ -54,8 +54,8 @@ import androidx.core.content.ContextCompat import androidx.navigation.NavController import com.google.accompanist.navigation.material.BottomSheetNavigatorSheetState import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi -import com.walletconnect.sample.wallet.R -import com.walletconnect.sample.wallet.ui.common.generated.CloseButton +import com.reown.sample.wallet.R +import com.reown.sample.wallet.ui.common.generated.CloseButton import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/bottomsheet_routes/update_subscription/UpdateSubscriptionRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/bottomsheet_routes/update_subscription/UpdateSubscriptionRoute.kt similarity index 98% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/bottomsheet_routes/update_subscription/UpdateSubscriptionRoute.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/bottomsheet_routes/update_subscription/UpdateSubscriptionRoute.kt index 1b66d9ef0..79dc75f08 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/bottomsheet_routes/update_subscription/UpdateSubscriptionRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/bottomsheet_routes/update_subscription/UpdateSubscriptionRoute.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalMaterialNavigationApi::class) -package com.walletconnect.sample.wallet.ui.routes.bottomsheet_routes.update_subscription +package com.reown.sample.wallet.ui.routes.bottomsheet_routes.update_subscription import android.widget.Toast import androidx.compose.animation.AnimatedVisibility @@ -45,7 +45,7 @@ import androidx.navigation.NavController import com.google.accompanist.navigation.material.BottomSheetNavigatorSheetState import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi import com.walletconnect.sample.common.ui.theme.blue_accent -import com.walletconnect.sample.wallet.ui.routes.showSnackbar +import com.reown.sample.wallet.ui.routes.showSnackbar import kotlinx.coroutines.launch diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/bottomsheet_routes/update_subscription/UpdateSubscriptionViewModel.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/bottomsheet_routes/update_subscription/UpdateSubscriptionViewModel.kt similarity index 91% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/bottomsheet_routes/update_subscription/UpdateSubscriptionViewModel.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/bottomsheet_routes/update_subscription/UpdateSubscriptionViewModel.kt index ace93e91d..017b7349b 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/bottomsheet_routes/update_subscription/UpdateSubscriptionViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/bottomsheet_routes/update_subscription/UpdateSubscriptionViewModel.kt @@ -1,14 +1,14 @@ -package com.walletconnect.sample.wallet.ui.routes.bottomsheet_routes.update_subscription +package com.reown.sample.wallet.ui.routes.bottomsheet_routes.update_subscription import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import com.reown.notify.client.Notify import com.reown.notify.client.NotifyClient -import com.walletconnect.sample.wallet.domain.EthAccountDelegate -import com.walletconnect.sample.wallet.domain.NotifyDelegate -import com.walletconnect.sample.wallet.ui.common.subscriptions.ActiveSubscriptionsUI -import com.walletconnect.sample.wallet.ui.common.subscriptions.toUI +import com.reown.sample.wallet.domain.EthAccountDelegate +import com.reown.sample.wallet.domain.NotifyDelegate +import com.reown.sample.wallet.ui.common.subscriptions.ActiveSubscriptionsUI +import com.reown.sample.wallet.ui.common.subscriptions.toUI import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.flow.MutableStateFlow diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt similarity index 96% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt index 544e446bb..1901538a6 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalPagerApi::class, ExperimentalPagerApi::class, ExperimentalPagerApi::class) -package com.walletconnect.sample.wallet.ui.routes.composable_routes.connection_details +package com.reown.sample.wallet.ui.routes.composable_routes.connection_details import android.widget.Toast import androidx.compose.animation.AnimatedContent @@ -54,15 +54,15 @@ import com.google.accompanist.pager.rememberPagerState import com.google.firebase.crashlytics.ktx.crashlytics import com.google.firebase.ktx.Firebase import com.walletconnect.sample.common.ui.themedColor -import com.walletconnect.sample.wallet.R -import com.walletconnect.sample.wallet.ui.common.Content -import com.walletconnect.sample.wallet.ui.common.InnerContent -import com.walletconnect.sample.wallet.ui.common.blue.BlueLabelTexts -import com.walletconnect.sample.wallet.ui.common.getAllEventsByChainId -import com.walletconnect.sample.wallet.ui.common.getAllMethodsByChainId -import com.walletconnect.sample.wallet.ui.routes.composable_routes.connections.ConnectionType -import com.walletconnect.sample.wallet.ui.routes.composable_routes.connections.ConnectionUI -import com.walletconnect.sample.wallet.ui.routes.composable_routes.connections.ConnectionsViewModel +import com.reown.sample.wallet.R +import com.reown.sample.wallet.ui.common.Content +import com.reown.sample.wallet.ui.common.InnerContent +import com.reown.sample.wallet.ui.common.blue.BlueLabelTexts +import com.reown.sample.wallet.ui.common.getAllEventsByChainId +import com.reown.sample.wallet.ui.common.getAllMethodsByChainId +import com.reown.sample.wallet.ui.routes.composable_routes.connections.ConnectionType +import com.reown.sample.wallet.ui.routes.composable_routes.connections.ConnectionUI +import com.reown.sample.wallet.ui.routes.composable_routes.connections.ConnectionsViewModel import com.reown.walletkit.client.Wallet import com.reown.walletkit.client.WalletKit import kotlinx.coroutines.Dispatchers diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionUI.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connections/ConnectionUI.kt similarity index 80% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionUI.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connections/ConnectionUI.kt index 73e8f84f8..0403e8a82 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionUI.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connections/ConnectionUI.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.routes.composable_routes.connections +package com.reown.sample.wallet.ui.routes.composable_routes.connections import com.reown.walletkit.client.Wallet diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionsButton.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connections/ConnectionsButton.kt similarity index 94% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionsButton.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connections/ConnectionsButton.kt index e59a9e8d4..ec8196e4a 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionsButton.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connections/ConnectionsButton.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.routes.composable_routes.connections +package com.reown.sample.wallet.ui.routes.composable_routes.connections import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -18,7 +18,7 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.vectorResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.walletconnect.sample.wallet.R +import com.reown.sample.wallet.R @Composable fun ConnectionsButton( diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionsRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connections/ConnectionsRoute.kt similarity index 97% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionsRoute.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connections/ConnectionsRoute.kt index 0513d96d7..0bf685a99 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionsRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connections/ConnectionsRoute.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.routes.composable_routes.connections +package com.reown.sample.wallet.ui.routes.composable_routes.connections import android.content.Intent import androidx.compose.foundation.Image @@ -44,9 +44,9 @@ import com.walletconnect.sample.common.ui.TopBarActionImage import com.walletconnect.sample.common.ui.WCTopAppBar import com.walletconnect.sample.common.ui.findActivity import com.walletconnect.sample.common.ui.themedColor -import com.walletconnect.sample.wallet.R -import com.walletconnect.sample.wallet.ui.Web3WalletViewModel -import com.walletconnect.sample.wallet.ui.routes.Route +import com.reown.sample.wallet.R +import com.reown.sample.wallet.ui.Web3WalletViewModel +import com.reown.sample.wallet.ui.routes.Route @Composable fun ConnectionsRoute(navController: NavController, connectionsViewModel: ConnectionsViewModel, web3WalletViewModel: Web3WalletViewModel) { diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionsViewModel.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connections/ConnectionsViewModel.kt similarity index 92% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionsViewModel.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connections/ConnectionsViewModel.kt index 05fe9b96a..6f658c851 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/connections/ConnectionsViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connections/ConnectionsViewModel.kt @@ -1,13 +1,13 @@ -package com.walletconnect.sample.wallet.ui.routes.composable_routes.connections +package com.reown.sample.wallet.ui.routes.composable_routes.connections import android.util.Log import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.walletconnect.sample.wallet.domain.ACCOUNTS_1_EIP155_ADDRESS -import com.walletconnect.sample.wallet.domain.ACCOUNTS_2_EIP155_ADDRESS -import com.walletconnect.sample.wallet.domain.WCDelegate +import com.reown.sample.wallet.domain.ACCOUNTS_1_EIP155_ADDRESS +import com.reown.sample.wallet.domain.ACCOUNTS_2_EIP155_ADDRESS +import com.reown.sample.wallet.domain.WCDelegate import com.reown.walletkit.client.WalletKit import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.flow.MutableSharedFlow diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/get_started/GetStartedRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/get_started/GetStartedRoute.kt similarity index 87% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/get_started/GetStartedRoute.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/get_started/GetStartedRoute.kt index a69114426..7864b35b8 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/get_started/GetStartedRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/get_started/GetStartedRoute.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.routes.composable_routes.get_started +package com.reown.sample.wallet.ui.routes.composable_routes.get_started import android.app.Activity import android.content.Context @@ -16,10 +16,10 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import androidx.navigation.NavController -import com.walletconnect.sample.wallet.ui.common.generated.GetStarted -import com.walletconnect.sample.wallet.ui.common.generated.Welcome -import com.walletconnect.sample.wallet.ui.routes.Route -import com.walletconnect.sample.wallet.R +import com.reown.sample.wallet.ui.common.generated.GetStarted +import com.reown.sample.wallet.ui.common.generated.Welcome +import com.reown.sample.wallet.ui.routes.Route +import com.reown.sample.wallet.R import com.walletconnect.sample.common.ui.findActivity import timber.log.Timber diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/InboxRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/InboxRoute.kt similarity index 94% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/InboxRoute.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/InboxRoute.kt index 12167a37a..5561206d8 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/InboxRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/InboxRoute.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalFoundationApi::class) -package com.walletconnect.sample.wallet.ui.routes.composable_routes.inbox +package com.reown.sample.wallet.ui.routes.composable_routes.inbox import android.widget.Toast import androidx.compose.foundation.ExperimentalFoundationApi @@ -39,12 +39,12 @@ import com.walletconnect.sample.common.ui.WCTopAppBar import com.walletconnect.sample.common.ui.theme.PreviewTheme import com.walletconnect.sample.common.ui.theme.UiModePreview import com.walletconnect.sample.common.ui.theme.blue_accent -import com.walletconnect.sample.wallet.R -import com.walletconnect.sample.wallet.ui.common.ImageUrl -import com.walletconnect.sample.wallet.ui.common.subscriptions.ActiveSubscriptionsUI -import com.walletconnect.sample.wallet.ui.routes.composable_routes.inbox.discover.DiscoverTab -import com.walletconnect.sample.wallet.ui.routes.composable_routes.inbox.discover.ExplorerApp -import com.walletconnect.sample.wallet.ui.routes.composable_routes.inbox.subscriptions.SubscriptionsTab +import com.reown.sample.wallet.R +import com.reown.sample.wallet.ui.common.ImageUrl +import com.reown.sample.wallet.ui.common.subscriptions.ActiveSubscriptionsUI +import com.reown.sample.wallet.ui.routes.composable_routes.inbox.discover.DiscoverTab +import com.reown.sample.wallet.ui.routes.composable_routes.inbox.discover.ExplorerApp +import com.reown.sample.wallet.ui.routes.composable_routes.inbox.subscriptions.SubscriptionsTab import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/InboxViewModel.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/InboxViewModel.kt similarity index 95% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/InboxViewModel.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/InboxViewModel.kt index 9be71a7d0..ea6b487cf 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/InboxViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/InboxViewModel.kt @@ -1,6 +1,6 @@ @file:OptIn(FlowPreview::class) -package com.walletconnect.sample.wallet.ui.routes.composable_routes.inbox +package com.reown.sample.wallet.ui.routes.composable_routes.inbox import android.app.Application import androidx.core.net.toUri @@ -10,12 +10,12 @@ import com.reown.android.CoreClient import com.reown.android.internal.common.explorer.data.model.Project import com.reown.notify.client.Notify import com.reown.notify.client.NotifyClient -import com.walletconnect.sample.wallet.domain.EthAccountDelegate -import com.walletconnect.sample.wallet.domain.NotifyDelegate -import com.walletconnect.sample.wallet.ui.common.ImageUrl -import com.walletconnect.sample.wallet.ui.common.subscriptions.ActiveSubscriptionsUI -import com.walletconnect.sample.wallet.ui.common.subscriptions.toUI -import com.walletconnect.sample.wallet.ui.routes.composable_routes.inbox.discover.ExplorerApp +import com.reown.sample.wallet.domain.EthAccountDelegate +import com.reown.sample.wallet.domain.NotifyDelegate +import com.reown.sample.wallet.ui.common.ImageUrl +import com.reown.sample.wallet.ui.common.subscriptions.ActiveSubscriptionsUI +import com.reown.sample.wallet.ui.common.subscriptions.toUI +import com.reown.sample.wallet.ui.routes.composable_routes.inbox.discover.ExplorerApp import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.delay diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/LazyColumnSurroundedWithFogVertically.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/LazyColumnSurroundedWithFogVertically.kt similarity index 97% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/LazyColumnSurroundedWithFogVertically.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/LazyColumnSurroundedWithFogVertically.kt index e5832fa94..50b59ea59 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/LazyColumnSurroundedWithFogVertically.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/LazyColumnSurroundedWithFogVertically.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.routes.composable_routes.inbox +package com.reown.sample.wallet.ui.routes.composable_routes.inbox import androidx.compose.animation.AnimatedVisibility diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/discover/DiscoverTab.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/discover/DiscoverTab.kt similarity index 96% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/discover/DiscoverTab.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/discover/DiscoverTab.kt index 5c3b5e12b..1ae6761ed 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/discover/DiscoverTab.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/discover/DiscoverTab.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.routes.composable_routes.inbox.discover +package com.reown.sample.wallet.ui.routes.composable_routes.inbox.discover import android.content.Intent @@ -46,10 +46,10 @@ import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.walletconnect.sample.common.ui.theme.blue_accent -import com.walletconnect.sample.wallet.R -import com.walletconnect.sample.wallet.ui.common.subscriptions.SubscriptionIcon -import com.walletconnect.sample.wallet.ui.routes.composable_routes.inbox.DiscoverState -import com.walletconnect.sample.wallet.ui.routes.composable_routes.inbox.LazyColumnSurroundedWithFogVertically +import com.reown.sample.wallet.R +import com.reown.sample.wallet.ui.common.subscriptions.SubscriptionIcon +import com.reown.sample.wallet.ui.routes.composable_routes.inbox.DiscoverState +import com.reown.sample.wallet.ui.routes.composable_routes.inbox.LazyColumnSurroundedWithFogVertically import java.net.URI diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/discover/ExplorerApp.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/discover/ExplorerApp.kt similarity index 77% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/discover/ExplorerApp.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/discover/ExplorerApp.kt index a72bb6a6f..81a80d416 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/discover/ExplorerApp.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/discover/ExplorerApp.kt @@ -1,6 +1,6 @@ -package com.walletconnect.sample.wallet.ui.routes.composable_routes.inbox.discover +package com.reown.sample.wallet.ui.routes.composable_routes.inbox.discover -import com.walletconnect.sample.wallet.ui.common.ImageUrl +import com.reown.sample.wallet.ui.common.ImageUrl data class ExplorerApp( diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/subscriptions/ActiveSubscriptions.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/subscriptions/ActiveSubscriptions.kt similarity index 93% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/subscriptions/ActiveSubscriptions.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/subscriptions/ActiveSubscriptions.kt index 794577210..d38776b8c 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/subscriptions/ActiveSubscriptions.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/subscriptions/ActiveSubscriptions.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.routes.composable_routes.inbox.subscriptions +package com.reown.sample.wallet.ui.routes.composable_routes.inbox.subscriptions import androidx.compose.foundation.background @@ -32,11 +32,11 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.navigation.NavHostController -import com.walletconnect.sample.wallet.ui.common.ImageUrl -import com.walletconnect.sample.wallet.ui.common.subscriptions.ActiveSubscriptionsUI -import com.walletconnect.sample.wallet.ui.common.subscriptions.SubscriptionIcon -import com.walletconnect.sample.wallet.ui.routes.Route -import com.walletconnect.sample.wallet.ui.routes.composable_routes.inbox.LazyColumnSurroundedWithFogVertically +import com.reown.sample.wallet.ui.common.ImageUrl +import com.reown.sample.wallet.ui.common.subscriptions.ActiveSubscriptionsUI +import com.reown.sample.wallet.ui.common.subscriptions.SubscriptionIcon +import com.reown.sample.wallet.ui.routes.Route +import com.reown.sample.wallet.ui.routes.composable_routes.inbox.LazyColumnSurroundedWithFogVertically @Composable diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/subscriptions/NoActiveSubscriptions.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/subscriptions/NoActiveSubscriptions.kt similarity index 97% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/subscriptions/NoActiveSubscriptions.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/subscriptions/NoActiveSubscriptions.kt index c4e5adc5b..241e09275 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/subscriptions/NoActiveSubscriptions.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/subscriptions/NoActiveSubscriptions.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.routes.composable_routes.inbox.subscriptions +package com.reown.sample.wallet.ui.routes.composable_routes.inbox.subscriptions import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.tween @@ -40,7 +40,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.walletconnect.sample.wallet.R +import com.reown.sample.wallet.R import kotlinx.coroutines.delay @Composable diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/subscriptions/SubscriptionsTab.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/subscriptions/SubscriptionsTab.kt similarity index 71% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/subscriptions/SubscriptionsTab.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/subscriptions/SubscriptionsTab.kt index 2528ba93f..8067d98dd 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/inbox/subscriptions/SubscriptionsTab.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/subscriptions/SubscriptionsTab.kt @@ -1,10 +1,10 @@ -package com.walletconnect.sample.wallet.ui.routes.composable_routes.inbox.subscriptions +package com.reown.sample.wallet.ui.routes.composable_routes.inbox.subscriptions import androidx.compose.runtime.Composable import androidx.navigation.NavHostController -import com.walletconnect.sample.wallet.ui.common.subscriptions.ActiveSubscriptionsUI -import com.walletconnect.sample.wallet.ui.routes.composable_routes.inbox.SubscriptionsState +import com.reown.sample.wallet.ui.common.subscriptions.ActiveSubscriptionsUI +import com.reown.sample.wallet.ui.routes.composable_routes.inbox.SubscriptionsState @Composable diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/notifications/NotificationsHeader.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/notifications/NotificationsHeader.kt similarity index 95% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/notifications/NotificationsHeader.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/notifications/NotificationsHeader.kt index 653e040d4..80c7b72af 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/notifications/NotificationsHeader.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/notifications/NotificationsHeader.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.routes.composable_routes.notifications +package com.reown.sample.wallet.ui.routes.composable_routes.notifications import androidx.compose.foundation.Image @@ -35,9 +35,9 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.walletconnect.sample.wallet.R -import com.walletconnect.sample.wallet.ui.common.subscriptions.ActiveSubscriptionsUI -import com.walletconnect.sample.wallet.ui.common.subscriptions.SubscriptionIcon +import com.reown.sample.wallet.R +import com.reown.sample.wallet.ui.common.subscriptions.ActiveSubscriptionsUI +import com.reown.sample.wallet.ui.common.subscriptions.SubscriptionIcon @Composable diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/notifications/NotificationsOptionsMenu.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/notifications/NotificationsOptionsMenu.kt similarity index 97% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/notifications/NotificationsOptionsMenu.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/notifications/NotificationsOptionsMenu.kt index 75fab4425..6d58c89d2 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/notifications/NotificationsOptionsMenu.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/notifications/NotificationsOptionsMenu.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.routes.composable_routes.notifications +package com.reown.sample.wallet.ui.routes.composable_routes.notifications import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -34,7 +34,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.walletconnect.sample.wallet.R +import com.reown.sample.wallet.R @Composable fun NotificationsOptionsMenu( diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/notifications/NotificationsViewModel.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/notifications/NotificationsViewModel.kt similarity index 95% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/notifications/NotificationsViewModel.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/notifications/NotificationsViewModel.kt index f409fd40d..50528ab5e 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/notifications/NotificationsViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/notifications/NotificationsViewModel.kt @@ -1,17 +1,17 @@ @file:OptIn(FlowPreview::class) -package com.walletconnect.sample.wallet.ui.routes.composable_routes.notifications +package com.reown.sample.wallet.ui.routes.composable_routes.notifications import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import com.reown.notify.client.Notify import com.reown.notify.client.NotifyClient -import com.walletconnect.sample.wallet.domain.EthAccountDelegate -import com.walletconnect.sample.wallet.domain.NotifyDelegate -import com.walletconnect.sample.wallet.domain.model.NotificationUI -import com.walletconnect.sample.wallet.ui.common.subscriptions.ActiveSubscriptionsUI -import com.walletconnect.sample.wallet.ui.common.subscriptions.toUI +import com.reown.sample.wallet.domain.EthAccountDelegate +import com.reown.sample.wallet.domain.NotifyDelegate +import com.reown.sample.wallet.domain.model.NotificationUI +import com.reown.sample.wallet.ui.common.subscriptions.ActiveSubscriptionsUI +import com.reown.sample.wallet.ui.common.subscriptions.toUI import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.flow.MutableSharedFlow diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/notifications/NotificiationsScreenRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/notifications/NotificiationsScreenRoute.kt similarity index 95% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/notifications/NotificiationsScreenRoute.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/notifications/NotificiationsScreenRoute.kt index 3297669ae..9c4b6ee7a 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/notifications/NotificiationsScreenRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/notifications/NotificiationsScreenRoute.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.routes.composable_routes.notifications +package com.reown.sample.wallet.ui.routes.composable_routes.notifications import android.content.Intent import android.net.Uri @@ -62,14 +62,14 @@ import com.walletconnect.sample.common.ui.commons.ButtonWithLoader import com.walletconnect.sample.common.ui.theme.PreviewTheme import com.walletconnect.sample.common.ui.theme.UiModePreview import com.walletconnect.sample.common.ui.theme.blue_accent -import com.walletconnect.sample.wallet.domain.model.NotificationUI -import com.walletconnect.sample.wallet.ui.common.ImageUrl -import com.walletconnect.sample.wallet.ui.common.subscriptions.ActiveSubscriptionsUI -import com.walletconnect.sample.wallet.ui.common.subscriptions.NotificationIcon -import com.walletconnect.sample.wallet.ui.routes.Route -import com.walletconnect.sample.wallet.ui.routes.composable_routes.inbox.InboxViewModel -import com.walletconnect.sample.wallet.ui.routes.composable_routes.inbox.LazyColumnSurroundedWithFogVertically -import com.walletconnect.sample.wallet.ui.routes.showSnackbar +import com.reown.sample.wallet.domain.model.NotificationUI +import com.reown.sample.wallet.ui.common.ImageUrl +import com.reown.sample.wallet.ui.common.subscriptions.ActiveSubscriptionsUI +import com.reown.sample.wallet.ui.common.subscriptions.NotificationIcon +import com.reown.sample.wallet.ui.routes.Route +import com.reown.sample.wallet.ui.routes.composable_routes.inbox.InboxViewModel +import com.reown.sample.wallet.ui.routes.composable_routes.inbox.LazyColumnSurroundedWithFogVertically +import com.reown.sample.wallet.ui.routes.showSnackbar import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.cancel import kotlinx.coroutines.flow.launchIn diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/settings/SettingUI.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/settings/SettingUI.kt similarity index 76% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/settings/SettingUI.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/settings/SettingUI.kt index 247be6035..375ba6849 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/settings/SettingUI.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/settings/SettingUI.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.routes.composable_routes.settings +package com.reown.sample.wallet.ui.routes.composable_routes.settings sealed interface Section { diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/settings/SettingsRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/settings/SettingsRoute.kt similarity index 97% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/settings/SettingsRoute.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/settings/SettingsRoute.kt index 33ee14def..0fa7173ec 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/settings/SettingsRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/settings/SettingsRoute.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.routes.composable_routes.settings +package com.reown.sample.wallet.ui.routes.composable_routes.settings import android.content.Context import android.widget.Toast @@ -43,8 +43,8 @@ import androidx.navigation.NavHostController import com.walletconnect.sample.common.ui.WCTopAppBar import com.walletconnect.sample.common.ui.theme.PreviewTheme import com.walletconnect.sample.common.ui.theme.UiModePreview -import com.walletconnect.sample.wallet.BuildConfig -import com.walletconnect.sample.wallet.R +import com.reown.sample.wallet.BuildConfig +import com.reown.sample.wallet.R @Composable fun SettingsRoute(navController: NavHostController) { diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/settings/SettingsViewModel.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/settings/SettingsViewModel.kt similarity index 84% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/settings/SettingsViewModel.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/settings/SettingsViewModel.kt index f8c3bcda2..365ed1491 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/composable_routes/settings/SettingsViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/settings/SettingsViewModel.kt @@ -1,10 +1,10 @@ -package com.walletconnect.sample.wallet.ui.routes.composable_routes.settings +package com.reown.sample.wallet.ui.routes.composable_routes.settings import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.google.firebase.messaging.FirebaseMessaging import com.reown.android.CoreClient -import com.walletconnect.sample.wallet.domain.EthAccountDelegate +import com.reown.sample.wallet.domain.EthAccountDelegate import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/paste_uri/PasteUriRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/paste_uri/PasteUriRoute.kt similarity index 97% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/paste_uri/PasteUriRoute.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/paste_uri/PasteUriRoute.kt index a63976575..b4fde6b15 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/paste_uri/PasteUriRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/paste_uri/PasteUriRoute.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalComposeUiApi::class) -package com.walletconnect.sample.wallet.ui.routes.dialog_routes.paste_uri +package com.reown.sample.wallet.ui.routes.dialog_routes.paste_uri import androidx.compose.foundation.background import androidx.compose.foundation.layout.* @@ -24,7 +24,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.walletconnect.sample.wallet.R +import com.reown.sample.wallet.R import com.walletconnect.sample.common.ui.themedColor @Composable diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateRoute.kt similarity index 94% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateRoute.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateRoute.kt index 204f22b41..28fdd2ac0 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateRoute.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.routes.dialog_routes.session_authenticate +package com.reown.sample.wallet.ui.routes.dialog_routes.session_authenticate import android.content.Context import android.net.Uri @@ -40,14 +40,14 @@ import com.reown.android.internal.common.exception.NoConnectivityException import com.walletconnect.sample.common.sendResponseDeepLink import com.walletconnect.sample.common.ui.theme.mismatch_color import com.walletconnect.sample.common.ui.themedColor -import com.walletconnect.sample.wallet.R -import com.walletconnect.sample.wallet.ui.common.Buttons -import com.walletconnect.sample.wallet.ui.common.SemiTransparentDialog -import com.walletconnect.sample.wallet.ui.common.generated.CancelButton -import com.walletconnect.sample.wallet.ui.common.peer.Peer -import com.walletconnect.sample.wallet.ui.common.peer.getValidationColor -import com.walletconnect.sample.wallet.ui.routes.Route -import com.walletconnect.sample.wallet.ui.routes.composable_routes.connections.ConnectionsViewModel +import com.reown.sample.wallet.R +import com.reown.sample.wallet.ui.common.Buttons +import com.reown.sample.wallet.ui.common.SemiTransparentDialog +import com.reown.sample.wallet.ui.common.generated.CancelButton +import com.reown.sample.wallet.ui.common.peer.Peer +import com.reown.sample.wallet.ui.common.peer.getValidationColor +import com.reown.sample.wallet.ui.routes.Route +import com.reown.sample.wallet.ui.routes.composable_routes.connections.ConnectionsViewModel import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateUI.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateUI.kt similarity index 86% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateUI.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateUI.kt index 5959726b1..36a8ec10b 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateUI.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateUI.kt @@ -1,8 +1,8 @@ -package com.walletconnect.sample.wallet.ui.routes.dialog_routes.session_authenticate +package com.reown.sample.wallet.ui.routes.dialog_routes.session_authenticate -import com.walletconnect.sample.wallet.domain.ACCOUNTS_1_EIP155_ADDRESS -import com.walletconnect.sample.wallet.ui.common.peer.PeerContextUI -import com.walletconnect.sample.wallet.ui.common.peer.PeerUI +import com.reown.sample.wallet.domain.ACCOUNTS_1_EIP155_ADDRESS +import com.reown.sample.wallet.ui.common.peer.PeerContextUI +import com.reown.sample.wallet.ui.common.peer.PeerUI import com.reown.walletkit.client.Wallet data class SessionAuthenticateUI( diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt similarity index 93% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt index 24b9b507e..7fd1d3f58 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.routes.dialog_routes.session_authenticate +package com.reown.sample.wallet.ui.routes.dialog_routes.session_authenticate import androidx.lifecycle.ViewModel import com.google.firebase.crashlytics.ktx.crashlytics @@ -6,11 +6,11 @@ import com.google.firebase.ktx.Firebase import com.reown.android.cacao.signature.SignatureType import com.reown.android.internal.common.exception.NoConnectivityException import com.reown.android.utils.cacao.sign -import com.walletconnect.sample.wallet.domain.ACCOUNTS_1_EIP155_ADDRESS -import com.walletconnect.sample.wallet.domain.EthAccountDelegate -import com.walletconnect.sample.wallet.domain.WCDelegate -import com.walletconnect.sample.wallet.ui.common.peer.PeerUI -import com.walletconnect.sample.wallet.ui.common.peer.toPeerUI +import com.reown.sample.wallet.domain.ACCOUNTS_1_EIP155_ADDRESS +import com.reown.sample.wallet.domain.EthAccountDelegate +import com.reown.sample.wallet.domain.WCDelegate +import com.reown.sample.wallet.ui.common.peer.PeerUI +import com.reown.sample.wallet.ui.common.peer.toPeerUI import com.walletconnect.util.hexToBytes import com.reown.walletkit.client.Wallet import com.reown.walletkit.client.WalletKit diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalRoute.kt similarity index 94% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalRoute.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalRoute.kt index 0b4ad4c9b..0fcf48c6f 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalRoute.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.routes.dialog_routes.session_proposal +package com.reown.sample.wallet.ui.routes.dialog_routes.session_proposal import android.content.Context import android.net.Uri @@ -48,18 +48,18 @@ import com.walletconnect.sample.common.sendResponseDeepLink import com.walletconnect.sample.common.ui.theme.PreviewTheme import com.walletconnect.sample.common.ui.theme.mismatch_color import com.walletconnect.sample.common.ui.themedColor -import com.walletconnect.sample.wallet.R -import com.walletconnect.sample.wallet.ui.common.Buttons -import com.walletconnect.sample.wallet.ui.common.SemiTransparentDialog -import com.walletconnect.sample.wallet.ui.common.generated.CancelButton -import com.walletconnect.sample.wallet.ui.common.peer.Peer -import com.walletconnect.sample.wallet.ui.common.peer.PeerContextUI -import com.walletconnect.sample.wallet.ui.common.peer.Validation -import com.walletconnect.sample.wallet.ui.common.peer.getColor -import com.walletconnect.sample.wallet.ui.common.peer.getDescriptionContent -import com.walletconnect.sample.wallet.ui.common.peer.getDescriptionTitle -import com.walletconnect.sample.wallet.ui.common.peer.getValidationIcon -import com.walletconnect.sample.wallet.ui.routes.Route +import com.reown.sample.wallet.R +import com.reown.sample.wallet.ui.common.Buttons +import com.reown.sample.wallet.ui.common.SemiTransparentDialog +import com.reown.sample.wallet.ui.common.generated.CancelButton +import com.reown.sample.wallet.ui.common.peer.Peer +import com.reown.sample.wallet.ui.common.peer.PeerContextUI +import com.reown.sample.wallet.ui.common.peer.Validation +import com.reown.sample.wallet.ui.common.peer.getColor +import com.reown.sample.wallet.ui.common.peer.getDescriptionContent +import com.reown.sample.wallet.ui.common.peer.getDescriptionTitle +import com.reown.sample.wallet.ui.common.peer.getValidationIcon +import com.reown.sample.wallet.ui.routes.Route import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalUI.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalUI.kt similarity index 89% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalUI.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalUI.kt index d4e0a7ac4..6ae3a9208 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalUI.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalUI.kt @@ -1,9 +1,9 @@ -package com.walletconnect.sample.wallet.ui.routes.dialog_routes.session_proposal +package com.reown.sample.wallet.ui.routes.dialog_routes.session_proposal -import com.walletconnect.sample.wallet.domain.ACCOUNTS_1_EIP155_ADDRESS -import com.walletconnect.sample.wallet.domain.ACCOUNTS_2_EIP155_ADDRESS -import com.walletconnect.sample.wallet.ui.common.peer.PeerContextUI -import com.walletconnect.sample.wallet.ui.common.peer.PeerUI +import com.reown.sample.wallet.domain.ACCOUNTS_1_EIP155_ADDRESS +import com.reown.sample.wallet.domain.ACCOUNTS_2_EIP155_ADDRESS +import com.reown.sample.wallet.ui.common.peer.PeerContextUI +import com.reown.sample.wallet.ui.common.peer.PeerUI import com.reown.walletkit.client.Wallet data class SessionProposalUI( diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalViewModel.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalViewModel.kt similarity index 93% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalViewModel.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalViewModel.kt index d63523021..70525b9a6 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalViewModel.kt @@ -1,11 +1,11 @@ -package com.walletconnect.sample.wallet.ui.routes.dialog_routes.session_proposal +package com.reown.sample.wallet.ui.routes.dialog_routes.session_proposal import androidx.lifecycle.ViewModel import com.google.firebase.crashlytics.ktx.crashlytics import com.google.firebase.ktx.Firebase -import com.walletconnect.sample.wallet.domain.WCDelegate -import com.walletconnect.sample.wallet.ui.common.peer.PeerUI -import com.walletconnect.sample.wallet.ui.common.peer.toPeerUI +import com.reown.sample.wallet.domain.WCDelegate +import com.reown.sample.wallet.ui.common.peer.PeerUI +import com.reown.sample.wallet.ui.common.peer.toPeerUI import com.reown.walletkit.client.Wallet import com.reown.walletkit.client.WalletKit import timber.log.Timber diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestRoute.kt similarity index 93% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestRoute.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestRoute.kt index b3df172ad..f044f2d23 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestRoute.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.routes.dialog_routes.session_request +package com.reown.sample.wallet.ui.routes.dialog_routes.session_request import android.annotation.SuppressLint import android.content.Context @@ -38,16 +38,16 @@ import com.walletconnect.sample.common.sendResponseDeepLink import com.walletconnect.sample.common.ui.theme.PreviewTheme import com.walletconnect.sample.common.ui.theme.verified_color import com.walletconnect.sample.common.ui.themedColor -import com.walletconnect.sample.wallet.domain.WCDelegate.currentId -import com.walletconnect.sample.wallet.ui.common.Buttons -import com.walletconnect.sample.wallet.ui.common.Content -import com.walletconnect.sample.wallet.ui.common.InnerContent -import com.walletconnect.sample.wallet.ui.common.SemiTransparentDialog -import com.walletconnect.sample.wallet.ui.common.blue.BlueLabelRow -import com.walletconnect.sample.wallet.ui.common.peer.Peer -import com.walletconnect.sample.wallet.ui.common.peer.PeerUI -import com.walletconnect.sample.wallet.ui.common.peer.getColor -import com.walletconnect.sample.wallet.ui.routes.Route +import com.reown.sample.wallet.domain.WCDelegate.currentId +import com.reown.sample.wallet.ui.common.Buttons +import com.reown.sample.wallet.ui.common.Content +import com.reown.sample.wallet.ui.common.InnerContent +import com.reown.sample.wallet.ui.common.SemiTransparentDialog +import com.reown.sample.wallet.ui.common.blue.BlueLabelRow +import com.reown.sample.wallet.ui.common.peer.Peer +import com.reown.sample.wallet.ui.common.peer.PeerUI +import com.reown.sample.wallet.ui.common.peer.getColor +import com.reown.sample.wallet.ui.routes.Route import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestUI.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestUI.kt similarity index 61% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestUI.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestUI.kt index 80fdc5aa7..4936c7e87 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestUI.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestUI.kt @@ -1,7 +1,7 @@ -package com.walletconnect.sample.wallet.ui.routes.dialog_routes.session_request +package com.reown.sample.wallet.ui.routes.dialog_routes.session_request -import com.walletconnect.sample.wallet.ui.common.peer.PeerContextUI -import com.walletconnect.sample.wallet.ui.common.peer.PeerUI +import com.reown.sample.wallet.ui.common.peer.PeerContextUI +import com.reown.sample.wallet.ui.common.peer.PeerUI sealed class SessionRequestUI { object Initial : SessionRequestUI() diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt similarity index 95% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt index 3149cdc68..85ed569be 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.routes.dialog_routes.session_request +package com.reown.sample.wallet.ui.routes.dialog_routes.session_request import android.net.Uri import androidx.core.net.toUri @@ -9,10 +9,10 @@ import com.reown.android.cacao.signature.SignatureType import com.reown.android.internal.common.exception.NoConnectivityException import com.reown.android.utils.cacao.sign import com.walletconnect.sample.common.Chains -import com.walletconnect.sample.wallet.domain.EthAccountDelegate -import com.walletconnect.sample.wallet.domain.WCDelegate -import com.walletconnect.sample.wallet.ui.common.peer.PeerUI -import com.walletconnect.sample.wallet.ui.common.peer.toPeerUI +import com.reown.sample.wallet.domain.EthAccountDelegate +import com.reown.sample.wallet.domain.WCDelegate +import com.reown.sample.wallet.ui.common.peer.PeerUI +import com.reown.sample.wallet.ui.common.peer.toPeerUI import com.walletconnect.util.hexToBytes import com.reown.walletkit.client.Wallet import com.reown.walletkit.client.WalletKit diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/snackbar_message/SnackbarMessageRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/snackbar_message/SnackbarMessageRoute.kt similarity index 95% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/snackbar_message/SnackbarMessageRoute.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/snackbar_message/SnackbarMessageRoute.kt index 9efa35238..59c283927 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/dialog_routes/snackbar_message/SnackbarMessageRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/snackbar_message/SnackbarMessageRoute.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.routes.dialog_routes.snackbar_message +package com.reown.sample.wallet.ui.routes.dialog_routes.snackbar_message import androidx.compose.foundation.layout.padding import androidx.compose.material.Button diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/host/BottomBar.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/host/BottomBar.kt similarity index 96% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/host/BottomBar.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/host/BottomBar.kt index 2b005b126..d81e48a19 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/host/BottomBar.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/host/BottomBar.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.routes.host +package com.reown.sample.wallet.ui.routes.host import androidx.annotation.DrawableRes import androidx.compose.foundation.Canvas @@ -23,8 +23,8 @@ import androidx.compose.ui.unit.dp import androidx.navigation.NavController import androidx.navigation.compose.currentBackStackEntryAsState import com.walletconnect.sample.common.ui.theme.blue_accent -import com.walletconnect.sample.wallet.R -import com.walletconnect.sample.wallet.ui.routes.Route +import com.reown.sample.wallet.R +import com.reown.sample.wallet.ui.routes.Route enum class BottomBarItem(val route: Route, val label: String, @DrawableRes val icon: Int) { CONNECTIONS(Route.Connections, "Connections", R.drawable.ic_connections), diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/host/WalletSampleHost.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/host/WalletSampleHost.kt similarity index 94% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/host/WalletSampleHost.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/host/WalletSampleHost.kt index 3962ee6e1..753cdf5a0 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/routes/host/WalletSampleHost.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/host/WalletSampleHost.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalMaterialNavigationApi::class) -package com.walletconnect.sample.wallet.ui.routes.host +package com.reown.sample.wallet.ui.routes.host import android.widget.Toast import androidx.compose.foundation.Image @@ -50,13 +50,13 @@ import com.google.accompanist.navigation.material.BottomSheetNavigator import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi import com.pandulapeter.beagle.DebugMenuView import com.walletconnect.sample.common.ui.themedColor -import com.walletconnect.sample.wallet.R -import com.walletconnect.sample.wallet.ui.Web3WalletNavGraph -import com.walletconnect.sample.wallet.ui.Web3WalletViewModel -import com.walletconnect.sample.wallet.ui.routes.Route -import com.walletconnect.sample.wallet.ui.routes.composable_routes.connections.ConnectionsViewModel -import com.walletconnect.sample.wallet.ui.state.ConnectionState -import com.walletconnect.sample.wallet.ui.state.PairingEvent +import com.reown.sample.wallet.R +import com.reown.sample.wallet.ui.Web3WalletNavGraph +import com.reown.sample.wallet.ui.Web3WalletViewModel +import com.reown.sample.wallet.ui.routes.Route +import com.reown.sample.wallet.ui.routes.composable_routes.connections.ConnectionsViewModel +import com.reown.sample.wallet.ui.state.ConnectionState +import com.reown.sample.wallet.ui.state.PairingEvent import kotlinx.coroutines.delay @OptIn(ExperimentalMaterialNavigationApi::class) diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/state/ConnectionState.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/state/ConnectionState.kt similarity index 86% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/state/ConnectionState.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/state/ConnectionState.kt index 93b5fb1a2..d36974853 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/state/ConnectionState.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/state/ConnectionState.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.state +package com.reown.sample.wallet.ui.state import kotlinx.coroutines.flow.MutableStateFlow diff --git a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/state/PairingEvent.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/state/PairingEvent.kt similarity index 76% rename from sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/state/PairingEvent.kt rename to sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/state/PairingEvent.kt index 34a7ca494..ac5d9f9f9 100644 --- a/sample/wallet/src/main/kotlin/com/walletconnect/sample/wallet/ui/state/PairingEvent.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/state/PairingEvent.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.ui.state +package com.reown.sample.wallet.ui.state sealed class PairingEvent { data class Error(val message: String) : PairingEvent() diff --git a/sample/wallet/src/main/res/navigation/nav_graph.xml b/sample/wallet/src/main/res/navigation/nav_graph.xml index 843e9ae5d..3e2bc5789 100644 --- a/sample/wallet/src/main/res/navigation/nav_graph.xml +++ b/sample/wallet/src/main/res/navigation/nav_graph.xml @@ -6,7 +6,7 @@ diff --git a/sample/wallet/src/test/kotlin/com/walletconnect/sample/wallet/domain/EthAccountDelegateTest.kt b/sample/wallet/src/test/kotlin/com/reown/sample/wallet/domain/EthAccountDelegateTest.kt similarity index 97% rename from sample/wallet/src/test/kotlin/com/walletconnect/sample/wallet/domain/EthAccountDelegateTest.kt rename to sample/wallet/src/test/kotlin/com/reown/sample/wallet/domain/EthAccountDelegateTest.kt index ae3db535a..125d7317c 100644 --- a/sample/wallet/src/test/kotlin/com/walletconnect/sample/wallet/domain/EthAccountDelegateTest.kt +++ b/sample/wallet/src/test/kotlin/com/reown/sample/wallet/domain/EthAccountDelegateTest.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.wallet.domain +package com.reown.sample.wallet.domain import com.reown.android.cacao.signature.SignatureType import com.reown.android.internal.common.model.ProjectId From ed1aa4b1ebc44d9c096a113da7b8d964a6cf6d92 Mon Sep 17 00:00:00 2001 From: kubel Date: Thu, 5 Sep 2024 08:33:14 +0200 Subject: [PATCH 22/51] Migrate sample dapp --- sample/dapp/build.gradle.kts | 4 ++-- sample/dapp/src/main/AndroidManifest.xml | 2 +- .../sample/dapp/DappSampleApp.kt | 2 +- .../sample/dapp/domain/DappDelegate.kt | 2 +- .../sample/dapp/ui/DappSampleActivity.kt | 4 ++-- .../sample/dapp/ui/DappSampleEvents.kt | 2 +- .../sample/dapp/ui/DappSampleNavGraph.kt | 10 +++++----- .../sample/dapp/ui/routes/Route.kt | 2 +- .../routes/composable_routes/account/AccountRoute.kt | 6 +++--- .../ui/routes/composable_routes/account/AccountUi.kt | 2 +- .../composable_routes/account/AccountViewModel.kt | 8 ++++---- .../chain_selection/ChainSelectionRoute.kt | 8 ++++---- .../chain_selection/ChainSelectionUi.kt | 2 +- .../chain_selection/ChainSelectionViewModel.kt | 6 +++--- .../routes/composable_routes/session/SessionRoute.kt | 10 +++++----- .../ui/routes/composable_routes/session/SessionUi.kt | 2 +- .../composable_routes/session/SessionViewModel.kt | 6 +++--- .../sample/dapp/ui/routes/host/DappSampleHost.kt | 10 +++++----- .../sample/dapp/ui/routes/host/DappSampleViewModel.kt | 6 +++--- 19 files changed, 47 insertions(+), 47 deletions(-) rename sample/dapp/src/main/kotlin/com/{walletconnect => reown}/sample/dapp/DappSampleApp.kt (98%) rename sample/dapp/src/main/kotlin/com/{walletconnect => reown}/sample/dapp/domain/DappDelegate.kt (98%) rename sample/dapp/src/main/kotlin/com/{walletconnect => reown}/sample/dapp/ui/DappSampleActivity.kt (94%) rename sample/dapp/src/main/kotlin/com/{walletconnect => reown}/sample/dapp/ui/DappSampleEvents.kt (96%) rename sample/dapp/src/main/kotlin/com/{walletconnect => reown}/sample/dapp/ui/DappSampleNavGraph.kt (85%) rename sample/dapp/src/main/kotlin/com/{walletconnect => reown}/sample/dapp/ui/routes/Route.kt (82%) rename sample/dapp/src/main/kotlin/com/{walletconnect => reown}/sample/dapp/ui/routes/composable_routes/account/AccountRoute.kt (96%) rename sample/dapp/src/main/kotlin/com/{walletconnect => reown}/sample/dapp/ui/routes/composable_routes/account/AccountUi.kt (78%) rename sample/dapp/src/main/kotlin/com/{walletconnect => reown}/sample/dapp/ui/routes/composable_routes/account/AccountViewModel.kt (96%) rename sample/dapp/src/main/kotlin/com/{walletconnect => reown}/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt (98%) rename sample/dapp/src/main/kotlin/com/{walletconnect => reown}/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionUi.kt (85%) rename sample/dapp/src/main/kotlin/com/{walletconnect => reown}/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt (97%) rename sample/dapp/src/main/kotlin/com/{walletconnect => reown}/sample/dapp/ui/routes/composable_routes/session/SessionRoute.kt (97%) rename sample/dapp/src/main/kotlin/com/{walletconnect => reown}/sample/dapp/ui/routes/composable_routes/session/SessionUi.kt (67%) rename sample/dapp/src/main/kotlin/com/{walletconnect => reown}/sample/dapp/ui/routes/composable_routes/session/SessionViewModel.kt (96%) rename sample/dapp/src/main/kotlin/com/{walletconnect => reown}/sample/dapp/ui/routes/host/DappSampleHost.kt (95%) rename sample/dapp/src/main/kotlin/com/{walletconnect => reown}/sample/dapp/ui/routes/host/DappSampleViewModel.kt (85%) diff --git a/sample/dapp/build.gradle.kts b/sample/dapp/build.gradle.kts index 3d39625dc..199359708 100644 --- a/sample/dapp/build.gradle.kts +++ b/sample/dapp/build.gradle.kts @@ -9,11 +9,11 @@ plugins { } android { - namespace = "com.walletconnect.sample.dapp" + namespace = "com.reown.sample.dapp" compileSdk = COMPILE_SDK defaultConfig { - applicationId = "com.walletconnect.sample.dapp" + applicationId = "com.reown.sample.dapp" minSdk = MIN_SDK targetSdk = TARGET_SDK versionName = SAMPLE_VERSION_NAME diff --git a/sample/dapp/src/main/AndroidManifest.xml b/sample/dapp/src/main/AndroidManifest.xml index 839c47653..5a5e4399b 100644 --- a/sample/dapp/src/main/AndroidManifest.xml +++ b/sample/dapp/src/main/AndroidManifest.xml @@ -31,7 +31,7 @@ android:name=".DappSampleApp" android:theme="@style/Theme.WalletConnect"> Date: Thu, 5 Sep 2024 08:39:53 +0200 Subject: [PATCH 23/51] Fix SessionViewModel --- .../session/SessionViewModel.kt | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/session/SessionViewModel.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/session/SessionViewModel.kt index d66f0122b..7bc6e04b5 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/session/SessionViewModel.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/session/SessionViewModel.kt @@ -4,12 +4,13 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.google.firebase.crashlytics.ktx.crashlytics import com.google.firebase.ktx.Firebase +import com.reown.appkit.client.AppKit +import com.reown.appkit.client.Modal +import com.reown.appkit.client.models.Session import com.walletconnect.sample.common.Chains import com.walletconnect.sample.common.tag import com.reown.sample.dapp.domain.DappDelegate import com.reown.sample.dapp.ui.DappSampleEvents -import com.walletconnect.wcmodal.client.Modal -import com.walletconnect.wcmodal.client.WalletConnectModal import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharedFlow @@ -50,13 +51,8 @@ class SessionViewModel : ViewModel() { } private fun getSessions(topic: String? = null): List { - return WalletConnectModal.getListOfActiveSessions().filter { - if (topic != null) { - it.topic == topic - } else { - it.topic == DappDelegate.selectedSessionTopic - } - }.flatMap { settledSession -> settledSession.namespaces.values.flatMap { it.accounts } } + return (AppKit.getSession() as Session.WalletConnectSession).namespaces.values + .flatMap { it.accounts } .map { caip10Account -> val (chainNamespace, chainReference, account) = caip10Account.split(":") val chain = Chains.values().first { chain -> @@ -64,14 +60,15 @@ class SessionViewModel : ViewModel() { } SessionUi(chain.icon, chain.name, account, chain.chainNamespace, chain.chainReference) } + + } fun ping() { - val pingParams = Modal.Params.Ping(topic = requireNotNull(DappDelegate.selectedSessionTopic)) viewModelScope.launch { _sessionEvents.emit(DappSampleEvents.PingLoading) } try { - WalletConnectModal.ping(pingParams, object : Modal.Listeners.SessionPing { + AppKit.ping(object : Modal.Listeners.SessionPing { override fun onSuccess(pingSuccess: Modal.Model.Ping.Success) { viewModelScope.launch { _sessionEvents.emit(DappSampleEvents.PingSuccess(pingSuccess.topic)) @@ -95,19 +92,18 @@ class SessionViewModel : ViewModel() { if (DappDelegate.selectedSessionTopic != null) { try { viewModelScope.launch { _sessionEvents.emit(DappSampleEvents.DisconnectLoading) } - val disconnectParams = Modal.Params.Disconnect(sessionTopic = requireNotNull(DappDelegate.selectedSessionTopic)) - WalletConnectModal.disconnect(disconnectParams, + AppKit.disconnect( onSuccess = { DappDelegate.deselectAccountDetails() viewModelScope.launch { _sessionEvents.emit(DappSampleEvents.Disconnect) } }, - onError = { error -> - Timber.tag(tag(this)).e(error.throwable.stackTraceToString()) - Firebase.crashlytics.recordException(error.throwable) + onError = { throwable: Throwable -> + Timber.tag(tag(this)).e(throwable.stackTraceToString()) + Firebase.crashlytics.recordException(throwable) viewModelScope.launch { - _sessionEvents.emit(DappSampleEvents.DisconnectError(error.throwable.message ?: "Unknown error, please try again or contact support")) + _sessionEvents.emit(DappSampleEvents.DisconnectError(throwable.message ?: "Unknown error, please try again or contact support")) } }) From 72a6204abd4a1b39fa94992b2572525ba41134b1 Mon Sep 17 00:00:00 2001 From: kubel Date: Thu, 5 Sep 2024 08:43:35 +0200 Subject: [PATCH 24/51] Migrate sample common --- sample/common/build.gradle.kts | 2 +- sample/common/src/main/AndroidManifest.xml | 2 +- .../sample/common/Beagle.kt | 2 +- .../BottomVerticalSpaceItemDecoration.kt | 2 +- .../sample/common/Chains.kt | 2 +- .../sample/common/Constants.kt | 2 +- .../sample/common/MultipreviewAnnotations.kt | 2 +- .../sample/common/Utils.kt | 2 +- .../sample/common/ui/ComposeExtensions.kt | 2 +- .../sample/common/ui/WCTopAppBar.kt | 8 ++++---- .../sample/common/ui/WCTopAppBarLegacy.kt | 6 +++--- .../sample/common/ui/commons/Buttons.kt | 2 +- .../sample/common/ui/commons/Loaders.kt | 4 ++-- .../sample/common/ui/theme/Color.kt | 2 +- .../sample/common/ui/theme/Theme.kt | 2 +- .../sample/common/ui/theme/Type.kt | 2 +- .../com/reown/sample/dapp/DappSampleApp.kt | 4 ++-- .../reown/sample/dapp/domain/DappDelegate.kt | 2 +- .../reown/sample/dapp/ui/DappSampleActivity.kt | 2 +- .../composable_routes/account/AccountRoute.kt | 6 +++--- .../account/AccountViewModel.kt | 10 +++++----- .../chain_selection/ChainSelectionRoute.kt | 18 +++++++++--------- .../chain_selection/ChainSelectionUi.kt | 2 +- .../chain_selection/ChainSelectionViewModel.kt | 4 ++-- .../composable_routes/session/SessionRoute.kt | 6 +++--- .../session/SessionViewModel.kt | 4 ++-- .../walletconnect/sample/modal/AppKitApp.kt | 4 ++-- .../sample/modal/ModalSampleDelegate.kt | 2 +- .../sample/modal/kotlindsl/HomeFragment.kt | 2 +- .../sample/modal/navComponent/HomeFragment.kt | 2 +- .../walletconnect/sample/modal/ui/LabScreen.kt | 8 ++++---- .../sample/wallet/WalletKitApplication.kt | 6 +++--- .../reown/sample/wallet/domain/TestAccounts.kt | 2 +- .../sample/wallet/ui/WalletKitActivity.kt | 2 +- .../reown/sample/wallet/ui/common/Content.kt | 2 +- .../sample/wallet/ui/common/InnerContent.kt | 2 +- .../wallet/ui/common/SemiTransparentDialog.kt | 2 +- .../wallet/ui/common/blue/BlueLabelText.kt | 2 +- .../ui/common/blue/BlueLabelTextsSection.kt | 2 +- .../wallet/ui/common/generated/Welcome.kt | 2 +- .../wallet/ui/common/peer/PeerSection.kt | 4 ++-- .../sample/wallet/ui/common/peer/PeerUI.kt | 6 +++--- .../UpdateSubscriptionRoute.kt | 2 +- .../ConnectionDetailsRoute.kt | 6 +++--- .../connections/ConnectionsRoute.kt | 10 +++++----- .../get_started/GetStartedRoute.kt | 2 +- .../composable_routes/inbox/InboxRoute.kt | 8 ++++---- .../inbox/discover/DiscoverTab.kt | 2 +- .../notifications/NotificiationsScreenRoute.kt | 8 ++++---- .../settings/SettingsRoute.kt | 6 +++--- .../dialog_routes/paste_uri/PasteUriRoute.kt | 2 +- .../SessionAuthenticateRoute.kt | 6 +++--- .../session_proposal/SessionProposalRoute.kt | 12 ++++++------ .../session_request/SessionRequestRoute.kt | 10 +++++----- .../session_request/SessionRequestViewModel.kt | 2 +- .../snackbar_message/SnackbarMessageRoute.kt | 2 +- .../sample/wallet/ui/routes/host/BottomBar.kt | 2 +- .../wallet/ui/routes/host/WalletSampleHost.kt | 2 +- 58 files changed, 117 insertions(+), 117 deletions(-) rename sample/common/src/main/kotlin/com/{walletconnect => reown}/sample/common/Beagle.kt (97%) rename sample/common/src/main/kotlin/com/{walletconnect => reown}/sample/common/BottomVerticalSpaceItemDecoration.kt (92%) rename sample/common/src/main/kotlin/com/{walletconnect => reown}/sample/common/Chains.kt (99%) rename sample/common/src/main/kotlin/com/{walletconnect => reown}/sample/common/Constants.kt (54%) rename sample/common/src/main/kotlin/com/{walletconnect => reown}/sample/common/MultipreviewAnnotations.kt (98%) rename sample/common/src/main/kotlin/com/{walletconnect => reown}/sample/common/Utils.kt (98%) rename sample/common/src/main/kotlin/com/{walletconnect => reown}/sample/common/ui/ComposeExtensions.kt (98%) rename sample/common/src/main/kotlin/com/{walletconnect => reown}/sample/common/ui/WCTopAppBar.kt (91%) rename sample/common/src/main/kotlin/com/{walletconnect => reown}/sample/common/ui/WCTopAppBarLegacy.kt (98%) rename sample/common/src/main/kotlin/com/{walletconnect => reown}/sample/common/ui/commons/Buttons.kt (98%) rename sample/common/src/main/kotlin/com/{walletconnect => reown}/sample/common/ui/commons/Loaders.kt (95%) rename sample/common/src/main/kotlin/com/{walletconnect => reown}/sample/common/ui/theme/Color.kt (96%) rename sample/common/src/main/kotlin/com/{walletconnect => reown}/sample/common/ui/theme/Theme.kt (98%) rename sample/common/src/main/kotlin/com/{walletconnect => reown}/sample/common/ui/theme/Type.kt (60%) diff --git a/sample/common/build.gradle.kts b/sample/common/build.gradle.kts index 6483cb47e..6ed9bf73c 100644 --- a/sample/common/build.gradle.kts +++ b/sample/common/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } android { - namespace = "com.walletconnect.sample.common" + namespace = "com.reown.sample.common" compileSdk = COMPILE_SDK defaultConfig { diff --git a/sample/common/src/main/AndroidManifest.xml b/sample/common/src/main/AndroidManifest.xml index 90fb541b3..ea3a781c2 100644 --- a/sample/common/src/main/AndroidManifest.xml +++ b/sample/common/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - diff --git a/sample/common/src/main/kotlin/com/walletconnect/sample/common/Beagle.kt b/sample/common/src/main/kotlin/com/reown/sample/common/Beagle.kt similarity index 97% rename from sample/common/src/main/kotlin/com/walletconnect/sample/common/Beagle.kt rename to sample/common/src/main/kotlin/com/reown/sample/common/Beagle.kt index efb57274b..c6d9c266c 100644 --- a/sample/common/src/main/kotlin/com/walletconnect/sample/common/Beagle.kt +++ b/sample/common/src/main/kotlin/com/reown/sample/common/Beagle.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.common +package com.reown.sample.common import android.app.Application import com.pandulapeter.beagle.Beagle diff --git a/sample/common/src/main/kotlin/com/walletconnect/sample/common/BottomVerticalSpaceItemDecoration.kt b/sample/common/src/main/kotlin/com/reown/sample/common/BottomVerticalSpaceItemDecoration.kt similarity index 92% rename from sample/common/src/main/kotlin/com/walletconnect/sample/common/BottomVerticalSpaceItemDecoration.kt rename to sample/common/src/main/kotlin/com/reown/sample/common/BottomVerticalSpaceItemDecoration.kt index 2c48e3cde..a2b0c65ec 100644 --- a/sample/common/src/main/kotlin/com/walletconnect/sample/common/BottomVerticalSpaceItemDecoration.kt +++ b/sample/common/src/main/kotlin/com/reown/sample/common/BottomVerticalSpaceItemDecoration.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.common +package com.reown.sample.common import android.graphics.Rect import android.view.View diff --git a/sample/common/src/main/kotlin/com/walletconnect/sample/common/Chains.kt b/sample/common/src/main/kotlin/com/reown/sample/common/Chains.kt similarity index 99% rename from sample/common/src/main/kotlin/com/walletconnect/sample/common/Chains.kt rename to sample/common/src/main/kotlin/com/reown/sample/common/Chains.kt index dee7c5dcf..eb73955d8 100644 --- a/sample/common/src/main/kotlin/com/walletconnect/sample/common/Chains.kt +++ b/sample/common/src/main/kotlin/com/reown/sample/common/Chains.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.common +package com.reown.sample.common import androidx.annotation.DrawableRes diff --git a/sample/common/src/main/kotlin/com/walletconnect/sample/common/Constants.kt b/sample/common/src/main/kotlin/com/reown/sample/common/Constants.kt similarity index 54% rename from sample/common/src/main/kotlin/com/walletconnect/sample/common/Constants.kt rename to sample/common/src/main/kotlin/com/reown/sample/common/Constants.kt index d4097db0a..89fdb7aa5 100644 --- a/sample/common/src/main/kotlin/com/walletconnect/sample/common/Constants.kt +++ b/sample/common/src/main/kotlin/com/reown/sample/common/Constants.kt @@ -1,3 +1,3 @@ -package com.walletconnect.sample.common +package com.reown.sample.common const val RELAY_URL = "relay.walletconnect.org" \ No newline at end of file diff --git a/sample/common/src/main/kotlin/com/walletconnect/sample/common/MultipreviewAnnotations.kt b/sample/common/src/main/kotlin/com/reown/sample/common/MultipreviewAnnotations.kt similarity index 98% rename from sample/common/src/main/kotlin/com/walletconnect/sample/common/MultipreviewAnnotations.kt rename to sample/common/src/main/kotlin/com/reown/sample/common/MultipreviewAnnotations.kt index 631f61b7b..323eca0d7 100644 --- a/sample/common/src/main/kotlin/com/walletconnect/sample/common/MultipreviewAnnotations.kt +++ b/sample/common/src/main/kotlin/com/reown/sample/common/MultipreviewAnnotations.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.walletconnect.sample.common +package com.reown.sample.common import android.content.res.Configuration.UI_MODE_NIGHT_YES import androidx.compose.ui.tooling.preview.Preview diff --git a/sample/common/src/main/kotlin/com/walletconnect/sample/common/Utils.kt b/sample/common/src/main/kotlin/com/reown/sample/common/Utils.kt similarity index 98% rename from sample/common/src/main/kotlin/com/walletconnect/sample/common/Utils.kt rename to sample/common/src/main/kotlin/com/reown/sample/common/Utils.kt index 4eb7755d7..b6acea911 100644 --- a/sample/common/src/main/kotlin/com/walletconnect/sample/common/Utils.kt +++ b/sample/common/src/main/kotlin/com/reown/sample/common/Utils.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.common +package com.reown.sample.common import android.content.ActivityNotFoundException import android.content.Context diff --git a/sample/common/src/main/kotlin/com/walletconnect/sample/common/ui/ComposeExtensions.kt b/sample/common/src/main/kotlin/com/reown/sample/common/ui/ComposeExtensions.kt similarity index 98% rename from sample/common/src/main/kotlin/com/walletconnect/sample/common/ui/ComposeExtensions.kt rename to sample/common/src/main/kotlin/com/reown/sample/common/ui/ComposeExtensions.kt index 47336a648..2c6634548 100644 --- a/sample/common/src/main/kotlin/com/walletconnect/sample/common/ui/ComposeExtensions.kt +++ b/sample/common/src/main/kotlin/com/reown/sample/common/ui/ComposeExtensions.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.common.ui +package com.reown.sample.common.ui import android.app.Activity import android.content.Context diff --git a/sample/common/src/main/kotlin/com/walletconnect/sample/common/ui/WCTopAppBar.kt b/sample/common/src/main/kotlin/com/reown/sample/common/ui/WCTopAppBar.kt similarity index 91% rename from sample/common/src/main/kotlin/com/walletconnect/sample/common/ui/WCTopAppBar.kt rename to sample/common/src/main/kotlin/com/reown/sample/common/ui/WCTopAppBar.kt index df0e6d1c1..e32e67590 100644 --- a/sample/common/src/main/kotlin/com/walletconnect/sample/common/ui/WCTopAppBar.kt +++ b/sample/common/src/main/kotlin/com/reown/sample/common/ui/WCTopAppBar.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.common.ui +package com.reown.sample.common.ui import androidx.annotation.DrawableRes import androidx.compose.foundation.Image @@ -22,9 +22,9 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.walletconnect.sample.common.R -import com.walletconnect.sample.common.ui.theme.PreviewTheme -import com.walletconnect.sample.common.ui.theme.UiModePreview +import com.reown.sample.common.R +import com.reown.sample.common.ui.theme.PreviewTheme +import com.reown.sample.common.ui.theme.UiModePreview @Composable diff --git a/sample/common/src/main/kotlin/com/walletconnect/sample/common/ui/WCTopAppBarLegacy.kt b/sample/common/src/main/kotlin/com/reown/sample/common/ui/WCTopAppBarLegacy.kt similarity index 98% rename from sample/common/src/main/kotlin/com/walletconnect/sample/common/ui/WCTopAppBarLegacy.kt rename to sample/common/src/main/kotlin/com/reown/sample/common/ui/WCTopAppBarLegacy.kt index 601653974..e569ef8df 100644 --- a/sample/common/src/main/kotlin/com/walletconnect/sample/common/ui/WCTopAppBarLegacy.kt +++ b/sample/common/src/main/kotlin/com/reown/sample/common/ui/WCTopAppBarLegacy.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.common.ui +package com.reown.sample.common.ui import androidx.annotation.DrawableRes import androidx.compose.foundation.Image @@ -28,8 +28,8 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.constraintlayout.compose.ConstraintLayout import androidx.constraintlayout.compose.Dimension -import com.walletconnect.sample.common.BuildConfig -import com.walletconnect.sample.common.R +import com.reown.sample.common.BuildConfig +import com.reown.sample.common.R @Composable fun WCTopAppBarLegacy( diff --git a/sample/common/src/main/kotlin/com/walletconnect/sample/common/ui/commons/Buttons.kt b/sample/common/src/main/kotlin/com/reown/sample/common/ui/commons/Buttons.kt similarity index 98% rename from sample/common/src/main/kotlin/com/walletconnect/sample/common/ui/commons/Buttons.kt rename to sample/common/src/main/kotlin/com/reown/sample/common/ui/commons/Buttons.kt index 7ab87442e..20e3e90f4 100644 --- a/sample/common/src/main/kotlin/com/walletconnect/sample/common/ui/commons/Buttons.kt +++ b/sample/common/src/main/kotlin/com/reown/sample/common/ui/commons/Buttons.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.common.ui.commons +package com.reown.sample.common.ui.commons import androidx.compose.animation.AnimatedContent import androidx.compose.animation.ExperimentalAnimationApi diff --git a/sample/common/src/main/kotlin/com/walletconnect/sample/common/ui/commons/Loaders.kt b/sample/common/src/main/kotlin/com/reown/sample/common/ui/commons/Loaders.kt similarity index 95% rename from sample/common/src/main/kotlin/com/walletconnect/sample/common/ui/commons/Loaders.kt rename to sample/common/src/main/kotlin/com/reown/sample/common/ui/commons/Loaders.kt index 1f2ecbfa5..7f33c5a44 100644 --- a/sample/common/src/main/kotlin/com/walletconnect/sample/common/ui/commons/Loaders.kt +++ b/sample/common/src/main/kotlin/com/reown/sample/common/ui/commons/Loaders.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.common.ui.commons +package com.reown.sample.common.ui.commons import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -23,7 +23,7 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.walletconnect.sample.common.ui.themedColor +import com.reown.sample.common.ui.themedColor @Composable fun FullScreenLoader( diff --git a/sample/common/src/main/kotlin/com/walletconnect/sample/common/ui/theme/Color.kt b/sample/common/src/main/kotlin/com/reown/sample/common/ui/theme/Color.kt similarity index 96% rename from sample/common/src/main/kotlin/com/walletconnect/sample/common/ui/theme/Color.kt rename to sample/common/src/main/kotlin/com/reown/sample/common/ui/theme/Color.kt index 727b7a683..aa9b21bde 100644 --- a/sample/common/src/main/kotlin/com/walletconnect/sample/common/ui/theme/Color.kt +++ b/sample/common/src/main/kotlin/com/reown/sample/common/ui/theme/Color.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.common.ui.theme +package com.reown.sample.common.ui.theme import androidx.compose.ui.graphics.Color diff --git a/sample/common/src/main/kotlin/com/walletconnect/sample/common/ui/theme/Theme.kt b/sample/common/src/main/kotlin/com/reown/sample/common/ui/theme/Theme.kt similarity index 98% rename from sample/common/src/main/kotlin/com/walletconnect/sample/common/ui/theme/Theme.kt rename to sample/common/src/main/kotlin/com/reown/sample/common/ui/theme/Theme.kt index 8eaaa9414..dfe53a89a 100644 --- a/sample/common/src/main/kotlin/com/walletconnect/sample/common/ui/theme/Theme.kt +++ b/sample/common/src/main/kotlin/com/reown/sample/common/ui/theme/Theme.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.common.ui.theme +package com.reown.sample.common.ui.theme import android.app.Activity import android.content.res.Configuration diff --git a/sample/common/src/main/kotlin/com/walletconnect/sample/common/ui/theme/Type.kt b/sample/common/src/main/kotlin/com/reown/sample/common/ui/theme/Type.kt similarity index 60% rename from sample/common/src/main/kotlin/com/walletconnect/sample/common/ui/theme/Type.kt rename to sample/common/src/main/kotlin/com/reown/sample/common/ui/theme/Type.kt index 93dccff24..2994d1510 100644 --- a/sample/common/src/main/kotlin/com/walletconnect/sample/common/ui/theme/Type.kt +++ b/sample/common/src/main/kotlin/com/reown/sample/common/ui/theme/Type.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.common.ui.theme +package com.reown.sample.common.ui.theme import androidx.compose.material.Typography diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/DappSampleApp.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/DappSampleApp.kt index bc9f778ee..02f4a4ac0 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/DappSampleApp.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/DappSampleApp.kt @@ -6,7 +6,7 @@ import com.google.firebase.crashlytics.ktx.crashlytics import com.google.firebase.ktx.Firebase import com.reown.android.Core import com.reown.android.CoreClient -import com.walletconnect.sample.common.tag +import com.reown.sample.common.tag import com.walletconnect.util.bytesToHex import com.walletconnect.util.randomBytes import com.reown.appkit.client.AppKit @@ -14,7 +14,7 @@ import com.reown.appkit.client.Modal import com.reown.appkit.presets.AppKitChainsPresets import com.reown.appkit.utils.EthUtils import timber.log.Timber -import com.walletconnect.sample.common.BuildConfig as CommonBuildConfig +import com.reown.sample.common.BuildConfig as CommonBuildConfig class DappSampleApp : Application() { diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/domain/DappDelegate.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/domain/DappDelegate.kt index 70f4fb15b..adf8920a9 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/domain/DappDelegate.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/domain/DappDelegate.kt @@ -2,7 +2,7 @@ package com.reown.sample.dapp.domain import com.reown.android.Core import com.reown.android.CoreClient -import com.walletconnect.sample.common.tag +import com.reown.sample.common.tag import com.reown.appkit.client.AppKit import com.reown.appkit.client.Modal import kotlinx.coroutines.CoroutineScope diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/DappSampleActivity.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/DappSampleActivity.kt index 4a54f704a..855880d25 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/DappSampleActivity.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/DappSampleActivity.kt @@ -10,7 +10,7 @@ import androidx.activity.compose.setContent import androidx.compose.material.ExperimentalMaterialApi import androidx.lifecycle.lifecycleScope import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi -import com.walletconnect.sample.common.ui.theme.WCSampleAppTheme +import com.reown.sample.common.ui.theme.WCSampleAppTheme import com.reown.sample.dapp.ui.routes.host.DappSampleHost import com.reown.sign.client.SignClient import kotlinx.coroutines.Dispatchers diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/account/AccountRoute.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/account/AccountRoute.kt index 4fa25eb7c..92d292edb 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/account/AccountRoute.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/account/AccountRoute.kt @@ -32,9 +32,9 @@ import androidx.compose.ui.unit.sp import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController import coil.compose.AsyncImage -import com.walletconnect.sample.common.ui.commons.BlueButton -import com.walletconnect.sample.common.ui.commons.FullScreenLoader -import com.walletconnect.sample.common.ui.commons.Loader +import com.reown.sample.common.ui.commons.BlueButton +import com.reown.sample.common.ui.commons.FullScreenLoader +import com.reown.sample.common.ui.commons.Loader import com.reown.sample.dapp.ui.DappSampleEvents import com.reown.sample.dapp.ui.routes.Route import timber.log.Timber diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/account/AccountViewModel.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/account/AccountViewModel.kt index 1a60ea9c0..41609f491 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/account/AccountViewModel.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/account/AccountViewModel.kt @@ -5,11 +5,11 @@ import androidx.core.net.toUri import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.walletconnect.sample.common.Chains -import com.walletconnect.sample.common.getEthSendTransaction -import com.walletconnect.sample.common.getEthSignBody -import com.walletconnect.sample.common.getEthSignTypedData -import com.walletconnect.sample.common.getPersonalSignBody +import com.reown.sample.common.Chains +import com.reown.sample.common.getEthSendTransaction +import com.reown.sample.common.getEthSignBody +import com.reown.sample.common.getEthSignTypedData +import com.reown.sample.common.getPersonalSignBody import com.reown.sample.dapp.domain.DappDelegate import com.reown.sample.dapp.ui.DappSampleEvents import com.reown.sample.dapp.ui.accountArg diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt index a619156df..f1a9b3032 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt @@ -60,15 +60,15 @@ import androidx.core.net.toUri import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController import com.reown.android.utils.isPackageInstalled -import com.walletconnect.sample.common.Chains -import com.walletconnect.sample.common.CompletePreviews -import com.walletconnect.sample.common.ui.WCTopAppBarLegacy -import com.walletconnect.sample.common.ui.coloredShadow -import com.walletconnect.sample.common.ui.commons.BlueButton -import com.walletconnect.sample.common.ui.conditionalModifier -import com.walletconnect.sample.common.ui.theme.PreviewTheme -import com.walletconnect.sample.common.ui.themedColor -import com.walletconnect.sample.common.ui.toColor +import com.reown.sample.common.Chains +import com.reown.sample.common.CompletePreviews +import com.reown.sample.common.ui.WCTopAppBarLegacy +import com.reown.sample.common.ui.coloredShadow +import com.reown.sample.common.ui.commons.BlueButton +import com.reown.sample.common.ui.conditionalModifier +import com.reown.sample.common.ui.theme.PreviewTheme +import com.reown.sample.common.ui.themedColor +import com.reown.sample.common.ui.toColor import com.reown.sample.dapp.BuildConfig import com.reown.sample.dapp.ui.DappSampleEvents import com.reown.sample.dapp.ui.routes.Route diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionUi.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionUi.kt index fd24e73c8..63acc2732 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionUi.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionUi.kt @@ -1,6 +1,6 @@ package com.reown.sample.dapp.ui.routes.composable_routes.chain_selection -import com.walletconnect.sample.common.Chains +import com.reown.sample.common.Chains data class ChainSelectionUi( val chainName: String, diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt index fdddd6c98..2302d1c80 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt @@ -6,8 +6,8 @@ import com.google.firebase.crashlytics.ktx.crashlytics import com.google.firebase.ktx.Firebase import com.reown.android.Core import com.reown.android.CoreClient -import com.walletconnect.sample.common.Chains -import com.walletconnect.sample.common.tag +import com.reown.sample.common.Chains +import com.reown.sample.common.tag import com.reown.sample.dapp.domain.DappDelegate import com.reown.sample.dapp.ui.DappSampleEvents import com.reown.sign.client.Sign diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/session/SessionRoute.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/session/SessionRoute.kt index e02a4cde8..66d59a3b9 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/session/SessionRoute.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/session/SessionRoute.kt @@ -48,9 +48,9 @@ import androidx.compose.ui.unit.sp import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController import coil.compose.AsyncImage -import com.walletconnect.sample.common.ui.WCTopAppBarLegacy -import com.walletconnect.sample.common.ui.commons.ButtonWithLoader -import com.walletconnect.sample.common.ui.themedColor +import com.reown.sample.common.ui.WCTopAppBarLegacy +import com.reown.sample.common.ui.commons.ButtonWithLoader +import com.reown.sample.common.ui.themedColor import com.reown.sample.dapp.R import com.reown.sample.dapp.ui.DappSampleEvents import com.reown.sample.dapp.ui.navigateToAccount diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/session/SessionViewModel.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/session/SessionViewModel.kt index 7bc6e04b5..e237263dc 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/session/SessionViewModel.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/session/SessionViewModel.kt @@ -7,8 +7,8 @@ import com.google.firebase.ktx.Firebase import com.reown.appkit.client.AppKit import com.reown.appkit.client.Modal import com.reown.appkit.client.models.Session -import com.walletconnect.sample.common.Chains -import com.walletconnect.sample.common.tag +import com.reown.sample.common.Chains +import com.reown.sample.common.tag import com.reown.sample.dapp.domain.DappDelegate import com.reown.sample.dapp.ui.DappSampleEvents import kotlinx.coroutines.flow.MutableSharedFlow diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/AppKitApp.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/AppKitApp.kt index b4541e621..cb14efc96 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/AppKitApp.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/AppKitApp.kt @@ -7,7 +7,7 @@ import com.google.firebase.ktx.Firebase import com.reown.android.Core import com.reown.android.CoreClient import com.reown.android.relay.ConnectionType -import com.walletconnect.sample.common.tag +import com.reown.sample.common.tag import com.walletconnect.util.bytesToHex import com.walletconnect.util.randomBytes import com.reown.appkit.client.Modal @@ -15,7 +15,7 @@ import com.reown.appkit.client.AppKit import com.reown.appkit.presets.AppKitChainsPresets import com.reown.appkit.utils.EthUtils import timber.log.Timber -import com.walletconnect.sample.common.BuildConfig as CommonBuildConfig +import com.reown.sample.common.BuildConfig as CommonBuildConfig class AppKitApp : Application() { override fun onCreate() { diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ModalSampleDelegate.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ModalSampleDelegate.kt index dfebece6a..ec145a8c1 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ModalSampleDelegate.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ModalSampleDelegate.kt @@ -1,6 +1,6 @@ package com.walletconnect.sample.modal -import com.walletconnect.sample.common.tag +import com.reown.sample.common.tag import com.reown.appkit.client.Modal import com.reown.appkit.client.AppKit import kotlinx.coroutines.CoroutineScope diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/kotlindsl/HomeFragment.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/kotlindsl/HomeFragment.kt index 86e91dd4d..378885c01 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/kotlindsl/HomeFragment.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/kotlindsl/HomeFragment.kt @@ -5,7 +5,7 @@ import android.view.View import androidx.fragment.app.Fragment import com.walletconnect.sample.modal.R import com.walletconnect.sample.modal.databinding.FragmentHomeBinding -import com.walletconnect.sample.common.viewBinding +import com.reown.sample.common.viewBinding class HomeFragment : Fragment(R.layout.fragment_home) { diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/navComponent/HomeFragment.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/navComponent/HomeFragment.kt index 281266843..699c7d16a 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/navComponent/HomeFragment.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/navComponent/HomeFragment.kt @@ -5,7 +5,7 @@ import android.view.View import androidx.fragment.app.Fragment import com.walletconnect.sample.modal.R import com.walletconnect.sample.modal.databinding.FragmentHomeBinding -import com.walletconnect.sample.common.viewBinding +import com.reown.sample.common.viewBinding class HomeFragment : Fragment(R.layout.fragment_home) { diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/LabScreen.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/LabScreen.kt index 18f526269..a20ba93ee 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/LabScreen.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/LabScreen.kt @@ -14,10 +14,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp import androidx.navigation.NavController -import com.walletconnect.sample.common.getEthSendTransaction -import com.walletconnect.sample.common.getEthSignTypedData -import com.walletconnect.sample.common.getPersonalSignBody -import com.walletconnect.sample.common.ui.commons.BlueButton +import com.reown.sample.common.getEthSendTransaction +import com.reown.sample.common.getEthSignTypedData +import com.reown.sample.common.getPersonalSignBody +import com.reown.sample.common.ui.commons.BlueButton import com.walletconnect.sample.modal.ModalSampleDelegate import com.reown.appkit.client.Modal import com.reown.appkit.client.AppKit diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitApplication.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitApplication.kt index bb2b1022f..38e30dff5 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitApplication.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitApplication.kt @@ -25,8 +25,8 @@ import com.reown.foundation.util.Logger import com.reown.notify.client.Notify import com.reown.notify.client.NotifyClient import com.reown.notify.client.cacao.CacaoSigner -import com.walletconnect.sample.common.initBeagle -import com.walletconnect.sample.common.tag +import com.reown.sample.common.initBeagle +import com.reown.sample.common.tag import com.reown.sample.wallet.domain.EthAccountDelegate import com.reown.sample.wallet.domain.NotificationHandler import com.reown.sample.wallet.domain.NotifyDelegate @@ -45,7 +45,7 @@ import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch import org.koin.core.qualifier.named import timber.log.Timber -import com.walletconnect.sample.common.BuildConfig as CommonBuildConfig +import com.reown.sample.common.BuildConfig as CommonBuildConfig class WalletKitApplication : Application() { private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/TestAccounts.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/TestAccounts.kt index 11ed0af27..9e99546cc 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/TestAccounts.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/TestAccounts.kt @@ -1,6 +1,6 @@ package com.reown.sample.wallet.domain -import com.walletconnect.sample.common.Chains +import com.reown.sample.common.Chains import com.walletconnect.util.hexToBytes import io.ipfs.multibase.Base16 diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt index 9cb8c554e..d5705e28e 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt @@ -27,7 +27,7 @@ import androidx.navigation.NavHostController import com.google.accompanist.navigation.animation.rememberAnimatedNavController import com.google.accompanist.navigation.material.BottomSheetNavigator import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi -import com.walletconnect.sample.common.ui.theme.WCSampleAppTheme +import com.reown.sample.common.ui.theme.WCSampleAppTheme import com.reown.sample.wallet.domain.NotifyDelegate import com.reown.sample.wallet.ui.routes.Route import com.reown.sample.wallet.ui.routes.composable_routes.connections.ConnectionsViewModel diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/Content.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/Content.kt index 6d00cf8d5..b59faed66 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/Content.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/Content.kt @@ -15,7 +15,7 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.walletconnect.sample.common.ui.themedColor +import com.reown.sample.common.ui.themedColor @Composable diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/InnerContent.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/InnerContent.kt index 63ccfd6ee..e29795669 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/InnerContent.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/InnerContent.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import com.walletconnect.sample.common.ui.themedColor +import com.reown.sample.common.ui.themedColor @Composable diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/SemiTransparentDialog.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/SemiTransparentDialog.kt index f91a3c42b..73a8ecd79 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/SemiTransparentDialog.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/SemiTransparentDialog.kt @@ -10,7 +10,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import com.walletconnect.sample.common.ui.themedColor +import com.reown.sample.common.ui.themedColor @Composable fun SemiTransparentDialog(backgroundColor: Color = themedColor(Color(0xFF242425), Color(0xFFFFFFFF)), content: @Composable () -> Unit) { diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/blue/BlueLabelText.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/blue/BlueLabelText.kt index 5de0efd9d..8bc4a2436 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/blue/BlueLabelText.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/blue/BlueLabelText.kt @@ -13,7 +13,7 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.walletconnect.sample.common.ui.themedColor +import com.reown.sample.common.ui.themedColor @Composable diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/blue/BlueLabelTextsSection.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/blue/BlueLabelTextsSection.kt index adb62ca57..18c6f1d3e 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/blue/BlueLabelTextsSection.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/blue/BlueLabelTextsSection.kt @@ -12,7 +12,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.reown.sample.wallet.ui.common.InnerContent -import com.walletconnect.sample.common.ui.themedColor +import com.reown.sample.common.ui.themedColor @Composable fun BlueLabelTexts(title: String, values: List, displayEndSpacer: Boolean = false) { diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/generated/Welcome.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/generated/Welcome.kt index ba536ca44..5bfebfc42 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/generated/Welcome.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/generated/Welcome.kt @@ -15,7 +15,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.em import androidx.compose.ui.unit.sp -import com.walletconnect.sample.common.ui.themedColor +import com.reown.sample.common.ui.themedColor @Composable fun Welcome(modifier: Modifier = Modifier) { diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/peer/PeerSection.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/peer/PeerSection.kt index 6e1b9ee40..38b731df0 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/peer/PeerSection.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/peer/PeerSection.kt @@ -31,7 +31,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import coil.compose.rememberAsyncImagePainter import coil.request.ImageRequest -import com.walletconnect.sample.common.ui.themedColor +import com.reown.sample.common.ui.themedColor import com.reown.sample.wallet.R @@ -51,7 +51,7 @@ fun Peer(peerUI: PeerUI, actionText: String?, peerContextUI: PeerContextUI? = nu .data(peerUI.peerIcon) .size(60) .crossfade(true) - .error(com.walletconnect.sample.common.R.drawable.ic_walletconnect_circle_blue) + .error(com.reown.sample.common.R.drawable.ic_walletconnect_circle_blue) .listener( onSuccess = { request, metadata -> println("onSuccess: $request, $metadata") }, onError = { _, throwable -> println("Error loading image: ${throwable.throwable.message}") }) diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/peer/PeerUI.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/peer/PeerUI.kt index 4af6b30b3..372ea150b 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/peer/PeerUI.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/common/peer/PeerUI.kt @@ -1,9 +1,9 @@ package com.reown.sample.wallet.ui.common.peer import androidx.compose.ui.graphics.Color -import com.walletconnect.sample.common.ui.theme.mismatch_color -import com.walletconnect.sample.common.ui.theme.unverified_color -import com.walletconnect.sample.common.ui.theme.verified_color +import com.reown.sample.common.ui.theme.mismatch_color +import com.reown.sample.common.ui.theme.unverified_color +import com.reown.sample.common.ui.theme.verified_color import com.reown.sample.wallet.R import com.reown.walletkit.client.Wallet diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/bottomsheet_routes/update_subscription/UpdateSubscriptionRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/bottomsheet_routes/update_subscription/UpdateSubscriptionRoute.kt index 79dc75f08..09b238b0c 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/bottomsheet_routes/update_subscription/UpdateSubscriptionRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/bottomsheet_routes/update_subscription/UpdateSubscriptionRoute.kt @@ -44,7 +44,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController import com.google.accompanist.navigation.material.BottomSheetNavigatorSheetState import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi -import com.walletconnect.sample.common.ui.theme.blue_accent +import com.reown.sample.common.ui.theme.blue_accent import com.reown.sample.wallet.ui.routes.showSnackbar import kotlinx.coroutines.launch diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt index 1901538a6..6ee14c488 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connection_details/ConnectionDetailsRoute.kt @@ -53,7 +53,7 @@ import com.google.accompanist.pager.HorizontalPagerIndicator import com.google.accompanist.pager.rememberPagerState import com.google.firebase.crashlytics.ktx.crashlytics import com.google.firebase.ktx.Firebase -import com.walletconnect.sample.common.ui.themedColor +import com.reown.sample.common.ui.themedColor import com.reown.sample.wallet.R import com.reown.sample.wallet.ui.common.Content import com.reown.sample.wallet.ui.common.InnerContent @@ -354,7 +354,7 @@ fun Connection(connectionUI: ConnectionUI) { .data(connectionUI.icon) .size(60) .crossfade(true) - .error(com.walletconnect.sample.common.R.drawable.ic_walletconnect_circle_blue) + .error(com.reown.sample.common.R.drawable.ic_walletconnect_circle_blue) .listener( onSuccess = { request, metadata -> println("onSuccess: $request, $metadata") }, onError = { _, throwable -> println("Error loading image: ${throwable.throwable.message}") }) @@ -391,7 +391,7 @@ fun TopButtons(navController: NavController, isEmitAndUpdateVisible: Boolean, is .clickable(interactionSource = interactionSourceRow, indication = null) { navController.popBackStack() } .padding(5.dp) ) { - Icon(tint = color, imageVector = ImageVector.vectorResource(id = com.walletconnect.sample.common.R.drawable.chevron_left), contentDescription = "Go back") + Icon(tint = color, imageVector = ImageVector.vectorResource(id = com.reown.sample.common.R.drawable.chevron_left), contentDescription = "Go back") Spacer(modifier = Modifier.width(5.dp)) Text(text = "Connections", style = style) } diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connections/ConnectionsRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connections/ConnectionsRoute.kt index 0bf685a99..ed6f5ad01 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connections/ConnectionsRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connections/ConnectionsRoute.kt @@ -40,10 +40,10 @@ import androidx.compose.ui.unit.sp import androidx.navigation.NavController import coil.compose.rememberAsyncImagePainter import coil.request.ImageRequest -import com.walletconnect.sample.common.ui.TopBarActionImage -import com.walletconnect.sample.common.ui.WCTopAppBar -import com.walletconnect.sample.common.ui.findActivity -import com.walletconnect.sample.common.ui.themedColor +import com.reown.sample.common.ui.TopBarActionImage +import com.reown.sample.common.ui.WCTopAppBar +import com.reown.sample.common.ui.findActivity +import com.reown.sample.common.ui.themedColor import com.reown.sample.wallet.R import com.reown.sample.wallet.ui.Web3WalletViewModel import com.reown.sample.wallet.ui.routes.Route @@ -147,7 +147,7 @@ fun Connection( .data(connectionUI.icon) .size(60) .crossfade(true) - .error(com.walletconnect.sample.common.R.drawable.ic_walletconnect_circle_blue) + .error(com.reown.sample.common.R.drawable.ic_walletconnect_circle_blue) .listener( onSuccess = { request, metadata -> println("onSuccess: $request, $metadata") }, onError = { _, throwable -> diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/get_started/GetStartedRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/get_started/GetStartedRoute.kt index 7864b35b8..3f2764a9a 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/get_started/GetStartedRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/get_started/GetStartedRoute.kt @@ -20,7 +20,7 @@ import com.reown.sample.wallet.ui.common.generated.GetStarted import com.reown.sample.wallet.ui.common.generated.Welcome import com.reown.sample.wallet.ui.routes.Route import com.reown.sample.wallet.R -import com.walletconnect.sample.common.ui.findActivity +import com.reown.sample.common.ui.findActivity import timber.log.Timber @Composable diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/InboxRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/InboxRoute.kt index 5561206d8..02bc6e66a 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/InboxRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/InboxRoute.kt @@ -35,10 +35,10 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider import androidx.compose.ui.unit.dp import androidx.navigation.NavHostController import com.reown.notify.client.InvalidDidJsonFileException -import com.walletconnect.sample.common.ui.WCTopAppBar -import com.walletconnect.sample.common.ui.theme.PreviewTheme -import com.walletconnect.sample.common.ui.theme.UiModePreview -import com.walletconnect.sample.common.ui.theme.blue_accent +import com.reown.sample.common.ui.WCTopAppBar +import com.reown.sample.common.ui.theme.PreviewTheme +import com.reown.sample.common.ui.theme.UiModePreview +import com.reown.sample.common.ui.theme.blue_accent import com.reown.sample.wallet.R import com.reown.sample.wallet.ui.common.ImageUrl import com.reown.sample.wallet.ui.common.subscriptions.ActiveSubscriptionsUI diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/discover/DiscoverTab.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/discover/DiscoverTab.kt index 1ae6761ed..bcff3e097 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/discover/DiscoverTab.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/inbox/discover/DiscoverTab.kt @@ -45,7 +45,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.walletconnect.sample.common.ui.theme.blue_accent +import com.reown.sample.common.ui.theme.blue_accent import com.reown.sample.wallet.R import com.reown.sample.wallet.ui.common.subscriptions.SubscriptionIcon import com.reown.sample.wallet.ui.routes.composable_routes.inbox.DiscoverState diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/notifications/NotificiationsScreenRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/notifications/NotificiationsScreenRoute.kt index 9c4b6ee7a..c9517b3a2 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/notifications/NotificiationsScreenRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/notifications/NotificiationsScreenRoute.kt @@ -58,10 +58,10 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.repeatOnLifecycle import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavHostController -import com.walletconnect.sample.common.ui.commons.ButtonWithLoader -import com.walletconnect.sample.common.ui.theme.PreviewTheme -import com.walletconnect.sample.common.ui.theme.UiModePreview -import com.walletconnect.sample.common.ui.theme.blue_accent +import com.reown.sample.common.ui.commons.ButtonWithLoader +import com.reown.sample.common.ui.theme.PreviewTheme +import com.reown.sample.common.ui.theme.UiModePreview +import com.reown.sample.common.ui.theme.blue_accent import com.reown.sample.wallet.domain.model.NotificationUI import com.reown.sample.wallet.ui.common.ImageUrl import com.reown.sample.wallet.ui.common.subscriptions.ActiveSubscriptionsUI diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/settings/SettingsRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/settings/SettingsRoute.kt index 0fa7173ec..892cc2614 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/settings/SettingsRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/settings/SettingsRoute.kt @@ -40,9 +40,9 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavHostController -import com.walletconnect.sample.common.ui.WCTopAppBar -import com.walletconnect.sample.common.ui.theme.PreviewTheme -import com.walletconnect.sample.common.ui.theme.UiModePreview +import com.reown.sample.common.ui.WCTopAppBar +import com.reown.sample.common.ui.theme.PreviewTheme +import com.reown.sample.common.ui.theme.UiModePreview import com.reown.sample.wallet.BuildConfig import com.reown.sample.wallet.R diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/paste_uri/PasteUriRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/paste_uri/PasteUriRoute.kt index b4fde6b15..a55699b80 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/paste_uri/PasteUriRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/paste_uri/PasteUriRoute.kt @@ -25,7 +25,7 @@ import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.reown.sample.wallet.R -import com.walletconnect.sample.common.ui.themedColor +import com.reown.sample.common.ui.themedColor @Composable fun PasteUriRoute(onSubmit: (String) -> Unit) { diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateRoute.kt index 28fdd2ac0..66b4ef496 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateRoute.kt @@ -37,9 +37,9 @@ import androidx.core.net.toUri import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavHostController import com.reown.android.internal.common.exception.NoConnectivityException -import com.walletconnect.sample.common.sendResponseDeepLink -import com.walletconnect.sample.common.ui.theme.mismatch_color -import com.walletconnect.sample.common.ui.themedColor +import com.reown.sample.common.sendResponseDeepLink +import com.reown.sample.common.ui.theme.mismatch_color +import com.reown.sample.common.ui.themedColor import com.reown.sample.wallet.R import com.reown.sample.wallet.ui.common.Buttons import com.reown.sample.wallet.ui.common.SemiTransparentDialog diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalRoute.kt index 0fcf48c6f..ec8f93f03 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_proposal/SessionProposalRoute.kt @@ -42,12 +42,12 @@ import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavHostController import androidx.navigation.compose.rememberNavController import com.reown.android.internal.common.exception.NoConnectivityException -import com.walletconnect.sample.common.Chains -import com.walletconnect.sample.common.CompletePreviews -import com.walletconnect.sample.common.sendResponseDeepLink -import com.walletconnect.sample.common.ui.theme.PreviewTheme -import com.walletconnect.sample.common.ui.theme.mismatch_color -import com.walletconnect.sample.common.ui.themedColor +import com.reown.sample.common.Chains +import com.reown.sample.common.CompletePreviews +import com.reown.sample.common.sendResponseDeepLink +import com.reown.sample.common.ui.theme.PreviewTheme +import com.reown.sample.common.ui.theme.mismatch_color +import com.reown.sample.common.ui.themedColor import com.reown.sample.wallet.R import com.reown.sample.wallet.ui.common.Buttons import com.reown.sample.wallet.ui.common.SemiTransparentDialog diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestRoute.kt index f044f2d23..55d1bb1d8 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestRoute.kt @@ -33,11 +33,11 @@ import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavHostController import androidx.navigation.compose.rememberNavController import com.reown.android.internal.common.exception.NoConnectivityException -import com.walletconnect.sample.common.CompletePreviews -import com.walletconnect.sample.common.sendResponseDeepLink -import com.walletconnect.sample.common.ui.theme.PreviewTheme -import com.walletconnect.sample.common.ui.theme.verified_color -import com.walletconnect.sample.common.ui.themedColor +import com.reown.sample.common.CompletePreviews +import com.reown.sample.common.sendResponseDeepLink +import com.reown.sample.common.ui.theme.PreviewTheme +import com.reown.sample.common.ui.theme.verified_color +import com.reown.sample.common.ui.themedColor import com.reown.sample.wallet.domain.WCDelegate.currentId import com.reown.sample.wallet.ui.common.Buttons import com.reown.sample.wallet.ui.common.Content diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt index 85ed569be..eaa286689 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt @@ -8,7 +8,7 @@ import com.google.firebase.ktx.Firebase import com.reown.android.cacao.signature.SignatureType import com.reown.android.internal.common.exception.NoConnectivityException import com.reown.android.utils.cacao.sign -import com.walletconnect.sample.common.Chains +import com.reown.sample.common.Chains import com.reown.sample.wallet.domain.EthAccountDelegate import com.reown.sample.wallet.domain.WCDelegate import com.reown.sample.wallet.ui.common.peer.PeerUI diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/snackbar_message/SnackbarMessageRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/snackbar_message/SnackbarMessageRoute.kt index 59c283927..b31184558 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/snackbar_message/SnackbarMessageRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/snackbar_message/SnackbarMessageRoute.kt @@ -15,7 +15,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp import androidx.navigation.NavController -import com.walletconnect.sample.common.ui.themedColor +import com.reown.sample.common.ui.themedColor import com.walletconnect.util.Empty import kotlinx.coroutines.delay diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/host/BottomBar.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/host/BottomBar.kt index d81e48a19..edac40495 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/host/BottomBar.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/host/BottomBar.kt @@ -22,7 +22,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import androidx.navigation.NavController import androidx.navigation.compose.currentBackStackEntryAsState -import com.walletconnect.sample.common.ui.theme.blue_accent +import com.reown.sample.common.ui.theme.blue_accent import com.reown.sample.wallet.R import com.reown.sample.wallet.ui.routes.Route diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/host/WalletSampleHost.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/host/WalletSampleHost.kt index 753cdf5a0..25c62c996 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/host/WalletSampleHost.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/host/WalletSampleHost.kt @@ -49,7 +49,7 @@ import androidx.navigation.compose.currentBackStackEntryAsState import com.google.accompanist.navigation.material.BottomSheetNavigator import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi import com.pandulapeter.beagle.DebugMenuView -import com.walletconnect.sample.common.ui.themedColor +import com.reown.sample.common.ui.themedColor import com.reown.sample.wallet.R import com.reown.sample.wallet.ui.Web3WalletNavGraph import com.reown.sample.wallet.ui.Web3WalletViewModel From 0526b40bc5e61497f011a543b3d50a5bbedbcda6 Mon Sep 17 00:00:00 2001 From: kubel Date: Thu, 5 Sep 2024 08:56:12 +0200 Subject: [PATCH 25/51] Migrate sample modal --- sample/modal/build.gradle.kts | 4 +-- .../sample/modal/AppKitApp.kt | 2 +- .../sample/modal/MainActivity.kt | 32 +++++++++---------- .../sample/modal/ModalSampleDelegate.kt | 2 +- .../sample/modal/common/Route.kt | 2 +- .../sample/modal/compose/ComposeActivity.kt | 6 ++-- .../sample/modal/compose/HomeScreen.kt | 2 +- .../sample/modal/kotlindsl/HomeFragment.kt | 6 ++-- .../modal/kotlindsl/KotlinDSLActivity.kt | 6 ++-- .../sample/modal/navComponent/HomeFragment.kt | 6 ++-- .../navComponent/NavComponentActivity.kt | 4 +-- .../sample/modal/ui/AlertDialog.kt | 2 +- .../sample/modal/ui/LabScreen.kt | 4 +-- .../sample/modal/ui/PredifinedThemes.kt | 2 +- .../sample/modal/ui/theme/Theme.kt | 2 +- .../sample/modal/view/ViewActivity.kt | 4 +-- .../src/main/res/navigation/nav_graph.xml | 2 +- 17 files changed, 44 insertions(+), 44 deletions(-) rename sample/modal/src/main/kotlin/com/{walletconnect => reown}/sample/modal/AppKitApp.kt (98%) rename sample/modal/src/main/kotlin/com/{walletconnect => reown}/sample/modal/MainActivity.kt (92%) rename sample/modal/src/main/kotlin/com/{walletconnect => reown}/sample/modal/ModalSampleDelegate.kt (98%) rename sample/modal/src/main/kotlin/com/{walletconnect => reown}/sample/modal/common/Route.kt (79%) rename sample/modal/src/main/kotlin/com/{walletconnect => reown}/sample/modal/compose/ComposeActivity.kt (95%) rename sample/modal/src/main/kotlin/com/{walletconnect => reown}/sample/modal/compose/HomeScreen.kt (97%) rename sample/modal/src/main/kotlin/com/{walletconnect => reown}/sample/modal/kotlindsl/HomeFragment.kt (71%) rename sample/modal/src/main/kotlin/com/{walletconnect => reown}/sample/modal/kotlindsl/KotlinDSLActivity.kt (85%) rename sample/modal/src/main/kotlin/com/{walletconnect => reown}/sample/modal/navComponent/HomeFragment.kt (70%) rename sample/modal/src/main/kotlin/com/{walletconnect => reown}/sample/modal/navComponent/NavComponentActivity.kt (83%) rename sample/modal/src/main/kotlin/com/{walletconnect => reown}/sample/modal/ui/AlertDialog.kt (97%) rename sample/modal/src/main/kotlin/com/{walletconnect => reown}/sample/modal/ui/LabScreen.kt (98%) rename sample/modal/src/main/kotlin/com/{walletconnect => reown}/sample/modal/ui/PredifinedThemes.kt (97%) rename sample/modal/src/main/kotlin/com/{walletconnect => reown}/sample/modal/ui/theme/Theme.kt (97%) rename sample/modal/src/main/kotlin/com/{walletconnect => reown}/sample/modal/view/ViewActivity.kt (82%) diff --git a/sample/modal/build.gradle.kts b/sample/modal/build.gradle.kts index fce8f916c..7db2b9c63 100644 --- a/sample/modal/build.gradle.kts +++ b/sample/modal/build.gradle.kts @@ -8,11 +8,11 @@ plugins { } android { - namespace = "com.walletconnect.sample.modal" + namespace = "com.reown.sample.modal" compileSdk = COMPILE_SDK defaultConfig { - applicationId = "com.walletconnect.sample.modal" + applicationId = "com.reown.sample.modal" minSdk = MIN_SDK targetSdk = TARGET_SDK versionName = SAMPLE_VERSION_NAME diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/AppKitApp.kt b/sample/modal/src/main/kotlin/com/reown/sample/modal/AppKitApp.kt similarity index 98% rename from sample/modal/src/main/kotlin/com/walletconnect/sample/modal/AppKitApp.kt rename to sample/modal/src/main/kotlin/com/reown/sample/modal/AppKitApp.kt index cb14efc96..67f0555c5 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/AppKitApp.kt +++ b/sample/modal/src/main/kotlin/com/reown/sample/modal/AppKitApp.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.modal +package com.reown.sample.modal import android.app.Application import com.google.firebase.appdistribution.FirebaseAppDistribution diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/MainActivity.kt b/sample/modal/src/main/kotlin/com/reown/sample/modal/MainActivity.kt similarity index 92% rename from sample/modal/src/main/kotlin/com/walletconnect/sample/modal/MainActivity.kt rename to sample/modal/src/main/kotlin/com/reown/sample/modal/MainActivity.kt index 53433f34f..bafb0663c 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/MainActivity.kt +++ b/sample/modal/src/main/kotlin/com/reown/sample/modal/MainActivity.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalMaterialNavigationApi::class, ExperimentalMaterialApi::class) -package com.walletconnect.sample.modal +package com.reown.sample.modal import android.content.Intent import android.os.Bundle @@ -61,21 +61,21 @@ import androidx.navigation.navArgument import com.google.accompanist.navigation.material.BottomSheetNavigator import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi import com.google.accompanist.navigation.material.ModalBottomSheetLayout -import com.walletconnect.sample.modal.common.Route -import com.walletconnect.sample.modal.common.messageArg -import com.walletconnect.sample.modal.compose.ComposeActivity -import com.walletconnect.sample.modal.kotlindsl.KotlinDSLActivity -import com.walletconnect.sample.modal.navComponent.NavComponentActivity -import com.walletconnect.sample.modal.ui.AlertDialogRoute -import com.walletconnect.sample.modal.ui.LabScreen -import com.walletconnect.sample.modal.ui.predefinedGreenDarkTheme -import com.walletconnect.sample.modal.ui.predefinedGreenLightTheme -import com.walletconnect.sample.modal.ui.predefinedOrangeDarkTheme -import com.walletconnect.sample.modal.ui.predefinedOrangeLightTheme -import com.walletconnect.sample.modal.ui.predefinedRedDarkTheme -import com.walletconnect.sample.modal.ui.predefinedRedLightTheme -import com.walletconnect.sample.modal.ui.theme.WalletConnectTheme -import com.walletconnect.sample.modal.view.ViewActivity +import com.reown.sample.modal.common.Route +import com.reown.sample.modal.common.messageArg +import com.reown.sample.modal.compose.ComposeActivity +import com.reown.sample.modal.kotlindsl.KotlinDSLActivity +import com.reown.sample.modal.navComponent.NavComponentActivity +import com.reown.sample.modal.ui.AlertDialogRoute +import com.reown.sample.modal.ui.LabScreen +import com.reown.sample.modal.ui.predefinedGreenDarkTheme +import com.reown.sample.modal.ui.predefinedGreenLightTheme +import com.reown.sample.modal.ui.predefinedOrangeDarkTheme +import com.reown.sample.modal.ui.predefinedOrangeLightTheme +import com.reown.sample.modal.ui.predefinedRedDarkTheme +import com.reown.sample.modal.ui.predefinedRedLightTheme +import com.reown.sample.modal.ui.theme.WalletConnectTheme +import com.reown.sample.modal.view.ViewActivity import com.reown.appkit.client.AppKit import com.reown.appkit.ui.AppKitTheme import com.reown.appkit.ui.appKitGraph diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ModalSampleDelegate.kt b/sample/modal/src/main/kotlin/com/reown/sample/modal/ModalSampleDelegate.kt similarity index 98% rename from sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ModalSampleDelegate.kt rename to sample/modal/src/main/kotlin/com/reown/sample/modal/ModalSampleDelegate.kt index ec145a8c1..c0eaeb5a0 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ModalSampleDelegate.kt +++ b/sample/modal/src/main/kotlin/com/reown/sample/modal/ModalSampleDelegate.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.modal +package com.reown.sample.modal import com.reown.sample.common.tag import com.reown.appkit.client.Modal diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/common/Route.kt b/sample/modal/src/main/kotlin/com/reown/sample/modal/common/Route.kt similarity index 79% rename from sample/modal/src/main/kotlin/com/walletconnect/sample/modal/common/Route.kt rename to sample/modal/src/main/kotlin/com/reown/sample/modal/common/Route.kt index f07a7384f..3275a9dc1 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/common/Route.kt +++ b/sample/modal/src/main/kotlin/com/reown/sample/modal/common/Route.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.modal.common +package com.reown.sample.modal.common const val messageArg = "messageArg" diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/ComposeActivity.kt b/sample/modal/src/main/kotlin/com/reown/sample/modal/compose/ComposeActivity.kt similarity index 95% rename from sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/ComposeActivity.kt rename to sample/modal/src/main/kotlin/com/reown/sample/modal/compose/ComposeActivity.kt index 278600c9c..bc0d83927 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/ComposeActivity.kt +++ b/sample/modal/src/main/kotlin/com/reown/sample/modal/compose/ComposeActivity.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalMaterialNavigationApi::class, ExperimentalMaterialApi::class) -package com.walletconnect.sample.modal.compose +package com.reown.sample.modal.compose import android.os.Bundle import androidx.activity.ComponentActivity @@ -27,8 +27,8 @@ import androidx.navigation.compose.rememberNavController import com.google.accompanist.navigation.material.BottomSheetNavigator import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi import com.google.accompanist.navigation.material.ModalBottomSheetLayout -import com.walletconnect.sample.modal.common.Route -import com.walletconnect.sample.modal.ui.theme.WalletConnectTheme +import com.reown.sample.modal.common.Route +import com.reown.sample.modal.ui.theme.WalletConnectTheme import com.reown.appkit.ui.appKitGraph class ComposeActivity : ComponentActivity() { diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/HomeScreen.kt b/sample/modal/src/main/kotlin/com/reown/sample/modal/compose/HomeScreen.kt similarity index 97% rename from sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/HomeScreen.kt rename to sample/modal/src/main/kotlin/com/reown/sample/modal/compose/HomeScreen.kt index 4ce033e2f..3b7ff7d1b 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/HomeScreen.kt +++ b/sample/modal/src/main/kotlin/com/reown/sample/modal/compose/HomeScreen.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.modal.compose +package com.reown.sample.modal.compose import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/kotlindsl/HomeFragment.kt b/sample/modal/src/main/kotlin/com/reown/sample/modal/kotlindsl/HomeFragment.kt similarity index 71% rename from sample/modal/src/main/kotlin/com/walletconnect/sample/modal/kotlindsl/HomeFragment.kt rename to sample/modal/src/main/kotlin/com/reown/sample/modal/kotlindsl/HomeFragment.kt index 378885c01..ed7e7d391 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/kotlindsl/HomeFragment.kt +++ b/sample/modal/src/main/kotlin/com/reown/sample/modal/kotlindsl/HomeFragment.kt @@ -1,10 +1,10 @@ -package com.walletconnect.sample.modal.kotlindsl +package com.reown.sample.modal.kotlindsl import android.os.Bundle import android.view.View import androidx.fragment.app.Fragment -import com.walletconnect.sample.modal.R -import com.walletconnect.sample.modal.databinding.FragmentHomeBinding +import com.reown.sample.modal.R +import com.reown.sample.modal.databinding.FragmentHomeBinding import com.reown.sample.common.viewBinding class HomeFragment : Fragment(R.layout.fragment_home) { diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/kotlindsl/KotlinDSLActivity.kt b/sample/modal/src/main/kotlin/com/reown/sample/modal/kotlindsl/KotlinDSLActivity.kt similarity index 85% rename from sample/modal/src/main/kotlin/com/walletconnect/sample/modal/kotlindsl/KotlinDSLActivity.kt rename to sample/modal/src/main/kotlin/com/reown/sample/modal/kotlindsl/KotlinDSLActivity.kt index 096cac793..d094df083 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/kotlindsl/KotlinDSLActivity.kt +++ b/sample/modal/src/main/kotlin/com/reown/sample/modal/kotlindsl/KotlinDSLActivity.kt @@ -1,12 +1,12 @@ -package com.walletconnect.sample.modal.kotlindsl +package com.reown.sample.modal.kotlindsl import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.navigation.createGraph import androidx.navigation.fragment.NavHostFragment import androidx.navigation.fragment.fragment -import com.walletconnect.sample.modal.common.Route -import com.walletconnect.sample.modal.R +import com.reown.sample.modal.common.Route +import com.reown.sample.modal.R import com.reown.appkit.ui.appKit class KotlinDSLActivity : AppCompatActivity(R.layout.activity_kotlin_dsl) { diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/navComponent/HomeFragment.kt b/sample/modal/src/main/kotlin/com/reown/sample/modal/navComponent/HomeFragment.kt similarity index 70% rename from sample/modal/src/main/kotlin/com/walletconnect/sample/modal/navComponent/HomeFragment.kt rename to sample/modal/src/main/kotlin/com/reown/sample/modal/navComponent/HomeFragment.kt index 699c7d16a..a7b711e05 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/navComponent/HomeFragment.kt +++ b/sample/modal/src/main/kotlin/com/reown/sample/modal/navComponent/HomeFragment.kt @@ -1,10 +1,10 @@ -package com.walletconnect.sample.modal.navComponent +package com.reown.sample.modal.navComponent import android.os.Bundle import android.view.View import androidx.fragment.app.Fragment -import com.walletconnect.sample.modal.R -import com.walletconnect.sample.modal.databinding.FragmentHomeBinding +import com.reown.sample.modal.R +import com.reown.sample.modal.databinding.FragmentHomeBinding import com.reown.sample.common.viewBinding class HomeFragment : Fragment(R.layout.fragment_home) { diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/navComponent/NavComponentActivity.kt b/sample/modal/src/main/kotlin/com/reown/sample/modal/navComponent/NavComponentActivity.kt similarity index 83% rename from sample/modal/src/main/kotlin/com/walletconnect/sample/modal/navComponent/NavComponentActivity.kt rename to sample/modal/src/main/kotlin/com/reown/sample/modal/navComponent/NavComponentActivity.kt index a6214a5df..d01d917b2 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/navComponent/NavComponentActivity.kt +++ b/sample/modal/src/main/kotlin/com/reown/sample/modal/navComponent/NavComponentActivity.kt @@ -1,8 +1,8 @@ -package com.walletconnect.sample.modal.navComponent +package com.reown.sample.modal.navComponent import androidx.appcompat.app.AppCompatActivity import androidx.navigation.fragment.NavHostFragment -import com.walletconnect.sample.modal.R +import com.reown.sample.modal.R class NavComponentActivity: AppCompatActivity(R.layout.activity_nav_component) { diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/AlertDialog.kt b/sample/modal/src/main/kotlin/com/reown/sample/modal/ui/AlertDialog.kt similarity index 97% rename from sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/AlertDialog.kt rename to sample/modal/src/main/kotlin/com/reown/sample/modal/ui/AlertDialog.kt index a3ad56002..7cea0af9d 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/AlertDialog.kt +++ b/sample/modal/src/main/kotlin/com/reown/sample/modal/ui/AlertDialog.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.modal.ui +package com.reown.sample.modal.ui import androidx.compose.foundation.background import androidx.compose.foundation.clickable diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/LabScreen.kt b/sample/modal/src/main/kotlin/com/reown/sample/modal/ui/LabScreen.kt similarity index 98% rename from sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/LabScreen.kt rename to sample/modal/src/main/kotlin/com/reown/sample/modal/ui/LabScreen.kt index a20ba93ee..eab1660f5 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/LabScreen.kt +++ b/sample/modal/src/main/kotlin/com/reown/sample/modal/ui/LabScreen.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.modal.ui +package com.reown.sample.modal.ui import android.widget.Toast import androidx.compose.foundation.layout.Arrangement @@ -18,7 +18,7 @@ import com.reown.sample.common.getEthSendTransaction import com.reown.sample.common.getEthSignTypedData import com.reown.sample.common.getPersonalSignBody import com.reown.sample.common.ui.commons.BlueButton -import com.walletconnect.sample.modal.ModalSampleDelegate +import com.reown.sample.modal.ModalSampleDelegate import com.reown.appkit.client.Modal import com.reown.appkit.client.AppKit import com.reown.appkit.client.models.request.Request diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/PredifinedThemes.kt b/sample/modal/src/main/kotlin/com/reown/sample/modal/ui/PredifinedThemes.kt similarity index 97% rename from sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/PredifinedThemes.kt rename to sample/modal/src/main/kotlin/com/reown/sample/modal/ui/PredifinedThemes.kt index 572aa26be..ad7742375 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/PredifinedThemes.kt +++ b/sample/modal/src/main/kotlin/com/reown/sample/modal/ui/PredifinedThemes.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.modal.ui +package com.reown.sample.modal.ui import androidx.compose.ui.graphics.Color import com.reown.appkit.ui.AppKitTheme diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/theme/Theme.kt b/sample/modal/src/main/kotlin/com/reown/sample/modal/ui/theme/Theme.kt similarity index 97% rename from sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/theme/Theme.kt rename to sample/modal/src/main/kotlin/com/reown/sample/modal/ui/theme/Theme.kt index ca96f22e0..6b8f7e9ce 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/theme/Theme.kt +++ b/sample/modal/src/main/kotlin/com/reown/sample/modal/ui/theme/Theme.kt @@ -1,4 +1,4 @@ -package com.walletconnect.sample.modal.ui.theme +package com.reown.sample.modal.ui.theme import android.app.Activity import androidx.compose.foundation.isSystemInDarkTheme diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/view/ViewActivity.kt b/sample/modal/src/main/kotlin/com/reown/sample/modal/view/ViewActivity.kt similarity index 82% rename from sample/modal/src/main/kotlin/com/walletconnect/sample/modal/view/ViewActivity.kt rename to sample/modal/src/main/kotlin/com/reown/sample/modal/view/ViewActivity.kt index 6f9e02783..f04c253ab 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/view/ViewActivity.kt +++ b/sample/modal/src/main/kotlin/com/reown/sample/modal/view/ViewActivity.kt @@ -1,8 +1,8 @@ -package com.walletconnect.sample.modal.view +package com.reown.sample.modal.view import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import com.walletconnect.sample.modal.R +import com.reown.sample.modal.R import com.reown.appkit.ui.AppKitView class ViewActivity: AppCompatActivity(R.layout.activity_view) { diff --git a/sample/modal/src/main/res/navigation/nav_graph.xml b/sample/modal/src/main/res/navigation/nav_graph.xml index f92760220..51acc3245 100644 --- a/sample/modal/src/main/res/navigation/nav_graph.xml +++ b/sample/modal/src/main/res/navigation/nav_graph.xml @@ -7,7 +7,7 @@ + android:name="com.reown.sample.modal.navComponent.HomeFragment"> From cc5fb40b6a5c01563f0f03757677093320c5c967 Mon Sep 17 00:00:00 2001 From: kubel Date: Thu, 5 Sep 2024 10:27:16 +0200 Subject: [PATCH 26/51] Migrate utils --- ReadMe.md | 4 ++-- build.gradle.kts | 5 +++-- buildSrc/src/main/kotlin/Versions.kt | 9 +++++---- core/android/build.gradle.kts | 2 +- .../kotlin/com/reown/android/CacaoTest.kt | 2 +- .../kotlin/com/reown/android/di/CoreStorageModule.kt | 2 +- .../reown/android/internal/common/crypto/Utils.kt | 2 +- .../internal/common/crypto/codec/ChaChaPolyCodec.kt | 6 +++--- .../kmr/BouncyCastleKeyManagementRepository.kt | 4 ++-- .../android/internal/common/di/BaseStorageModule.kt | 2 +- .../android/internal/common/di/CoreJsonRpcModule.kt | 4 +--- .../android/internal/common/di/DatabaseConfig.kt | 2 +- .../common/json_rpc/data/JsonRpcSerializer.kt | 2 +- .../domain/link_mode/LinkModeJsonRpcInteractor.kt | 2 +- .../json_rpc/domain/relay/RelayJsonRpcInteractor.kt | 2 +- .../reown/android/internal/common/model/WCRequest.kt | 2 +- .../android/internal/common/signing/cacao/Utils.kt | 2 +- .../common/signing/eip1271/EIP1271Verifier.kt | 4 ++-- .../internal/common/signing/signature/Signature.kt | 6 +++--- .../internal/common/storage/key_chain/KeyChain.kt | 4 ++-- .../storage/pairing/PairingStorageRepository.kt | 2 +- .../reown/android/internal/utils/UtilFunctions.kt | 2 +- .../android/keyserver/domain/IdentitiesInteractor.kt | 4 ++-- .../android/pairing/engine/domain/PairingEngine.kt | 4 ++-- .../com/reown/android/pairing/model/PairingRpc.kt | 2 +- .../android/pairing/model/mapper/PairingMapper.kt | 2 +- .../reown/android/pulse/domain/SendEventUseCase.kt | 2 +- .../kotlin/com/reown/android/pulse/model/Event.kt | 2 +- .../reown/android/pulse/model/properties/Props.kt | 2 +- .../kotlin/com/reown/android/utils/Extensions.kt | 2 +- .../com/reown/android/verify/domain/JWTRepository.kt | 2 +- .../verify/domain/ResolveAttestationIdUseCase.kt | 2 +- .../reown/android/verify/domain/VerifyRepository.kt | 2 +- .../com/reown/android/verify/domain/VerifyUtils.kt | 2 +- .../kotlin/com.reown.android/di/CoreStorageModule.kt | 4 ++-- core/android/src/test/java/CacaoTestJvmTest.java | 2 +- .../internal/BouncyCastleCryptoRepositoryTest.kt | 2 +- .../reown/android/internal/ChaChaPolyCodecTest.kt | 2 +- .../com/reown/android/internal/JWTRepositoryTest.kt | 2 +- .../com/reown/android/internal/KeyChainMock.kt | 4 ++-- .../internal/ResolveAttestationUseCaseTest.kt | 2 +- .../com/reown/android/internal/URLComparisonTest.kt | 2 +- .../internal/common/cacao/eip191/EIP191SignerTest.kt | 4 ++-- .../android/internal/domain/RelayerInteractorTest.kt | 2 +- core/modal/build.gradle.kts | 2 +- .../modal/ui/components/logo/WalletConnectLogo.kt | 2 +- .../modal/ui/components/qr/WalletConnectQRCode.kt | 2 +- .../kotlin/com/reown/foundation/common/model/Key.kt | 2 +- .../com/reown/foundation/common/model/Topic.kt | 2 +- .../data/repository/BaseClientIdJwtRepository.kt | 4 +--- .../com/reown/foundation/network/BaseRelayClient.kt | 2 +- .../com/reown/foundation/network/model/RelayDTO.kt | 2 +- .../com/reown/foundation/util/UtilFunctions.kt | 2 +- .../kotlin/com/reown/foundation/util/jwt/JwtUtils.kt | 2 +- .../foundation/BaseRelayClientTest.kt | 0 .../{walletconnect => reown}/foundation/RelayTest.kt | 3 +-- .../{walletconnect => reown}/foundation/UtilsTest.kt | 3 +-- .../foundation/adapters/SubscriptionIdAdapterTest.kt | 0 .../foundation/adapters/TopicAdapterTest.kt | 0 .../foundation/adapters/TtlAdapterTest.kt | 0 .../data/repository/ClientIdJwtRepositoryTest.kt | 0 product/appkit/build.gradle.kts | 12 ++++++------ .../main/kotlin/com/reown/appkit/client/AppKit.kt | 2 +- .../reown/appkit/data/json_rpc/balance/BalanceRpc.kt | 2 +- .../kotlin/com/reown/appkit/engine/AppKitEngine.kt | 2 +- .../reown/appkit/engine/coinbase/CoinbaseClient.kt | 2 +- .../reown/appkit/engine/coinbase/CoinbaseMapper.kt | 2 +- .../components/internal/commons/inputs/InputState.kt | 2 +- .../internal/commons/inputs/SearchInput.kt | 2 +- .../ui/components/internal/email/code/CodeInput.kt | 2 +- .../reown/appkit/ui/navigation/account/Navigation.kt | 2 +- .../ui/navigation/connection/RedirectNavigation.kt | 2 +- .../appkit/ui/routes/connect/WalletDataSource.kt | 2 +- .../ui/routes/connect/all_wallets/AllWalletsRoute.kt | 2 +- .../routes/connect/redirect/RedirectWalletScreen.kt | 2 +- .../kotlin/com/reown/appkit/utils/SessionUtils.kt | 2 +- .../appkit/ui/routes/connect/AllWalletsRouteTest.kt | 2 +- product/walletkit/build.gradle.kts | 10 +++++----- product/walletkit/src/main/AndroidManifest.xml | 3 +-- protocol/notify/build.gradle.kts | 2 +- .../com/reown/notify/common/model/NotifyRpc.kt | 2 +- .../com/reown/notify/di/NotifyJsonRpcModule.kt | 4 ++-- .../domain/ExtractPublicKeysFromDidJsonUseCase.kt | 2 +- protocol/sign/ReadMe.md | 6 +++--- protocol/sign/build.gradle.kts | 2 +- .../SessionAuthenticateInstrumentedAndroidTest.kt | 2 +- .../com/reown/sign/test/utils/dapp/DappSignClient.kt | 4 ++-- .../common/model/vo/clientsync/session/SignRpc.kt | 2 +- .../model/vo/clientsync/session/params/SignParams.kt | 2 +- .../kotlin/com/reown/sign/di/SignJsonRpcModule.kt | 6 +++--- .../com/reown/sign/engine/domain/SignEngine.kt | 4 ++-- .../reown/sign/engine/model/mapper/EngineMapper.kt | 2 +- .../sign/engine/use_case/calls/EmitEventUseCase.kt | 2 +- .../sign/engine/use_case/calls/GetSessionsUseCase.kt | 2 +- .../use_case/calls/SessionAuthenticateUseCase.kt | 2 +- .../use_case/requests/OnSessionRequestUseCase.kt | 2 +- .../use_case/requests/OnSessionSettleUseCase.kt | 2 +- .../use_case/requests/OnSessionUpdateUseCase.kt | 2 +- .../responses/OnSessionUpdateResponseUseCase.kt | 2 +- .../storage/sequence/SessionStorageRepository.kt | 4 ++-- .../calls/ApproveSessionAuthenticateUseCaseTest.kt | 4 ++-- .../calls/RejectSessionAuthenticateUseCaseTest.kt | 4 ++-- sample/dapp/build.gradle.kts | 8 ++++---- .../kotlin/com/reown/sample/dapp/DappSampleApp.kt | 4 ++-- .../chain_selection/ChainSelectionViewModel.kt | 4 ++-- sample/modal/build.gradle.kts | 6 +++--- .../main/kotlin/com/reown/sample/modal/AppKitApp.kt | 4 ++-- sample/wallet/build.gradle.kts | 8 ++++---- .../com/reown/sample/wallet/WalletKitApplication.kt | 2 +- .../com/reown/sample/wallet/domain/TestAccounts.kt | 2 +- .../SessionAuthenticateViewModel.kt | 2 +- .../session_request/SessionRequestViewModel.kt | 2 +- .../snackbar_message/SnackbarMessageRoute.kt | 2 +- .../sample/wallet/domain/EthAccountDelegateTest.kt | 2 +- 114 files changed, 158 insertions(+), 163 deletions(-) rename foundation/src/test/kotlin/com/{walletconnect => reown}/foundation/BaseRelayClientTest.kt (100%) rename foundation/src/test/kotlin/com/{walletconnect => reown}/foundation/RelayTest.kt (99%) rename foundation/src/test/kotlin/com/{walletconnect => reown}/foundation/UtilsTest.kt (84%) rename foundation/src/test/kotlin/com/{walletconnect => reown}/foundation/adapters/SubscriptionIdAdapterTest.kt (100%) rename foundation/src/test/kotlin/com/{walletconnect => reown}/foundation/adapters/TopicAdapterTest.kt (100%) rename foundation/src/test/kotlin/com/{walletconnect => reown}/foundation/adapters/TtlAdapterTest.kt (100%) rename foundation/src/test/kotlin/com/{walletconnect => reown}/foundation/crypto/data/repository/ClientIdJwtRepositoryTest.kt (100%) diff --git a/ReadMe.md b/ReadMe.md index 292102af7..1b6193cf4 100644 --- a/ReadMe.md +++ b/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. diff --git a/build.gradle.kts b/build.gradle.kts index 1125385af..60b84bf67 100644 --- a/build.gradle.kts +++ b/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) ) \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 739171b79..5fe556355 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/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 diff --git a/core/android/build.gradle.kts b/core/android/build.gradle.kts index a41189858..9932d36ca 100644 --- a/core/android/build.gradle.kts +++ b/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) diff --git a/core/android/src/androidTest/kotlin/com/reown/android/CacaoTest.kt b/core/android/src/androidTest/kotlin/com/reown/android/CacaoTest.kt index c4fe8ad95..429438b6a 100644 --- a/core/android/src/androidTest/kotlin/com/reown/android/CacaoTest.kt +++ b/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 diff --git a/core/android/src/debug/kotlin/com/reown/android/di/CoreStorageModule.kt b/core/android/src/debug/kotlin/com/reown/android/di/CoreStorageModule.kt index 2745adcad..1e7722309 100644 --- a/core/android/src/debug/kotlin/com/reown/android/di/CoreStorageModule.kt +++ b/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 diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/crypto/Utils.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/crypto/Utils.kt index a340f61c8..ca9dd0c7c 100644 --- a/core/android/src/main/kotlin/com/reown/android/internal/common/crypto/Utils.kt +++ b/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 diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/crypto/codec/ChaChaPolyCodec.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/crypto/codec/ChaChaPolyCodec.kt index 7a23a2f77..4ea9532c2 100644 --- a/core/android/src/main/kotlin/com/reown/android/internal/common/crypto/codec/ChaChaPolyCodec.kt +++ b/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 diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/crypto/kmr/BouncyCastleKeyManagementRepository.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/crypto/kmr/BouncyCastleKeyManagementRepository.kt index 0a6a5eb6d..e6725a330 100644 --- a/core/android/src/main/kotlin/com/reown/android/internal/common/crypto/kmr/BouncyCastleKeyManagementRepository.kt +++ b/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 diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/di/BaseStorageModule.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/di/BaseStorageModule.kt index 2dc1adbe9..a1a5e8178 100644 --- a/core/android/src/main/kotlin/com/reown/android/internal/common/di/BaseStorageModule.kt +++ b/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 diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreJsonRpcModule.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreJsonRpcModule.kt index 4c1f62a2c..429295146 100644 --- a/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreJsonRpcModule.kt +++ b/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 diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/di/DatabaseConfig.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/di/DatabaseConfig.kt index a472c1f87..4bc474c3a 100644 --- a/core/android/src/main/kotlin/com/reown/android/internal/common/di/DatabaseConfig.kt +++ b/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 diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/data/JsonRpcSerializer.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/data/JsonRpcSerializer.kt index 9d6289ce1..61ece3831 100644 --- a/core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/data/JsonRpcSerializer.kt +++ b/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 diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/domain/link_mode/LinkModeJsonRpcInteractor.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/domain/link_mode/LinkModeJsonRpcInteractor.kt index 12707fc57..2eb313429 100644 --- a/core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/domain/link_mode/LinkModeJsonRpcInteractor.kt +++ b/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 diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt index 4fb2e7964..9e15724e8 100644 --- a/core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt +++ b/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 diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/model/WCRequest.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/model/WCRequest.kt index e451eca88..c59a5b25e 100644 --- a/core/android/src/main/kotlin/com/reown/android/internal/common/model/WCRequest.kt +++ b/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, diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/signing/cacao/Utils.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/cacao/Utils.kt index b3f15f35a..80a6cceed 100644 --- a/core/android/src/main/kotlin/com/reown/android/internal/common/signing/cacao/Utils.kt +++ b/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 diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/signing/eip1271/EIP1271Verifier.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/eip1271/EIP1271Verifier.kt index 787c6f559..c58867926 100644 --- a/core/android/src/main/kotlin/com/reown/android/internal/common/signing/eip1271/EIP1271Verifier.kt +++ b/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 diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/signing/signature/Signature.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/signing/signature/Signature.kt index de7100890..fbf0a821e 100644 --- a/core/android/src/main/kotlin/com/reown/android/internal/common/signing/signature/Signature.kt +++ b/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 diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/storage/key_chain/KeyChain.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/key_chain/KeyChain.kt index 9e5574e4f..71eefabef 100644 --- a/core/android/src/main/kotlin/com/reown/android/internal/common/storage/key_chain/KeyChain.kt +++ b/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 { diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/storage/pairing/PairingStorageRepository.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/storage/pairing/PairingStorageRepository.kt index 1c082ea6d..55a62718f 100644 --- a/core/android/src/main/kotlin/com/reown/android/internal/common/storage/pairing/PairingStorageRepository.kt +++ b/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 { diff --git a/core/android/src/main/kotlin/com/reown/android/internal/utils/UtilFunctions.kt b/core/android/src/main/kotlin/com/reown/android/internal/utils/UtilFunctions.kt index ff956bf36..6a66f5974 100644 --- a/core/android/src/main/kotlin/com/reown/android/internal/utils/UtilFunctions.kt +++ b/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 diff --git a/core/android/src/main/kotlin/com/reown/android/keyserver/domain/IdentitiesInteractor.kt b/core/android/src/main/kotlin/com/reown/android/keyserver/domain/IdentitiesInteractor.kt index 191ba1d36..bf24255ea 100644 --- a/core/android/src/main/kotlin/com/reown/android/keyserver/domain/IdentitiesInteractor.kt +++ b/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 diff --git a/core/android/src/main/kotlin/com/reown/android/pairing/engine/domain/PairingEngine.kt b/core/android/src/main/kotlin/com/reown/android/pairing/engine/domain/PairingEngine.kt index 380061733..d11e594d5 100644 --- a/core/android/src/main/kotlin/com/reown/android/pairing/engine/domain/PairingEngine.kt +++ b/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 diff --git a/core/android/src/main/kotlin/com/reown/android/pairing/model/PairingRpc.kt b/core/android/src/main/kotlin/com/reown/android/pairing/model/PairingRpc.kt index b7044a33d..98a86d793 100644 --- a/core/android/src/main/kotlin/com/reown/android/pairing/model/PairingRpc.kt +++ b/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 { diff --git a/core/android/src/main/kotlin/com/reown/android/pairing/model/mapper/PairingMapper.kt b/core/android/src/main/kotlin/com/reown/android/pairing/model/mapper/PairingMapper.kt index 4c6d04e33..3193bfb5c 100644 --- a/core/android/src/main/kotlin/com/reown/android/pairing/model/mapper/PairingMapper.kt +++ b/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.") diff --git a/core/android/src/main/kotlin/com/reown/android/pulse/domain/SendEventUseCase.kt b/core/android/src/main/kotlin/com/reown/android/pulse/domain/SendEventUseCase.kt index af58a9e26..b10a90c25 100644 --- a/core/android/src/main/kotlin/com/reown/android/pulse/domain/SendEventUseCase.kt +++ b/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 diff --git a/core/android/src/main/kotlin/com/reown/android/pulse/model/Event.kt b/core/android/src/main/kotlin/com/reown/android/pulse/model/Event.kt index b37525279..40b31d4ac 100644 --- a/core/android/src/main/kotlin/com/reown/android/pulse/model/Event.kt +++ b/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( diff --git a/core/android/src/main/kotlin/com/reown/android/pulse/model/properties/Props.kt b/core/android/src/main/kotlin/com/reown/android/pulse/model/properties/Props.kt index c2512286d..7c56f297b 100644 --- a/core/android/src/main/kotlin/com/reown/android/pulse/model/properties/Props.kt +++ b/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") diff --git a/core/android/src/main/kotlin/com/reown/android/utils/Extensions.kt b/core/android/src/main/kotlin/com/reown/android/utils/Extensions.kt index 280871e1d..e2310ef07 100644 --- a/core/android/src/main/kotlin/com/reown/android/utils/Extensions.kt +++ b/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 diff --git a/core/android/src/main/kotlin/com/reown/android/verify/domain/JWTRepository.kt b/core/android/src/main/kotlin/com/reown/android/verify/domain/JWTRepository.kt index af7d1ad9b..c8a0af451 100644 --- a/core/android/src/main/kotlin/com/reown/android/verify/domain/JWTRepository.kt +++ b/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 diff --git a/core/android/src/main/kotlin/com/reown/android/verify/domain/ResolveAttestationIdUseCase.kt b/core/android/src/main/kotlin/com/reown/android/verify/domain/ResolveAttestationIdUseCase.kt index 3fd255fd0..bc74cf9dd 100644 --- a/core/android/src/main/kotlin/com/reown/android/verify/domain/ResolveAttestationIdUseCase.kt +++ b/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 diff --git a/core/android/src/main/kotlin/com/reown/android/verify/domain/VerifyRepository.kt b/core/android/src/main/kotlin/com/reown/android/verify/domain/VerifyRepository.kt index a1d0fd1d7..509dfb4ac 100644 --- a/core/android/src/main/kotlin/com/reown/android/verify/domain/VerifyRepository.kt +++ b/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 diff --git a/core/android/src/main/kotlin/com/reown/android/verify/domain/VerifyUtils.kt b/core/android/src/main/kotlin/com/reown/android/verify/domain/VerifyUtils.kt index 5ea6559b4..2119b226f 100644 --- a/core/android/src/main/kotlin/com/reown/android/verify/domain/VerifyUtils.kt +++ b/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 \ No newline at end of file diff --git a/core/android/src/release/kotlin/com.reown.android/di/CoreStorageModule.kt b/core/android/src/release/kotlin/com.reown.android/di/CoreStorageModule.kt index 40aedfc4b..1b67f7f08 100644 --- a/core/android/src/release/kotlin/com.reown.android/di/CoreStorageModule.kt +++ b/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 diff --git a/core/android/src/test/java/CacaoTestJvmTest.java b/core/android/src/test/java/CacaoTestJvmTest.java index 5072d2133..9011afd40 100644 --- a/core/android/src/test/java/CacaoTestJvmTest.java +++ b/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; diff --git a/core/android/src/test/kotlin/com/reown/android/internal/BouncyCastleCryptoRepositoryTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/BouncyCastleCryptoRepositoryTest.kt index 14ef08920..1fe6fff95 100644 --- a/core/android/src/test/kotlin/com/reown/android/internal/BouncyCastleCryptoRepositoryTest.kt +++ b/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 diff --git a/core/android/src/test/kotlin/com/reown/android/internal/ChaChaPolyCodecTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/ChaChaPolyCodecTest.kt index 2f896bad5..c1c271bd6 100644 --- a/core/android/src/test/kotlin/com/reown/android/internal/ChaChaPolyCodecTest.kt +++ b/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 diff --git a/core/android/src/test/kotlin/com/reown/android/internal/JWTRepositoryTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/JWTRepositoryTest.kt index 19d6c3323..7748f6bad 100644 --- a/core/android/src/test/kotlin/com/reown/android/internal/JWTRepositoryTest.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/JWTRepositoryTest.kt @@ -2,7 +2,7 @@ package com.reown.android.internal import com.reown.android.verify.domain.JWTRepository import com.reown.android.verify.model.JWK -import com.walletconnect.util.hexToBytes +import com.reown.util.hexToBytes import io.mockk.spyk import junit.framework.TestCase.assertEquals import junit.framework.TestCase.assertNotNull diff --git a/core/android/src/test/kotlin/com/reown/android/internal/KeyChainMock.kt b/core/android/src/test/kotlin/com/reown/android/internal/KeyChainMock.kt index 8c7541abd..3666f8865 100644 --- a/core/android/src/test/kotlin/com/reown/android/internal/KeyChainMock.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/KeyChainMock.kt @@ -2,8 +2,8 @@ package com.reown.android.internal import com.reown.android.internal.common.storage.key_chain.KeyStore 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 KeyChainMock : KeyStore { private val mapOfKeys = mutableMapOf() diff --git a/core/android/src/test/kotlin/com/reown/android/internal/ResolveAttestationUseCaseTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/ResolveAttestationUseCaseTest.kt index 769862857..ca8108298 100644 --- a/core/android/src/test/kotlin/com/reown/android/internal/ResolveAttestationUseCaseTest.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/ResolveAttestationUseCaseTest.kt @@ -11,7 +11,7 @@ import com.reown.android.verify.domain.ResolveAttestationIdUseCase import com.reown.android.verify.domain.VerifyResult import com.reown.android.verify.model.VerifyContext import com.reown.foundation.common.model.Topic -import com.walletconnect.utils.Empty +import com.reown.utils.Empty import io.mockk.Runs import io.mockk.coEvery import io.mockk.coVerify diff --git a/core/android/src/test/kotlin/com/reown/android/internal/URLComparisonTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/URLComparisonTest.kt index 5e8d6c053..768418518 100644 --- a/core/android/src/test/kotlin/com/reown/android/internal/URLComparisonTest.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/URLComparisonTest.kt @@ -1,7 +1,7 @@ package com.reown.android.internal import com.google.common.net.InternetDomainName -import com.walletconnect.utils.compareDomains +import com.reown.utils.compareDomains import org.junit.Test import java.net.URI diff --git a/core/android/src/test/kotlin/com/reown/android/internal/common/cacao/eip191/EIP191SignerTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/common/cacao/eip191/EIP191SignerTest.kt index 8c88e6b3d..264ae2324 100644 --- a/core/android/src/test/kotlin/com/reown/android/internal/common/cacao/eip191/EIP191SignerTest.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/common/cacao/eip191/EIP191SignerTest.kt @@ -12,8 +12,8 @@ import com.reown.android.internal.common.signing.model.HexString import com.reown.android.internal.common.signing.signature.Signature import com.reown.android.utils.cacao.CacaoSignerInterface import com.reown.android.utils.cacao.sign -import com.walletconnect.util.bytesToHex -import com.walletconnect.util.hexToBytes +import com.reown.util.bytesToHex +import com.reown.util.hexToBytes import junit.framework.TestCase.assertFalse import junit.framework.TestCase.assertTrue import org.junit.Test diff --git a/core/android/src/test/kotlin/com/reown/android/internal/domain/RelayerInteractorTest.kt b/core/android/src/test/kotlin/com/reown/android/internal/domain/RelayerInteractorTest.kt index 006134566..c263d59dc 100644 --- a/core/android/src/test/kotlin/com/reown/android/internal/domain/RelayerInteractorTest.kt +++ b/core/android/src/test/kotlin/com/reown/android/internal/domain/RelayerInteractorTest.kt @@ -21,7 +21,7 @@ import com.reown.foundation.common.model.Ttl import com.reown.foundation.network.model.Relay import com.reown.foundation.network.model.RelayDTO import com.reown.foundation.util.Logger -import com.walletconnect.utils.Empty +import com.reown.utils.Empty import io.mockk.Called import io.mockk.every import io.mockk.mockk diff --git a/core/modal/build.gradle.kts b/core/modal/build.gradle.kts index 0c9eae093..c41252235 100644 --- a/core/modal/build.gradle.kts +++ b/core/modal/build.gradle.kts @@ -12,7 +12,7 @@ project.apply { } android { - namespace = "com.walletconnect.modalcore" + namespace = "com.reown.modalcore" compileSdk = COMPILE_SDK defaultConfig { diff --git a/core/modal/src/main/kotlin/com/reown/modal/ui/components/logo/WalletConnectLogo.kt b/core/modal/src/main/kotlin/com/reown/modal/ui/components/logo/WalletConnectLogo.kt index 6c87800ed..64a07de41 100644 --- a/core/modal/src/main/kotlin/com/reown/modal/ui/components/logo/WalletConnectLogo.kt +++ b/core/modal/src/main/kotlin/com/reown/modal/ui/components/logo/WalletConnectLogo.kt @@ -17,7 +17,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.reown.modal.ui.ComponentPreview import com.reown.modal.ui.components.common.HorizontalSpacer -import com.walletconnect.modalcore.R +import com.reown.modalcore.R @Composable fun WalletConnectLogo(modifier: Modifier = Modifier, color: Color) { diff --git a/core/modal/src/main/kotlin/com/reown/modal/ui/components/qr/WalletConnectQRCode.kt b/core/modal/src/main/kotlin/com/reown/modal/ui/components/qr/WalletConnectQRCode.kt index cd076ffa6..2f4471415 100644 --- a/core/modal/src/main/kotlin/com/reown/modal/ui/components/qr/WalletConnectQRCode.kt +++ b/core/modal/src/main/kotlin/com/reown/modal/ui/components/qr/WalletConnectQRCode.kt @@ -26,7 +26,7 @@ import com.github.alexzhirkevich.customqrgenerator.vector.style.QrVectorLogoPadd import com.github.alexzhirkevich.customqrgenerator.vector.style.QrVectorPixelShape import com.google.accompanist.drawablepainter.rememberDrawablePainter import com.reown.modal.ui.ComponentPreview -import com.walletconnect.modalcore.R +import com.reown.modalcore.R import androidx.compose.ui.graphics.Color as ComposeColor enum class QrCodeType { diff --git a/foundation/src/main/kotlin/com/reown/foundation/common/model/Key.kt b/foundation/src/main/kotlin/com/reown/foundation/common/model/Key.kt index 62aab91b8..464932f7d 100644 --- a/foundation/src/main/kotlin/com/reown/foundation/common/model/Key.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/common/model/Key.kt @@ -1,6 +1,6 @@ package com.reown.foundation.common.model -import com.walletconnect.util.hexToBytes +import com.reown.util.hexToBytes interface Key { val keyAsHex: String diff --git a/foundation/src/main/kotlin/com/reown/foundation/common/model/Topic.kt b/foundation/src/main/kotlin/com/reown/foundation/common/model/Topic.kt index da8483acb..47d5b2434 100644 --- a/foundation/src/main/kotlin/com/reown/foundation/common/model/Topic.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/common/model/Topic.kt @@ -1,7 +1,7 @@ package com.reown.foundation.common.model import com.squareup.moshi.JsonClass -import com.walletconnect.util.Empty +import com.reown.util.Empty @JsonClass(generateAdapter = false) data class Topic(val value: String = String.Empty) \ No newline at end of file diff --git a/foundation/src/main/kotlin/com/reown/foundation/crypto/data/repository/BaseClientIdJwtRepository.kt b/foundation/src/main/kotlin/com/reown/foundation/crypto/data/repository/BaseClientIdJwtRepository.kt index a59eb8643..cf08d940e 100644 --- a/foundation/src/main/kotlin/com/reown/foundation/crypto/data/repository/BaseClientIdJwtRepository.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/crypto/data/repository/BaseClientIdJwtRepository.kt @@ -9,9 +9,7 @@ import com.reown.foundation.util.jwt.encodeEd25519DidKey import com.reown.foundation.util.jwt.encodeJWT import com.reown.foundation.util.jwt.jwtIatAndExp import com.reown.foundation.util.jwt.signJwt -import com.walletconnect.util.bytesToHex -import com.walletconnect.util.hexToBytes -import com.walletconnect.util.randomBytes +import com.reown.util.* import org.bouncycastle.crypto.AsymmetricCipherKeyPair import org.bouncycastle.crypto.generators.Ed25519KeyPairGenerator import org.bouncycastle.crypto.params.Ed25519KeyGenerationParameters diff --git a/foundation/src/main/kotlin/com/reown/foundation/network/BaseRelayClient.kt b/foundation/src/main/kotlin/com/reown/foundation/network/BaseRelayClient.kt index 4ecc24c75..79fca2a77 100644 --- a/foundation/src/main/kotlin/com/reown/foundation/network/BaseRelayClient.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/network/BaseRelayClient.kt @@ -12,7 +12,7 @@ import com.reown.foundation.network.model.Relay import com.reown.foundation.network.model.RelayDTO import com.reown.foundation.util.Logger import com.reown.foundation.util.scope -import com.walletconnect.util.generateClientToServerId +import com.reown.util.generateClientToServerId import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.ExperimentalCoroutinesApi diff --git a/foundation/src/main/kotlin/com/reown/foundation/network/model/RelayDTO.kt b/foundation/src/main/kotlin/com/reown/foundation/network/model/RelayDTO.kt index 2656f1796..f1ccc0938 100644 --- a/foundation/src/main/kotlin/com/reown/foundation/network/model/RelayDTO.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/network/model/RelayDTO.kt @@ -8,7 +8,7 @@ import com.reown.foundation.common.adapters.TtlAdapter import com.reown.foundation.common.model.SubscriptionId import com.reown.foundation.common.model.Topic import com.reown.foundation.common.model.Ttl -import com.walletconnect.util.generateClientToServerId +import com.reown.util.generateClientToServerId sealed class RelayDTO { abstract val id: Long diff --git a/foundation/src/main/kotlin/com/reown/foundation/util/UtilFunctions.kt b/foundation/src/main/kotlin/com/reown/foundation/util/UtilFunctions.kt index 54413a71b..91a6f4182 100644 --- a/foundation/src/main/kotlin/com/reown/foundation/util/UtilFunctions.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/util/UtilFunctions.kt @@ -1,6 +1,6 @@ @file:Suppress("PackageDirectoryMismatch") -package com.walletconnect.util +package com.reown.util import java.security.SecureRandom import kotlin.math.pow diff --git a/foundation/src/main/kotlin/com/reown/foundation/util/jwt/JwtUtils.kt b/foundation/src/main/kotlin/com/reown/foundation/util/jwt/JwtUtils.kt index b5b13a28b..e49ca3667 100644 --- a/foundation/src/main/kotlin/com/reown/foundation/util/jwt/JwtUtils.kt +++ b/foundation/src/main/kotlin/com/reown/foundation/util/jwt/JwtUtils.kt @@ -7,7 +7,7 @@ import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory import com.reown.foundation.common.model.PrivateKey import com.reown.foundation.common.model.PublicKey -import com.walletconnect.util.bytesToHex +import com.reown.util.bytesToHex import io.ipfs.multibase.Base58 import io.ipfs.multibase.Multibase import org.bouncycastle.crypto.params.Ed25519PrivateKeyParameters diff --git a/foundation/src/test/kotlin/com/walletconnect/foundation/BaseRelayClientTest.kt b/foundation/src/test/kotlin/com/reown/foundation/BaseRelayClientTest.kt similarity index 100% rename from foundation/src/test/kotlin/com/walletconnect/foundation/BaseRelayClientTest.kt rename to foundation/src/test/kotlin/com/reown/foundation/BaseRelayClientTest.kt diff --git a/foundation/src/test/kotlin/com/walletconnect/foundation/RelayTest.kt b/foundation/src/test/kotlin/com/reown/foundation/RelayTest.kt similarity index 99% rename from foundation/src/test/kotlin/com/walletconnect/foundation/RelayTest.kt rename to foundation/src/test/kotlin/com/reown/foundation/RelayTest.kt index 79fc23e2a..505e164b4 100644 --- a/foundation/src/test/kotlin/com/walletconnect/foundation/RelayTest.kt +++ b/foundation/src/test/kotlin/com/reown/foundation/RelayTest.kt @@ -8,8 +8,7 @@ import com.reown.foundation.di.networkModule import com.reown.foundation.network.BaseRelayClient import com.reown.foundation.network.RelayInterface import com.reown.foundation.network.model.Relay -import com.walletconnect.util.addUserAgent -import com.walletconnect.util.bytesToHex +import com.reown.util.* import junit.framework.TestCase.assertEquals import junit.framework.TestCase.fail import kotlinx.coroutines.CompletableJob diff --git a/foundation/src/test/kotlin/com/walletconnect/foundation/UtilsTest.kt b/foundation/src/test/kotlin/com/reown/foundation/UtilsTest.kt similarity index 84% rename from foundation/src/test/kotlin/com/walletconnect/foundation/UtilsTest.kt rename to foundation/src/test/kotlin/com/reown/foundation/UtilsTest.kt index 9d06ab7e6..3f2cd369d 100644 --- a/foundation/src/test/kotlin/com/walletconnect/foundation/UtilsTest.kt +++ b/foundation/src/test/kotlin/com/reown/foundation/UtilsTest.kt @@ -1,7 +1,6 @@ package com.reown.foundation -import com.walletconnect.util.generateClientToServerId -import com.walletconnect.util.generateId +import com.reown.util.* import junit.framework.TestCase.assertTrue import org.junit.Test diff --git a/foundation/src/test/kotlin/com/walletconnect/foundation/adapters/SubscriptionIdAdapterTest.kt b/foundation/src/test/kotlin/com/reown/foundation/adapters/SubscriptionIdAdapterTest.kt similarity index 100% rename from foundation/src/test/kotlin/com/walletconnect/foundation/adapters/SubscriptionIdAdapterTest.kt rename to foundation/src/test/kotlin/com/reown/foundation/adapters/SubscriptionIdAdapterTest.kt diff --git a/foundation/src/test/kotlin/com/walletconnect/foundation/adapters/TopicAdapterTest.kt b/foundation/src/test/kotlin/com/reown/foundation/adapters/TopicAdapterTest.kt similarity index 100% rename from foundation/src/test/kotlin/com/walletconnect/foundation/adapters/TopicAdapterTest.kt rename to foundation/src/test/kotlin/com/reown/foundation/adapters/TopicAdapterTest.kt diff --git a/foundation/src/test/kotlin/com/walletconnect/foundation/adapters/TtlAdapterTest.kt b/foundation/src/test/kotlin/com/reown/foundation/adapters/TtlAdapterTest.kt similarity index 100% rename from foundation/src/test/kotlin/com/walletconnect/foundation/adapters/TtlAdapterTest.kt rename to foundation/src/test/kotlin/com/reown/foundation/adapters/TtlAdapterTest.kt diff --git a/foundation/src/test/kotlin/com/walletconnect/foundation/crypto/data/repository/ClientIdJwtRepositoryTest.kt b/foundation/src/test/kotlin/com/reown/foundation/crypto/data/repository/ClientIdJwtRepositoryTest.kt similarity index 100% rename from foundation/src/test/kotlin/com/walletconnect/foundation/crypto/data/repository/ClientIdJwtRepositoryTest.kt rename to foundation/src/test/kotlin/com/reown/foundation/crypto/data/repository/ClientIdJwtRepositoryTest.kt diff --git a/product/appkit/build.gradle.kts b/product/appkit/build.gradle.kts index fb94bb65a..762de8cc7 100644 --- a/product/appkit/build.gradle.kts +++ b/product/appkit/build.gradle.kts @@ -8,9 +8,9 @@ plugins { } project.apply { - extra[KEY_PUBLISH_ARTIFACT_ID] = WEB_3_MODAL - extra[KEY_PUBLISH_VERSION] = WEB_3_MODAL_VERSION - extra[KEY_SDK_NAME] = "web3modal" + extra[KEY_PUBLISH_ARTIFACT_ID] = APPKIT + extra[KEY_PUBLISH_VERSION] = APPKIT_VERSION + extra[KEY_SDK_NAME] = "appkit" } android { @@ -92,9 +92,9 @@ dependencies { testImplementation(libs.coroutines.test) testImplementation(libs.turbine) - releaseImplementation("com.walletconnect:android-core:$CORE_VERSION") - releaseImplementation("com.walletconnect:sign:$SIGN_VERSION") - releaseImplementation("com.walletconnect:modal-core:$MODAL_CORE_VERSION") + releaseImplementation("com.reown:android-core:$CORE_VERSION") + releaseImplementation("com.reown:sign:$SIGN_VERSION") + releaseImplementation("com.reown:modal-core:$MODAL_CORE_VERSION") debugImplementation(project(":core:android")) debugImplementation(project(":protocol:sign")) diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/client/AppKit.kt b/product/appkit/src/main/kotlin/com/reown/appkit/client/AppKit.kt index ee8f12fa6..5a828cfd5 100644 --- a/product/appkit/src/main/kotlin/com/reown/appkit/client/AppKit.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/client/AppKit.kt @@ -9,7 +9,7 @@ import com.reown.android.pulse.model.properties.Props import com.reown.sign.client.Sign import com.reown.sign.client.SignClient import com.reown.sign.common.exceptions.SignClientAlreadyInitializedException -import com.walletconnect.util.Empty +import com.reown.util.Empty import com.reown.appkit.client.models.Account import com.reown.appkit.client.models.Session import com.reown.appkit.client.models.AppKitClientAlreadyInitializedException diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/data/json_rpc/balance/BalanceRpc.kt b/product/appkit/src/main/kotlin/com/reown/appkit/data/json_rpc/balance/BalanceRpc.kt index 74fc14e1e..07ac79876 100644 --- a/product/appkit/src/main/kotlin/com/reown/appkit/data/json_rpc/balance/BalanceRpc.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/data/json_rpc/balance/BalanceRpc.kt @@ -2,7 +2,7 @@ package com.reown.appkit.data.json_rpc.balance import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import com.walletconnect.util.generateId +import com.reown.util.generateId import com.reown.appkit.data.json_rpc.JsonRpcMethod @JsonClass(generateAdapter = true) diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/engine/AppKitEngine.kt b/product/appkit/src/main/kotlin/com/reown/appkit/engine/AppKitEngine.kt index 822bc45a6..46b3c16c1 100644 --- a/product/appkit/src/main/kotlin/com/reown/appkit/engine/AppKitEngine.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/engine/AppKitEngine.kt @@ -15,7 +15,7 @@ import com.reown.android.pulse.model.properties.Props import com.reown.foundation.util.Logger import com.reown.sign.client.Sign import com.reown.sign.client.SignClient -import com.walletconnect.util.Empty +import com.reown.util.Empty import com.reown.appkit.client.Modal import com.reown.appkit.client.AppKit import com.reown.appkit.client.models.Account diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/engine/coinbase/CoinbaseClient.kt b/product/appkit/src/main/kotlin/com/reown/appkit/engine/coinbase/CoinbaseClient.kt index e7aba5dd4..4edf47fa2 100644 --- a/product/appkit/src/main/kotlin/com/reown/appkit/engine/coinbase/CoinbaseClient.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/engine/coinbase/CoinbaseClient.kt @@ -22,7 +22,7 @@ import com.coinbase.android.nativesdk.message.response.ResponseResult import com.reown.android.internal.common.modal.data.model.Wallet import com.reown.android.internal.common.model.AppMetaData import com.reown.android.internal.common.wcKoinApp -import com.walletconnect.util.Empty +import com.reown.util.Empty import com.reown.appkit.client.Modal import com.reown.appkit.client.models.Account import com.reown.appkit.client.models.request.Request diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/engine/coinbase/CoinbaseMapper.kt b/product/appkit/src/main/kotlin/com/reown/appkit/engine/coinbase/CoinbaseMapper.kt index 8328d1679..36322d5aa 100644 --- a/product/appkit/src/main/kotlin/com/reown/appkit/engine/coinbase/CoinbaseMapper.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/engine/coinbase/CoinbaseMapper.kt @@ -4,7 +4,7 @@ import com.coinbase.android.nativesdk.message.request.AddChainNativeCurrency import com.coinbase.android.nativesdk.message.request.WatchAssetOptions import com.coinbase.android.nativesdk.message.request.Web3JsonRPC import com.coinbase.android.nativesdk.message.response.ActionResult -import com.walletconnect.util.Empty +import com.reown.util.Empty import org.json.JSONArray import org.json.JSONObject import java.math.BigDecimal diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/InputState.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/InputState.kt index ad1a980fd..dd8a48c26 100644 --- a/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/InputState.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/InputState.kt @@ -1,7 +1,7 @@ package com.reown.appkit.ui.components.internal.commons.inputs import androidx.compose.ui.focus.FocusManager -import com.walletconnect.util.Empty +import com.reown.util.Empty import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/SearchInput.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/SearchInput.kt index a1f9e5a9a..9764a5355 100644 --- a/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/SearchInput.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/SearchInput.kt @@ -32,7 +32,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.tooling.preview.PreviewParameterProvider import androidx.compose.ui.unit.dp import com.reown.modal.ui.components.common.HorizontalSpacer -import com.walletconnect.util.Empty +import com.reown.util.Empty import com.reown.appkit.R import com.reown.appkit.ui.components.internal.commons.ContentDescription import com.reown.appkit.ui.previews.ComponentPreview diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/code/CodeInput.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/code/CodeInput.kt index c22d6bc52..f6fb3b592 100644 --- a/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/code/CodeInput.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/code/CodeInput.kt @@ -37,7 +37,7 @@ import androidx.compose.ui.graphics.SolidColor import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.dp -import com.walletconnect.util.Empty +import com.reown.util.Empty import com.reown.appkit.ui.theme.AppKitTheme @Composable diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/account/Navigation.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/account/Navigation.kt index 427f6ffd1..7d4055170 100644 --- a/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/account/Navigation.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/account/Navigation.kt @@ -7,7 +7,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavType import com.google.accompanist.navigation.animation.composable import androidx.navigation.navArgument -import com.walletconnect.util.Empty +import com.reown.util.Empty import com.reown.appkit.client.Modal import com.reown.appkit.client.AppKit import com.reown.appkit.ui.navigation.Route diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/connection/RedirectNavigation.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/connection/RedirectNavigation.kt index 602399b82..4ce85f924 100644 --- a/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/connection/RedirectNavigation.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/connection/RedirectNavigation.kt @@ -8,7 +8,7 @@ import androidx.navigation.NavType import androidx.navigation.navArgument import com.google.accompanist.navigation.animation.composable import com.reown.android.internal.common.modal.data.model.Wallet -import com.walletconnect.util.Empty +import com.reown.util.Empty import com.reown.appkit.ui.navigation.Route import com.reown.appkit.ui.navigation.addTitleArg import com.reown.appkit.ui.routes.connect.ConnectViewModel diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/WalletDataSource.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/WalletDataSource.kt index 70cd22f41..a8fe4b302 100644 --- a/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/WalletDataSource.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/WalletDataSource.kt @@ -5,7 +5,7 @@ import com.reown.android.internal.common.modal.domain.usecase.GetInstalledWallet import com.reown.android.internal.common.modal.domain.usecase.GetSampleWalletsUseCaseInterface import com.reown.android.internal.common.modal.domain.usecase.GetWalletsUseCaseInterface import com.reown.android.internal.common.wcKoinApp -import com.walletconnect.util.Empty +import com.reown.util.Empty import com.reown.appkit.domain.usecase.GetRecentWalletUseCase import com.reown.appkit.engine.AppKitEngine import com.reown.appkit.engine.coinbase.COINBASE_WALLET_ID diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/all_wallets/AllWalletsRoute.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/all_wallets/AllWalletsRoute.kt index 79446df7a..637628195 100644 --- a/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/all_wallets/AllWalletsRoute.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/all_wallets/AllWalletsRoute.kt @@ -50,7 +50,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.reown.android.internal.common.modal.data.model.Wallet import com.reown.modal.utils.isLandscape -import com.walletconnect.util.Empty +import com.reown.util.Empty import com.reown.appkit.R import com.reown.appkit.ui.components.internal.commons.ContentDescription import com.reown.appkit.ui.components.internal.commons.HorizontalSpacer diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/redirect/RedirectWalletScreen.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/redirect/RedirectWalletScreen.kt index 1cf4af83e..4ed8fa2e6 100644 --- a/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/redirect/RedirectWalletScreen.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/redirect/RedirectWalletScreen.kt @@ -34,7 +34,7 @@ import com.reown.android.pulse.model.ConnectionMethod import com.reown.modal.utils.openMobileLink import com.reown.modal.utils.openPlayStore import com.reown.modal.utils.openWebAppLink -import com.walletconnect.util.Empty +import com.reown.util.Empty import com.reown.appkit.client.Modal import com.reown.appkit.domain.delegate.AppKitDelegate import com.reown.appkit.engine.coinbase.isCoinbaseWallet diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/utils/SessionUtils.kt b/product/appkit/src/main/kotlin/com/reown/appkit/utils/SessionUtils.kt index 4f1a81f84..95f2cc765 100644 --- a/product/appkit/src/main/kotlin/com/reown/appkit/utils/SessionUtils.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/utils/SessionUtils.kt @@ -2,7 +2,7 @@ package com.reown.appkit.utils import com.reown.android.internal.utils.CoreValidator import com.reown.sign.client.Sign -import com.walletconnect.util.Empty +import com.reown.util.Empty import com.reown.appkit.client.Modal import com.reown.appkit.client.AppKit import com.reown.appkit.client.models.Account diff --git a/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/AllWalletsRouteTest.kt b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/AllWalletsRouteTest.kt index a7d2f162f..85a35d21b 100644 --- a/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/AllWalletsRouteTest.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/AllWalletsRouteTest.kt @@ -3,7 +3,7 @@ package com.reown.appkit.ui.routes.connect import com.android.resources.NightMode import com.android.resources.ScreenOrientation import com.reown.modal.ui.model.LoadingState -import com.walletconnect.util.Empty +import com.reown.util.Empty import com.reown.appkit.ui.navigation.Route import com.reown.appkit.ui.previews.testWallets import com.reown.appkit.ui.routes.connect.all_wallets.AllWalletsRoute diff --git a/product/walletkit/build.gradle.kts b/product/walletkit/build.gradle.kts index 7746b3929..3268e47b6 100644 --- a/product/walletkit/build.gradle.kts +++ b/product/walletkit/build.gradle.kts @@ -7,9 +7,9 @@ plugins { } project.apply { - extra[KEY_PUBLISH_ARTIFACT_ID] = WEB_3_WALLET - extra[KEY_PUBLISH_VERSION] = WEB_3_WALLET_VERSION - extra[KEY_SDK_NAME] = "web3wallet" + extra[KEY_PUBLISH_ARTIFACT_ID] = WALLETKIT + extra[KEY_PUBLISH_VERSION] = WALLETKIT_VERSION + extra[KEY_SDK_NAME] = "walletkit" } android { @@ -60,6 +60,6 @@ dependencies { debugImplementation(project(":core:android")) debugImplementation(project(":protocol:sign")) - releaseImplementation("com.walletconnect:android-core:$CORE_VERSION") - releaseImplementation("com.walletconnect:sign:$SIGN_VERSION") + releaseImplementation("com.reown:android-core:$CORE_VERSION") + releaseImplementation("com.reown:sign:$SIGN_VERSION") } \ No newline at end of file diff --git a/product/walletkit/src/main/AndroidManifest.xml b/product/walletkit/src/main/AndroidManifest.xml index 9bb540c41..560dc5b67 100644 --- a/product/walletkit/src/main/AndroidManifest.xml +++ b/product/walletkit/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + \ No newline at end of file diff --git a/protocol/notify/build.gradle.kts b/protocol/notify/build.gradle.kts index d9804e642..84f6571f1 100644 --- a/protocol/notify/build.gradle.kts +++ b/protocol/notify/build.gradle.kts @@ -85,7 +85,7 @@ sqldelight { dependencies { debugImplementation(project(":core:android")) - releaseImplementation("com.walletconnect:android-core:$CORE_VERSION") + releaseImplementation("com.reown:android-core:$CORE_VERSION") implementation("com.squareup.retrofit2:converter-scalars:2.9.0") ksp(libs.moshi.ksp) diff --git a/protocol/notify/src/main/kotlin/com/reown/notify/common/model/NotifyRpc.kt b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/NotifyRpc.kt index 8ae8c1071..5facc4952 100644 --- a/protocol/notify/src/main/kotlin/com/reown/notify/common/model/NotifyRpc.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/common/model/NotifyRpc.kt @@ -7,7 +7,7 @@ import com.squareup.moshi.JsonClass import com.reown.android.internal.common.model.params.CoreNotifyParams import com.reown.android.internal.common.model.type.JsonRpcClientSync import com.reown.notify.common.JsonRpcMethod -import com.walletconnect.util.generateId +import com.reown.util.generateId internal sealed class NotifyRpc : JsonRpcClientSync { diff --git a/protocol/notify/src/main/kotlin/com/reown/notify/di/NotifyJsonRpcModule.kt b/protocol/notify/src/main/kotlin/com/reown/notify/di/NotifyJsonRpcModule.kt index e5417e06c..39d0e81e3 100644 --- a/protocol/notify/src/main/kotlin/com/reown/notify/di/NotifyJsonRpcModule.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/di/NotifyJsonRpcModule.kt @@ -4,8 +4,8 @@ package com.reown.notify.di import com.reown.notify.common.JsonRpcMethod import com.reown.notify.common.model.NotifyRpc -import com.walletconnect.utils.addDeserializerEntry -import com.walletconnect.utils.addSerializerEntry +import com.reown.utils.addDeserializerEntry +import com.reown.utils.addSerializerEntry import org.koin.dsl.module @JvmSynthetic diff --git a/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/ExtractPublicKeysFromDidJsonUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/ExtractPublicKeysFromDidJsonUseCase.kt index c9037573a..13fdfb791 100644 --- a/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/ExtractPublicKeysFromDidJsonUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/ExtractPublicKeysFromDidJsonUseCase.kt @@ -10,7 +10,7 @@ import com.reown.notify.client.InvalidDidJsonFileException import com.reown.notify.data.wellknown.did.DidJsonDTO import com.reown.notify.data.wellknown.did.VerificationMethodDTO import com.reown.notify.engine.calls.DidJsonPublicKeyPair -import com.walletconnect.util.bytesToHex +import com.reown.util.bytesToHex import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.net.URL diff --git a/protocol/sign/ReadMe.md b/protocol/sign/ReadMe.md index f4c319ed1..464903ec5 100644 --- a/protocol/sign/ReadMe.md +++ b/protocol/sign/ReadMe.md @@ -36,9 +36,9 @@ allprojects { app/build.gradle.kts ```gradle -implementation(platform("com.walletconnect:android-bom:{BOM version}")) -implementation("com.walletconnect:android-core") -implementation("com.walletconnect:sign") +implementation(platform("com.reown:android-bom:{BOM version}")) +implementation("com.reown:android-core") +implementation("com.reown:sign") ```   diff --git a/protocol/sign/build.gradle.kts b/protocol/sign/build.gradle.kts index 300947407..3ec02cab1 100644 --- a/protocol/sign/build.gradle.kts +++ b/protocol/sign/build.gradle.kts @@ -100,7 +100,7 @@ sqldelight { dependencies { debugImplementation(project(":core:android")) - releaseImplementation("com.walletconnect:android-core:$CORE_VERSION") + releaseImplementation("com.reown:android-core:$CORE_VERSION") ksp(libs.moshi.ksp) implementation(libs.bundles.sqlDelight) diff --git a/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/client/SessionAuthenticateInstrumentedAndroidTest.kt b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/client/SessionAuthenticateInstrumentedAndroidTest.kt index bb7101c0d..b53c8a241 100644 --- a/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/client/SessionAuthenticateInstrumentedAndroidTest.kt +++ b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/client/SessionAuthenticateInstrumentedAndroidTest.kt @@ -20,7 +20,7 @@ import com.reown.sign.test.utils.globalOnError import com.reown.sign.test.utils.wallet.WalletDelegate import com.reown.sign.test.utils.wallet.WalletSignClient import com.reown.sign.test.utils.wallet.walletClientRespondToRequest -import com.walletconnect.util.hexToBytes +import com.reown.util.hexToBytes import org.junit.Rule import org.junit.Test import org.web3j.utils.Numeric diff --git a/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/dapp/DappSignClient.kt b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/dapp/DappSignClient.kt index 0108821e3..c2d7147e6 100644 --- a/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/dapp/DappSignClient.kt +++ b/protocol/sign/src/androidTest/kotlin/com/reown/sign/test/utils/dapp/DappSignClient.kt @@ -7,8 +7,8 @@ import com.reown.sign.test.utils.globalOnError import com.reown.sign.test.utils.proposalNamespaces import com.reown.sign.test.utils.sessionChains import com.reown.sign.test.utils.sessionMethods -import com.walletconnect.util.bytesToHex -import com.walletconnect.util.randomBytes +import com.reown.util.bytesToHex +import com.reown.util.randomBytes import timber.log.Timber val DappSignClient = TestClient.Dapp.signClient diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/session/SignRpc.kt b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/session/SignRpc.kt index c0925463d..adb6cad09 100644 --- a/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/session/SignRpc.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/session/SignRpc.kt @@ -7,7 +7,7 @@ import com.squareup.moshi.JsonClass import com.reown.android.internal.common.model.type.JsonRpcClientSync import com.reown.sign.common.model.vo.clientsync.session.params.SignParams import com.reown.sign.json_rpc.model.JsonRpcMethod -import com.walletconnect.util.generateId +import com.reown.util.generateId internal sealed class SignRpc : JsonRpcClientSync { diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/session/params/SignParams.kt b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/session/params/SignParams.kt index 24b6f2683..8e5815db7 100644 --- a/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/session/params/SignParams.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/common/model/vo/clientsync/session/params/SignParams.kt @@ -13,7 +13,7 @@ import com.reown.sign.common.model.vo.clientsync.common.Requester import com.reown.sign.common.model.vo.clientsync.common.SessionParticipant import com.reown.sign.common.model.vo.clientsync.session.payload.SessionEventVO import com.reown.sign.common.model.vo.clientsync.session.payload.SessionRequestVO -import com.walletconnect.utils.DefaultId +import com.reown.utils.DefaultId internal sealed class SignParams : CoreSignParams() { diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/di/SignJsonRpcModule.kt b/protocol/sign/src/main/kotlin/com/reown/sign/di/SignJsonRpcModule.kt index def194645..0e9c2a35b 100644 --- a/protocol/sign/src/main/kotlin/com/reown/sign/di/SignJsonRpcModule.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/di/SignJsonRpcModule.kt @@ -8,9 +8,9 @@ import com.reown.sign.common.model.vo.clientsync.session.SignRpc import com.reown.sign.common.model.vo.clientsync.session.payload.SessionEventVO import com.reown.sign.common.model.vo.clientsync.session.payload.SessionRequestVO import com.reown.sign.json_rpc.model.JsonRpcMethod -import com.walletconnect.utils.addDeserializerEntry -import com.walletconnect.utils.addJsonAdapter -import com.walletconnect.utils.addSerializerEntry +import com.reown.utils.addDeserializerEntry +import com.reown.utils.addJsonAdapter +import com.reown.utils.addSerializerEntry import org.koin.dsl.module @JvmSynthetic diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/domain/SignEngine.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/domain/SignEngine.kt index a0603f1fd..f9f571ab9 100644 --- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/domain/SignEngine.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/domain/SignEngine.kt @@ -73,8 +73,8 @@ import com.reown.sign.json_rpc.model.JsonRpcMethod import com.reown.sign.storage.authenticate.AuthenticateResponseTopicRepository import com.reown.sign.storage.proposal.ProposalStorageRepository import com.reown.sign.storage.sequence.SessionStorageRepository -import com.walletconnect.utils.Empty -import com.walletconnect.utils.isSequenceValid +import com.reown.utils.Empty +import com.reown.utils.isSequenceValid import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.delay diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/model/mapper/EngineMapper.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/model/mapper/EngineMapper.kt index f8e7be93e..c988fa822 100644 --- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/model/mapper/EngineMapper.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/model/mapper/EngineMapper.kt @@ -29,7 +29,7 @@ import com.reown.sign.common.model.vo.sequence.SessionVO import com.reown.sign.engine.model.EngineDO import com.reown.sign.engine.model.ValidationError import com.reown.sign.json_rpc.model.JsonRpcMethod -import com.walletconnect.util.Empty +import com.reown.util.Empty import java.net.URI import java.text.SimpleDateFormat import java.util.Calendar diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/EmitEventUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/EmitEventUseCase.kt index efc539e4e..34bd4df73 100644 --- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/EmitEventUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/EmitEventUseCase.kt @@ -19,7 +19,7 @@ import com.reown.sign.common.model.vo.clientsync.session.payload.SessionEventVO import com.reown.sign.common.validator.SignValidator import com.reown.sign.engine.model.EngineDO import com.reown.sign.storage.sequence.SessionStorageRepository -import com.walletconnect.util.generateId +import com.reown.util.generateId import kotlinx.coroutines.supervisorScope internal class EmitEventUseCase( diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetSessionsUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetSessionsUseCase.kt index 048232f3a..3d754f2b4 100644 --- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetSessionsUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/GetSessionsUseCase.kt @@ -6,7 +6,7 @@ import com.reown.android.internal.common.storage.metadata.MetadataStorageReposit import com.reown.sign.engine.model.EngineDO import com.reown.sign.engine.model.mapper.toEngineDO import com.reown.sign.storage.sequence.SessionStorageRepository -import com.walletconnect.utils.isSequenceValid +import com.reown.utils.isSequenceValid import kotlinx.coroutines.supervisorScope internal class GetSessionsUseCase( diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/SessionAuthenticateUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/SessionAuthenticateUseCase.kt index 024e4f4d5..7fb792641 100644 --- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/SessionAuthenticateUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/SessionAuthenticateUseCase.kt @@ -39,7 +39,7 @@ import com.reown.sign.engine.model.mapper.toCommon import com.reown.sign.engine.model.mapper.toMapOfEngineNamespacesOptional import com.reown.sign.storage.authenticate.AuthenticateResponseTopicRepository import com.reown.sign.storage.link_mode.LinkModeStorageRepository -import com.walletconnect.utils.Empty +import com.reown.utils.Empty import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.async import kotlinx.coroutines.launch diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionRequestUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionRequestUseCase.kt index 2c4f1c4da..58995bbd8 100644 --- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionRequestUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionRequestUseCase.kt @@ -34,7 +34,7 @@ import com.reown.sign.engine.model.mapper.toEngineDO import com.reown.sign.engine.model.mapper.toPeerError import com.reown.sign.engine.sessionRequestEventsQueue import com.reown.sign.storage.sequence.SessionStorageRepository -import com.walletconnect.utils.Empty +import com.reown.utils.Empty import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionSettleUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionSettleUseCase.kt index a724d6ecc..0c23cc7e2 100644 --- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionSettleUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionSettleUseCase.kt @@ -25,7 +25,7 @@ import com.reown.sign.engine.model.mapper.toPeerError import com.reown.sign.engine.model.mapper.toSessionApproved import com.reown.sign.storage.proposal.ProposalStorageRepository import com.reown.sign.storage.sequence.SessionStorageRepository -import com.walletconnect.utils.Empty +import com.reown.utils.Empty import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionUpdateUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionUpdateUseCase.kt index 44f44ad9c..c109b98f0 100644 --- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionUpdateUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/requests/OnSessionUpdateUseCase.kt @@ -18,7 +18,7 @@ import com.reown.sign.common.validator.SignValidator import com.reown.sign.engine.model.EngineDO import com.reown.sign.engine.model.mapper.toMapOfEngineNamespacesSession import com.reown.sign.storage.sequence.SessionStorageRepository -import com.walletconnect.utils.extractTimestamp +import com.reown.utils.extractTimestamp import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/responses/OnSessionUpdateResponseUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/responses/OnSessionUpdateResponseUseCase.kt index 8a1296f9f..e0ca10066 100644 --- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/responses/OnSessionUpdateResponseUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/responses/OnSessionUpdateResponseUseCase.kt @@ -8,7 +8,7 @@ import com.reown.foundation.util.Logger import com.reown.sign.engine.model.EngineDO import com.reown.sign.engine.model.mapper.toMapOfEngineNamespacesSession import com.reown.sign.storage.sequence.SessionStorageRepository -import com.walletconnect.utils.extractTimestamp +import com.reown.utils.extractTimestamp import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/storage/sequence/SessionStorageRepository.kt b/protocol/sign/src/main/kotlin/com/reown/sign/storage/sequence/SessionStorageRepository.kt index 1a1ae20a0..cff86c4b9 100644 --- a/protocol/sign/src/main/kotlin/com/reown/sign/storage/sequence/SessionStorageRepository.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/storage/sequence/SessionStorageRepository.kt @@ -15,8 +15,8 @@ import com.reown.sign.storage.data.dao.optionalnamespaces.OptionalNamespaceDaoQu import com.reown.sign.storage.data.dao.proposalnamespace.ProposalNamespaceDaoQueries import com.reown.sign.storage.data.dao.session.SessionDaoQueries import com.reown.sign.storage.data.dao.temp.TempNamespaceDaoQueries -import com.walletconnect.utils.Empty -import com.walletconnect.utils.isSequenceValid +import com.reown.utils.Empty +import com.reown.utils.isSequenceValid internal class SessionStorageRepository( private val sessionDaoQueries: SessionDaoQueries, diff --git a/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCaseTest.kt index 72b72846c..0b6909b98 100644 --- a/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCaseTest.kt @@ -27,8 +27,8 @@ import com.reown.sign.common.model.vo.clientsync.common.Requester import com.reown.sign.common.model.vo.clientsync.session.params.SignParams import com.reown.sign.json_rpc.domain.GetPendingSessionAuthenticateRequest import com.reown.sign.storage.sequence.SessionStorageRepository -import com.walletconnect.util.bytesToHex -import com.walletconnect.util.randomBytes +import com.reown.util.bytesToHex +import com.reown.util.randomBytes import io.mockk.Runs import io.mockk.coEvery import io.mockk.coVerify diff --git a/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/RejectSessionAuthenticateUseCaseTest.kt b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/RejectSessionAuthenticateUseCaseTest.kt index 58bc50b48..fa0222570 100644 --- a/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/RejectSessionAuthenticateUseCaseTest.kt +++ b/protocol/sign/src/test/kotlin/com/reown/sign/engine/use_case/calls/RejectSessionAuthenticateUseCaseTest.kt @@ -19,8 +19,8 @@ import com.reown.sign.common.model.vo.clientsync.common.PayloadParams import com.reown.sign.common.model.vo.clientsync.common.Requester import com.reown.sign.common.model.vo.clientsync.session.params.SignParams import com.reown.sign.json_rpc.domain.GetPendingSessionAuthenticateRequest -import com.walletconnect.util.bytesToHex -import com.walletconnect.util.randomBytes +import com.reown.util.bytesToHex +import com.reown.util.randomBytes import io.mockk.Runs import io.mockk.coEvery import io.mockk.coVerify diff --git a/sample/dapp/build.gradle.kts b/sample/dapp/build.gradle.kts index 199359708..5246de15b 100644 --- a/sample/dapp/build.gradle.kts +++ b/sample/dapp/build.gradle.kts @@ -104,8 +104,8 @@ dependencies { internalImplementation(project(":product:appkit")) internalImplementation(project(":protocol:sign")) - releaseImplementation(platform("com.walletconnect:android-bom:$BOM_VERSION")) - releaseImplementation("com.walletconnect:android-core") - releaseImplementation("com.walletconnect:web3modal") - releaseImplementation("com.walletconnect:sign") + releaseImplementation(platform("com.reown:android-bom:$BOM_VERSION")) + releaseImplementation("com.reown:android-core") + releaseImplementation("com.reown:web3modal") + releaseImplementation("com.reown:sign") } diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/DappSampleApp.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/DappSampleApp.kt index 02f4a4ac0..0f19333fc 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/DappSampleApp.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/DappSampleApp.kt @@ -7,8 +7,8 @@ import com.google.firebase.ktx.Firebase import com.reown.android.Core import com.reown.android.CoreClient import com.reown.sample.common.tag -import com.walletconnect.util.bytesToHex -import com.walletconnect.util.randomBytes +import com.reown.util.bytesToHex +import com.reown.util.randomBytes import com.reown.appkit.client.AppKit import com.reown.appkit.client.Modal import com.reown.appkit.presets.AppKitChainsPresets diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt index 2302d1c80..041c7bffc 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt @@ -12,8 +12,8 @@ import com.reown.sample.dapp.domain.DappDelegate import com.reown.sample.dapp.ui.DappSampleEvents import com.reown.sign.client.Sign import com.reown.sign.client.SignClient -import com.walletconnect.util.bytesToHex -import com.walletconnect.util.randomBytes +import com.reown.util.bytesToHex +import com.reown.util.randomBytes import com.reown.appkit.client.AppKit import com.reown.appkit.client.Modal import kotlinx.coroutines.flow.MutableSharedFlow diff --git a/sample/modal/build.gradle.kts b/sample/modal/build.gradle.kts index 7db2b9c63..9707a2286 100644 --- a/sample/modal/build.gradle.kts +++ b/sample/modal/build.gradle.kts @@ -95,7 +95,7 @@ dependencies { internalImplementation(project(":core:android")) internalImplementation(project(":product:appkit")) - releaseImplementation(platform("com.walletconnect:android-bom:$BOM_VERSION")) - releaseImplementation("com.walletconnect:android-core") - releaseImplementation("com.walletconnect:web3modal") + releaseImplementation(platform("com.reown:android-bom:$BOM_VERSION")) + releaseImplementation("com.reown:android-core") + releaseImplementation("com.reown:web3modal") } \ No newline at end of file diff --git a/sample/modal/src/main/kotlin/com/reown/sample/modal/AppKitApp.kt b/sample/modal/src/main/kotlin/com/reown/sample/modal/AppKitApp.kt index 67f0555c5..ba0e406a9 100644 --- a/sample/modal/src/main/kotlin/com/reown/sample/modal/AppKitApp.kt +++ b/sample/modal/src/main/kotlin/com/reown/sample/modal/AppKitApp.kt @@ -8,8 +8,8 @@ import com.reown.android.Core import com.reown.android.CoreClient import com.reown.android.relay.ConnectionType import com.reown.sample.common.tag -import com.walletconnect.util.bytesToHex -import com.walletconnect.util.randomBytes +import com.reown.util.bytesToHex +import com.reown.util.randomBytes import com.reown.appkit.client.Modal import com.reown.appkit.client.AppKit import com.reown.appkit.presets.AppKitChainsPresets diff --git a/sample/wallet/build.gradle.kts b/sample/wallet/build.gradle.kts index 68982bcab..6529d39a0 100644 --- a/sample/wallet/build.gradle.kts +++ b/sample/wallet/build.gradle.kts @@ -130,8 +130,8 @@ dependencies { internalImplementation(project(":product:walletkit")) internalImplementation(project(":protocol:notify")) - releaseImplementation(platform("com.walletconnect:android-bom:$BOM_VERSION")) - releaseImplementation("com.walletconnect:android-core") - releaseImplementation("com.walletconnect:web3wallet") - releaseImplementation("com.walletconnect:notify") + releaseImplementation(platform("com.reown:android-bom:$BOM_VERSION")) + releaseImplementation("com.reown:android-core") + releaseImplementation("com.reown:web3wallet") + releaseImplementation("com.reown:notify") } diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitApplication.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitApplication.kt index 38e30dff5..03f07d2d4 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitApplication.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitApplication.kt @@ -33,7 +33,7 @@ import com.reown.sample.wallet.domain.NotifyDelegate import com.reown.sample.wallet.domain.mixPanel import com.reown.sample.wallet.ui.state.ConnectionState import com.reown.sample.wallet.ui.state.connectionStateFlow -import com.walletconnect.util.hexToBytes +import com.reown.util.hexToBytes import com.reown.walletkit.client.Wallet import com.reown.walletkit.client.WalletKit import kotlinx.coroutines.CoroutineScope diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/TestAccounts.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/TestAccounts.kt index 9e99546cc..fbe9691fe 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/TestAccounts.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/domain/TestAccounts.kt @@ -1,7 +1,7 @@ package com.reown.sample.wallet.domain import com.reown.sample.common.Chains -import com.walletconnect.util.hexToBytes +import com.reown.util.hexToBytes import io.ipfs.multibase.Base16 val ACCOUNTS_1_EIP155_ADDRESS by lazy { EthAccountDelegate.account } diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt index 7fd1d3f58..9bdb94af8 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_authenticate/SessionAuthenticateViewModel.kt @@ -11,7 +11,7 @@ import com.reown.sample.wallet.domain.EthAccountDelegate import com.reown.sample.wallet.domain.WCDelegate import com.reown.sample.wallet.ui.common.peer.PeerUI import com.reown.sample.wallet.ui.common.peer.toPeerUI -import com.walletconnect.util.hexToBytes +import com.reown.util.hexToBytes import com.reown.walletkit.client.Wallet import com.reown.walletkit.client.WalletKit import com.reown.walletkit.utils.CacaoSigner diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt index eaa286689..19f15b78a 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/session_request/SessionRequestViewModel.kt @@ -13,7 +13,7 @@ import com.reown.sample.wallet.domain.EthAccountDelegate import com.reown.sample.wallet.domain.WCDelegate import com.reown.sample.wallet.ui.common.peer.PeerUI import com.reown.sample.wallet.ui.common.peer.toPeerUI -import com.walletconnect.util.hexToBytes +import com.reown.util.hexToBytes import com.reown.walletkit.client.Wallet import com.reown.walletkit.client.WalletKit import com.reown.walletkit.utils.CacaoSigner diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/snackbar_message/SnackbarMessageRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/snackbar_message/SnackbarMessageRoute.kt index b31184558..34d5a22c6 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/snackbar_message/SnackbarMessageRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/dialog_routes/snackbar_message/SnackbarMessageRoute.kt @@ -16,7 +16,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp import androidx.navigation.NavController import com.reown.sample.common.ui.themedColor -import com.walletconnect.util.Empty +import com.reown.util.Empty import kotlinx.coroutines.delay @Composable diff --git a/sample/wallet/src/test/kotlin/com/reown/sample/wallet/domain/EthAccountDelegateTest.kt b/sample/wallet/src/test/kotlin/com/reown/sample/wallet/domain/EthAccountDelegateTest.kt index 125d7317c..d82e12e58 100644 --- a/sample/wallet/src/test/kotlin/com/reown/sample/wallet/domain/EthAccountDelegateTest.kt +++ b/sample/wallet/src/test/kotlin/com/reown/sample/wallet/domain/EthAccountDelegateTest.kt @@ -4,7 +4,7 @@ import com.reown.android.cacao.signature.SignatureType import com.reown.android.internal.common.model.ProjectId import com.reown.android.internal.common.signing.message.MessageSignatureVerifier import com.reown.android.utils.cacao.sign -import com.walletconnect.util.hexToBytes +import com.reown.util.hexToBytes import com.reown.walletkit.utils.CacaoSigner import junit.framework.TestCase.assertEquals import junit.framework.TestCase.assertFalse From cb2380d3ad1881cd975f6c20f8dc1c6925dbb588 Mon Sep 17 00:00:00 2001 From: kubel Date: Thu, 5 Sep 2024 10:29:55 +0200 Subject: [PATCH 27/51] Change group id for maven central --- buildSrc/src/main/kotlin/publish-module-android.gradle.kts | 2 +- buildSrc/src/main/kotlin/publish-module-java.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/publish-module-android.gradle.kts b/buildSrc/src/main/kotlin/publish-module-android.gradle.kts index 098806a22..7df4c11c7 100644 --- a/buildSrc/src/main/kotlin/publish-module-android.gradle.kts +++ b/buildSrc/src/main/kotlin/publish-module-android.gradle.kts @@ -36,7 +36,7 @@ afterEvaluate { artifact(tasks.getByName("javadocJar")) artifact(tasks.getByName("sourcesJar")) - groupId = "com.walletconnect" + groupId = "com.reown" artifactId = requireNotNull(project.extra[KEY_PUBLISH_ARTIFACT_ID]).toString() version = requireNotNull(project.extra[KEY_PUBLISH_VERSION]).toString() diff --git a/buildSrc/src/main/kotlin/publish-module-java.gradle.kts b/buildSrc/src/main/kotlin/publish-module-java.gradle.kts index 3872dce24..1083e7678 100644 --- a/buildSrc/src/main/kotlin/publish-module-java.gradle.kts +++ b/buildSrc/src/main/kotlin/publish-module-java.gradle.kts @@ -32,7 +32,7 @@ afterEvaluate { from(components["javaPlatform"]) } - groupId = "com.walletconnect" + groupId = "com.reown" artifactId = requireNotNull(extra.get(KEY_PUBLISH_ARTIFACT_ID)).toString() version = requireNotNull(extra.get(KEY_PUBLISH_VERSION)).toString() From 77792a6d41994c26edb53cf701ba2feb4e03b3c9 Mon Sep 17 00:00:00 2001 From: kubel Date: Thu, 5 Sep 2024 10:46:26 +0200 Subject: [PATCH 28/51] Migrate last deps imports --- .../com/reown/appkit/ui/navigation/account/Navigation.kt | 5 ++--- sample/dapp/build.gradle.kts | 2 +- sample/modal/build.gradle.kts | 2 +- sample/wallet/build.gradle.kts | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/account/Navigation.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/account/Navigation.kt index 7d4055170..ffb2d8fb1 100644 --- a/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/account/Navigation.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/account/Navigation.kt @@ -1,5 +1,3 @@ -@file:OptIn(ExperimentalAnimationApi::class) - package com.reown.appkit.ui.navigation.account import androidx.compose.animation.ExperimentalAnimationApi @@ -20,12 +18,13 @@ private const val CHAIN_ID_ARG = "{chainId}" internal fun Modal.Model.Chain.toChainSwitchPath() = Route.CHAIN_SWITCH_REDIRECT.path + "/${id}&${chainName}" +@OptIn(ExperimentalAnimationApi::class) internal fun NavGraphBuilder.chainSwitchRoute( accountViewModel: AccountViewModel ) { composable( route = Route.CHAIN_SWITCH_REDIRECT.path + "/" + CHAIN_ID_ARG + addTitleArg(), - arguments = listOf(navArgument(CHAIN_ID_KEY) { type = NavType.StringType } ) + arguments = listOf(navArgument(CHAIN_ID_KEY) { type = NavType.StringType }) ) { backStackEntry -> val chainId = backStackEntry.arguments?.getString(CHAIN_ID_KEY, String.Empty) val chain = AppKit.chains.find { it.id == chainId } diff --git a/sample/dapp/build.gradle.kts b/sample/dapp/build.gradle.kts index 5246de15b..3f2fdd5b7 100644 --- a/sample/dapp/build.gradle.kts +++ b/sample/dapp/build.gradle.kts @@ -106,6 +106,6 @@ dependencies { releaseImplementation(platform("com.reown:android-bom:$BOM_VERSION")) releaseImplementation("com.reown:android-core") - releaseImplementation("com.reown:web3modal") + releaseImplementation("com.reown:appkit") releaseImplementation("com.reown:sign") } diff --git a/sample/modal/build.gradle.kts b/sample/modal/build.gradle.kts index 9707a2286..8adbb8b76 100644 --- a/sample/modal/build.gradle.kts +++ b/sample/modal/build.gradle.kts @@ -97,5 +97,5 @@ dependencies { releaseImplementation(platform("com.reown:android-bom:$BOM_VERSION")) releaseImplementation("com.reown:android-core") - releaseImplementation("com.reown:web3modal") + releaseImplementation("com.reown:appkit") } \ No newline at end of file diff --git a/sample/wallet/build.gradle.kts b/sample/wallet/build.gradle.kts index 6529d39a0..a36aa158b 100644 --- a/sample/wallet/build.gradle.kts +++ b/sample/wallet/build.gradle.kts @@ -132,6 +132,6 @@ dependencies { releaseImplementation(platform("com.reown:android-bom:$BOM_VERSION")) releaseImplementation("com.reown:android-core") - releaseImplementation("com.reown:web3wallet") + releaseImplementation("com.reown:walletkit") releaseImplementation("com.reown:notify") } From 62b03a4b244b8f4a9832fc1a986baa5e603d54fa Mon Sep 17 00:00:00 2001 From: kubel Date: Thu, 5 Sep 2024 11:00:22 +0200 Subject: [PATCH 29/51] Clean up --- .../com/reown/appkit/ui/navigation/account/Navigation.kt | 5 +++-- sample/dapp/build.gradle.kts | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/account/Navigation.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/account/Navigation.kt index ffb2d8fb1..7d4055170 100644 --- a/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/account/Navigation.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/account/Navigation.kt @@ -1,3 +1,5 @@ +@file:OptIn(ExperimentalAnimationApi::class) + package com.reown.appkit.ui.navigation.account import androidx.compose.animation.ExperimentalAnimationApi @@ -18,13 +20,12 @@ private const val CHAIN_ID_ARG = "{chainId}" internal fun Modal.Model.Chain.toChainSwitchPath() = Route.CHAIN_SWITCH_REDIRECT.path + "/${id}&${chainName}" -@OptIn(ExperimentalAnimationApi::class) internal fun NavGraphBuilder.chainSwitchRoute( accountViewModel: AccountViewModel ) { composable( route = Route.CHAIN_SWITCH_REDIRECT.path + "/" + CHAIN_ID_ARG + addTitleArg(), - arguments = listOf(navArgument(CHAIN_ID_KEY) { type = NavType.StringType }) + arguments = listOf(navArgument(CHAIN_ID_KEY) { type = NavType.StringType } ) ) { backStackEntry -> val chainId = backStackEntry.arguments?.getString(CHAIN_ID_KEY, String.Empty) val chain = AppKit.chains.find { it.id == chainId } diff --git a/sample/dapp/build.gradle.kts b/sample/dapp/build.gradle.kts index 3f2fdd5b7..9df393388 100644 --- a/sample/dapp/build.gradle.kts +++ b/sample/dapp/build.gradle.kts @@ -23,7 +23,7 @@ android { useSupportLibrary = true } buildConfigField("String", "PROJECT_ID", "\"${System.getenv("WC_CLOUD_PROJECT_ID") ?: ""}\"") - buildConfigField("String", "BOM_VERSION", "\"${BOM_VERSION ?: ""}\"") + buildConfigField("String", "BOM_VERSION", "\"${BOM_VERSION}\"") } buildTypes { From fdfb90ff6cf48033a9780fa5ccd6c21154e3ddf5 Mon Sep 17 00:00:00 2001 From: kubel Date: Thu, 5 Sep 2024 14:21:35 +0200 Subject: [PATCH 30/51] Update --- ReadMe.md | 106 +++++++++--------- buildSrc/src/main/kotlin/Versions.kt | 16 +-- .../main/kotlin/release-scripts.gradle.kts | 5 +- settings.gradle.kts | 2 +- 4 files changed, 64 insertions(+), 65 deletions(-) diff --git a/ReadMe.md b/ReadMe.md index 1b6193cf4..bde47402e 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -22,59 +22,59 @@ dependencies { ## SDK Chart -| BOM | [Core SDK](core/android) | [Sign SDK](protocol/sign) | [Notify SDK](protocol/notify) | [WalletKit](product/web3wallet) | [AppKit](product/web3modal) | -|-----------------------------------------------------------------------------------------|--------------------------|---------------------------|:------------------------------|---------------------------------|-----------------------------| -| 1.35.1 | 1.35.1 | 2.35.1 | 1.3.10 | 1.35.1 | 1.6.5 | -| 1.35.0 | 1.35.0 | 2.35.0 | 1.3.9 | 1.35.0 | 1.6.4 | -| 1.34.1 | 1.34.1 | 2.34.1 | 1.3.8 | 1.34.1 | 1.6.3 | -| 1.34.0 | 1.34.0 | 2.34.0 | 1.3.7 | 1.34.0 | 1.6.2 | -| 1.33.1 | 1.33.1 | 2.33.1 | 1.3.6 | 1.33.1 | 1.6.1 | -| 1.33.0 | 1.33.0 | 2.33.0 | 1.3.5 | 1.33.0 | 1.6.0 | -| 1.32.1 | 1.32.0 | 2.32.0 | 1.3.4 | 1.32.1 | 1.5.4 | -| 1.31.3 | 1.31.2 | 2.31.2 | 1.3.2 | 1.31.2 | 1.5.2 | -| 1.31.1 | 1.31.1 | 2.31.1 | 1.3.1 | 1.31.1 | 1.5.1 | -| 1.31.0[**](https://gist.github.com/TalhaAli00/7b9e1cadf19b9dc5141cd033aa4e6172) | 1.31.0 | 2.31.0 | 1.3.0 | 1.31.0 | 1.5.0 | -| 1.30.0 | 1.30.0 | 2.30.0 | 1.2.0 | 1.30.0 | 1.4.0 | -| 1.23.0 | 1.28.0 | 2.26.0 | 1.1.0 | 1.21.0 | 1.3.0 | -| 1.22.2 | 1.27.2 | 2.25.2 | 1.0.2 | 1.20.2 | 1.2.2 | -| 1.22.1 | 1.27.0 | 2.25.0 | 1.0.0 | 1.20.0 | 1.2.1 | -| 1.22.0 | 1.27.0 | 2.25.0 | 1.0.0 | 1.20.0 | 1.2.0 | -| 1.21.1 | 1.26.0 | 2.24.0 | 1.0.0-beta04 | 1.19.0 | 1.1.1 | -| 1.21.0 | 1.26.0 | 2.24.0 | 1.0.0-beta04 | 1.19.0 | 1.1.0 | -| 1.20.0 | 1.25.0 | 2.23.0 | 1.0.0-beta03 | 1.18.0 | 1.0.0 | -| 1.19.1 | 1.24.0 | 2.22.0 | 1.0.0-beta02 | 1.17.0 | 1.0.0-beta02 | -| 1.19.0 | 1.24.0 | 2.22.0 | 1.0.0-beta02 | 1.17.0 | 1.0.0-beta01 | -| 1.18.0 | 1.23.0 | 2.21.0 | 1.0.0-beta01 | 1.16.0 | 1.0.0-alpha11 | -| 1.17.2 | 1.22.1 | 2.20.1 | 1.0.0-alpha05 | 1.15.1 | 1.0.0-alpha10 | -| 1.17.1 | 1.22.0 | 2.20.0 | 1.0.0-alpha04 | 1.15.0 | 1.0.0-alpha09 | -| 1.17.0 | 1.22.0 | 2.20.0 | 1.0.0-alpha03 | 1.15.0 | 1.0.0-alpha09 | -| 1.16.0 | 1.21.0 | 2.19.0 | 1.0.0-alpha02 | 1.14.0 | | -| 1.15.0 | 1.20.0 | 2.18.0 | | 1.13.0 | | -| 1.14.0 | 1.19.0 | 2.17.0 | | 1.12.0 | | -| 1.13.1 | 1.18.0 | 2.16.0 | | 1.11.0 | | -| 1.12.0 | 1.17.0 | 2.15.0 | | 1.10.0 | | -| 1.11.1 | 1.16.1 | 2.14.1 | | 1.9.1 | | -| 1.11.0 | 1.16.0 | 2.14.0 | | 1.9.0 | | -| 1.10.0 | 1.15.0 | 2.13.0 | | 1.8.0 | | -| 1.9.3 | 1.14.3 | 2.12.3 | | 1.7.3 | | -| 1.9.2 | 1.14.2 | 2.12.2 | | 1.7.2 | | -| 1.9.1 | 1.14.1 | 2.12.1 | | 1.7.1 | | -| 1.9.0[**](https://github.com/WalletConnect/WalletConnectKotlinV2/issues/821) | 1.14.0 | 2.12.0 | | 1.7.0 | | -| 1.8.0 | 1.13.0 | 2.11.0 | | 1.6.0 | | -| 1.7.0 | 1.12.0 | 2.10.0 | | 1.5.0 | | -| 1.6.1 | 1.11.1 | 2.9.1 | | 1.4.1 | | -| 1.6.0 | 1.11.0 | 2.9.0 | | 1.4.0 | | -| 1.5.0 | 1.10.0 | 2.8.0 | | 1.3.0 | | -| 1.4.1 | 1.9.1 | 2.7.1 | | 1.2.1 | | -| 1.3.0 | 1.8.0 | 2.6.0 | | 1.1.0 | | -| 1.2.0 | 1.7.0 | 2.5.0 | | 1.0.0 | | -| 1.1.1 | 1.6.0 | 2.4.0 | | | | -| 1.0.1 | 1.5.0 | 2.3.1 | | | | -| | 1.4.0 | 2.2.0 | | | | -| | 1.3.0 | 2.1.0 | | | | -| | 1.2.0 | | | | | -| | 1.1.0 | 2.0.0 | | | | -| | 1.0.0 | 2.0.0-rc.5 | | | | +| BOM | [Core SDK](core/android) | [Sign SDK](protocol/sign) | [WalletKit](product/web3wallet) | [AppKit](product/web3modal) | +|-----------------------------------------------------------------------------------------|--------------------------|---------------------------|---------------------------------|-----------------------------| +| 1.35.1 | 1.35.1 | 2.35.1 | 1.35.1 | 1.6.5 | +| 1.35.0 | 1.35.0 | 2.35.0 | 1.35.0 | 1.6.4 | +| 1.34.1 | 1.34.1 | 2.34.1 | 1.34.1 | 1.6.3 | +| 1.34.0 | 1.34.0 | 2.34.0 | 1.34.0 | 1.6.2 | +| 1.33.1 | 1.33.1 | 2.33.1 | 1.33.1 | 1.6.1 | +| 1.33.0 | 1.33.0 | 2.33.0 | 1.33.0 | 1.6.0 | +| 1.32.1 | 1.32.0 | 2.32.0 | 1.32.1 | 1.5.4 | +| 1.31.3 | 1.31.2 | 2.31.2 | 1.31.2 | 1.5.2 | +| 1.31.1 | 1.31.1 | 2.31.1 | 1.31.1 | 1.5.1 | +| 1.31.0[**](https://gist.github.com/TalhaAli00/7b9e1cadf19b9dc5141cd033aa4e6172) | 1.31.0 | 2.31.0 | 1.31.0 | 1.5.0 | +| 1.30.0 | 1.30.0 | 2.30.0 | 1.30.0 | 1.4.0 | +| 1.23.0 | 1.28.0 | 2.26.0 | 1.21.0 | 1.3.0 | +| 1.22.2 | 1.27.2 | 2.25.2 | 1.20.2 | 1.2.2 | +| 1.22.1 | 1.27.0 | 2.25.0 | 1.20.0 | 1.2.1 | +| 1.22.0 | 1.27.0 | 2.25.0 | 1.20.0 | 1.2.0 | +| 1.21.1 | 1.26.0 | 2.24.0 | 1.19.0 | 1.1.1 | +| 1.21.0 | 1.26.0 | 2.24.0 | 1.19.0 | 1.1.0 | +| 1.20.0 | 1.25.0 | 2.23.0 | 1.18.0 | 1.0.0 | +| 1.19.1 | 1.24.0 | 2.22.0 | 1.17.0 | 1.0.0-beta02 | +| 1.19.0 | 1.24.0 | 2.22.0 | 1.17.0 | 1.0.0-beta01 | +| 1.18.0 | 1.23.0 | 2.21.0 | 1.16.0 | 1.0.0-alpha11 | +| 1.17.2 | 1.22.1 | 2.20.1 | 1.15.1 | 1.0.0-alpha10 | +| 1.17.1 | 1.22.0 | 2.20.0 | 1.15.0 | 1.0.0-alpha09 | +| 1.17.0 | 1.22.0 | 2.20.0 | 1.15.0 | 1.0.0-alpha09 | +| 1.16.0 | 1.21.0 | 2.19.0 | 1.14.0 | | +| 1.15.0 | 1.20.0 | 2.18.0 | 1.13.0 | | +| 1.14.0 | 1.19.0 | 2.17.0 | 1.12.0 | | +| 1.13.1 | 1.18.0 | 2.16.0 | 1.11.0 | | +| 1.12.0 | 1.17.0 | 2.15.0 | 1.10.0 | | +| 1.11.1 | 1.16.1 | 2.14.1 | 1.9.1 | | +| 1.11.0 | 1.16.0 | 2.14.0 | 1.9.0 | | +| 1.10.0 | 1.15.0 | 2.13.0 | 1.8.0 | | +| 1.9.3 | 1.14.3 | 2.12.3 | 1.7.3 | | +| 1.9.2 | 1.14.2 | 2.12.2 | 1.7.2 | | +| 1.9.1 | 1.14.1 | 2.12.1 | 1.7.1 | | +| 1.9.0[**](https://github.com/WalletConnect/WalletConnectKotlinV2/issues/821) | 1.14.0 | 2.12.0 | 1.7.0 | | +| 1.8.0 | 1.13.0 | 2.11.0 | 1.6.0 | | +| 1.7.0 | 1.12.0 | 2.10.0 | 1.5.0 | | +| 1.6.1 | 1.11.1 | 2.9.1 | 1.4.1 | | +| 1.6.0 | 1.11.0 | 2.9.0 | 1.4.0 | | +| 1.5.0 | 1.10.0 | 2.8.0 | 1.3.0 | | +| 1.4.1 | 1.9.1 | 2.7.1 | 1.2.1 | | +| 1.3.0 | 1.8.0 | 2.6.0 | 1.1.0 | | +| 1.2.0 | 1.7.0 | 2.5.0 | 1.0.0 | | +| 1.1.1 | 1.6.0 | 2.4.0 | | | +| 1.0.1 | 1.5.0 | 2.3.1 | | | +| | 1.4.0 | 2.2.0 | | | +| | 1.3.0 | 2.1.0 | | | +| | 1.2.0 | | | | +| | 1.1.0 | 2.0.0 | | | +| | 1.0.0 | 2.0.0-rc.5 | | | ## License diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 5fe556355..068fc3ccc 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -6,14 +6,14 @@ 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 WALLETKIT_VERSION = "1.35.1" -const val APPKIT_VERSION = "1.6.5" -const val MODAL_CORE_VERSION = "1.6.5" +const val BOM_VERSION = "1.0.0" +const val FOUNDATION_VERSION = "1.0.0" +const val CORE_VERSION = "1.0.0" +const val SIGN_VERSION = "1.0.0" +const val NOTIFY_VERSION = "1.0.0" +const val WALLETKIT_VERSION = "1.0.0" +const val APPKIT_VERSION = "1.0.0" +const val MODAL_CORE_VERSION = "1.0.0" //Artifact ids const val ANDROID_BOM = "android-bom" diff --git a/buildSrc/src/main/kotlin/release-scripts.gradle.kts b/buildSrc/src/main/kotlin/release-scripts.gradle.kts index 1f53fa6ee..831e738ea 100644 --- a/buildSrc/src/main/kotlin/release-scripts.gradle.kts +++ b/buildSrc/src/main/kotlin/release-scripts.gradle.kts @@ -36,9 +36,8 @@ fun compileListOfSDKs(): List> = mutableListOf( Triple("core", "modal", "android"), Triple("protocol", "sign", "android"), Triple("protocol", "notify", "android"), - Triple("product", "web3wallet", "android"), - Triple("product", "web3modal", "android"), - Triple("product", "walletconnectmodal", "android"), + Triple("product", "walletkit", "android"), + Triple("product", "appkit", "android") ).apply { // The BOM has to be last artifact add(Triple("core", "bom", "jvm")) diff --git a/settings.gradle.kts b/settings.gradle.kts index 5106516c5..bd1fa7f75 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,4 +1,4 @@ -rootProject.name = "reown kotlin" +rootProject.name = "Reown Kotlin" val excludedDirs = listOf( "undefined", From ba4b8e96d45b93187dbb7b98635c612f7d146722 Mon Sep 17 00:00:00 2001 From: kubel Date: Fri, 6 Sep 2024 07:21:11 +0200 Subject: [PATCH 31/51] Disable sonarcloud for now --- .github/workflows/ci_sonarcloud.yml | 15 +++++--- build.gradle.kts | 59 +++++++++++++++-------------- 2 files changed, 39 insertions(+), 35 deletions(-) diff --git a/.github/workflows/ci_sonarcloud.yml b/.github/workflows/ci_sonarcloud.yml index e19745af7..df4a080fb 100644 --- a/.github/workflows/ci_sonarcloud.yml +++ b/.github/workflows/ci_sonarcloud.yml @@ -1,12 +1,15 @@ name: SonarCloud on: - push: - branches: - - develop - - master - pull_request: - types: [opened, synchronize, reopened] + workflow_dispatch: +#TODO: user sonar when repos are public +#on: +# push: +# branches: +# - develop +# - master +# pull_request: +# types: [opened, synchronize, reopened] concurrency: # Support push/pr as event types with different behaviors each: diff --git a/build.gradle.kts b/build.gradle.kts index 60b84bf67..9ebcc0592 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,39 +35,40 @@ allprojects { } } -//todo: change sonar cloud -sonar { - properties { - properties( - mapOf( - "sonar.projectKey" to "WalletConnect_WalletConnectKotlinV2", - "sonar.organization" to "walletconnect", - "sonar.host.url" to "https://sonarcloud.io", - "sonar.gradle.skipCompile" to true, - "sonar.coverage.exclusions" to "sample/**,**/di/**,/buildSrc/**,**/gradle/**,**/test/**,**/androidTest/**,**/build.gradle.kts", - ) - ) - } -} +////todo: user sonar cloud after repos are public +//sonar { +// properties { +// properties( +// mapOf( +// "sonar.projectKey" to "WalletConnect_WalletConnectKotlinV2", +// "sonar.organization" to "walletconnect", +// "sonar.host.url" to "https://sonarcloud.io", +// "sonar.gradle.skipCompile" to true, +// "sonar.coverage.exclusions" to "sample/**,**/di/**,/buildSrc/**,**/gradle/**,**/test/**,**/androidTest/**,**/build.gradle.kts", +// ) +// ) +// } +//} subprojects { apply(plugin = rootProject.libs.plugins.sonarqube.get().pluginId) - extensions.configure { - setAndroidVariant("debug") - - isSkipProject = name == "bom" - properties { - properties( - mapOf( - "sonar.gradle.skipCompile" to true, - "sonar.sources" to "${projectDir}/src/main/kotlin", - "sonar.java.binaries" to layout.buildDirectory, - "sonar.coverage.jacoco.xmlReportPaths" to "${layout.buildDirectory}/reports/jacoco/xml/jacoco.xml" - ) - ) - } - } +////todo: user sonar cloud after repos are public +// extensions.configure { +// setAndroidVariant("debug") +// +// isSkipProject = name == "bom" +// properties { +// properties( +// mapOf( +// "sonar.gradle.skipCompile" to true, +// "sonar.sources" to "${projectDir}/src/main/kotlin", +// "sonar.java.binaries" to layout.buildDirectory, +// "sonar.coverage.jacoco.xmlReportPaths" to "${layout.buildDirectory}/reports/jacoco/xml/jacoco.xml" +// ) +// ) +// } +// } afterEvaluate { if (hasProperty("android")) { From 60641c47e15348651c24f710128059bab3521562 Mon Sep 17 00:00:00 2001 From: kubel Date: Fri, 6 Sep 2024 07:46:57 +0200 Subject: [PATCH 32/51] Remove faulty dependency --- sample/dapp/build.gradle.kts | 2 +- .../chain_selection/ChainSelectionRoute.kt | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sample/dapp/build.gradle.kts b/sample/dapp/build.gradle.kts index 9df393388..0dd8755f0 100644 --- a/sample/dapp/build.gradle.kts +++ b/sample/dapp/build.gradle.kts @@ -78,8 +78,8 @@ dependencies { implementation("io.insert-koin:koin-androidx-compose:3.4.3") implementation("io.coil-kt:coil-compose:2.3.0") - implementation("androidmads.library.qrgenearator:QRGenearator:1.0.4") + implementation(libs.qrCodeGenerator) implementation(platform(libs.androidx.compose.bom)) implementation(libs.androidx.compose.ui) implementation(libs.androidx.compose.ui.tooling.preview) diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt index f1a9b3032..bb8d715c4 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt @@ -2,10 +2,8 @@ package com.reown.sample.dapp.ui.routes.composable_routes.chain_selection import android.content.Context import android.content.Intent -import android.graphics.Bitmap +import android.graphics.drawable.Drawable import android.widget.Toast -import androidmads.library.qrgenearator.QRGContents -import androidmads.library.qrgenearator.QRGEncoder import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -41,7 +39,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.asImageBitmap import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.platform.ClipboardManager import androidx.compose.ui.platform.LocalClipboardManager @@ -59,7 +56,12 @@ import androidx.compose.ui.window.Dialog import androidx.core.net.toUri import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController +import com.github.alexzhirkevich.customqrgenerator.QrData +import com.github.alexzhirkevich.customqrgenerator.vector.QrCodeDrawable +import com.google.accompanist.drawablepainter.rememberDrawablePainter import com.reown.android.utils.isPackageInstalled +import com.reown.appkit.ui.components.button.rememberAppKitState +import com.reown.appkit.ui.openAppKit import com.reown.sample.common.Chains import com.reown.sample.common.CompletePreviews import com.reown.sample.common.ui.WCTopAppBarLegacy @@ -72,8 +74,6 @@ import com.reown.sample.common.ui.toColor import com.reown.sample.dapp.BuildConfig import com.reown.sample.dapp.ui.DappSampleEvents import com.reown.sample.dapp.ui.routes.Route -import com.reown.appkit.ui.components.button.rememberAppKitState -import com.reown.appkit.ui.openAppKit import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -325,7 +325,7 @@ private fun ChainSelectionScreen( @Composable private fun QRDialog(composableScope: CoroutineScope, dispatcher: CoroutineDispatcher, pairingUri: PairingUri, onDismissRequest: () -> Unit, context: Context) { - val qrBitmap = generateQRCode(pairingUri.uri) + val qrDrawable = generateQRCode(pairingUri.uri) val clipboardManager: ClipboardManager = LocalClipboardManager.current Dialog(onDismissRequest = { onDismissRequest() }) { @@ -337,9 +337,9 @@ private fun QRDialog(composableScope: CoroutineScope, dispatcher: CoroutineDispa contentAlignment = Alignment.Center ) { Column(horizontalAlignment = Alignment.CenterHorizontally) { - qrBitmap?.let { + qrDrawable?.let { Image( - bitmap = it.asImageBitmap(), + painter = rememberDrawablePainter(drawable = it), contentDescription = "QR Code", modifier = Modifier .fillMaxWidth() @@ -442,10 +442,10 @@ private fun onDynamicSwitcher( } } -fun generateQRCode(content: String): Bitmap? { - val qrgEncoder = QRGEncoder(content, null, QRGContents.Type.TEXT, 400) +fun generateQRCode(content: String): Drawable? { + val qrgEncoder = QrCodeDrawable(QrData.Url(content)) return try { - qrgEncoder.bitmap + qrgEncoder } catch (e: Exception) { e.printStackTrace() null From dc4bef3040f46dfa78bbe30494057b5698cd5574 Mon Sep 17 00:00:00 2001 From: kubel Date: Fri, 6 Sep 2024 14:10:35 +0200 Subject: [PATCH 33/51] Comment out firebase testers groups --- buildSrc/src/main/kotlin/signing-config.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/src/main/kotlin/signing-config.gradle.kts b/buildSrc/src/main/kotlin/signing-config.gradle.kts index 781fa86c9..a8b5de69b 100644 --- a/buildSrc/src/main/kotlin/signing-config.gradle.kts +++ b/buildSrc/src/main/kotlin/signing-config.gradle.kts @@ -52,7 +52,7 @@ project.extensions.configure(BaseExtension::class.java) { firebaseAppDistribution { artifactType = "AAB" serviceCredentialsFile = File(rootDir, "credentials.json").path - groups = "design-team, javascript-team, kotlin-team, rust-team, swift-team, wc-testers" +// groups = "design-team, javascript-team, kotlin-team, rust-team, swift-team, wc-testers" } } @@ -69,7 +69,7 @@ project.extensions.configure(BaseExtension::class.java) { firebaseAppDistribution { artifactType = "APK" serviceCredentialsFile = File(rootDir, "credentials.json").path - groups = "design-team, javascript-team, kotlin-team, rust-team, swift-team, wc-testers" +// groups = "design-team, javascript-team, kotlin-team, rust-team, swift-team, wc-testers" } } @@ -81,7 +81,7 @@ project.extensions.configure(BaseExtension::class.java) { firebaseAppDistribution { artifactType = "APK" serviceCredentialsFile = File(rootDir, "credentials.json").path - groups = "design-team, javascript-team, kotlin-team, rust-team, swift-team, wc-testers" +// groups = "design-team, javascript-team, kotlin-team, rust-team, swift-team, wc-testers" } } } From ea190038b639a77fa853e0263a7969e238dfdf9a Mon Sep 17 00:00:00 2001 From: kubel Date: Fri, 6 Sep 2024 14:29:53 +0200 Subject: [PATCH 34/51] Add new testers group --- buildSrc/src/main/kotlin/signing-config.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/src/main/kotlin/signing-config.gradle.kts b/buildSrc/src/main/kotlin/signing-config.gradle.kts index a8b5de69b..47ff5063b 100644 --- a/buildSrc/src/main/kotlin/signing-config.gradle.kts +++ b/buildSrc/src/main/kotlin/signing-config.gradle.kts @@ -52,7 +52,7 @@ project.extensions.configure(BaseExtension::class.java) { firebaseAppDistribution { artifactType = "AAB" serviceCredentialsFile = File(rootDir, "credentials.json").path -// groups = "design-team, javascript-team, kotlin-team, rust-team, swift-team, wc-testers" + groups = "internal_testers" } } @@ -69,7 +69,7 @@ project.extensions.configure(BaseExtension::class.java) { firebaseAppDistribution { artifactType = "APK" serviceCredentialsFile = File(rootDir, "credentials.json").path -// groups = "design-team, javascript-team, kotlin-team, rust-team, swift-team, wc-testers" + groups = "internal_testers" } } @@ -81,7 +81,7 @@ project.extensions.configure(BaseExtension::class.java) { firebaseAppDistribution { artifactType = "APK" serviceCredentialsFile = File(rootDir, "credentials.json").path -// groups = "design-team, javascript-team, kotlin-team, rust-team, swift-team, wc-testers" + groups = "internal_testers" } } } From 3840bfb8574fdf281190c300ca9cafee1d2a93c6 Mon Sep 17 00:00:00 2001 From: kubel Date: Fri, 6 Sep 2024 15:06:15 +0200 Subject: [PATCH 35/51] Update --- .github/actions/ci_relay/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/ci_relay/action.yml b/.github/actions/ci_relay/action.yml index d490aaf1e..f6986acc0 100644 --- a/.github/actions/ci_relay/action.yml +++ b/.github/actions/ci_relay/action.yml @@ -33,6 +33,5 @@ runs: run: echo $SECRETS_PROPERTIES | base64 --decode > secrets.properties - name: Relay integration tests - # TODO: Add SDK_VERSION env var shell: bash run: ./gradlew :foundation:test --tests "com.reown.foundation.RelayTest" -i \ No newline at end of file From 309088b8bfa5f28c0b0f81d7bc26e21b452b432e Mon Sep 17 00:00:00 2001 From: kubel Date: Mon, 9 Sep 2024 07:50:29 +0200 Subject: [PATCH 36/51] Update user agent format --- .../com/reown/android/internal/common/di/CoreNetworkModule.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreNetworkModule.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreNetworkModule.kt index a655d9e5a..259a26a2d 100644 --- a/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreNetworkModule.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreNetworkModule.kt @@ -47,7 +47,7 @@ fun coreAndroidNetworkModule(serverUrl: String, connectionType: ConnectionType, } factory(named(AndroidCommonDITags.USER_AGENT)) { - """wc-2/kotlin-${sdkVersion}/android-${Build.VERSION.RELEASE}""" + """wc-2/Reown-kotlin-${sdkVersion}/android-${Build.VERSION.RELEASE}""" } single { From 12b45609afc9f7126f58ccf763be0362b31fa2fe Mon Sep 17 00:00:00 2001 From: kubel Date: Mon, 9 Sep 2024 07:51:30 +0200 Subject: [PATCH 37/51] Typo --- .../com/reown/android/internal/common/di/CoreNetworkModule.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreNetworkModule.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreNetworkModule.kt index 259a26a2d..52e3ce157 100644 --- a/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreNetworkModule.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreNetworkModule.kt @@ -47,7 +47,7 @@ fun coreAndroidNetworkModule(serverUrl: String, connectionType: ConnectionType, } factory(named(AndroidCommonDITags.USER_AGENT)) { - """wc-2/Reown-kotlin-${sdkVersion}/android-${Build.VERSION.RELEASE}""" + """wc-2/reown-kotlin-${sdkVersion}/android-${Build.VERSION.RELEASE}""" } single { From 97b0a27e37d1e8b3fd7d4cd28e6004c5b462775c Mon Sep 17 00:00:00 2001 From: kubel Date: Mon, 9 Sep 2024 14:11:10 +0200 Subject: [PATCH 38/51] Update publishing plugins --- .../main/kotlin/publish-module-android.gradle.kts | 14 +++++++------- .../src/main/kotlin/publish-module-java.gradle.kts | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/buildSrc/src/main/kotlin/publish-module-android.gradle.kts b/buildSrc/src/main/kotlin/publish-module-android.gradle.kts index 7df4c11c7..292286dc4 100644 --- a/buildSrc/src/main/kotlin/publish-module-android.gradle.kts +++ b/buildSrc/src/main/kotlin/publish-module-android.gradle.kts @@ -41,9 +41,9 @@ afterEvaluate { version = requireNotNull(project.extra[KEY_PUBLISH_VERSION]).toString() pom { - name.set("WalletConnect ${requireNotNull(extra.get(KEY_SDK_NAME))}") - description.set("${requireNotNull(extra.get(KEY_SDK_NAME))} SDK for WalletConnect") - url.set("https://github.com/WalletConnect/WalletConnectKotlinV2") + name.set("Reown ${requireNotNull(extra.get(KEY_SDK_NAME))}") + description.set("${requireNotNull(extra.get(KEY_SDK_NAME))} SDK for Reown") + url.set("https://github.com/reown-com/reown-kotlin") licenses { license { name.set("The Apache License, Version 2.0") @@ -58,15 +58,15 @@ afterEvaluate { developers { developer { id.set("KotlinSDKTeam") - name.set("WalletConnect Kotlin") + name.set("Reown Kotlin") email.set("Kotlin@WalletConnect.com") } } scm { - connection.set("scm:git:git://github.com/WalletConnect/WalletConnectKotlinV2.git") - developerConnection.set("scm:git:ssh://github.com/WalletConnect/WalletConnectKotlinV2.git") - url.set("https://github.com/WalletConnect/WalletConnectKotlinV2") + connection.set("scm:git:git://github.com/reown-com/reown-kotlin.git") + developerConnection.set("scm:git:ssh://github.com/reown-com/reown-kotlin.git") + url.set("https://github.com/reown-com/reown-kotlin") } } } diff --git a/buildSrc/src/main/kotlin/publish-module-java.gradle.kts b/buildSrc/src/main/kotlin/publish-module-java.gradle.kts index 1083e7678..cf382f4a8 100644 --- a/buildSrc/src/main/kotlin/publish-module-java.gradle.kts +++ b/buildSrc/src/main/kotlin/publish-module-java.gradle.kts @@ -37,9 +37,9 @@ afterEvaluate { version = requireNotNull(extra.get(KEY_PUBLISH_VERSION)).toString() pom { - name.set("WalletConnect ${requireNotNull(extra.get(KEY_SDK_NAME))}") - description.set("${requireNotNull(extra.get(KEY_SDK_NAME))} SDK for WalletConnect") - url.set("https://github.com/WalletConnect/WalletConnectKotlinV2") + name.set("Reown ${requireNotNull(extra.get(KEY_SDK_NAME))}") + description.set("${requireNotNull(extra.get(KEY_SDK_NAME))} SDK for Reown") + url.set("https://github.com/reown-con/reown-kotlin") licenses { license { @@ -55,15 +55,15 @@ afterEvaluate { developers { developer { id.set("KotlinSDKTeam") - name.set("WalletConnect Kotlin") + name.set("Reown Kotlin") email.set("Kotlin@WalletConnect.com") } } scm { - connection.set("scm:git:git://github.com/WalletConnect/WalletConnectKotlinV2.git") - developerConnection.set("scm:git:ssh://github.com/WalletConnect/WalletConnectKotlinV2.git") - url.set("https://github.com/WalletConnect/WalletConnectKotlinV2") + connection.set("scm:git:git://github.com/reown-con/reown-kotlin.git") + developerConnection.set("scm:git:ssh://github.com/reown-con/reown-kotlin.git") + url.set("https://github.com/reown-con/reown-kotlin") } } } From 011fe7bfe52dcef6d6d1d041e27a13c86a86b3e1 Mon Sep 17 00:00:00 2001 From: kubel Date: Mon, 9 Sep 2024 17:23:02 +0200 Subject: [PATCH 39/51] ReadMe update --- ReadMe.md | 58 ++++--------------------------------------------------- 1 file changed, 4 insertions(+), 54 deletions(-) diff --git a/ReadMe.md b/ReadMe.md index bde47402e..1732c5a2d 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -22,60 +22,10 @@ dependencies { ## SDK Chart -| BOM | [Core SDK](core/android) | [Sign SDK](protocol/sign) | [WalletKit](product/web3wallet) | [AppKit](product/web3modal) | -|-----------------------------------------------------------------------------------------|--------------------------|---------------------------|---------------------------------|-----------------------------| -| 1.35.1 | 1.35.1 | 2.35.1 | 1.35.1 | 1.6.5 | -| 1.35.0 | 1.35.0 | 2.35.0 | 1.35.0 | 1.6.4 | -| 1.34.1 | 1.34.1 | 2.34.1 | 1.34.1 | 1.6.3 | -| 1.34.0 | 1.34.0 | 2.34.0 | 1.34.0 | 1.6.2 | -| 1.33.1 | 1.33.1 | 2.33.1 | 1.33.1 | 1.6.1 | -| 1.33.0 | 1.33.0 | 2.33.0 | 1.33.0 | 1.6.0 | -| 1.32.1 | 1.32.0 | 2.32.0 | 1.32.1 | 1.5.4 | -| 1.31.3 | 1.31.2 | 2.31.2 | 1.31.2 | 1.5.2 | -| 1.31.1 | 1.31.1 | 2.31.1 | 1.31.1 | 1.5.1 | -| 1.31.0[**](https://gist.github.com/TalhaAli00/7b9e1cadf19b9dc5141cd033aa4e6172) | 1.31.0 | 2.31.0 | 1.31.0 | 1.5.0 | -| 1.30.0 | 1.30.0 | 2.30.0 | 1.30.0 | 1.4.0 | -| 1.23.0 | 1.28.0 | 2.26.0 | 1.21.0 | 1.3.0 | -| 1.22.2 | 1.27.2 | 2.25.2 | 1.20.2 | 1.2.2 | -| 1.22.1 | 1.27.0 | 2.25.0 | 1.20.0 | 1.2.1 | -| 1.22.0 | 1.27.0 | 2.25.0 | 1.20.0 | 1.2.0 | -| 1.21.1 | 1.26.0 | 2.24.0 | 1.19.0 | 1.1.1 | -| 1.21.0 | 1.26.0 | 2.24.0 | 1.19.0 | 1.1.0 | -| 1.20.0 | 1.25.0 | 2.23.0 | 1.18.0 | 1.0.0 | -| 1.19.1 | 1.24.0 | 2.22.0 | 1.17.0 | 1.0.0-beta02 | -| 1.19.0 | 1.24.0 | 2.22.0 | 1.17.0 | 1.0.0-beta01 | -| 1.18.0 | 1.23.0 | 2.21.0 | 1.16.0 | 1.0.0-alpha11 | -| 1.17.2 | 1.22.1 | 2.20.1 | 1.15.1 | 1.0.0-alpha10 | -| 1.17.1 | 1.22.0 | 2.20.0 | 1.15.0 | 1.0.0-alpha09 | -| 1.17.0 | 1.22.0 | 2.20.0 | 1.15.0 | 1.0.0-alpha09 | -| 1.16.0 | 1.21.0 | 2.19.0 | 1.14.0 | | -| 1.15.0 | 1.20.0 | 2.18.0 | 1.13.0 | | -| 1.14.0 | 1.19.0 | 2.17.0 | 1.12.0 | | -| 1.13.1 | 1.18.0 | 2.16.0 | 1.11.0 | | -| 1.12.0 | 1.17.0 | 2.15.0 | 1.10.0 | | -| 1.11.1 | 1.16.1 | 2.14.1 | 1.9.1 | | -| 1.11.0 | 1.16.0 | 2.14.0 | 1.9.0 | | -| 1.10.0 | 1.15.0 | 2.13.0 | 1.8.0 | | -| 1.9.3 | 1.14.3 | 2.12.3 | 1.7.3 | | -| 1.9.2 | 1.14.2 | 2.12.2 | 1.7.2 | | -| 1.9.1 | 1.14.1 | 2.12.1 | 1.7.1 | | -| 1.9.0[**](https://github.com/WalletConnect/WalletConnectKotlinV2/issues/821) | 1.14.0 | 2.12.0 | 1.7.0 | | -| 1.8.0 | 1.13.0 | 2.11.0 | 1.6.0 | | -| 1.7.0 | 1.12.0 | 2.10.0 | 1.5.0 | | -| 1.6.1 | 1.11.1 | 2.9.1 | 1.4.1 | | -| 1.6.0 | 1.11.0 | 2.9.0 | 1.4.0 | | -| 1.5.0 | 1.10.0 | 2.8.0 | 1.3.0 | | -| 1.4.1 | 1.9.1 | 2.7.1 | 1.2.1 | | -| 1.3.0 | 1.8.0 | 2.6.0 | 1.1.0 | | -| 1.2.0 | 1.7.0 | 2.5.0 | 1.0.0 | | -| 1.1.1 | 1.6.0 | 2.4.0 | | | -| 1.0.1 | 1.5.0 | 2.3.1 | | | -| | 1.4.0 | 2.2.0 | | | -| | 1.3.0 | 2.1.0 | | | -| | 1.2.0 | | | | -| | 1.1.0 | 2.0.0 | | | -| | 1.0.0 | 2.0.0-rc.5 | | | +| BOM | [Core SDK](core/android) | [Sign SDK](protocol/sign) | [WalletKit](product/walletkit) | [AppKit](product/appkit) | +|-------|--------------------------|---------------------------|--------------------------------|--------------------------| +| 1.0.0 | 1.0.0 | 1.0.0 | 1.0.0 | 1.0.0 | ## 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. \ No newline at end of file From 3fb9e5a12a8478744aa065286f28487d876c1473 Mon Sep 17 00:00:00 2001 From: kubel Date: Tue, 10 Sep 2024 15:44:17 +0200 Subject: [PATCH 40/51] Updates --- product/appkit/ReadMe.md | 6 - .../kotlin/com/reown/appkit/client/AppKit.kt | 78 ------------ .../com/reown/walletkit/client/WalletKit.kt | 13 -- .../com/reown/sign/client/SignInterface.kt | 67 ----------- .../com/reown/sign/client/SignProtocol.kt | 111 ------------------ 5 files changed, 275 deletions(-) diff --git a/product/appkit/ReadMe.md b/product/appkit/ReadMe.md index c9ea7ad82..c5dc98fdc 100644 --- a/product/appkit/ReadMe.md +++ b/product/appkit/ReadMe.md @@ -2,12 +2,6 @@ # Installation -:::caution -**The AppKit SDK is currently in Alpha and is not production-ready**. - -It's public API and associated documentation may still see significant and breaking changes. -::: - Kotlin implementation of AppKit for Android applications. Android Core ![Maven Central](https://img.shields.io/maven-central/v/com.walletconnect/android-core) diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/client/AppKit.kt b/product/appkit/src/main/kotlin/com/reown/appkit/client/AppKit.kt index 5a828cfd5..ca7d2c261 100644 --- a/product/appkit/src/main/kotlin/com/reown/appkit/client/AppKit.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/client/AppKit.kt @@ -174,21 +174,6 @@ object AppKit { }.launchIn(scope) } - @Deprecated( - message = "Replaced with the same name method but onSuccess callback returns a Pairing URL", - replaceWith = ReplaceWith(expression = "fun connect(connect: Modal.Params.Connect, onSuccess: (String) -> Unit, onError: (Modal.Model.Error) -> Unit)") - ) - internal fun connect( - connect: Modal.Params.Connect, - onSuccess: () -> Unit, - onError: (Modal.Model.Error) -> Unit - ) { - SignClient.connect( - connect.toSign(), - onSuccess - ) { onError(it.toModal()) } - } - fun connect( connect: Modal.Params.Connect, onSuccess: (String) -> Unit, @@ -219,23 +204,6 @@ object AppKit { } } - @Deprecated( - message = "Modal.Params.Request is deprecated", - replaceWith = ReplaceWith("com.reown.appkit.client.models.Request") - ) - fun request( - request: Modal.Params.Request, - onSuccess: (Modal.Model.SentRequest) -> Unit = {}, - onError: (Modal.Model.Error) -> Unit, - ) { - checkEngineInitialization() - appKitEngine.request( - request = Request(request.method, request.params, request.expiry), - onSuccess = { onSuccess(it.sentRequestToModal()) }, - onError = { onError(it.toModalError()) } - ) - } - fun request( request: Request, onSuccess: (SentRequestResult) -> Unit = {}, @@ -261,26 +229,6 @@ object AppKit { fun ping(sessionPing: Modal.Listeners.SessionPing? = null) = appKitEngine.ping(sessionPing) - @Deprecated( - message = "This has become deprecate in favor of the parameterless disconnect function", - level = DeprecationLevel.WARNING - ) - fun disconnect( - onSuccess: (Modal.Params.Disconnect) -> Unit = {}, - onError: (Modal.Model.Error) -> Unit, - ) { - checkEngineInitialization() - val topic = when (val session = appKitEngine.getActiveSession()) { - is WalletConnect -> session.topic - else -> String.Empty - } - - appKitEngine.disconnect( - onSuccess = { onSuccess(Modal.Params.Disconnect(topic)) }, - onError = { onError(it.toModalError()) } - ) - } - fun disconnect( onSuccess: () -> Unit, onError: (Throwable) -> Unit, @@ -294,32 +242,6 @@ object AppKit { * It is advised that this function be called from background operation */ fun getSelectedChain() = selectedChain -// fun getSelectedChain() = getSelectedChainUseCase()?.toChain() - - /** - * Caution: This function is blocking and runs on the current thread. - * It is advised that this function be called from background operation - */ - @Deprecated( - message = "Getting active session is replaced with getAccount()", - replaceWith = ReplaceWith("com.reown.appkit.client.AppKit.getAccount()"), - level = DeprecationLevel.WARNING - ) - internal fun getActiveSessionByTopic(topic: String) = SignClient.getActiveSessionByTopic(topic)?.toModal() - - /** - * Caution: This function is blocking and runs on the current thread. - * It is advised that this function be called from background operation - */ - @Deprecated( - message = "Getting active session is replaced with getAccount()", - replaceWith = ReplaceWith("com.reown.appkit.client.AppKit.getAccount()"), - level = DeprecationLevel.WARNING - ) - fun getActiveSession(): Modal.Model.Session? { - checkEngineInitialization() - return (appKitEngine.getActiveSession() as? WalletConnect)?.topic?.let { SignClient.getActiveSessionByTopic(it)?.toModal() } - } /** * Caution: This function is blocking and runs on the current thread. diff --git a/product/walletkit/src/main/kotlin/com/reown/walletkit/client/WalletKit.kt b/product/walletkit/src/main/kotlin/com/reown/walletkit/client/WalletKit.kt index bfdfc8d4e..d881f99b8 100644 --- a/product/walletkit/src/main/kotlin/com/reown/walletkit/client/WalletKit.kt +++ b/product/walletkit/src/main/kotlin/com/reown/walletkit/client/WalletKit.kt @@ -302,19 +302,6 @@ object WalletKit { return SignClient.getActiveSessionByTopic(topic)?.toWallet() } - /** - * Caution: This function is blocking and runs on the current thread. - * It is advised that this function be called from background operation - */ - - @Deprecated( - "The return type of getPendingRequests methods has been replaced with SessionRequest list", - replaceWith = ReplaceWith("getPendingSessionRequests(topic: String): List") - ) - @Throws(IllegalStateException::class) - fun getPendingSessionRequests(topic: String): List { - return SignClient.getPendingRequests(topic).mapToPendingRequests() - } /** * Caution: This function is blocking and runs on the current thread. diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/client/SignInterface.kt b/protocol/sign/src/main/kotlin/com/reown/sign/client/SignInterface.kt index 9b80fb524..2e61406bb 100644 --- a/protocol/sign/src/main/kotlin/com/reown/sign/client/SignInterface.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/client/SignInterface.kt @@ -54,16 +54,6 @@ interface SignInterface { fun initialize(init: Sign.Params.Init, onSuccess: () -> Unit = {}, onError: (Sign.Model.Error) -> Unit) fun setWalletDelegate(delegate: WalletDelegate) fun setDappDelegate(delegate: DappDelegate) - - @Deprecated( - message = "Replaced with the same name method but onSuccess callback returns a Pairing URL", - replaceWith = ReplaceWith(expression = "fun connect(connect: Sign.Params.Connect, onSuccess: (String) -> Unit, onError: (Sign.Model.Error) -> Unit)") - ) - fun connect( - connect: Sign.Params.Connect, onSuccess: () -> Unit, - onError: (Sign.Model.Error) -> Unit, - ) - fun connect( connect: Sign.Params.Connect, onSuccess: (String) -> Unit, onError: (Sign.Model.Error) -> Unit, @@ -71,29 +61,12 @@ interface SignInterface { fun authenticate(authenticate: Sign.Params.Authenticate, walletAppLink: String? = null, onSuccess: (String) -> Unit, onError: (Sign.Model.Error) -> Unit) fun dispatchEnvelope(urlWithEnvelope: String, onError: (Sign.Model.Error) -> Unit) - - @Deprecated( - message = "Creating a pairing will be moved to CoreClient to make pairing SDK agnostic", - replaceWith = ReplaceWith(expression = "CoreClient.Pairing.pair()", imports = ["com.reown.android.CoreClient"]) - ) - fun pair(pair: Sign.Params.Pair, onSuccess: (Sign.Params.Pair) -> Unit = {}, onError: (Sign.Model.Error) -> Unit) fun approveSession(approve: Sign.Params.Approve, onSuccess: (Sign.Params.Approve) -> Unit = {}, onError: (Sign.Model.Error) -> Unit) fun rejectSession(reject: Sign.Params.Reject, onSuccess: (Sign.Params.Reject) -> Unit = {}, onError: (Sign.Model.Error) -> Unit) fun approveAuthenticate(approve: Sign.Params.ApproveAuthenticate, onSuccess: (Sign.Params.ApproveAuthenticate) -> Unit, onError: (Sign.Model.Error) -> Unit) fun rejectAuthenticate(reject: Sign.Params.RejectAuthenticate, onSuccess: (Sign.Params.RejectAuthenticate) -> Unit, onError: (Sign.Model.Error) -> Unit) fun formatAuthMessage(formatMessage: Sign.Params.FormatMessage): String - @Deprecated( - message = "The onSuccess callback has been replaced with a new callback that returns Sign.Model.SentRequest", - replaceWith = ReplaceWith(expression = "this.request(request, onSuccessWithSentRequest, onError)", imports = ["com.reown.sign.client"]) - ) - fun request( - request: Sign.Params.Request, - onSuccess: (Sign.Params.Request) -> Unit = {}, - onSuccessWithSentRequest: (Sign.Model.SentRequest) -> Unit = { it: Sign.Model.SentRequest -> Unit }, - onError: (Sign.Model.Error) -> Unit, - ) - fun request(request: Sign.Params.Request, onSuccess: (Sign.Model.SentRequest) -> Unit = {}, onError: (Sign.Model.Error) -> Unit) fun respond(response: Sign.Params.Response, onSuccess: (Sign.Params.Response) -> Unit = {}, onError: (Sign.Model.Error) -> Unit) fun update(update: Sign.Params.Update, onSuccess: (Sign.Params.Update) -> Unit = {}, onError: (Sign.Model.Error) -> Unit) @@ -115,46 +88,6 @@ interface SignInterface { */ fun getActiveSessionByTopic(topic: String): Sign.Model.Session? - /** - * Caution: This function is blocking and runs on the current thread. - * It is advised that this function be called from background operation - */ - @Deprecated( - message = "Getting a list of settled sessions is replaced with getListOfActiveSessions()", - replaceWith = ReplaceWith(expression = "SignClient.getListOfActiveSessions()") - ) - fun getListOfSettledSessions(): List - - /** - * Caution: This function is blocking and runs on the current thread. - * It is advised that this function be called from background operation - */ - @Deprecated( - message = "Getting a list of settled sessions by topic is replaced with getSettledSessionByTopic()", - replaceWith = ReplaceWith(expression = "SignClient.getSettledSessionByTopic()") - ) - fun getSettledSessionByTopic(topic: String): Sign.Model.Session? - - /** - * Caution: This function is blocking and runs on the current thread. - * It is advised that this function be called from background operation - */ - @Deprecated( - message = "Getting a list of Pairings will be moved to CoreClient to make pairing SDK agnostic", - replaceWith = ReplaceWith(expression = "CoreClient.Pairing.getPairings()") - ) - fun getListOfSettledPairings(): List - - /** - * Caution: This function is blocking and runs on the current thread. - * It is advised that this function be called from background operation - */ - @Deprecated( - "The return type of getPendingRequests methods has been replaced with SessionRequest list", - replaceWith = ReplaceWith("getPendingSessionRequests(topic: String): List") - ) - fun getPendingRequests(topic: String): List - /** * Caution: This function is blocking and runs on the current thread. * It is advised that this function be called from background operation diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/client/SignProtocol.kt b/protocol/sign/src/main/kotlin/com/reown/sign/client/SignProtocol.kt index 2a5db588f..516ec2a39 100644 --- a/protocol/sign/src/main/kotlin/com/reown/sign/client/SignProtocol.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/client/SignProtocol.kt @@ -172,27 +172,6 @@ class SignProtocol(private val koinApp: KoinApplication = wcKoinApp) : SignInter return runBlocking { signEngine.formatMessage(formatMessage.payloadParams.toEngine(), formatMessage.iss) } } - @Throws(IllegalStateException::class) - override fun pair( - pair: Sign.Params.Pair, - onSuccess: (Sign.Params.Pair) -> Unit, - onError: (Sign.Model.Error) -> Unit, - ) { - checkEngineInitialization() - - scope.launch { - try { - signEngine.pair( - uri = pair.uri, - onSuccess = { onSuccess(pair) }, - onFailure = { throwable -> onError(Sign.Model.Error(throwable)) } - ) - } catch (error: Exception) { - onError(Sign.Model.Error(error)) - } - } - } - @Throws(IllegalStateException::class) override fun approveSession(approve: Sign.Params.Approve, onSuccess: (Sign.Params.Approve) -> Unit, onError: (Sign.Model.Error) -> Unit) { checkEngineInitialization() @@ -424,23 +403,6 @@ class SignProtocol(private val koinApp: KoinApplication = wcKoinApp) : SignInter } } - @Throws(IllegalStateException::class) - override fun getListOfSettledSessions(): List { - checkEngineInitialization() - return runBlocking { - signEngine.getListOfSettledSessions().map(EngineDO.Session::toClientActiveSession) - } - } - - @Throws(IllegalStateException::class) - override fun getSettledSessionByTopic(topic: String): Sign.Model.Session? { - checkEngineInitialization() - return runBlocking { - signEngine.getListOfSettledSessions().map(EngineDO.Session::toClientActiveSession) - .find { session -> session.topic == topic } - } - } - @Throws(IllegalStateException::class) override fun getPendingSessionRequests(topic: String): List { checkEngineInitialization() @@ -471,79 +433,6 @@ class SignProtocol(private val koinApp: KoinApplication = wcKoinApp) : SignInter return runBlocking { signEngine.getListOfVerifyContexts().map { verifyContext -> verifyContext.toCore() } } } - @Deprecated( - message = "Replaced with the same name method but onSuccess callback returns a Pairing URL", - replaceWith = ReplaceWith(expression = "fun connect(connect: Sign.Params.Connect, onSuccess: (String) -> Unit, onError: (Sign.Model.Error) -> Unit)") - ) - @Throws(IllegalStateException::class) - override fun connect( - connect: Sign.Params.Connect, - onSuccess: () -> Unit, - onError: (Sign.Model.Error) -> Unit, - ) { - checkEngineInitialization() - scope.launch { - try { - signEngine.proposeSession( - connect.namespaces?.toMapOfEngineNamespacesRequired(), - connect.optionalNamespaces?.toMapOfEngineNamespacesOptional(), - connect.properties, - connect.pairing.toPairing(), - onSuccess = { onSuccess() }, - onFailure = { error -> onError(Sign.Model.Error(error)) } - ) - } catch (error: Exception) { - onError(Sign.Model.Error(error)) - } - } - } - - @Deprecated( - "The onSuccess callback has been replaced with a new callback that returns Sign.Model.SentRequest", - replaceWith = ReplaceWith("this.request(request, onSuccessWithSentRequest, onError)", "com.reown.sign.client") - ) - @Throws(IllegalStateException::class) - override fun request( - request: Sign.Params.Request, - onSuccess: (Sign.Params.Request) -> Unit, - onSuccessWithSentRequest: (Sign.Model.SentRequest) -> Unit, - onError: (Sign.Model.Error) -> Unit, - ) { - checkEngineInitialization() - - scope.launch { - try { - signEngine.sessionRequest( - request = request.toEngineDORequest(), - onSuccess = { onSuccess(request) }, - onFailure = { error -> onError(Sign.Model.Error(error)) } - ) - } catch (error: Exception) { - onError(Sign.Model.Error(error)) - } - } - } - - @Deprecated( - "Getting a list of Pairings will be moved to CoreClient to make pairing SDK agnostic", - replaceWith = ReplaceWith("CoreClient.Pairing.getPairings()", "com.reown.android.CoreClient") - ) - @Throws(IllegalStateException::class) - override fun getListOfSettledPairings(): List { - checkEngineInitialization() - return runBlocking { signEngine.getListOfSettledPairings().map(EngineDO.PairingSettle::toClientSettledPairing) } - } - - @Deprecated( - "The return type of getPendingRequests methods has been replaced with SessionRequest list", - replaceWith = ReplaceWith("getPendingSessionRequests(topic: String): List") - ) - @Throws(IllegalStateException::class) - override fun getPendingRequests(topic: String): List { - checkEngineInitialization() - return runBlocking { signEngine.getPendingRequests(Topic(topic)).mapToPendingRequests() } - } - // TODO: Uncomment once reinit scope logic is added // fun shutdown() { // scope.cancel() From bfcd177849e7c84241021cef567fd1560700af46 Mon Sep 17 00:00:00 2001 From: kubel Date: Tue, 10 Sep 2024 18:46:20 +0200 Subject: [PATCH 41/51] Fix build --- .../kotlin/com/reown/appkit/client/AppKit.kt | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/client/AppKit.kt b/product/appkit/src/main/kotlin/com/reown/appkit/client/AppKit.kt index ca7d2c261..6b765d0f3 100644 --- a/product/appkit/src/main/kotlin/com/reown/appkit/client/AppKit.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/client/AppKit.kt @@ -243,6 +243,31 @@ object AppKit { */ fun getSelectedChain() = selectedChain + /** + * Caution: This function is blocking and runs on the current thread. + * It is advised that this function be called from background operation + */ + @Deprecated( + message = "Getting active session is replaced with getAccount()", + replaceWith = ReplaceWith("com.reown.appkit.client.AppKit.getAccount()"), + level = DeprecationLevel.WARNING + ) + internal fun getActiveSessionByTopic(topic: String) = SignClient.getActiveSessionByTopic(topic)?.toModal() + + /** + * Caution: This function is blocking and runs on the current thread. + * It is advised that this function be called from background operation + */ + @Deprecated( + message = "Getting active session is replaced with getAccount()", + replaceWith = ReplaceWith("com.reown.appkit.client.AppKit.getAccount()"), + level = DeprecationLevel.WARNING + ) + fun getActiveSession(): Modal.Model.Session? { + checkEngineInitialization() + return (appKitEngine.getActiveSession() as? WalletConnect)?.topic?.let { SignClient.getActiveSessionByTopic(it)?.toModal() } + } + /** * Caution: This function is blocking and runs on the current thread. * It is advised that this function be called from background operation From 280c291b24c70549f906a9a5dbb15e85ef1c679e Mon Sep 17 00:00:00 2001 From: kubel Date: Thu, 12 Sep 2024 09:09:05 +0200 Subject: [PATCH 42/51] Fix calling activity twice on deep link flow --- .../domain/WatchSubscriptionsUseCase.kt | 20 +- .../use_case/calls/RejectSessionUseCase.kt | 2 +- .../kotlin/com/reown/sample/common/Beagle.kt | 9 - .../sample/dapp/ui/DappSampleNavGraph.kt | 4 +- .../chain_selection/ChainSelectionRoute.kt | 2 +- .../com/reown/sample/modal/AppKitApp.kt | 2 +- sample/wallet/src/main/AndroidManifest.xml | 25 ++- .../sample/wallet/WalletKitApplication.kt | 179 ++++-------------- .../sample/wallet/ui/WalletKitActivity.kt | 102 +++++++++- .../sample/wallet/ui/Web3WalletNavGraph.kt | 11 +- .../sample/wallet/ui/Web3WalletViewModel.kt | 11 +- .../src/main/res/navigation/nav_graph.xml | 14 +- 12 files changed, 194 insertions(+), 187 deletions(-) diff --git a/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/WatchSubscriptionsUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/WatchSubscriptionsUseCase.kt index d4438c872..186f5b4c9 100644 --- a/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/WatchSubscriptionsUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/WatchSubscriptionsUseCase.kt @@ -35,7 +35,7 @@ internal class WatchSubscriptionsUseCase( val selfPublicKey = getSelfKeyForWatchSubscriptionUseCase(requestTopic, accountId) val responseTopic = keyManagementRepository.generateTopicFromKeyAgreement(selfPublicKey, peerPublicKey) - jsonRpcInteractor.subscribe(responseTopic) { error -> onFailure(error) } +// jsonRpcInteractor.subscribe(responseTopic) { error -> onFailure(error) } val account = registeredAccountsRepository.getAccountByAccountId(accountId.value) val didJwt = fetchDidJwtInteractor.watchSubscriptionsRequest(accountId, authenticationPublicKey, account.appDomain) @@ -46,14 +46,14 @@ internal class WatchSubscriptionsUseCase( val request = NotifyRpc.NotifyWatchSubscriptions(params = watchSubscriptionsParams) val irnParams = IrnParams(Tags.NOTIFY_WATCH_SUBSCRIPTIONS, Ttl(thirtySeconds)) - jsonRpcInteractor.publishJsonRpcRequest( - topic = requestTopic, - params = irnParams, - payload = request, - envelopeType = EnvelopeType.ONE, - participants = Participants(selfPublicKey, peerPublicKey), - onSuccess = onSuccess, - onFailure = onFailure - ) +// jsonRpcInteractor.publishJsonRpcRequest( +// topic = requestTopic, +// params = irnParams, +// payload = request, +// envelopeType = EnvelopeType.ONE, +// participants = Participants(selfPublicKey, peerPublicKey), +// onSuccess = onSuccess, +// onFailure = onFailure +// ) } } diff --git a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/RejectSessionUseCase.kt b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/RejectSessionUseCase.kt index 6d530fce7..66ca48653 100644 --- a/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/RejectSessionUseCase.kt +++ b/protocol/sign/src/main/kotlin/com/reown/sign/engine/use_case/calls/RejectSessionUseCase.kt @@ -45,7 +45,7 @@ internal class RejectSessionUseCase( scope.launch { proposalStorageRepository.deleteProposal(proposerPublicKey) verifyContextStorageRepository.delete(proposal.requestId) - pairingController.deleteAndUnsubscribePairing(Core.Params.Delete(proposal.pairingTopic.value)) + jsonRpcInteractor.unsubscribe(proposal.pairingTopic) } onSuccess() }, diff --git a/sample/common/src/main/kotlin/com/reown/sample/common/Beagle.kt b/sample/common/src/main/kotlin/com/reown/sample/common/Beagle.kt index c6d9c266c..75831c990 100644 --- a/sample/common/src/main/kotlin/com/reown/sample/common/Beagle.kt +++ b/sample/common/src/main/kotlin/com/reown/sample/common/Beagle.kt @@ -30,13 +30,4 @@ fun initBeagle(app: Application, header: HeaderModule, vararg modules: Module<*> networkLogBehavior = Behavior.NetworkLogBehavior(networkLoggers = listOf(BeagleOkHttpLogger)) ) ) - Beagle.set( - header, - ScreenCaptureToolboxModule(), - DividerModule(), - TextModule("Logs", TextModule.Type.SECTION_HEADER), - NetworkLogListModule(), - LogListModule(), - *modules - ) } diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/DappSampleNavGraph.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/DappSampleNavGraph.kt index fa87dd30c..b619b0495 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/DappSampleNavGraph.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/DappSampleNavGraph.kt @@ -44,7 +44,7 @@ fun DappSampleNavGraph( composable(Route.ChainSelection.path) { ChainSelectionRoute(navController) } - composable(Route.Session.path, deepLinks = listOf(NavDeepLink("kotlin-dapp-wc://request"))) { + composable(Route.Session.path) { SessionRoute(navController) } composable( @@ -58,7 +58,7 @@ fun DappSampleNavGraph( } } -const val accountArg= "accountArg" +const val accountArg = "accountArg" fun NavController.navigateToAccount(selectedAccount: String) { navigate(Route.Account.path + "/$selectedAccount") } diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt index bb8d715c4..21dffdb83 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt @@ -259,7 +259,7 @@ private fun ChainSelectionScreen( onChainClick, ) BlueButton( - text = "Connect via WalletConnect Modal", + text = "Connect via AppKit", onClick = onConnectClick, modifier = Modifier .padding(vertical = 10.dp) diff --git a/sample/modal/src/main/kotlin/com/reown/sample/modal/AppKitApp.kt b/sample/modal/src/main/kotlin/com/reown/sample/modal/AppKitApp.kt index ba0e406a9..159f6d70f 100644 --- a/sample/modal/src/main/kotlin/com/reown/sample/modal/AppKitApp.kt +++ b/sample/modal/src/main/kotlin/com/reown/sample/modal/AppKitApp.kt @@ -22,7 +22,7 @@ class AppKitApp : Application() { super.onCreate() val appMetaData = Core.Model.AppMetaData( - name = "reown Modals", + name = "AppKit Lab Sample", description = "Kotlin AppKit Lab Sample", url = "https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app", icons = listOf("https://gblobscdn.gitbook.com/spaces%2F-LJJeCjcLrr53DcT1Ml7%2Favatar.png?alt=media"), diff --git a/sample/wallet/src/main/AndroidManifest.xml b/sample/wallet/src/main/AndroidManifest.xml index bf4f07c9d..bc083610e 100644 --- a/sample/wallet/src/main/AndroidManifest.xml +++ b/sample/wallet/src/main/AndroidManifest.xml @@ -35,29 +35,40 @@ - + + + android:host="wc" + android:scheme="kotlin-web3wallet" /> + + - + + + + + + + + + diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitApplication.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitApplication.kt index 03f07d2d4..1e47bd9d7 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitApplication.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitApplication.kt @@ -1,39 +1,27 @@ package com.reown.sample.wallet import android.app.Application -import android.content.ClipData -import android.content.ClipboardManager import com.google.firebase.appdistribution.FirebaseAppDistribution import com.google.firebase.crashlytics.ktx.crashlytics import com.google.firebase.ktx.Firebase -import com.google.firebase.messaging.FirebaseMessaging import com.mixpanel.android.mpmetrics.MixpanelAPI import com.pandulapeter.beagle.Beagle -import com.pandulapeter.beagle.common.configuration.Placement -import com.pandulapeter.beagle.modules.DividerModule -import com.pandulapeter.beagle.modules.HeaderModule -import com.pandulapeter.beagle.modules.PaddingModule -import com.pandulapeter.beagle.modules.TextInputModule -import com.pandulapeter.beagle.modules.TextModule +import com.pandulapeter.beagle.common.configuration.Behavior +import com.pandulapeter.beagle.log.BeagleLogger +import com.pandulapeter.beagle.logOkHttp.BeagleOkHttpLogger import com.reown.android.Core import com.reown.android.CoreClient -import com.reown.android.cacao.signature.SignatureType import com.reown.android.internal.common.di.AndroidCommonDITags import com.reown.android.internal.common.wcKoinApp -import com.reown.android.utils.cacao.sign import com.reown.foundation.util.Logger import com.reown.notify.client.Notify import com.reown.notify.client.NotifyClient -import com.reown.notify.client.cacao.CacaoSigner -import com.reown.sample.common.initBeagle -import com.reown.sample.common.tag import com.reown.sample.wallet.domain.EthAccountDelegate import com.reown.sample.wallet.domain.NotificationHandler import com.reown.sample.wallet.domain.NotifyDelegate import com.reown.sample.wallet.domain.mixPanel import com.reown.sample.wallet.ui.state.ConnectionState import com.reown.sample.wallet.ui.state.connectionStateFlow -import com.reown.util.hexToBytes import com.reown.walletkit.client.Wallet import com.reown.walletkit.client.WalletKit import kotlinx.coroutines.CoroutineScope @@ -43,18 +31,16 @@ import kotlinx.coroutines.flow.filterIsInstance import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch +import kotlinx.coroutines.supervisorScope import org.koin.core.qualifier.named import timber.log.Timber import com.reown.sample.common.BuildConfig as CommonBuildConfig class WalletKitApplication : Application() { private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) - private var addFirebaseBeagleModules: () -> Unit = {} - private lateinit var logger: Logger override fun onCreate() { super.onCreate() - EthAccountDelegate.application = this val projectId = BuildConfig.PROJECT_ID @@ -81,121 +67,64 @@ class WalletKitApplication : Application() { } ) - - mixPanel = MixpanelAPI.getInstance(this, CommonBuildConfig.MIX_PANEL, true).apply { - identify(CoreClient.Push.clientId) - people.set("\$name", EthAccountDelegate.ethAddress) - } - - logger = wcKoinApp.koin.get(named(AndroidCommonDITags.LOGGER)) - logger.log("Account: ${EthAccountDelegate.account}") + println("Account: ${EthAccountDelegate.account}") WalletKit.initialize(Wallet.Params.Init(core = CoreClient), - onSuccess = { - logger.log("Web3Wallet initialized") - }, + onSuccess = { println("Web3Wallet initialized") }, onError = { error -> Firebase.crashlytics.recordException(error.throwable) - logger.error(error.throwable.stackTraceToString()) + println(error.throwable.stackTraceToString()) }) + FirebaseAppDistribution.getInstance().updateIfNewReleaseAvailable() + NotifyClient.initialize( init = Notify.Params.Init(CoreClient) ) { error -> Firebase.crashlytics.recordException(error.throwable) - logger.error(error.throwable.stackTraceToString()) + println(error.throwable.stackTraceToString()) } - FirebaseAppDistribution.getInstance().updateIfNewReleaseAvailable() + mixPanel = MixpanelAPI.getInstance(this, CommonBuildConfig.MIX_PANEL, true).apply { + identify(CoreClient.Push.clientId) + people.set("\$name", EthAccountDelegate.ethAddress) + } - registerAccount() initializeBeagle() - - - wcKoinApp.koin.get().plant(object : Timber.Tree() { - override fun log(priority: Int, tag: String?, message: String, t: Throwable?) { - if (t != null) { - mixPanel.track("error: $t, message: $message") - } else { - mixPanel.track(message) - } + scope.launch { + supervisorScope { + wcKoinApp.koin.get().plant(object : Timber.Tree() { + override fun log(priority: Int, tag: String?, message: String, t: Throwable?) { + if (t != null) { + mixPanel.track("error: $t, message: $message") + } else { + mixPanel.track(message) + } + } + }) + + handleNotifyMessages() } - }) - - - // For testing purposes only - FirebaseMessaging.getInstance().token.addOnSuccessListener { token -> - addFirebaseBeagleModules = { - WalletKit.registerDeviceToken(firebaseAccessToken = token, enableEncrypted = true, - onSuccess = { - Timber.tag(tag(this)).e("Successfully registered firebase token for Web3Wallet") - }, - onError = { - logger.error("Error while registering firebase token for Web3Wallet: ${it.throwable}") - Firebase.crashlytics.recordException(Throwable("Error while registering firebase token for Web3Wallet: ${it.throwable}")) - }) - - Beagle.add( - PaddingModule(size = PaddingModule.Size.LARGE, id = "${token}Padding"), - placement = Placement.Below(id = CoreClient.Push.clientId) - ) - Beagle.add( - TextModule(text = token) { - (getSystemService(CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(ClipData.newPlainText("FMC_Token", token)) - }, - placement = Placement.Below(id = "${token}Padding") - ) - } - addFirebaseBeagleModules() } - - handleNotifyMessages() } private fun initializeBeagle() { - initBeagle( - this@WalletKitApplication, - HeaderModule( - title = getString(R.string.app_name), - subtitle = BuildConfig.APPLICATION_ID, - text = "${BuildConfig.BUILD_TYPE} v${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})" - ), - DividerModule(), - TextModule(text = EthAccountDelegate.ethAddress) { - (getSystemService(CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(ClipData.newPlainText("Account", EthAccountDelegate.ethAddress)) - }, - PaddingModule(size = PaddingModule.Size.LARGE), - TextModule(text = EthAccountDelegate.privateKey) { - (getSystemService(CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(ClipData.newPlainText("Private Key", EthAccountDelegate.privateKey)) - }, - PaddingModule(size = PaddingModule.Size.LARGE), - TextModule(text = CoreClient.Push.clientId, id = CoreClient.Push.clientId) { - (getSystemService(CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(ClipData.newPlainText("ClientId", CoreClient.Push.clientId)) - }, - DividerModule(), - TextInputModule( - text = "Import Private Key", - areRealTimeUpdatesEnabled = false, - validator = { text -> - !text.startsWith("0x") && text.length == 64 - }, - onValueChanged = { text -> - NotifyClient.unregister( - params = Notify.Params.Unregister( - EthAccountDelegate.ethAddress, - ), - onSuccess = { - logger.log("Unregister Success") - EthAccountDelegate.privateKey = text - registerAccount() - }, - onError = { logger.error(it.throwable.stackTraceToString()) } - ) + Timber.plant( + object : Timber.Tree() { + override fun log(priority: Int, tag: String?, message: String, t: Throwable?) { + Beagle.log("${tag?.let { "[$it] " } ?: ""}$message", "Timber", t?.stackTraceToString(), timestamp = System.currentTimeMillis()) } - ), + } + ) + + Beagle.initialize( + application = this, + behavior = Behavior( + logBehavior = Behavior.LogBehavior(loggers = listOf(BeagleLogger)), + networkLogBehavior = Behavior.NetworkLogBehavior(networkLoggers = listOf(BeagleOkHttpLogger)) + ) ) - addFirebaseBeagleModules() } @@ -223,32 +152,4 @@ class WalletKitApplication : Application() { private fun onScopeCancelled(error: Throwable?, job: String) { wcKoinApp.koin.get(named(AndroidCommonDITags.LOGGER)).error("onScopeCancelled($job): $error") } - - private fun registerAccount() { - val account = EthAccountDelegate.ethAddress - val domain = BuildConfig.APPLICATION_ID - val isRegistered = NotifyClient.isRegistered(params = Notify.Params.IsRegistered(account = account, domain = domain)) - - if (!isRegistered) { - NotifyClient.prepareRegistration( - params = Notify.Params.PrepareRegistration(account = account, domain = domain), - onSuccess = { cacaoPayloadWithIdentityPrivateKey, message -> - logger.log("PrepareRegistration Success: $cacaoPayloadWithIdentityPrivateKey") - - val signature = CacaoSigner.sign(message, EthAccountDelegate.privateKey.hexToBytes(), SignatureType.EIP191) - - NotifyClient.register( - params = Notify.Params.Register(cacaoPayloadWithIdentityPrivateKey = cacaoPayloadWithIdentityPrivateKey, signature = signature), - onSuccess = { logger.log("Register Success") }, - onError = { logger.error(it.throwable.stackTraceToString()) } - ) - - }, - onError = { logger.error(it.throwable.stackTraceToString()) } - ) - } else { - logger.log("$account is already registered") - } - } - } \ No newline at end of file diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt index d5705e28e..d30de0156 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt @@ -6,6 +6,8 @@ package com.reown.sample.wallet.ui +import android.content.ClipData +import android.content.ClipboardManager import android.content.Intent import android.content.pm.PackageManager import android.os.Build @@ -27,11 +29,30 @@ import androidx.navigation.NavHostController import com.google.accompanist.navigation.animation.rememberAnimatedNavController import com.google.accompanist.navigation.material.BottomSheetNavigator import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi +import com.pandulapeter.beagle.Beagle +import com.pandulapeter.beagle.modules.DividerModule +import com.pandulapeter.beagle.modules.HeaderModule +import com.pandulapeter.beagle.modules.LogListModule +import com.pandulapeter.beagle.modules.NetworkLogListModule +import com.pandulapeter.beagle.modules.PaddingModule +import com.pandulapeter.beagle.modules.ScreenCaptureToolboxModule +import com.pandulapeter.beagle.modules.TextInputModule +import com.pandulapeter.beagle.modules.TextModule +import com.reown.android.CoreClient +import com.reown.android.cacao.signature.SignatureType +import com.reown.android.utils.cacao.sign +import com.reown.notify.client.Notify +import com.reown.notify.client.NotifyClient +import com.reown.notify.client.cacao.CacaoSigner import com.reown.sample.common.ui.theme.WCSampleAppTheme +import com.reown.sample.wallet.BuildConfig +import com.reown.sample.wallet.R +import com.reown.sample.wallet.domain.EthAccountDelegate import com.reown.sample.wallet.domain.NotifyDelegate import com.reown.sample.wallet.ui.routes.Route import com.reown.sample.wallet.ui.routes.composable_routes.connections.ConnectionsViewModel import com.reown.sample.wallet.ui.routes.host.WalletSampleHost +import com.reown.util.hexToBytes import com.reown.walletkit.client.WalletKit import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay @@ -56,12 +77,13 @@ class WalletKitActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContent(web3walletViewModel, connectionsViewModel) handleWeb3WalletEvents(web3walletViewModel, connectionsViewModel) askNotificationPermission() handleErrors() handleAppLink(intent) + registerAccount() + setBeagle() } private fun setContent( @@ -139,7 +161,7 @@ class WalletKitActivity : AppCompatActivity() { private suspend fun navigateWhenReady(navigate: () -> Unit) { if (!::navController.isInitialized) { - delay(300) + delay(400) navigate() } else { navigate() @@ -187,9 +209,83 @@ class WalletKitActivity : AppCompatActivity() { } } + private fun setBeagle() { + Beagle.set( + HeaderModule( + title = getString(R.string.app_name), + subtitle = BuildConfig.APPLICATION_ID, + text = "${BuildConfig.BUILD_TYPE} v${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})" + ), + ScreenCaptureToolboxModule(), + DividerModule(), + TextModule("Logs", TextModule.Type.SECTION_HEADER), + NetworkLogListModule(), + LogListModule(), + DividerModule(), + TextModule(text = EthAccountDelegate.ethAddress) { + (getSystemService(CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(ClipData.newPlainText("Account", EthAccountDelegate.ethAddress)) + }, + PaddingModule(size = PaddingModule.Size.LARGE), + TextModule(text = EthAccountDelegate.privateKey) { + (getSystemService(CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(ClipData.newPlainText("Private Key", EthAccountDelegate.privateKey)) + }, + PaddingModule(size = PaddingModule.Size.LARGE), + TextModule(text = CoreClient.Push.clientId, id = CoreClient.Push.clientId) { + (getSystemService(CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(ClipData.newPlainText("ClientId", CoreClient.Push.clientId)) + }, + DividerModule(), + TextInputModule( + text = "Import Private Key", + areRealTimeUpdatesEnabled = false, + validator = { text -> + !text.startsWith("0x") && text.length == 64 + }, + onValueChanged = { text -> + NotifyClient.unregister( + params = Notify.Params.Unregister( + EthAccountDelegate.ethAddress, + ), + onSuccess = { + println("Unregister Success") + EthAccountDelegate.privateKey = text + registerAccount() + }, + onError = { println(it.throwable.stackTraceToString()) } + ) + } + ) + ) + } + + private fun registerAccount() { + val account = EthAccountDelegate.ethAddress + val domain = BuildConfig.APPLICATION_ID + val isRegistered = NotifyClient.isRegistered(params = Notify.Params.IsRegistered(account = account, domain = domain)) + + if (!isRegistered) { + NotifyClient.prepareRegistration( + params = Notify.Params.PrepareRegistration(account = account, domain = domain), + onSuccess = { cacaoPayloadWithIdentityPrivateKey, message -> + println("PrepareRegistration Success: $cacaoPayloadWithIdentityPrivateKey") + + val signature = CacaoSigner.sign(message, EthAccountDelegate.privateKey.hexToBytes(), SignatureType.EIP191) + + NotifyClient.register( + params = Notify.Params.Register(cacaoPayloadWithIdentityPrivateKey = cacaoPayloadWithIdentityPrivateKey, signature = signature), + onSuccess = { println("Register Success") }, + onError = { println(it.throwable.stackTraceToString()) } + ) + + }, + onError = { println(it.throwable.stackTraceToString()) } + ) + } else { + println("$account is already registered") + } + } + override fun onNewIntent(intent: Intent?) { super.onNewIntent(intent) - handleAppLink(intent) } diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/Web3WalletNavGraph.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/Web3WalletNavGraph.kt index 2ea2566d1..9ecff8fac 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/Web3WalletNavGraph.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/Web3WalletNavGraph.kt @@ -109,10 +109,7 @@ fun Web3WalletNavGraph( composable(Route.GetStarted.path) { GetStartedRoute(navController) } - composable( - Route.Connections.path, - deepLinks = listOf(NavDeepLink("kotlin-web3wallet://wc")) - ) { + composable(Route.Connections.path,) { ConnectionsRoute(navController, connectionsViewModel, web3walletViewModel) } composable("${Route.ConnectionDetails.path}/{connectionId}", arguments = listOf( @@ -139,7 +136,9 @@ fun Web3WalletNavGraph( bottomSheet(Route.ScanUri.path) { web3walletViewModel.showLoader(false) scrimColor = Color.Unspecified - ScanUriRoute(navController, sheetState, onScanSuccess = { web3walletViewModel.pair(it) }) + ScanUriRoute(navController, sheetState, onScanSuccess = { + web3walletViewModel.pair(it) + }) } bottomSheet( "${Route.UpdateSubscription.path}/{topic}", arguments = listOf( @@ -157,7 +156,7 @@ fun Web3WalletNavGraph( dialog(Route.SessionAuthenticate.path, dialogProperties = DialogProperties(usePlatformDefaultWidth = false)) { SessionAuthenticateRoute(navController, connectionsViewModel) } - dialog(Route.SessionRequest.path, deepLinks = listOf(NavDeepLink("kotlin-web3wallet://request")), dialogProperties = DialogProperties(usePlatformDefaultWidth = false)) { + dialog(Route.SessionRequest.path, dialogProperties = DialogProperties(usePlatformDefaultWidth = false)) { SessionRequestRoute(navController) } dialog(Route.PasteUri.path, dialogProperties = DialogProperties(usePlatformDefaultWidth = false)) { diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/Web3WalletViewModel.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/Web3WalletViewModel.kt index be5549ef3..372130102 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/Web3WalletViewModel.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/Web3WalletViewModel.kt @@ -95,7 +95,6 @@ class Web3WalletViewModel : ViewModel() { viewModelScope.launch { _eventsSharedFlow.emit(PairingEvent.ProposalExpired("Proposal expired, please pair again")) } - } is Wallet.Model.ExpiredRequest -> SignEvent.ExpiredRequest @@ -125,6 +124,16 @@ class Web3WalletViewModel : ViewModel() { _isLoadingFlow.value = false SignEvent.SessionProposal } + is Wallet.Model.Error -> { + if (wcEvent.throwable.message?.contains("No proposal or pending session authenticate request for pairing topic") == true){ + viewModelScope.launch { + _isLoadingFlow.value = false + _eventsSharedFlow.emit(PairingEvent.ProposalExpired("No proposal or pending session authenticate request for pairing topic: Proposal already consumed")) + } + } else { + println(wcEvent.throwable) + } + } else -> NoAction } diff --git a/sample/wallet/src/main/res/navigation/nav_graph.xml b/sample/wallet/src/main/res/navigation/nav_graph.xml index 3e2bc5789..9eb7a37e0 100644 --- a/sample/wallet/src/main/res/navigation/nav_graph.xml +++ b/sample/wallet/src/main/res/navigation/nav_graph.xml @@ -8,17 +8,17 @@ android:id="@+id/web3walletActivity" android:name="com.reown.sample.wallet.ui.WalletKitActivity" android:fitsSystemWindows="true" - android:label="Web3WalletActivity" /> + android:label="WalletKitActivity" /> - + + + - + + + \ No newline at end of file From 6c7934b0a228bc31848c7ff8ae4336f5c4922209 Mon Sep 17 00:00:00 2001 From: kubel Date: Thu, 12 Sep 2024 11:23:48 +0200 Subject: [PATCH 43/51] Update app links --- .../GetSamplesWalletsUseCaseInterface.kt | 6 +++--- .../domain/WatchSubscriptionsUseCase.kt | 20 +++++++++---------- sample/dapp/build.gradle.kts | 6 +++--- sample/dapp/src/main/AndroidManifest.xml | 2 +- .../com/reown/sample/dapp/DappSampleApp.kt | 2 +- .../chain_selection/ChainSelectionRoute.kt | 6 +++--- sample/modal/build.gradle.kts | 6 +++--- sample/modal/src/main/AndroidManifest.xml | 2 +- .../com/reown/sample/modal/AppKitApp.kt | 2 +- sample/wallet/build.gradle.kts | 6 +++--- sample/wallet/src/main/AndroidManifest.xml | 4 ++-- .../sample/wallet/WalletKitApplication.kt | 2 +- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/core/android/src/main/kotlin/com/reown/android/internal/common/modal/domain/usecase/GetSamplesWalletsUseCaseInterface.kt b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/domain/usecase/GetSamplesWalletsUseCaseInterface.kt index 4b96ca4da..41cd42757 100644 --- a/core/android/src/main/kotlin/com/reown/android/internal/common/modal/domain/usecase/GetSamplesWalletsUseCaseInterface.kt +++ b/core/android/src/main/kotlin/com/reown/android/internal/common/modal/domain/usecase/GetSamplesWalletsUseCaseInterface.kt @@ -39,7 +39,7 @@ private val SampleWalletDebug = Wallet( mobileLink = "kotlin-web3wallet://", playStore = null, webAppLink = null, - linkMode = "https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/wallet_debug", + linkMode = "https://dev.lab.web3modal.com/wallet_debug", true ) @@ -52,7 +52,7 @@ private val SampleWalletInternal = Wallet( mobileLink = "kotlin-web3wallet://", playStore = null, webAppLink = null, - linkMode = "https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/wallet_internal", + linkMode = "https://dev.lab.web3modal.com/wallet_internal", true ) @@ -65,7 +65,7 @@ private val SampleWalletRelease = Wallet( mobileLink = "kotlin-web3wallet://", playStore = null, webAppLink = null, - linkMode = "https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/wallet_release", + linkMode = "https://dev.lab.web3modal.com/wallet_release", true ) diff --git a/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/WatchSubscriptionsUseCase.kt b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/WatchSubscriptionsUseCase.kt index 186f5b4c9..d4438c872 100644 --- a/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/WatchSubscriptionsUseCase.kt +++ b/protocol/notify/src/main/kotlin/com/reown/notify/engine/domain/WatchSubscriptionsUseCase.kt @@ -35,7 +35,7 @@ internal class WatchSubscriptionsUseCase( val selfPublicKey = getSelfKeyForWatchSubscriptionUseCase(requestTopic, accountId) val responseTopic = keyManagementRepository.generateTopicFromKeyAgreement(selfPublicKey, peerPublicKey) -// jsonRpcInteractor.subscribe(responseTopic) { error -> onFailure(error) } + jsonRpcInteractor.subscribe(responseTopic) { error -> onFailure(error) } val account = registeredAccountsRepository.getAccountByAccountId(accountId.value) val didJwt = fetchDidJwtInteractor.watchSubscriptionsRequest(accountId, authenticationPublicKey, account.appDomain) @@ -46,14 +46,14 @@ internal class WatchSubscriptionsUseCase( val request = NotifyRpc.NotifyWatchSubscriptions(params = watchSubscriptionsParams) val irnParams = IrnParams(Tags.NOTIFY_WATCH_SUBSCRIPTIONS, Ttl(thirtySeconds)) -// jsonRpcInteractor.publishJsonRpcRequest( -// topic = requestTopic, -// params = irnParams, -// payload = request, -// envelopeType = EnvelopeType.ONE, -// participants = Participants(selfPublicKey, peerPublicKey), -// onSuccess = onSuccess, -// onFailure = onFailure -// ) + jsonRpcInteractor.publishJsonRpcRequest( + topic = requestTopic, + params = irnParams, + payload = request, + envelopeType = EnvelopeType.ONE, + participants = Participants(selfPublicKey, peerPublicKey), + onSuccess = onSuccess, + onFailure = onFailure + ) } } diff --git a/sample/dapp/build.gradle.kts b/sample/dapp/build.gradle.kts index 0dd8755f0..6628ef8f8 100644 --- a/sample/dapp/build.gradle.kts +++ b/sample/dapp/build.gradle.kts @@ -29,18 +29,18 @@ android { buildTypes { getByName("release") { manifestPlaceholders["pathPrefix"] = "/dapp_release" - buildConfigField("String", "DAPP_APP_LINK", "\"https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/dapp_release\"") + buildConfigField("String", "DAPP_APP_LINK", "\"https://dev.lab.web3modal.com/dapp_release\"") } getByName("internal") { manifestPlaceholders["pathPrefix"] = "/dapp_internal" - buildConfigField("String", "DAPP_APP_LINK", "\"https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/dapp_internal\"") + buildConfigField("String", "DAPP_APP_LINK", "\"https://dev.lab.web3modal.com/dapp_internal\"") } getByName("debug") { manifestPlaceholders["pathPrefix"] = "/dapp_debug" - buildConfigField("String", "DAPP_APP_LINK", "\"https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/dapp_debug\"") + buildConfigField("String", "DAPP_APP_LINK", "\"https://dev.lab.web3modal.com/dapp_debug\"") } } diff --git a/sample/dapp/src/main/AndroidManifest.xml b/sample/dapp/src/main/AndroidManifest.xml index 5a5e4399b..1aac7378d 100644 --- a/sample/dapp/src/main/AndroidManifest.xml +++ b/sample/dapp/src/main/AndroidManifest.xml @@ -47,7 +47,7 @@ diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/DappSampleApp.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/DappSampleApp.kt index 0f19333fc..de7a638f6 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/DappSampleApp.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/DappSampleApp.kt @@ -24,7 +24,7 @@ class DappSampleApp : Application() { val appMetaData = Core.Model.AppMetaData( name = "Kotlin Dapp", description = "Kotlin Dapp Implementation", - url = "https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app", + url = "https://dev.lab.web3modal.com", icons = listOf("https://gblobscdn.gitbook.com/spaces%2F-LJJeCjcLrr53DcT1Ml7%2Favatar.png?alt=media"), redirect = "kotlin-dapp-wc://request", appLink = BuildConfig.DAPP_APP_LINK, diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt index 21dffdb83..571cc72bd 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt @@ -271,9 +271,9 @@ private fun ChainSelectionScreen( text = "1-CA Link Mode (Kotlin Sample Wallet)", onClick = { val applink = when { - context.packageManager.isPackageInstalled(SAMPLE_WALLET_DEBUG_PACKAGE) -> "https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/wallet_debug" - context.packageManager.isPackageInstalled(SAMPLE_WALLET_INTERNAL_PACKAGE) -> "https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/wallet_internal" - context.packageManager.isPackageInstalled(SAMPLE_WALLET_RELEASE_PACKAGE) -> "https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/wallet_release" + context.packageManager.isPackageInstalled(SAMPLE_WALLET_DEBUG_PACKAGE) -> "https://dev.lab.web3modal.com/wallet_debug" + context.packageManager.isPackageInstalled(SAMPLE_WALLET_INTERNAL_PACKAGE) -> "https://dev.lab.web3modal.com/wallet_internal" + context.packageManager.isPackageInstalled(SAMPLE_WALLET_RELEASE_PACKAGE) -> "https://dev.lab.web3modal.com/wallet_release" else -> "" } onAuthenticateLinkMode(applink) diff --git a/sample/modal/build.gradle.kts b/sample/modal/build.gradle.kts index 8adbb8b76..e5de8a686 100644 --- a/sample/modal/build.gradle.kts +++ b/sample/modal/build.gradle.kts @@ -28,18 +28,18 @@ android { buildTypes { getByName("release") { manifestPlaceholders["pathPrefix"] = "/lab_release" - buildConfigField("String", "LAB_APP_LINK", "\"https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/lab_release\"") + buildConfigField("String", "LAB_APP_LINK", "\"https://dev.lab.web3modal.com/lab_release\"") } getByName("internal") { manifestPlaceholders["pathPrefix"] = "/lab_internal" - buildConfigField("String", "LAB_APP_LINK", "\"https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/lab_internal\"") + buildConfigField("String", "LAB_APP_LINK", "\"https://dev.lab.web3modal.com/lab_internal\"") } getByName("debug") { manifestPlaceholders["pathPrefix"] = "/lab_debug" - buildConfigField("String", "LAB_APP_LINK", "\"https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/lab_debug\"") + buildConfigField("String", "LAB_APP_LINK", "\"https://dev.lab.web3modal.com/lab_debug\"") } } diff --git a/sample/modal/src/main/AndroidManifest.xml b/sample/modal/src/main/AndroidManifest.xml index 2e8d91d1e..34a43b4e0 100644 --- a/sample/modal/src/main/AndroidManifest.xml +++ b/sample/modal/src/main/AndroidManifest.xml @@ -77,7 +77,7 @@ diff --git a/sample/modal/src/main/kotlin/com/reown/sample/modal/AppKitApp.kt b/sample/modal/src/main/kotlin/com/reown/sample/modal/AppKitApp.kt index 159f6d70f..185be13f8 100644 --- a/sample/modal/src/main/kotlin/com/reown/sample/modal/AppKitApp.kt +++ b/sample/modal/src/main/kotlin/com/reown/sample/modal/AppKitApp.kt @@ -24,7 +24,7 @@ class AppKitApp : Application() { val appMetaData = Core.Model.AppMetaData( name = "AppKit Lab Sample", description = "Kotlin AppKit Lab Sample", - url = "https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app", + url = "https://dev.lab.web3modal.com", icons = listOf("https://gblobscdn.gitbook.com/spaces%2F-LJJeCjcLrr53DcT1Ml7%2Favatar.png?alt=media"), redirect = "kotlin-modal-wc://request", linkMode = true, diff --git a/sample/wallet/build.gradle.kts b/sample/wallet/build.gradle.kts index a36aa158b..8ebdab27e 100644 --- a/sample/wallet/build.gradle.kts +++ b/sample/wallet/build.gradle.kts @@ -28,18 +28,18 @@ android { buildTypes { getByName("release") { manifestPlaceholders["pathPrefix"] = "/wallet_release" - buildConfigField("String", "WALLET_APP_LINK", "\"https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/wallet_release\"") + buildConfigField("String", "WALLET_APP_LINK", "\"https://dev.lab.web3modal.com/wallet_release\"") } getByName("internal") { manifestPlaceholders["pathPrefix"] = "/wallet_internal" - buildConfigField("String", "WALLET_APP_LINK", "\"https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/wallet_internal\"") + buildConfigField("String", "WALLET_APP_LINK", "\"https://dev.lab.web3modal.com/wallet_internal\"") } getByName("debug") { manifestPlaceholders["pathPrefix"] = "/wallet_debug" - buildConfigField("String", "WALLET_APP_LINK", "\"https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app/wallet_debug\"") + buildConfigField("String", "WALLET_APP_LINK", "\"https://dev.lab.web3modal.com/wallet_debug\"") } } diff --git a/sample/wallet/src/main/AndroidManifest.xml b/sample/wallet/src/main/AndroidManifest.xml index bc083610e..79fca02d9 100644 --- a/sample/wallet/src/main/AndroidManifest.xml +++ b/sample/wallet/src/main/AndroidManifest.xml @@ -57,14 +57,14 @@ android:scheme="kotlin-web3wallet" /> - + diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitApplication.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitApplication.kt index 1e47bd9d7..32ed5ed8a 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitApplication.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/WalletKitApplication.kt @@ -47,7 +47,7 @@ class WalletKitApplication : Application() { val appMetaData = Core.Model.AppMetaData( name = "Kotlin Wallet", description = "Kotlin Wallet Implementation", - url = "https://web3modal-laboratory-git-chore-kotlin-assetlinks-walletconnect1.vercel.app", + url = "https://dev.lab.web3modal.com", icons = listOf("https://raw.githubusercontent.com/WalletConnect/walletconnect-assets/master/Icon/Gradient/Icon.png"), redirect = "kotlin-web3wallet://request", appLink = BuildConfig.WALLET_APP_LINK, From e23a8b0c802f2a0abe6e579e4cc63749dee83be4 Mon Sep 17 00:00:00 2001 From: kubel Date: Thu, 12 Sep 2024 12:33:47 +0200 Subject: [PATCH 44/51] Optimize deep linking flow --- .../com/reown/sample/dapp/ui/DappSampleNavGraph.kt | 1 - .../com/reown/sample/wallet/ui/WalletKitActivity.kt | 4 +++- .../com/reown/sample/wallet/ui/Web3WalletNavGraph.kt | 6 ++++-- .../composable_routes/connections/ConnectionsRoute.kt | 9 --------- sample/wallet/src/main/res/navigation/nav_graph.xml | 8 -------- 5 files changed, 7 insertions(+), 21 deletions(-) diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/DappSampleNavGraph.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/DappSampleNavGraph.kt index b619b0495..af18f8a69 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/DappSampleNavGraph.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/DappSampleNavGraph.kt @@ -8,7 +8,6 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp import androidx.navigation.NavController -import androidx.navigation.NavDeepLink import androidx.navigation.NavHostController import androidx.navigation.NavType import androidx.navigation.compose.NavHost diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt index d30de0156..1e34b172a 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt @@ -202,7 +202,7 @@ class WalletKitActivity : AppCompatActivity() { ) { lifecycleScope.launch { navigateWhenReady { - navController.handleDeepLink(intent) + web3walletViewModel.pair(intent.dataString.toString()) } } } @@ -286,6 +286,8 @@ class WalletKitActivity : AppCompatActivity() { override fun onNewIntent(intent: Intent?) { super.onNewIntent(intent) + + println("kobe: WalletKitActivity.newIntent ${intent?.dataString}") handleAppLink(intent) } diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/Web3WalletNavGraph.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/Web3WalletNavGraph.kt index 9ecff8fac..6e6bf3b75 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/Web3WalletNavGraph.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/Web3WalletNavGraph.kt @@ -109,7 +109,7 @@ fun Web3WalletNavGraph( composable(Route.GetStarted.path) { GetStartedRoute(navController) } - composable(Route.Connections.path,) { + composable(Route.Connections.path) { ConnectionsRoute(navController, connectionsViewModel, web3walletViewModel) } composable("${Route.ConnectionDetails.path}/{connectionId}", arguments = listOf( @@ -156,7 +156,9 @@ fun Web3WalletNavGraph( dialog(Route.SessionAuthenticate.path, dialogProperties = DialogProperties(usePlatformDefaultWidth = false)) { SessionAuthenticateRoute(navController, connectionsViewModel) } - dialog(Route.SessionRequest.path, dialogProperties = DialogProperties(usePlatformDefaultWidth = false)) { + dialog( + Route.SessionRequest.path, dialogProperties = DialogProperties(usePlatformDefaultWidth = false) + ) { SessionRequestRoute(navController) } dialog(Route.PasteUri.path, dialogProperties = DialogProperties(usePlatformDefaultWidth = false)) { diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connections/ConnectionsRoute.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connections/ConnectionsRoute.kt index ed6f5ad01..d78c81fa0 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connections/ConnectionsRoute.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/connections/ConnectionsRoute.kt @@ -50,15 +50,6 @@ import com.reown.sample.wallet.ui.routes.Route @Composable fun ConnectionsRoute(navController: NavController, connectionsViewModel: ConnectionsViewModel, web3WalletViewModel: Web3WalletViewModel) { - val context = LocalContext.current - val activity = context.findActivity() - - activity?.intent.takeIf { intent -> intent?.action == Intent.ACTION_VIEW && !intent.dataString.isNullOrBlank() }?.let { intent -> - if (intent.dataString?.startsWith("kotlin-web3wallet://wc?uri=wc") == true) { - web3WalletViewModel.pair(intent.dataString.toString()) - } - intent.data = null - } connectionsViewModel.refreshConnections() val connections by connectionsViewModel.connections.collectAsState(initial = emptyList()) diff --git a/sample/wallet/src/main/res/navigation/nav_graph.xml b/sample/wallet/src/main/res/navigation/nav_graph.xml index 9eb7a37e0..6dc81f973 100644 --- a/sample/wallet/src/main/res/navigation/nav_graph.xml +++ b/sample/wallet/src/main/res/navigation/nav_graph.xml @@ -10,15 +10,7 @@ android:fitsSystemWindows="true" android:label="WalletKitActivity" /> - - - - - - - - \ No newline at end of file From 2bf0f743a942ac7f9cf98f3d78be3c88321bea25 Mon Sep 17 00:00:00 2001 From: kubel Date: Thu, 12 Sep 2024 13:04:32 +0200 Subject: [PATCH 45/51] New x-sdk-type --- product/appkit/src/main/kotlin/com/reown/appkit/utils/Image.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/utils/Image.kt b/product/appkit/src/main/kotlin/com/reown/appkit/utils/Image.kt index 6cf544860..8482abd44 100644 --- a/product/appkit/src/main/kotlin/com/reown/appkit/utils/Image.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/utils/Image.kt @@ -10,7 +10,7 @@ import com.reown.android.internal.common.wcKoinApp internal fun ImageRequest.Builder.imageHeaders() = apply { addHeader("x-project-id", wcKoinApp.koin.get().value) addHeader("x-sdk-version", BuildConfig.SDK_VERSION) - addHeader("x-sdk-type", "w3m") + addHeader("x-sdk-type", "appkit") } internal val grayColorFilter = ColorFilter.colorMatrix(ColorMatrix().apply { setToSaturation(0f) }) From 886949a8fcfff834f29732e859722558bdb2794e Mon Sep 17 00:00:00 2001 From: kubel Date: Fri, 13 Sep 2024 11:12:05 +0200 Subject: [PATCH 46/51] Restore Sample Dapp state --- .../sample/common/ui/WCTopAppBarLegacy.kt | 10 ----- sample/dapp/build.gradle.kts | 3 -- .../sample/dapp/ui/DappSampleActivity.kt | 8 ++-- .../com/reown/sample/dapp/ui/routes/Route.kt | 1 - .../composable_routes/account/AccountRoute.kt | 7 +++- .../chain_selection/ChainSelectionRoute.kt | 14 ++++++- .../ChainSelectionViewModel.kt | 10 ++--- .../composable_routes/session/SessionRoute.kt | 13 +++--- .../session/SessionViewModel.kt | 40 +++++++++---------- .../dapp/ui/routes/host/DappSampleHost.kt | 12 +++++- .../sample/wallet/ui/WalletKitActivity.kt | 1 - 11 files changed, 61 insertions(+), 58 deletions(-) diff --git a/sample/common/src/main/kotlin/com/reown/sample/common/ui/WCTopAppBarLegacy.kt b/sample/common/src/main/kotlin/com/reown/sample/common/ui/WCTopAppBarLegacy.kt index e569ef8df..f2076b3bd 100644 --- a/sample/common/src/main/kotlin/com/reown/sample/common/ui/WCTopAppBarLegacy.kt +++ b/sample/common/src/main/kotlin/com/reown/sample/common/ui/WCTopAppBarLegacy.kt @@ -48,22 +48,12 @@ fun WCTopAppBarLegacy( ), @DrawableRes icon: Int? = null, onIconClick: (() -> Unit)? = null, - onBackIconClick: (() -> Unit)? = null, ) { Row( modifier = modifier, verticalAlignment = Alignment.CenterVertically ) { Spacer(modifier = Modifier.width(8.dp)) - onBackIconClick?.let { - Icon( - tint = Color(0xFF3496ff), - imageVector = ImageVector.vectorResource(id = R.drawable.chevron_left), - contentDescription = "BackArrow", - modifier = Modifier.clickable { onBackIconClick() } - ) - Spacer(modifier = Modifier.width(32.dp)) - } Row( modifier = Modifier .fillMaxWidth() diff --git a/sample/dapp/build.gradle.kts b/sample/dapp/build.gradle.kts index 6628ef8f8..b6e6263d5 100644 --- a/sample/dapp/build.gradle.kts +++ b/sample/dapp/build.gradle.kts @@ -98,14 +98,11 @@ dependencies { debugImplementation(project(":core:android")) debugImplementation(project(":product:appkit")) - debugImplementation(project(":protocol:sign")) internalImplementation(project(":core:android")) internalImplementation(project(":product:appkit")) - internalImplementation(project(":protocol:sign")) releaseImplementation(platform("com.reown:android-bom:$BOM_VERSION")) releaseImplementation("com.reown:android-core") releaseImplementation("com.reown:appkit") - releaseImplementation("com.reown:sign") } diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/DappSampleActivity.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/DappSampleActivity.kt index 855880d25..8e427445a 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/DappSampleActivity.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/DappSampleActivity.kt @@ -10,9 +10,9 @@ import androidx.activity.compose.setContent import androidx.compose.material.ExperimentalMaterialApi import androidx.lifecycle.lifecycleScope import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi +import com.reown.appkit.client.AppKit import com.reown.sample.common.ui.theme.WCSampleAppTheme import com.reown.sample.dapp.ui.routes.host.DappSampleHost -import com.reown.sign.client.SignClient import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -20,14 +20,14 @@ class DappSampleActivity : ComponentActivity() { @ExperimentalMaterialNavigationApi override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContent() { + setContent { WCSampleAppTheme { DappSampleHost() } } if (intent?.dataString?.contains("wc_ev") == true) { - SignClient.dispatchEnvelope(intent.dataString ?: "") { + AppKit.handleDeepLink(intent.dataString ?: "") { lifecycleScope.launch(Dispatchers.Main) { Toast.makeText(this@DappSampleActivity, "Error dispatching envelope: ${it.throwable.message}", Toast.LENGTH_SHORT).show() } @@ -39,7 +39,7 @@ class DappSampleActivity : ComponentActivity() { super.onNewIntent(intent) if (intent?.dataString?.contains("wc_ev") == true) { - SignClient.dispatchEnvelope(intent.dataString ?: "") { + AppKit.handleDeepLink(intent.dataString ?: "") { lifecycleScope.launch(Dispatchers.Main) { Toast.makeText(this@DappSampleActivity, "Error dispatching envelope: ${it.throwable.message}", Toast.LENGTH_SHORT).show() } diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/Route.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/Route.kt index 816416ffd..dd89b0adf 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/Route.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/Route.kt @@ -2,7 +2,6 @@ package com.reown.sample.dapp.ui.routes sealed class Route(val path: String) { object ChainSelection : Route("chain_selection") - object ParingGeneration : Route("paring_generation") object Session : Route("session") object Account : Route("account") } diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/account/AccountRoute.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/account/AccountRoute.kt index 92d292edb..9938c9d20 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/account/AccountRoute.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/account/AccountRoute.kt @@ -63,7 +63,12 @@ fun AccountRoute(navController: NavController) { Toast.makeText(context, "Error: ${event.exceptionMsg}", Toast.LENGTH_LONG).show() } - is DappSampleEvents.Disconnect -> navController.popBackStack(Route.ChainSelection.path, false) + is DappSampleEvents.Disconnect -> navController.navigate(Route.ChainSelection.path) { + popUpTo(navController.graph.startDestinationId) { + inclusive = true + } + } + else -> Unit } } diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt index 571cc72bd..19d5f16a4 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt @@ -464,7 +464,12 @@ private fun handleSignEvents( when (event) { DappSampleEvents.SessionApproved -> { viewModel.awaitingProposalResponse(false) - navController.navigate(Route.Session.path) + navController.navigate(Route.Session.path) { + popUpTo(0) { + inclusive = true + } + launchSingleTop = true + } } DappSampleEvents.SessionRejected -> { @@ -482,7 +487,12 @@ private fun handleSignEvents( if (event.message != null) { Toast.makeText(context, event.message, Toast.LENGTH_SHORT).show() } else { - navController.navigate(Route.Session.path) + navController.navigate(Route.Session.path) { + popUpTo(0) { + inclusive = true + } + launchSingleTop = true + } } } diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt index 041c7bffc..898eaa06c 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt @@ -10,8 +10,6 @@ import com.reown.sample.common.Chains import com.reown.sample.common.tag import com.reown.sample.dapp.domain.DappDelegate import com.reown.sample.dapp.ui.DappSampleEvents -import com.reown.sign.client.Sign -import com.reown.sign.client.SignClient import com.reown.util.bytesToHex import com.reown.util.randomBytes import com.reown.appkit.client.AppKit @@ -72,12 +70,12 @@ class ChainSelectionViewModel : ViewModel() { } } - fun authenticate(authenticateParams: Sign.Params.Authenticate, appLink: String = "", onAuthenticateSuccess: (String?) -> Unit, onError: (String) -> Unit = {}) { + fun authenticate(authenticateParams: Modal.Params.Authenticate, appLink: String = "", onAuthenticateSuccess: (String?) -> Unit, onError: (String) -> Unit = {}) { viewModelScope.launch { _awaitingProposalSharedFlow.emit(true) } - SignClient.authenticate(authenticateParams, walletAppLink = appLink, + AppKit.authenticate(authenticateParams, walletAppLink = appLink, onSuccess = { url -> viewModelScope.launch { _awaitingProposalSharedFlow.emit(false) @@ -190,7 +188,7 @@ class ChainSelectionViewModel : ViewModel() { val authenticateParams - get() = Sign.Params.Authenticate( + get() = Modal.Params.Authenticate( chains = uiState.value.filter { it.isSelected }.map { it.chainId }, domain = "sample.kotlin.dapp", uri = "https://web3inbox.com/all-apps", @@ -208,7 +206,7 @@ class ChainSelectionViewModel : ViewModel() { ) val siweParams - get() = Sign.Params.Authenticate( + get() = Modal.Params.Authenticate( chains = uiState.value.filter { it.isSelected }.map { it.chainId }, domain = "sample.kotlin.dapp", uri = "https://web3inbox.com/all-apps", diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/session/SessionRoute.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/session/SessionRoute.kt index 66d59a3b9..f39eb3c8a 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/session/SessionRoute.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/session/SessionRoute.kt @@ -82,7 +82,11 @@ fun SessionRoute( is DappSampleEvents.PingLoading -> isPingLoading = true is DappSampleEvents.Disconnect -> { isDisconnectLoading = false - navController.popBackStack(Route.ChainSelection.path, inclusive = false) + navController.navigate(Route.ChainSelection.path) { + popUpTo(navController.graph.startDestinationId) { + inclusive = true + } + } Toast.makeText(context, "Disconnected successfully", Toast.LENGTH_SHORT).show() } @@ -99,7 +103,6 @@ fun SessionRoute( SessionScreen( uiState = state, - onBackPressed = navController::popBackStack, onSessionClick = navController::navigateToAccount, onPingClick = viewModel::ping, onDisconnectClick = viewModel::disconnect, @@ -111,7 +114,6 @@ fun SessionRoute( @Composable private fun SessionScreen( uiState: List, - onBackPressed: () -> Unit, onSessionClick: (String) -> Unit, onPingClick: () -> Unit, onDisconnectClick: () -> Unit, @@ -119,10 +121,7 @@ private fun SessionScreen( isPingLoading: Boolean, ) { Column { - WCTopAppBarLegacy( - titleText = "Session Chains", - onBackIconClick = onBackPressed, - ) + WCTopAppBarLegacy(titleText = "Session Chains",) ChainsAction(onPingClick, onDisconnectClick, isDisconnectLoading, isPingLoading) LazyColumn(modifier = Modifier.fillMaxSize()) { item { diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/session/SessionViewModel.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/session/SessionViewModel.kt index e237263dc..7b7c89353 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/session/SessionViewModel.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/session/SessionViewModel.kt @@ -89,28 +89,26 @@ class SessionViewModel : ViewModel() { } fun disconnect() { - if (DappDelegate.selectedSessionTopic != null) { - try { - viewModelScope.launch { _sessionEvents.emit(DappSampleEvents.DisconnectLoading) } - AppKit.disconnect( - onSuccess = { - DappDelegate.deselectAccountDetails() - viewModelScope.launch { - _sessionEvents.emit(DappSampleEvents.Disconnect) - } - }, - onError = { throwable: Throwable -> - Timber.tag(tag(this)).e(throwable.stackTraceToString()) - Firebase.crashlytics.recordException(throwable) - viewModelScope.launch { - _sessionEvents.emit(DappSampleEvents.DisconnectError(throwable.message ?: "Unknown error, please try again or contact support")) - } - }) + try { + viewModelScope.launch { _sessionEvents.emit(DappSampleEvents.DisconnectLoading) } + AppKit.disconnect( + onSuccess = { + DappDelegate.deselectAccountDetails() + viewModelScope.launch { + _sessionEvents.emit(DappSampleEvents.Disconnect) + } + }, + onError = { throwable: Throwable -> + Timber.tag(tag(this)).e(throwable.stackTraceToString()) + Firebase.crashlytics.recordException(throwable) + viewModelScope.launch { + _sessionEvents.emit(DappSampleEvents.DisconnectError(throwable.message ?: "Unknown error, please try again or contact support")) + } + }) - } catch (e: Exception) { - viewModelScope.launch { - _sessionEvents.emit(DappSampleEvents.DisconnectError(e.message ?: "Unknown error, please try again or contact support")) - } + } catch (e: Exception) { + viewModelScope.launch { + _sessionEvents.emit(DappSampleEvents.DisconnectError(e.message ?: "Unknown error, please try again or contact support")) } } } diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/host/DappSampleHost.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/host/DappSampleHost.kt index c7eae3097..eefa9c3ea 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/host/DappSampleHost.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/host/DappSampleHost.kt @@ -34,6 +34,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.compose.rememberNavController import com.google.accompanist.navigation.material.BottomSheetNavigator import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi +import com.reown.appkit.client.AppKit import com.reown.sample.dapp.R import com.reown.sample.dapp.ui.DappSampleEvents import com.reown.sample.dapp.ui.DappSampleNavGraph @@ -48,15 +49,22 @@ fun DappSampleHost() { initialValue = ModalBottomSheetValue.Hidden, skipHalfExpanded = true ) + val bottomSheetNavigator = BottomSheetNavigator(sheetState) val navController = rememberNavController(bottomSheetNavigator) val viewModel: DappSampleViewModel = viewModel() + val isConnected = AppKit.getAccount() != null + val startDestination = if (isConnected) Route.Session.path else Route.ChainSelection.path LaunchedEffect(Unit) { viewModel.events.collect { event -> when (event) { is DappSampleEvents.ConnectionEvent -> isOfflineState = !event.isAvailable - is DappSampleEvents.Disconnect -> navController.navigate(Route.ChainSelection.path) + is DappSampleEvents.Disconnect -> navController.navigate(Route.ChainSelection.path) { + popUpTo(navController.graph.startDestinationId) { + inclusive = true + } + } is DappSampleEvents.RequestError -> scaffoldState.snackbarHostState.showSnackbar(event.exceptionMsg) is DappSampleEvents.SessionExtend -> scaffoldState.snackbarHostState.showSnackbar("Session extended") else -> Unit @@ -71,7 +79,7 @@ fun DappSampleHost() { DappSampleNavGraph( bottomSheetNavigator = bottomSheetNavigator, navController = navController, - startDestination = Route.ChainSelection.path, + startDestination = startDestination, ) if (isOfflineState != null) { diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt index 1e34b172a..c23f99eed 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt @@ -287,7 +287,6 @@ class WalletKitActivity : AppCompatActivity() { override fun onNewIntent(intent: Intent?) { super.onNewIntent(intent) - println("kobe: WalletKitActivity.newIntent ${intent?.dataString}") handleAppLink(intent) } From 448f0fe29ee5b89a6db5b211f2a5ecde0ef58624 Mon Sep 17 00:00:00 2001 From: kubel Date: Fri, 13 Sep 2024 11:39:45 +0200 Subject: [PATCH 47/51] Fix disconnect ui glitch --- .../kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt index c23f99eed..a6f8a856d 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/WalletKitActivity.kt @@ -148,7 +148,11 @@ class WalletKitActivity : AppCompatActivity() { is SignEvent.Disconnect -> { connectionsViewModel.refreshConnections() - if (navController.currentDestination?.route != Route.Connections.path) { + + if (navController.currentDestination?.route != Route.Connections.path && + navController.currentDestination?.route != Route.SessionProposal.path && + navController.currentDestination?.route != Route.SessionAuthenticate.path + ) { navController.navigate(Route.Connections.path) } } From ead1ec8561ee8b26ec12f7326b8b486eba7f6335 Mon Sep 17 00:00:00 2001 From: kubel Date: Mon, 16 Sep 2024 13:08:07 +0200 Subject: [PATCH 48/51] Update nav component --- buildSrc/src/main/kotlin/Versions.kt | 1 - .../kotlin/publish-module-android.gradle.kts | 2 +- .../kotlin/publish-module-java.gradle.kts | 2 +- gradle/libs.versions.toml | 26 +++++++++---------- .../com/reown/sample/common/ui/WCTopAppBar.kt | 2 +- sample/dapp/build.gradle.kts | 1 + sample/modal/build.gradle.kts | 1 + .../com/reown/sample/modal/MainActivity.kt | 5 +--- .../notifications/NotificationsHeader.kt | 2 +- .../notifications/NotificationsOptionsMenu.kt | 2 +- 10 files changed, 21 insertions(+), 23 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 068fc3ccc..e00f7b501 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -5,7 +5,6 @@ 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.0.0" const val FOUNDATION_VERSION = "1.0.0" const val CORE_VERSION = "1.0.0" diff --git a/buildSrc/src/main/kotlin/publish-module-android.gradle.kts b/buildSrc/src/main/kotlin/publish-module-android.gradle.kts index 292286dc4..c4ff56577 100644 --- a/buildSrc/src/main/kotlin/publish-module-android.gradle.kts +++ b/buildSrc/src/main/kotlin/publish-module-android.gradle.kts @@ -59,7 +59,7 @@ afterEvaluate { developer { id.set("KotlinSDKTeam") name.set("Reown Kotlin") - email.set("Kotlin@WalletConnect.com") + email.set("mobile@reown.com ") } } diff --git a/buildSrc/src/main/kotlin/publish-module-java.gradle.kts b/buildSrc/src/main/kotlin/publish-module-java.gradle.kts index cf382f4a8..76313552e 100644 --- a/buildSrc/src/main/kotlin/publish-module-java.gradle.kts +++ b/buildSrc/src/main/kotlin/publish-module-java.gradle.kts @@ -56,7 +56,7 @@ afterEvaluate { developer { id.set("KotlinSDKTeam") name.set("Reown Kotlin") - email.set("Kotlin@WalletConnect.com") + email.set("mobile@reown.com ") } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d002a0a2d..ead72ccb4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,7 +20,7 @@ coroutines = "1.8.1" sqlDelight = "2.0.2" dokka = "1.9.20" moshi = "1.15.1" -googleService = "4.4.1" +googleService = "4.4.2" scarlet = "1.0.2" koin = "3.5.6" retrofit = "2.11.0" @@ -38,18 +38,18 @@ customQrGenerator = "1.6.2" beagle = "2.9.0" coinbase = "1.0.4" -firebaseBOM = "33.0.0" +firebaseBOM = "33.3.0" firebaseAppDistribution = "5.0.0" androidxCore = "1.13.1" -androidxAppCompat = "1.6.1" +androidxAppCompat = "1.7.0" andoridxMaterial = "1.12.0" -androidxLifecycle = "2.8.0" -androidxTest = "1.5.0" -androidxTestOrchestration = "1.4.2" +androidxLifecycle = "2.8.5" +androidxTest = "1.6.1" +androidxTestOrchestration = "1.5.0" androidxSecurity = "1.1.0-alpha06" androidxDatastore = "1.1.1" -androidxNavigation = "2.7.7" +androidxNavigation = "2.8.0" jUnit = "4.13.2" robolectric = "4.12.2" @@ -78,10 +78,10 @@ androidx-datastore = { module = "androidx.datastore:datastore-preferences", vers androidx-core = { module = "androidx.core:core-ktx", version.ref = "androidxCore" } androidx-appCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidxAppCompat" } androidx-material = { module = "com.google.android.material:material", version.ref = "andoridxMaterial" } -androidx-testJunit = { module = "androidx.test.ext:junit-ktx", version = "1.1.5" } +androidx-testJunit = { module = "androidx.test.ext:junit-ktx", version = "1.2.1" } androidx-testCore = { module = "androidx.test:core-ktx", version.ref = "androidxTest" } androidx-testOrchestrator = { module = "androidx.test:orchestrator", version.ref = "androidxTestOrchestration" } -androidx-testRunner = { module = "androidx.test:runner", version = "1.5.2" } +androidx-testRunner = { module = "androidx.test:runner", version = "1.6.2" } androidx-testRules = { module = "androidx.test:rules", version.ref = "androidxTest" } #-------------------------- Compose -------------------------- androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBOM" } @@ -89,11 +89,11 @@ androidx-compose-ui = { module = "androidx.compose.ui:ui" } androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" } -androidx-compose-ui-test-junit = { module = "androidx.compose.ui:ui-test-junit4", version = "1.6.7" } +androidx-compose-ui-test-junit = { module = "androidx.compose.ui:ui-test-junit4", version = "1.7.1" } androidx-compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "androidxNavigation" } androidx-compose-navigation-testing = { module = "androidx.navigation:navigation-testing", version.ref = "androidxNavigation" } androidx-compose-lifecycle = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "composeViewModel" } -androidx-compose-material = { module = "androidx.compose.material:material", version = "1.6.7" } +androidx-compose-material = { module = "androidx.compose.material:material", version = "1.7.1" } coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" } coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } @@ -122,7 +122,7 @@ koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" } koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin" } jUnit = { module = "junit:junit", version.ref = "jUnit" } -jUnit-engine = { module = "org.junit.vintage:junit-vintage-engine", version = "5.10.0" } +jUnit-engine = { module = "org.junit.vintage:junit-vintage-engine", version = "5.11.0" } kethereum-bip39 = { module = "com.github.komputing.kethereum:bip39", version.ref = "kethereum" } kethereum-bip39-wordlist = { module = "com.github.komputing.kethereum:bip39_wordlist_en", version.ref = "kethereum" } @@ -195,7 +195,7 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" } -firebase-crashlytics = { id = "com.google.firebase.crashlytics", version = "3.0.1" } +firebase-crashlytics = { id = "com.google.firebase.crashlytics", version = "3.0.2" } firebase-distribution = { id = "com.google.firebase.appdistribution", version.ref = "firebaseAppDistribution" } google-services = { id = "com.google.gms.google-services", version.ref = "googleService" } diff --git a/sample/common/src/main/kotlin/com/reown/sample/common/ui/WCTopAppBar.kt b/sample/common/src/main/kotlin/com/reown/sample/common/ui/WCTopAppBar.kt index e32e67590..1113055c1 100644 --- a/sample/common/src/main/kotlin/com/reown/sample/common/ui/WCTopAppBar.kt +++ b/sample/common/src/main/kotlin/com/reown/sample/common/ui/WCTopAppBar.kt @@ -45,7 +45,7 @@ fun WCTopAppBar( Image( modifier = Modifier .size(24.dp) - .clickable(indication = rememberRipple(bounded = false, radius = 24.dp), interactionSource = remember { MutableInteractionSource() }, onClick = actionImage.onClick), + .clickable(onClick = actionImage.onClick), painter = painterResource(id = actionImage.resource), contentDescription = null, ) diff --git a/sample/dapp/build.gradle.kts b/sample/dapp/build.gradle.kts index b6e6263d5..1cf769692 100644 --- a/sample/dapp/build.gradle.kts +++ b/sample/dapp/build.gradle.kts @@ -78,6 +78,7 @@ dependencies { implementation("io.insert-koin:koin-androidx-compose:3.4.3") implementation("io.coil-kt:coil-compose:2.3.0") + implementation("androidx.compose.material:material-icons-core:1.7.1") implementation(libs.qrCodeGenerator) implementation(platform(libs.androidx.compose.bom)) diff --git a/sample/modal/build.gradle.kts b/sample/modal/build.gradle.kts index e5de8a686..ac9c78032 100644 --- a/sample/modal/build.gradle.kts +++ b/sample/modal/build.gradle.kts @@ -69,6 +69,7 @@ android { dependencies { implementation(project(":sample:common")) + implementation("androidx.compose.material:material-icons-core:1.7.1") implementation(platform(libs.firebase.bom)) implementation(libs.bundles.firebase) diff --git a/sample/modal/src/main/kotlin/com/reown/sample/modal/MainActivity.kt b/sample/modal/src/main/kotlin/com/reown/sample/modal/MainActivity.kt index bafb0663c..df0491a4f 100644 --- a/sample/modal/src/main/kotlin/com/reown/sample/modal/MainActivity.kt +++ b/sample/modal/src/main/kotlin/com/reown/sample/modal/MainActivity.kt @@ -257,10 +257,7 @@ private fun ThemeModeIcon( modifier = Modifier .padding(12.dp) .size(20.dp) - .clickable( - indication = rememberRipple(bounded = false), - interactionSource = remember { MutableInteractionSource() }, - ) { onClick(!isDarkTheme) } + .clickable { onClick(!isDarkTheme) } ) } diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/notifications/NotificationsHeader.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/notifications/NotificationsHeader.kt index 80c7b72af..11c71985d 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/notifications/NotificationsHeader.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/notifications/NotificationsHeader.kt @@ -64,7 +64,7 @@ fun NotificationsHeader( modifier = Modifier .width(20.dp) .height(28.dp) - .clickable(indication = rememberRipple(bounded = false, radius = 20.dp), interactionSource = remember { MutableInteractionSource() }, onClick = onBackIconClick) + .clickable(onClick = onBackIconClick) .padding(vertical = 8.dp), imageVector = ImageVector.vectorResource(id = R.drawable.ic_chevron_left), contentDescription = "Back arrow", diff --git a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/notifications/NotificationsOptionsMenu.kt b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/notifications/NotificationsOptionsMenu.kt index 6d58c89d2..d4075a88c 100644 --- a/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/notifications/NotificationsOptionsMenu.kt +++ b/sample/wallet/src/main/kotlin/com/reown/sample/wallet/ui/routes/composable_routes/notifications/NotificationsOptionsMenu.kt @@ -54,7 +54,7 @@ fun NotificationsOptionsMenu( Icon( modifier = Modifier .size(20.dp) - .clickable(indication = rememberRipple(bounded = false, radius = 20.dp), interactionSource = remember { MutableInteractionSource() }, onClick = onMoreIconClick), + .clickable(onClick = onMoreIconClick), painter = painterResource(id = R.drawable.ic_more), contentDescription = "More", ) From 0c25d9958b78babdc758b115d8180d1015a12c2a Mon Sep 17 00:00:00 2001 From: kubel Date: Mon, 16 Sep 2024 13:50:45 +0200 Subject: [PATCH 49/51] Fix Android Lint --- .../kotlin/com/reown/modal/ui/components/common/Modifiers.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/modal/src/main/kotlin/com/reown/modal/ui/components/common/Modifiers.kt b/core/modal/src/main/kotlin/com/reown/modal/ui/components/common/Modifiers.kt index 3859a46e9..4afa7d7ca 100644 --- a/core/modal/src/main/kotlin/com/reown/modal/ui/components/common/Modifiers.kt +++ b/core/modal/src/main/kotlin/com/reown/modal/ui/components/common/Modifiers.kt @@ -17,7 +17,5 @@ fun Modifier.roundedClickable( onClick: () -> Unit ) = composed { clickable( enabled = enabled, - indication = rememberRipple(bounded = bounded, radius = radius), - interactionSource = remember { MutableInteractionSource() }, onClick = onClick ) } From 43bf105c6fd0146adb1f2911ea2bb96d0b2695cd Mon Sep 17 00:00:00 2001 From: kubel Date: Mon, 16 Sep 2024 14:15:47 +0200 Subject: [PATCH 50/51] Fix Android Lint --- .../ui/components/internal/commons/entry/ActionEntry.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/ActionEntry.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/ActionEntry.kt index b4b2088cf..448aa2e54 100644 --- a/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/ActionEntry.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/ActionEntry.kt @@ -9,14 +9,15 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.material.Text -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Done import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.ColorFilter +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.res.vectorResource import androidx.compose.ui.unit.dp +import com.reown.appkit.R import com.reown.appkit.ui.components.internal.commons.CopyIcon import com.reown.appkit.ui.components.internal.commons.HorizontalSpacer import com.reown.appkit.ui.components.internal.commons.button.ButtonSize @@ -74,8 +75,8 @@ private fun ActionEntryPreview() { MultipleComponentsPreview( { ActionEntry(text = "Action without icon") {} }, { ActionEntry(text = "Action without icon", isEnabled = false) {} }, - { ActionEntry(icon = { Image(imageVector = Icons.Default.Done, contentDescription = null, colorFilter = ColorFilter.tint(it)) }, text = "Action with icon") {} }, - { ActionEntry(isEnabled = false, icon = { Image(imageVector = Icons.Default.Done, contentDescription = null, colorFilter = ColorFilter.tint(it)) }, text = "Action with icon") {} }, + { ActionEntry(icon = { Image(imageVector = ImageVector.vectorResource(R.drawable.ic_check), contentDescription = null, colorFilter = ColorFilter.tint(it)) }, text = "Action with icon") {} }, + { ActionEntry(isEnabled = false, icon = { Image(imageVector = ImageVector.vectorResource(R.drawable.ic_check), contentDescription = null, colorFilter = ColorFilter.tint(it)) }, text = "Action with icon") {} }, ) } From 29bb93195a988658ec8900c83f07d108bec38452 Mon Sep 17 00:00:00 2001 From: kubel Date: Tue, 17 Sep 2024 08:15:50 +0200 Subject: [PATCH 51/51] Update --- .../com/reown/sample/dapp/DappSampleApp.kt | 20 +++++++++---------- .../session/SessionViewModel.kt | 11 +++++++--- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/DappSampleApp.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/DappSampleApp.kt index de7a638f6..1315a7bef 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/DappSampleApp.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/DappSampleApp.kt @@ -44,16 +44,16 @@ class DappSampleApp : Application() { } AppKit.setChains(AppKitChainsPresets.ethChains.values.toList()) - - val authParams = Modal.Model.AuthPayloadParams( - chains = AppKitChainsPresets.ethChains.values.toList().map { it.id }, - domain = "sample.kotlin.modal", - uri = "https://web3inbox.com/all-apps", - nonce = randomBytes(12).bytesToHex(), - statement = "I accept the Terms of Service: https://yourDappDomain.com/", - methods = EthUtils.ethMethods - ) - AppKit.setAuthRequestParams(authParams) +// +// val authParams = Modal.Model.AuthPayloadParams( +// chains = AppKitChainsPresets.ethChains.values.toList().map { it.id }, +// domain = "sample.kotlin.modal", +// uri = "https://web3inbox.com/all-apps", +// nonce = randomBytes(12).bytesToHex(), +// statement = "I accept the Terms of Service: https://yourDappDomain.com/", +// methods = EthUtils.ethMethods +// ) +// AppKit.setAuthRequestParams(authParams) FirebaseAppDistribution.getInstance().updateIfNewReleaseAvailable() } diff --git a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/session/SessionViewModel.kt b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/session/SessionViewModel.kt index 7b7c89353..41890dc4b 100644 --- a/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/session/SessionViewModel.kt +++ b/sample/dapp/src/main/kotlin/com/reown/sample/dapp/ui/routes/composable_routes/session/SessionViewModel.kt @@ -53,15 +53,20 @@ class SessionViewModel : ViewModel() { private fun getSessions(topic: String? = null): List { return (AppKit.getSession() as Session.WalletConnectSession).namespaces.values .flatMap { it.accounts } + .filter { + val (chainNamespace, chainReference, account) = it.split(":") + val chain = Chains.values().find { chain -> + chain.chainNamespace == chainNamespace && chain.chainReference == chainReference + } + chain != null + } .map { caip10Account -> val (chainNamespace, chainReference, account) = caip10Account.split(":") - val chain = Chains.values().first { chain -> + val chain = Chains.values().first() { chain -> chain.chainNamespace == chainNamespace && chain.chainReference == chainReference } SessionUi(chain.icon, chain.name, account, chain.chainNamespace, chain.chainReference) } - - } fun ping() {