CAIP-222/ReCaps #1272

jakubuid · 2024-01-05T12:08:42Z

ReCaps: https://eips.ethereum.org/EIPS/eip-5573
Specs: https://github.com/WalletConnect/walletconnect-specs/pull/171/files#diff-0f26e2a5f5b0afc129a0d37185d8c037ecb5d4583e15ead76ac6d6332b570aa7

Added ReCaps into CAIP-222

…inV2 into sign_2.5_recaps

github-actions · 2024-01-05T12:25:01Z

Qodana Community for Android

42 new problems were found

Inspection name	Severity	Problems
`Constant conditions`	🔶 Warning	26
`Serializable object must implement 'readResolve'`	🔶 Warning	10
`Control flow with empty body`	🔶 Warning	1
`JUnit malformed declaration`	🔶 Warning	1
`Constant conditions`	◽️ Notice	3
`Argument could be converted to 'Set' to improve performance`	◽️ Notice	1

View the detailed Qodana report

To be able to view the detailed Qodana report, you can either:

Register at Qodana Cloud and configure the action
Use GitHub Code Scanning with Qodana
Host Qodana report at GitHub Pages
Inspect and use qodana.sarif.json (see the Qodana SARIF format for details)

To get *.log files or any other Qodana artifacts, run the action with upload-result option set to true,
so that the action will upload the files as the job artifacts:

      - name: 'Qodana Scan'
        uses: JetBrains/[email protected]
        with:
          upload-result: true

Contact Qodana team

Contact us at [email protected]

Or via our issue tracker: https://jb.gg/qodana-issue
Or share your feedback: https://jb.gg/qodana-discussions

Elyniss · 2024-01-05T15:57:32Z

core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/cacao/Cacao.kt

+    if (resources?.find { r -> r.startsWith(RECAPS_PREFIX) } != null) message += "\nI further authorize the stated URI to perform the following actions on my behalf: (1) $actionsString for '${
+        Issuer(iss).namespace
+    }'\n"


I think the part where you only specify (1) resource might be wrong. It only works if there is one resource.

Could there be multiple namespaces defined for one cacao? If yes then this will generate invalid statement

We support for now only a single namespace that's why (1) is hardcoded

// multi-namespace should error const { uri, response } = await dapp.sessionAuthenticate({ chains: ["eip155:1", "cosmos:1"], domain: "localhost", nonce: "1", aud: "aud", methods: ["personal_sign", "eth_signTypedData_v4"], }); // this is fine const { uri, response } = await dapp.sessionAuthenticate({ chains: ["eip155:1", "eip155:137"], domain: "localhost", nonce: "1", aud: "aud", methods: ["personal_sign", "eth_signTypedData_v4"], }); // this is fine const { uri, response } = await dapp.sessionAuthenticate({ chains: ["cosmos:1", "cosmos:2"], domain: "localhost", nonce: "1", aud: "aud", methods: ["personal_sign", "eth_signTypedData_v4"], });

Elyniss · 2024-01-05T16:12:27Z

core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/cacao/Cacao.kt

    if (statement != null) message += "$statement\n"
+    if (resources?.find { r -> r.startsWith(RECAPS_PREFIX) } != null) message += "\nI further authorize the stated URI to perform the following actions on my behalf: (1) $actionsString for '${
+        Issuer(iss).namespace
+    }'\n"


As per specs statement part of the SIWE MUST NOT contain \n source. Current code results too many new lines.

Cacao.Payload statement is not the same as SIWE statement

Currenlty it generates:

service.invalid wants you to sign in with your Ethereum account: 0x15bca56b6e2728aec2532df9d436bd1600e86688 I accept the ServiceOrg Terms of Service: https://service.invalid/tos I further authorize the stated URI to perform the following actions on my behalf: (1) 'request': 'eth_signTypedData_v4', 'personal_sign' for 'eip155' URI: https://service.invalid/login Version: 1 Chain ID: 1 Nonce: 32891756

