Mobile Connect #907

jakub-rdx · 2024-05-08T14:35:44Z

Description

Mobile Connect requests handling implementation flow
Changes:

added deep link handling which is tied to MobileConnectScreen
there are two types of deep links recognized now - linking and dapp request - see MobieConnectViewModel
updated MessageFromDataChannel to IncomingMessage since now messages could come from deep link or data channel.
each incoming request has now remoteEntityId which is sealed interface hierarchy representing origin of that request (mobile connect or CE`
WalletInteraction was replaced with DappToWalletInteractionUnvalidated from sargon and WalletInteractionResponse with WalletToDappInteractionResponse, while our domain models built from those network models are the same.
extracted logic that was used to respond after sucesfull/failed request handling into RespondToIncomingRequestUseCase. Use case decides if it should respond as usual via DappMessenger or if it should use Radix Connect Relay.

Test scenarios

Use this dApp to test Mobile Connect flow.
Test dApps like sandbox/dashboard/gumball to see if there are no serialization issues using sargon.

sergiupuhalschi-rdx · 2024-06-11T12:58:46Z

app/src/main/java/com/babylon/wallet/android/domain/model/Browser.kt

micbakos-rdx · 2024-06-12T07:39:41Z

app/src/main/AndroidManifest.xml

@@ -43,5 +70,14 @@
 tools:node="remove" />

 </application>
-
+ <queries>


micbakos-rdx · 2024-06-12T07:47:58Z

app/src/main/java/com/babylon/wallet/android/data/dapp/DappMessenger.kt

 ): Result<Unit> {
 val messageJson = try {
- Json.encodeToString(response)
+ response.toJson()


I think this should not throw as per https://github.com/radixdlt/sargon/blob/b1fb6d6fe04dbee9a114008cce2327834cf2ea72/jvm/sargon-android/src/main/java/com/radixdlt/sargon/extensions/WalletToDappInteractionResponse.kt#L11

We can remove the try/catch here.

micbakos-rdx · 2024-06-12T07:52:02Z

app/src/main/java/com/babylon/wallet/android/data/dapp/LedgerMessenger.kt

 }

 class LedgerMessengerImpl @Inject constructor(
 private val peerdroidClient: PeerdroidClient,
+ private val json: Json


Please rename this to jsonSerializer, or something similar.

if you decide to rename it, please do the same in ObserveAccountsAndSyncWithConnectorExtensionUseCase

micbakos-rdx · 2024-06-12T07:53:18Z

app/src/main/java/com/babylon/wallet/android/data/dapp/PeerdroidClient.kt

- is WalletInteraction -> payload.toDomainModel(remoteConnectorId = remoteConnectorId)
- else -> (payload as LedgerInteractionResponse).toDomainModel()
+ val dappInteraction = runCatching {
+ DappToWalletInteractionUnvalidated.Companion.fromJson(messageInJsonString)


No need for Companion here.

micbakos-rdx · 2024-06-12T07:56:02Z

...rc/main/java/com/babylon/wallet/android/data/dapp/model/DappToWalletInteractionExtensions.kt

+import rdx.works.core.domain.TransactionManifestData
+
+fun DappToWalletInteractionUnvalidated.toDomainModel(remoteEntityId: IncomingMessage.RemoteEntityID): IncomingMessage.IncomingRequest {
+ try {


Methods like these could be easier readable my converting them as

= runCatching { .... }.mapError { RadixWalletException.IncomingMessageException.MessageParse(it) }

micbakos-rdx · 2024-06-12T08:08:55Z

app/src/main/java/com/babylon/wallet/android/domain/model/Browser.kt

micbakos-rdx · 2024-06-12T08:15:08Z

app/src/main/java/com/babylon/wallet/android/domain/model/IncomingMessage.kt


- val isInternal: Boolean
+ open val isInternal: Boolean


Very nice that you did split the incoming messages with the notion of RemoteEntityId. On the other hand, the isInternal is becoming now confusing. I will see what I can do when I will work on this PR. We could explore maybe renaming the RemoteEntityID to RequestEntity. This entity can be

for radix connect

for CE

for internal messages.

I have not yet though about it throughout, but I think it is worth exploring.

it definitely makes sense and worth exploring, I didn't have time to actually think about this but seem very reasonable suggestion

micbakos-rdx · 2024-06-12T08:15:57Z

...src/main/java/com/babylon/wallet/android/domain/usecases/AuthorizeSpecifiedPersonaUseCase.kt

@@ -37,7 +37,7 @@ import javax.inject.Inject
 */
 class AuthorizeSpecifiedPersonaUseCase @Inject constructor(
 private val dAppConnectionRepository: DAppConnectionRepository,
- private val dAppMessenger: DappMessenger,
+ private val respondToIncomingRequestUseCase: RespondToIncomingRequestUseCase,


micbakos-rdx · 2024-06-12T08:18:58Z

app/src/main/java/com/babylon/wallet/android/presentation/mobileconnect/MobileConnectNav.kt

+fun NavGraphBuilder.mobileConnect(onBackClick: () -> Unit) {
+ composable(
+ route = ROUTE,
+ deepLinks = listOf(
+ navDeepLink {
+ uriPattern =
+ "https://dr6vsuukf8610.cloudfront.net/?$ROUTE_ARGS"
+ },
+ navDeepLink {
+ uriPattern = "radixwallet://?${ROUTE_ARGS}"
+ }
+ ),
+ arguments = listOf(
+ navArgument(ARG_PUBLIC_KEY) {
+ type = NavType.StringType
+ nullable = true
+ },
+ navArgument(ARG_SESSION_ID) {
+ type = NavType.StringType
+ nullable = true
+ },
+ navArgument(ARG_DAPP_ORIGIN) {
+ type = NavType.StringType
+ nullable = true
+ },
+ navArgument(ARG_INTERACTION_ID) {
+ type = NavType.StringType
+ nullable = true
+ },
+ navArgument(ARG_BROWSER) {
+ type = NavType.StringType
+ nullable = true
+ }
+ ),
+ enterTransition = {
+ slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Up)
+ },
+ exitTransition = {
+ slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Down)
+ }
+ ) {
+ MobileConnectScreen(onBackClick = onBackClick)
+ }
+}


So I guess this will be eventually removed?

micbakos-rdx · 2024-06-12T08:32:04Z

core/src/main/java/rdx/works/core/EncryptionHelper.kt

+
+@Suppress("MagicNumber")
+fun String.decodeHex(): ByteArray {
+ check(length % 2 == 0) { "Must have an even length" }
+
+ return chunked(2)
+ .map { it.toInt(16).toByte() }
+ .toByteArray()
+}
+
+fun generateX25519KeyPair(): Result<Pair<String, String>> {
+ return runCatching {
+ val generator = X25519KeyPairGenerator()
+ val params = X25519KeyGenerationParameters(SecureRandom())
+ generator.init(params)
+ val keypair1: AsymmetricCipherKeyPair = generator.generateKeyPair()
+ val priv1 = keypair1.private as X25519PrivateKeyParameters
+ val pub1 = keypair1.public as X25519PublicKeyParameters
+ Pair(priv1.encoded.toHexString(), pub1.encoded.toHexString())
+ }
+}
+
+fun generateX25519SharedSecret(privateKeyCompressed: ByteArray, publicKeyCompressed: ByteArray): Result<String> {
+ return runCatching {
+ val agreement = X25519Agreement().apply {
+ init(X25519PrivateKeyParameters(privateKeyCompressed))
+ }
+
+ val secret = ByteArray(agreement.agreementSize)
+ agreement.calculateAgreement(X25519PublicKeyParameters(publicKeyCompressed), secret, 0)
+ secret.toHexString()
+ }
+}


Reminder to remove this code before merging

after using sargon for linking flow this goes away, it's just temporary for the PoC to work now.

RCfM api changes

…ling [ABW-3406] - RCfM Deep link handling

New request handling flow for mobile connect

# Conflicts: # app/src/main/java/com/babylon/wallet/android/utils/Constants.kt # gradle/libs.versions.toml

…flow # Conflicts: # app/src/main/java/com/babylon/wallet/android/MainActivity.kt # app/src/main/java/com/babylon/wallet/android/presentation/navigation/NavigationHost.kt # app/src/main/res/values-en/strings.xml # gradle/libs.versions.toml

…ed-flow Update mobile connect flow and UI

# Conflicts: # app/src/main/res/values-en/strings.xml

sonarcloud · 2024-06-27T10:54:14Z

Quality Gate failed

Failed conditions
3 Security Hotspots
0.0% Coverage on New Code (required ≥ 40%)

See analysis details on SonarCloud

jakub-rdx force-pushed the feature/m2m-poc branch 3 times, most recently from 74a8e1b to 1da79f0 Compare May 28, 2024 14:18

jakub-rdx force-pushed the feature/m2m-poc branch from 1da79f0 to 06dbe6f Compare June 3, 2024 12:16

jakub-rdx changed the title ~~Mobile Connect PoC~~ Mobile Connect Jun 3, 2024

jakub-rdx force-pushed the feature/m2m-poc branch 2 times, most recently from 5efeb07 to 01b9513 Compare June 10, 2024 11:23

jakub-rdx requested review from micbakos-rdx, giannis-rdx and sergiupuhalschi-rdx and removed request for micbakos-rdx and giannis-rdx June 10, 2024 18:23

jakub-rdx marked this pull request as ready for review June 10, 2024 18:26

jakub-rdx requested a review from giannis-rdx June 11, 2024 07:58

sergiupuhalschi-rdx approved these changes Jun 11, 2024

View reviewed changes

sergiupuhalschi-rdx reviewed Jun 11, 2024

View reviewed changes

micbakos-rdx reviewed Jun 12, 2024

View reviewed changes

jakub-rdx added 12 commits June 12, 2024 12:11

m2m POC

f2e2869

rcr wip

d4e02a8

update RCR api, add test methods

991e120

m2m requests handling wip

cb841fb

detekt changes

f7a3db1

properly handle sending response via redirect url in authorized flow

a874ce2

add configurable delay to connect step of radix mobile connect

485ad5e

rebase fixes after sargon intergration

dd8f9d4

fix tests

3dbc47f

discard requests that we couldn't decrypt

155df32

sargon rebase fix

146358c

new mobile connect flow wip

f01d689

sergiupuhalschi-rdx and others added 24 commits June 17, 2024 11:02

Merge pull request #996 from radixdlt/feature/rcm-api-changes

f5e6b34

RCfM api changes

Merge branch 'feature/m2m-poc' into feature/ABW-3406-deep-link-handling

0e45e1e

Fix issues

bfcb148

Fix test compile error

1bd2f54

Merge pull request #993 from radixdlt/feature/ABW-3406-deep-link-hand…

f48a077

…ling [ABW-3406] - RCfM Deep link handling

new request handling flow

c6cf9e3

Merge pull request #998 from radixdlt/feature/new-request-handling-flow

c44f065

New request handling flow for mobile connect

update mobile connect flow and UI

bb0708d

update mobile connect requests handling

9508b28

buffer deep link when wallet is not set up

53ae79c

remove app link scheme

dfa3603

Merge branch 'main' into feature/m2m-poc

f677081

# Conflicts: # app/src/main/java/com/babylon/wallet/android/utils/Constants.kt # gradle/libs.versions.toml

changes after merge with main

89f7ae8

changes after merge with main

2e0da3b

downgrade okhttp to match the one in sargon

67b9c8a

update 'dismiss' request wording with defer

e6a77e1

dismiss -> defer wording in tests

d5536e9

update mobile connect request buffering and requests verification logic

e0aa548

push missing code

3d1af37

pr review changes

b0c2275

buffer request in incoming request repository

6b03334

Merge pull request #1008 from radixdlt/feature/mobile-connect-optimiz…

362f82a

…ed-flow Update mobile connect flow and UI

Merge branch 'main' into feature/m2m-poc

e51222c

# Conflicts: # app/src/main/res/values-en/strings.xml

micbakos-rdx approved these changes Jun 27, 2024

View reviewed changes

sergiupuhalschi-rdx approved these changes Jun 27, 2024

View reviewed changes

center text in a circle

5798ea5

jakub-rdx merged commit bb8d1ec into main Jun 27, 2024
7 of 9 checks passed

jakub-rdx deleted the feature/m2m-poc branch June 27, 2024 10:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Mobile Connect #907

Mobile Connect #907

jakub-rdx commented May 8, 2024 •

edited

Loading

sergiupuhalschi-rdx Jun 11, 2024

micbakos-rdx Jun 12, 2024

micbakos-rdx Jun 12, 2024

micbakos-rdx Jun 12, 2024

micbakos-rdx Jun 12, 2024

giannis-rdx Jun 12, 2024

micbakos-rdx Jun 12, 2024

micbakos-rdx Jun 12, 2024

micbakos-rdx Jun 12, 2024

micbakos-rdx Jun 12, 2024

jakub-rdx Jun 12, 2024

micbakos-rdx Jun 12, 2024

micbakos-rdx Jun 12, 2024

jakub-rdx Jun 12, 2024

micbakos-rdx Jun 12, 2024

jakub-rdx Jun 12, 2024

sonarcloud bot commented Jun 27, 2024

Mobile Connect #907

Mobile Connect #907

Conversation

jakub-rdx commented May 8, 2024 • edited Loading

Description

Test scenarios

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sonarcloud bot commented Jun 27, 2024

Quality Gate failed

jakub-rdx commented May 8, 2024 •

edited

Loading