Skip to content

Commit a12707b

Browse files
Talhaali00Talhaali00
authored
Merge branch 'sign_2.5' into feature/meta/allowing_tests_for_all_PRs
2 parents 66d729d + bbd9951 commit a12707b

File tree

215 files changed

+6467
-823
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

215 files changed

+6467
-823
lines changed

‎.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
* @WalletConnect/kotlin-team @kacperoak @Elyniss @jakubuid @TalhaAli00

‎.github/workflows/ci_db_migrations.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
types:
66
- opened
7+
- synchronize
78
- edited
89

910
concurrency:

‎.github/workflows/ci_instrumented_tests.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ concurrency:
3131
jobs:
3232
sdk_tests:
3333
name: Run Instrumented Tests
34-
runs-on:
35-
group: apple-silicon
34+
runs-on: macos-latest-xlarge
3635
steps:
3736
- uses: actions/checkout@v3
3837
with:

‎.github/workflows/ci_internal_sample.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- 'protocol/**'
1111
- 'product/**'
1212
- 'sample/**'
13+
workflow_dispatch:
1314

1415
jobs:
1516
release_samples_internal:

‎ReadMe.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ WalletConnect v2 protocols for Android applications.
1111

1212
| 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) |
1313
|-----------------------------------------------------------------------------------------|--------------------------|---------------------------|---------------------------|---------------------------|:------------------------------|----------------------------------|--------------------------------|--------------------------------------------------|
14+
| 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 |
1415
| 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 |
1516
| 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 |
1617
| 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 |

‎build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ allprojects {
4545
if (requested.group == "androidx.navigation" && requested.name == "navigation-compose") {
4646
useVersion(composeNavigationVersion)
4747
}
48+
if (requested.group == "org.bouncycastle" && requested.name == "bcprov-jdk15on") {
49+
useTarget("org.bouncycastle:bcprov-jdk18on:$bouncyCastleVersion")
50+
}
4851
}
4952
}
5053
}

‎buildSrc/src/main/kotlin/Dependencies.kt

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
import org.gradle.kotlin.dsl.DependencyHandlerScope
22