Wheras it should be:

service.invalid wants you to sign in with your Ethereum account: 0x15bca56b6e2728aec2532df9d436bd1600e86688 I accept the ServiceOrg Terms of Service: https://service.invalid/tos I further authorize the stated URI to perform the following actions on my behalf: (1) 'request': 'eth_signTypedData_v4', 'personal_sign' for 'eip155' URI: https://service.invalid/login Version: 1 Chain ID: 1 Nonce: 32891756

Good catch, ty

kacperoak

There is a lot new todos, make sure you really want to leave them all

product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/Wallet.kt

Talhaali00

Verify that all public methods are backwards compatible. Instead of changing the function names, create new functions and deprecate old.

Talhaali00 · 2024-01-17T05:43:22Z

...oid/src/main/kotlin/com/walletconnect/android/internal/common/model/params/CoreSignParams.kt

-        @Json(name = "caip222Response")
-        val caip222Response: List<Cacao>,


Should we still keep this for backwards compatibility?

No, it's a new method that has changed during development

Talhaali00 · 2024-01-17T05:47:24Z

core/android/src/main/kotlin/com/walletconnect/android/internal/common/signing/cacao/Cacao.kt

+    val actions: MutableMap<String, MutableList<String>> = mutableMapOf()
+
+    for (i in 0 until requests.length()) {
+        val actionString = requests.getJSONObject(i).keys().next() as String


regarding the Qodana warning, can we just do next().toString() instead?

Talhaali00 · 2024-01-17T05:59:32Z

...roid/src/main/kotlin/com/walletconnect/android/internal/common/storage/rpc/JsonRpcHistory.kt

please address lint warnings on this file

Talhaali00 · 2024-01-17T06:02:14Z

product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/Wallet.kt

            val payloadParams: PayloadAuthRequestParams,
        ) : Model()

+        data class Participant(


can this be a child class of SessionAuthenticated?

Talhaali00 · 2024-01-17T06:03:12Z

protocol/sign/src/main/kotlin/com/walletconnect/sign/client/Sign.kt

        )