3-
fun DependencyHandlerScope.scanner() {
4-
"implementation"("com.google.mlkit:barcode-scanning:$mlKitBarcode")
5-
"implementation"("androidx.camera:camera-camera2:$camera2Version")
6-
"implementation"("androidx.camera:camera-lifecycle:$camera2Version")
7-
"implementation"("androidx.camera:camera-view:1.0.0-alpha21")
8-
}
9-
103
fun DependencyHandlerScope.lifecycle() {
114
"implementation"("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion")
125
"implementation"("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
@@ -63,17 +56,12 @@ fun DependencyHandlerScope.okhttp() {
6356
}
6457

6558
fun DependencyHandlerScope.bouncyCastle() {
66-
"api"("org.bouncycastle:bcprov-jdk15on:$bouncyCastleVersion")
67-
}
68-
69-
fun DependencyHandlerScope.sqlDelightAndroid() {
70-
"api"("com.squareup.sqldelight:android-driver:$sqlDelightVersion")
71-
"api"("com.squareup.sqldelight:coroutines-extensions-jvm:$sqlDelightVersion")
72-
59+
"api"("org.bouncycastle:bcprov-jdk18on:$bouncyCastleVersion")
7360
}
7461

7562
fun DependencyHandlerScope.sqlCipher() {
7663
"api"("net.zetetic:android-database-sqlcipher:$sqlCipherVersion")
64+
"api"("app.cash.sqldelight:async-extensions:2.0.0")
7765
}
7866

7967
fun DependencyHandlerScope.reLinker() {
@@ -93,15 +81,6 @@ fun DependencyHandlerScope.koinAndroid() {
9381
"api"("io.insert-koin:koin-android:$koinVersion")
9482
}
9583

96-
fun DependencyHandlerScope.koinTest() {
97-
"testImplementation"("io.insert-koin:koin-test-junit5:$koinVersion")
98-
}
99-
100-
fun DependencyHandlerScope.glide_N_kapt() {
101-
"implementation"("com.github.bumptech.glide:glide:4.12.0")
102-
"kapt"("com.github.bumptech.glide:compiler:4.12.0")
103-
}
104-
10584
fun DependencyHandlerScope.multibaseJava() {
10685
"api"("com.github.multiformats:java-multibase:$multibaseVersion") //https://mvnrepository.com/artifact/com.github.multiformats/java-multibase/1.1.0 vulnerability detected with library
10786
}

‎buildSrc/src/main/kotlin/Versions.kt

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ const val KEY_PUBLISH_ARTIFACT_ID = "PUBLISH_ARTIFACT_ID"
55
const val KEY_SDK_NAME = "SDK_NAME"
66

77
//Latest versions
8-
const val BOM_VERSION = "1.22.2"
9-
const val FOUNDATION_VERSION = "1.14.2"
10-
const val CORE_VERSION = "1.27.2"
11-
const val SIGN_VERSION = "2.25.2"
12-
const val AUTH_VERSION = "1.25.2"
13-
const val CHAT_VERSION = "1.0.0-beta25"
14-
const val NOTIFY_VERSION = "1.0.2"
15-
const val WEB_3_WALLET_VERSION = "1.20.2"
16-
const val WEB_3_MODAL_VERSION = "1.2.2"
17-
const val WC_MODAL_VERSION = "1.2.2"
18-
const val MODAL_CORE_VERSION = "1.2.2"
8+
const val BOM_VERSION = "1.23.0"
9+
const val FOUNDATION_VERSION = "1.15.0"
10+
const val CORE_VERSION = "1.28.0"
11+
const val SIGN_VERSION = "2.26.0"
12+
const val AUTH_VERSION = "1.26.0"
13+
const val CHAT_VERSION = "1.0.0-beta26"
14+
const val NOTIFY_VERSION = "1.1.0"
15+
const val WEB_3_WALLET_VERSION = "1.21.0"
16+
const val WEB_3_MODAL_VERSION = "1.3.0"
17+
const val WC_MODAL_VERSION = "1.3.0"
18+
const val MODAL_CORE_VERSION = "1.3.0"
1919

2020
val jvmVersion = JavaVersion.VERSION_11
2121
const val MIN_SDK: Int = 23
@@ -39,13 +39,11 @@ const val composeViewModelVersion = "2.6.1"
3939
const val scarletVersion = "1.0.0"
4040
const val scarletPackage = "com.github.WalletConnect.Scarlet"
4141
const val koinVersion = "3.4.2"
42-
const val mlKitBarcode = "17.0.3"
43-
const val camera2Version = "1.1.0-alpha01"
4442
const val lifecycleVersion = "2.6.1"
4543
const val navVersion = "2.5.3"
4644
const val retrofitVersion = "2.9.0"
4745
const val okhttpVersion = "4.11.0"
48-
const val bouncyCastleVersion = "1.70"
46+
const val bouncyCastleVersion = "1.77"
4947
const val sqlCipherVersion = "4.5.3@aar"
5048
const val multibaseVersion = "1.1.1"
5149
const val jUnit4Version = "4.13.2"
@@ -59,7 +57,6 @@ const val androidSecurityVersion = "1.1.0-alpha06"
5957
const val web3jVersion = "4.9.5"
6058
const val kethereumVersion = "0.85.7"
6159
const val wsRestJavaVersion = "3.1.0"
62-
const val fcmVersion = "23.1.1"
6360
const val relinkerVersion = "1.4.5"
6461
const val accompanistVersion = "0.31.3-beta"
6562
const val coreKtxVersion = "1.10.1"

‎core/android/src/test/kotlin/com/walletconnect/android/internal/common/cacao/CacaoTest.kt renamed to ‎core/android/src/androidTest/kotlin/com/walletconnect/android/CacaoTest.kt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
package com.walletconnect.android.internal.common.cacao
1+
package com.walletconnect.android
22

3-
import com.walletconnect.android.BuildConfig
43
import com.walletconnect.android.cacao.signature.SignatureType
54
import com.walletconnect.android.internal.common.model.ProjectId
65
import com.walletconnect.android.internal.common.signing.cacao.Cacao
76
import com.walletconnect.android.internal.common.signing.cacao.CacaoType
87
import com.walletconnect.android.internal.common.signing.cacao.CacaoVerifier
9-
import com.walletconnect.android.internal.common.signing.cacao.toCAIP122Message
8+
import com.walletconnect.android.internal.common.signing.cacao.toCAIP222Message
109
import com.walletconnect.android.utils.cacao.CacaoSignerInterface
1110
import com.walletconnect.android.utils.cacao.sign
12-
import com.walletconnect.android.utils.cacao.signHex
1311
import com.walletconnect.util.hexToBytes
1412
import org.junit.Assert
1513
import org.junit.Test
@@ -31,27 +29,29 @@ internal class CacaoTest {
3129
exp = null,
3230
statement = "I accept the ServiceOrg Terms of Service: https://service.invalid/tos",
3331
requestId = null,
34-
resources = listOf("ipfs://bafybeiemxf5abjwjbikoz4mc3a3dla6ual3jsgpdr4cjr3oz3evfyavhwq/", "https://example.com/my-web2-claim.json")
32+
resources = listOf(
33+
"ipfs://bafybeiemxf5abjwjbikoz4mc3a3dla6ual3jsgpdr4cjr3oz3evfyavhwq/",
34+
"https://example.com/my-web2-claim.json",
35+
"urn:recap:eyJhdHQiOnsiZWlwMTU1Ijp7InJlcXVlc3QvcGVyc29uYWxfc2lnbiI6W3siY2hhaW5zIjpbImVpcDE1NToxIl19XSwicmVxdWVzdC9ldGhfc2lnblR5cGVkRGF0YV92NCI6W3siY2hhaW5zIjpbImVpcDE1NToxIl19XX19fQ=="
36+
)
3537
)
3638

3739
private val privateKey = "305c6cde3846927892cd32762f6120539f3ec74c9e3a16b9b798b1e85351ae2a".hexToBytes()
3840

3941
@Test
4042
fun signAndVerifyWithEIP191Test() {
41-
print(payload.toCAIP122Message(chainName))
42-
val message = payload.toCAIP122Message(chainName)
43+
val message = payload.toCAIP222Message(chainName)
4344
val signature: Cacao.Signature = cacaoSigner.sign(message, privateKey, SignatureType.EIP191)
44-
val cacao = Cacao(CacaoType.EIP4361.toHeader(), payload, signature)
45+
val cacao = Cacao(CacaoType.CAIP222.toHeader(), payload, signature)
4546
val result: Boolean = cacaoVerifier.verify(cacao)
4647
Assert.assertTrue(result)
4748
}
4849

4950
@Test
5051
fun signHexAndVerifyWithEIP191Test() {
51-
print(payload.toCAIP122Message(chainName))
52-
val message = payload.toCAIP122Message(chainName)
53-
val signature: Cacao.Signature = cacaoSigner.signHex(Numeric.toHexString(message.toByteArray()), privateKey, SignatureType.EIP191)
54-
val cacao = Cacao(CacaoType.EIP4361.toHeader(), payload, signature)
52+
val message = payload.toCAIP222Message(chainName)
53+
val signature: Cacao.Signature = cacaoSigner.sign(Numeric.toHexString(message.toByteArray()), privateKey, SignatureType.EIP191)
54+
val cacao = Cacao(CacaoType.CAIP222.toHeader(), payload, signature)
5555
val result: Boolean = cacaoVerifier.verify(cacao)
5656
assert(result)
5757
}
@@ -74,7 +74,7 @@ internal class CacaoTest {
7474
)
7575

7676
val signatureString = "0xb518b65724f224f8b12dedeeb06f8b278eb7d3b42524959bed5d0dfa49801bd776c7ee05de396eadc38ee693c917a04d93b20981d68c4a950cbc42ea7f4264bc1c"
77-
val signature: Cacao.Signature = Cacao.Signature(SignatureType.EIP1271.header, signatureString, payload.toCAIP122Message())
77+
val signature: Cacao.Signature = Cacao.Signature(SignatureType.EIP1271.header, signatureString, payload.toCAIP222Message())
7878
val cacao = Cacao(CacaoType.EIP4361.toHeader(), payload, signature)
7979
val result: Boolean = cacaoVerifier.verify(cacao)
8080
Assert.assertTrue(result)
@@ -99,7 +99,7 @@ internal class CacaoTest {
9999
)
100100

101101
val signatureString = "0xdeaddeaddead4095116db01baaf276361efd3a73c28cf8cc28dabefa945b8d536011289ac0a3b048600c1e692ff173ca944246cf7ceb319ac2262d27b395c82b1c"
102-
val signature: Cacao.Signature = Cacao.Signature(SignatureType.EIP1271.header, signatureString, payload.toCAIP122Message())
102+
val signature: Cacao.Signature = Cacao.Signature(SignatureType.EIP1271.header, signatureString, payload.toCAIP222Message())
103103
val cacao = Cacao(CacaoType.EIP4361.toHeader(), payload, signature)
104104
val result: Boolean = cacaoVerifier.verify(cacao)
105105
Assert.assertFalse(result)

0 commit comments

Comments
 (0)