+        data class Participant(


same question, can this be moved to SessionAuthenticate?

Talhaali00 · 2024-01-17T06:04:26Z

protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignProtocol.kt

instead of just renaming the functions, we should deprecate the old functions and then create the new ones. Otherwise current implementers will see crashes in their apps

These are not on production

Talhaali00 · 2024-01-17T06:07:45Z

...sign/src/main/kotlin/com/walletconnect/sign/json_rpc/domain/GetSessionAuthenticateRequest.kt

make internal

Talhaali00 · 2024-01-17T06:10:33Z

Also, try to address as many of the linter wanrings

…nV2 into sign_2.5_recaps # Conflicts: # core/android/src/main/kotlin/com/walletconnect/android/internal/utils/Expiration.kt # product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/client/ClientMapper.kt # product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/client/Modal.kt # product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/client/WalletConnectModal.kt # product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/domain/WalletConnectModalDelegate.kt # product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/ClientMapper.kt # product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/Web3Modal.kt # product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/delegate/Web3ModalDelegate.kt # protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/dapp/DappDelegate.kt # protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/hybrid/HybridDelegate.kt # protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignInterface.kt # protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignProtocol.kt # protocol/sign/src/main/kotlin/com/walletconnect/sign/common/exceptions/SignExceptions.kt # protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/session/params/SignParams.kt # protocol/sign/src/main/kotlin/com/walletconnect/sign/di/CallsModule.kt # protocol/sign/src/main/kotlin/com/walletconnect/sign/di/EngineModule.kt # protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/domain/SignEngine.kt # protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/mapper/EngineMapper.kt # protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionUseCase.kt # protocol/sign/src/main/sqldelight/databases/8.db # sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/domain/DappDelegate.kt # sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ModalSampleDelegate.kt

github-actions · 2024-01-25T07:16:52Z

Qodana Community for Android

56 new problems were found

Inspection name	Severity	Problems
`Constant conditions`	🔶 Warning	41
`Serializable object must implement 'readResolve'`	🔶 Warning	10
`Control flow with empty body`	🔶 Warning	1
`JUnit malformed declaration`	🔶 Warning	1
`Constant conditions`	◽️ Notice	2
`Argument could be converted to 'Set' to improve performance`	◽️ Notice	1

View the detailed Qodana report

To be able to view the detailed Qodana report, you can either:

Register at Qodana Cloud and configure the action
Use GitHub Code Scanning with Qodana
Host Qodana report at GitHub Pages
Inspect and use qodana.sarif.json (see the Qodana SARIF format for details)

To get *.log files or any other Qodana artifacts, run the action with upload-result option set to true,
so that the action will upload the files as the job artifacts:

      - name: 'Qodana Scan'
        uses: JetBrains/[email protected]
        with:
          upload-result: true

Contact Qodana team

Contact us at [email protected]

Or via our issue tracker: https://jb.gg/qodana-issue
Or share your feedback: https://jb.gg/qodana-discussions

…nV2 into sign_2.5_recaps # Conflicts: # product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/Modal.kt # product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/Web3Modal.kt

…inV2 into sign_2.5_recaps # Conflicts: # product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/client/ClientMapper.kt # product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/client/WalletConnectModal.kt # product/walletconnectmodal/src/main/kotlin/com/walletconnect/wcmodal/domain/WalletConnectModalDelegate.kt # product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/ClientMapper.kt # product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/delegate/Web3ModalDelegate.kt # product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/Web3ModalEngine.kt # protocol/sign/src/androidTest/kotlin/com/walletconnect/sign/test/utils/hybrid/HybridDelegate.kt # protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignInterface.kt # protocol/sign/src/main/kotlin/com/walletconnect/sign/client/SignProtocol.kt # protocol/sign/src/main/kotlin/com/walletconnect/sign/common/exceptions/SignExceptions.kt # protocol/sign/src/main/kotlin/com/walletconnect/sign/common/model/vo/clientsync/session/params/SignParams.kt # protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/model/mapper/EngineMapper.kt # protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/ApproveSessionAuthenticateUseCase.kt # protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/calls/SessionAuthenticateUseCase.kt # protocol/sign/src/main/kotlin/com/walletconnect/sign/engine/use_case/responses/OnSessionAuthenticateResponseUseCase.kt # sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/domain/DappDelegate.kt

jakubuid · 2024-01-31T08:16:39Z

There is a lot new todos, make sure you really want to leave them all

Yeah I do, we're merging to a feature branch so before merging this feature branch to develop, all the TODOs will be resolved

jakubuid added 18 commits December 15, 2023 16:10

Merge branch 'caip_222' of github.com:WalletConnect/WalletConnectKotl…

6fde6cb

…inV2 into sign_2.5_recaps

Merge branch 'caip_222' of github.com:WalletConnect/WalletConnectKotl…

cfab8af

…inV2 into sign_2.5_recaps

Align methods names with specs

fddd7f3

Merge branch 'caip_222' of github.com:WalletConnect/WalletConnectKotl…

ab8ad34

…inV2 into sign_2.5_recaps

Fix authenticate public params

4aca1d5

Refactor params to be in line with specs

4e2c5bc

Add test for encoding and decoding recaps

64d19b6

Encode ReCaps

7d6015c

Adjust integration tests to new params

95def21

Add ReCaps integration tests

63220ed

Merge branch 'sign_2.5' of github.com:WalletConnect/WalletConnectKotl…

ccf8b71

…inV2 into sign_2.5_recaps

Add alphabetic sort for actions

960558b

ReCaps decoding

7cb8e8e

Merge branch 'sign_2.5' of github.com:WalletConnect/WalletConnectKotl…

eeec72b

…inV2 into sign_2.5_recaps

Set iat internally

caad190

Add isAuthenticate flag to Session

cc07a33

Authenticates session with ReCaps flow

cea30b0

Authenticates session with ReCaps flow

ac843be

jakubuid changed the title ~~ReCaps~~ CAIP-222/ReCaps Jan 5, 2024

Send session request over authenticated session flow

50ce3c0

jakubuid marked this pull request as ready for review January 5, 2024 15:44

jakubuid requested review from kacperoak, Elyniss, Talhaali00 and a team as code owners January 5, 2024 15:44

Elyniss reviewed Jan 5, 2024

View reviewed changes

Fix statement generation

343effd

kacperoak approved these changes Jan 9, 2024

View reviewed changes

product/web3wallet/src/main/kotlin/com/walletconnect/web3/wallet/client/Wallet.kt Outdated Show resolved Hide resolved

Talhaali00 reviewed Jan 17, 2024

View reviewed changes

jakubuid added 2 commits January 25, 2024 07:46

Resolve merge conflicts

ea45ebb

jakubuid added 5 commits January 30, 2024 11:32

Merge branch 'develop' of github.com:WalletConnect/WalletConnectKotli…

3702609

…nV2 into sign_2.5_recaps # Conflicts: # product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/Modal.kt # product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/Web3Modal.kt

Implement missing method

ac0494d

Add migration

bf373a4

Fix merging

bd988cc

Address PR comments

d04eece

jakubuid requested review from Talhaali00, kacperoak and Elyniss January 31, 2024 08:37

kacperoak approved these changes Feb 1, 2024

View reviewed changes

Talhaali00 approved these changes Feb 2, 2024

View reviewed changes

jakubuid merged commit 92b3c1b into sign_2.5 Feb 2, 2024
2 checks passed

jakubuid deleted the sign_2.5_recaps branch February 2, 2024 06:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CAIP-222/ReCaps #1272

CAIP-222/ReCaps #1272

jakubuid commented Jan 5, 2024

github-actions bot commented Jan 5, 2024 •

edited

Loading

Elyniss Jan 5, 2024 •

edited

Loading

jakubuid Jan 8, 2024

Elyniss Jan 5, 2024 •

edited

Loading

Elyniss Jan 5, 2024

jakubuid Jan 8, 2024

kacperoak left a comment

Talhaali00 left a comment

Talhaali00 Jan 17, 2024

jakubuid Jan 31, 2024

Talhaali00 Jan 17, 2024

jakubuid Jan 31, 2024

Talhaali00 Jan 17, 2024

Talhaali00 Jan 17, 2024

jakubuid Jan 31, 2024

Talhaali00 Jan 17, 2024

Talhaali00 Jan 17, 2024

jakubuid Jan 31, 2024

Talhaali00 Jan 17, 2024

Talhaali00 commented Jan 17, 2024

github-actions bot commented Jan 25, 2024 •

edited

Loading

jakubuid commented Jan 31, 2024

		@Json(name = "caip222Response")
		val caip222Response: List<Cacao>,

CAIP-222/ReCaps #1272

CAIP-222/ReCaps #1272

Conversation

jakubuid commented Jan 5, 2024

github-actions bot commented Jan 5, 2024 • edited Loading

Qodana Community for Android

Elyniss Jan 5, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Elyniss Jan 5, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kacperoak left a comment

Choose a reason for hiding this comment

Talhaali00 left a 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

Talhaali00 commented Jan 17, 2024

github-actions bot commented Jan 25, 2024 • edited Loading

Qodana Community for Android

jakubuid commented Jan 31, 2024

github-actions bot commented Jan 5, 2024 •

edited

Loading

Elyniss Jan 5, 2024 •

edited

Loading

Elyniss Jan 5, 2024 •

edited

Loading

github-actions bot commented Jan 25, 2024 •

edited

Loading