Merge pull request #1071 from WalletConnect/develop

BOM 1.15.0

Author: Talhaali00

.github/workflows/ci_assemble.yml

@@ -43,7 +43,7 @@ jobs:
       - name: Assemble Debug Project
         env:
           WC_CLOUD_PROJECT_ID: ${{ secrets.WC_CLOUD_PROJECT_ID }}
-        run: ./gradlew assembleDebug -x :sample:wallet:assembleDebug -x :sample:dapp:assembleDebug -x :sample:common:assembleDebug
+        run: ./gradlew assembleDebug -x :sample:wallet:assembleDebug -x :sample:dapp:assembleDebug -x :sample:common:assembleDebug -x :sample:inbox:assembleDebug
 
       - name: Stop Gradle
         run: ./gradlew --stop

.github/workflows/ci_release_sample.yml

@@ -10,6 +10,7 @@ jobs:
         conf: [
           { name: wallet, command: ":sample:wallet:assembleRelease :sample:wallet:appDistributionUploadRelease" },
           { name: dapp, command: ":sample:dapp:assembleRelease :sample:dapp:appDistributionUploadRelease" }
+          { name: inbox, command: ":sample:inbox:assembleRelease :sample:inbox:appDistributionUploadRelease" }
         ]
     name: ${{ matrix.conf.name }}
     runs-on: ubuntu-latest

.github/workflows/ci_scheduled.yml

@@ -3,6 +3,19 @@ name: Kotlin Scheduled Integration
 on:
   schedule:
     - cron: '0 0,12 * * *' # Runs every day at 0:00 and 12:00 UTC
+  workflow_dispatch:
+    inputs:
+      testTimeoutSeconds:
+        description: 'Seconds for test timeout'
+        required: true
+        default: 40  # should be same as env.TEST_TIMEOUT_SECONDS
+      shouldUseCache:
+        description: 'Flag to use and save cache gradle. Tests results are cached!'
+        required: true
+        default: false
+
+env:
+  TEST_TIMEOUT_SECONDS: 40 # Predefined timeout for integration tests
 
 jobs:
 # Copy of ci_relay.yml
@@ -18,54 +31,41 @@ jobs:
           TEST_PROJECT_ID: ${{ secrets.WC_CLOUD_PROJECT_ID }}
         uses: ./.github/actions/ci_relay
 
-      - name: Send GitHub Action trigger data to Slack workflow
-        if: failure()
-        id: slack
-        uses: slackapi/[email protected]
-        with:
-          payload: |
-            {
-              "action_url": "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-            }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_SCHEDULED_CI_WEBHOOK_URL }}
+# Copy of ci_instrumented_test.yml
+#   sdk_tests:
+#     strategy:
+#       fail-fast: false
+#       matrix:
+#         conf: [
+#           { name: 'Sign_SDK', command: ":protocol:sign:allDevicesCheck" },
+#           { name: 'Android_Core_SDK', command: ":core:android:allDevicesCheck" },
+#         ]
 
+#     name: ${{ matrix.conf.name }}
+#     runs-on: self-hosted
+#     steps:
+#       - uses: actions/checkout@v3
 
-# Copy of ci_instrumented_test.yml
-  sdk_tests:
-    strategy:
-      fail-fast: false
-      matrix:
-        conf: [
-          { name: Sign SDK, command: ":protocol:sign:connectedCheck", report: '/Users/runner/work/WalletConnectKotlinV2/WalletConnectKotlinV2/protocol/sign/build/reports/**' },
-          { name: Android Core SDK, command: ":core:android:connectedCheck", report: '/Users/runner/work/WalletConnectKotlinV2/WalletConnectKotlinV2/core/android/build/reports/**' },
-        ]
-        api-level: [ 32 ] # JUnit5 only supports API younger or equal to 26
-        target: [ google_apis ]
-        profile: [ Nexus 6 ]
-        arch: [ arm64-v8a ]
+#       - name: Run instrumented tests
+#         uses: ./.github/actions/ci_instrumented_tests
+#         with:
+#           shouldUseCache: ${{ github.event.inputs.testTimeoutSeconds || true }} # Setting to true faster pass unchanged code
+#           name: ${{ matrix.conf.name }}
+#           command: ${{ matrix.conf.command }}
+#           report: ${{ matrix.conf.report }}
+#           projectId: ${{ secrets.WC_CLOUD_PROJECT_ID }}
+#           testTimeoutSeconds: ${{ github.event.inputs.testTimeoutSeconds || env.TEST_TIMEOUT_SECONDS }} # Prioritise dispatch input timeout over env one
 
-    name: ${{ matrix.conf.name }} API ${{ matrix.api-level }}-${{ matrix.target }}-${{ matrix.profile }}-${{ matrix.arch }}
-    runs-on: self-hosted
+  trigger_slack_webhook:
+    runs-on: ubuntu-latest
+#     needs: [sdk_tests, relay_tests]
+    needs: [relay_tests]
+    if: failure()
     steps:
-      - uses: actions/checkout@v3
-
-      - name: Run instrumented tests
-        uses: ./.github/actions/ci_instrumented_tests
-        with:
-          shouldCache: true
-          name: ${{ matrix.conf.name }}
-          command: ${{ matrix.conf.command }}
-          report: ${{ matrix.conf.report }}
-          projectId: ${{ secrets.WC_CLOUD_PROJECT_ID }}
-          testTimeoutSeconds: ${{ github.event.inputs.testTimeoutSeconds || env.TEST_TIMEOUT_SECONDS }} # Prioritise dispatch input timeout over env one
-          api-level: ${{ matrix.api-level }}
-          target: ${{ matrix.target }}
-          profile: ${{ matrix.profile }}
-          arch: ${{ matrix.arch }}
+      - name: Checkout
+        uses: actions/checkout@v3
 
       - name: Send GitHub Action trigger data to Slack workflow
-        if: failure()
         id: slack
         uses: slackapi/[email protected]
         with:

ReadMe.md

@@ -10,6 +10,7 @@ WalletConnect v2 protocols for Android applications.
 
 | BOM                                                                                     | [Core SDK](core/android) | [Sign SDK](protocol/sign) | [Auth SDK](protocol/auth) | [Chat SDK](protocol/chat) | [Push SDK](protocol/push) | [web3wallet](product/web3wallet) | [web3inbox](product/web3inbox) | [WalletConnectModal](product/walletconnectmodal) |
 |-----------------------------------------------------------------------------------------|--------------------------|---------------------------|---------------------------|---------------------------|---------------------------|----------------------------------|--------------------------------|--------------------------------------------------|
+| 1.15.0                                                                                  | 1.20.0                   | 2.18.0                    | 1.18.0                    | 1.0.0-beta16              | 1.0.0-alpha11             | 1.13.0                           | 1.0.0-alpha16                  | 1.0.0-alpha03                                    |
 | 1.14.0                                                                                  | 1.19.0                   | 2.17.0                    | 1.17.0                    | 1.0.0-beta15              | 1.0.0-alpha10             | 1.12.0                           | 1.0.0-alpha15                  | 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-alpha14                  | 1.0.0-alpha01                                    |
 | 1.12.0                                                                                  | 1.17.0                   | 2.15.0                    | 1.15.0                    | 1.0.0-beta13              |                           | 1.10.0                           | 1.0.0-alpha13                  |                                                  |

buildSrc/src/main/kotlin/Dependencies.kt

@@ -159,8 +159,16 @@ fun DependencyHandlerScope.kethereum() {
     "api"("com.github.komputing.kethereum:crypto_impl_spongycastle:$kethereumVersion")
 }
 
-fun DependencyHandlerScope.fcm() {
-    "implementation"("com.google.firebase:firebase-messaging:$fcmVersion")
+fun DependencyHandlerScope.firebaseMessaging() {
+    "implementation"(platform("com.google.firebase:firebase-bom:$firebaseBomVersion"))
+    "implementation"("com.google.firebase:firebase-messaging")
+}
+
+
+fun DependencyHandlerScope.firebaseChrashlytics() {
+    "implementation"(platform("com.google.firebase:firebase-bom:$firebaseBomVersion"))
+    "implementation"("com.google.firebase:firebase-crashlytics-ktx")
+    "implementation"("com.google.firebase:firebase-analytics-ktx")
 }
 
 fun DependencyHandlerScope.compose() {

buildSrc/src/main/kotlin/Versions.kt

@@ -5,18 +5,18 @@ const val KEY_PUBLISH_ARTIFACT_ID = "PUBLISH_ARTIFACT_ID"
 const val KEY_SDK_NAME = "SDK_NAME"
 
 //Latest versions
-const val BOM_VERSION = "1.14.0"
-const val FOUNDATION_VERSION = "1.10.0"
-const val CORE_VERSION = "1.19.0"
-const val SIGN_VERSION = "2.17.0"
-const val AUTH_VERSION = "1.17.0"
-const val CHAT_VERSION = "1.0.0-beta15"
-const val PUSH_VERSION = "1.0.0-alpha10"
-const val WEB_3_WALLET = "1.12.0"
-const val WEB_3_INBOX = "1.0.0-alpha15"
-const val WEB_3_MODAL = "1.0.0-alpha06"
-const val WC_MODAL_VERSION = "1.0.0-alpha02"
-const val MODAL_CORE_VERSION = "1.0.0-alpha02"
+const val BOM_VERSION = "1.15.0"
+const val FOUNDATION_VERSION = "1.11.0"
+const val CORE_VERSION = "1.20.0"
+const val SIGN_VERSION = "2.18.0"
+const val AUTH_VERSION = "1.18.0"
+const val CHAT_VERSION = "1.0.0-beta16"
+const val PUSH_VERSION = "1.0.0-alpha11"
+const val WEB_3_WALLET = "1.13.0"
+const val WEB_3_INBOX = "1.0.0-alpha16"
+const val WEB_3_MODAL = "1.0.0-alpha07"
+const val WC_MODAL_VERSION = "1.0.0-alpha03"
+const val MODAL_CORE_VERSION = "1.0.0-alpha03"
 
 val jvmVersion = JavaVersion.VERSION_11
 const val MIN_SDK: Int = 23
@@ -69,3 +69,4 @@ const val materialVersion = "1.9.0"
 const val coilVersion = "2.3.0"
 const val customQrGeneratorVersion = "1.6.2"
 const val turbineVersion = "1.0.0"
+const val firebaseBomVersion = "32.2.0"

core/android/src/main/kotlin/com/walletconnect/android/internal/Messages.kt

@@ -4,7 +4,7 @@ package com.walletconnect.android.internal
 internal const val MALFORMED_PAIRING_URI_MESSAGE: String = "Pairing URI string is invalid."
 
 @JvmSynthetic
-internal const val PAIRING_NOW_ALLOWED_MESSAGE: String = "Pair with existing pairing is not allowed"
+internal const val PAIRING_NOW_ALLOWED_MESSAGE: String = "Pair with existing pairing is not allowed, please refresh QR code"
 
 @JvmSynthetic
 internal const val NO_SEQUENCE_FOR_TOPIC_MESSAGE: String = "Cannot find sequence for given topic: "

core/android/src/main/kotlin/com/walletconnect/android/internal/common/di/ExplorerModule.kt

@@ -28,6 +28,7 @@ internal fun explorerModule() = module {
 
     single {
         ExplorerRepository(
+            context = get(),
             explorerService = get(),
             projectId = get(),
             explorerApiUrl = get(named(AndroidCommonDITags.EXPLORER_URL)),

core/android/src/main/kotlin/com/walletconnect/android/internal/common/exception/PeerError.kt

@@ -25,7 +25,6 @@ sealed class Invalid : Error {
     object RequestExpired: Invalid() {
         override val message: String = "Request expired or expiry param validation failed (MIN_INTERVAL: 300, MAX_INTERVAL: 604800)"
         override val code: Int = 8000
-
     }
 }
 

core/android/src/main/kotlin/com/walletconnect/android/internal/common/explorer/ExplorerRepository.kt

@@ -1,5 +1,6 @@
 package com.walletconnect.android.internal.common.explorer
 
+import android.content.Context
 import androidx.core.net.toUri
 import com.walletconnect.android.BuildConfig
 import com.walletconnect.android.internal.common.explorer.data.model.App
@@ -28,8 +29,10 @@ import com.walletconnect.android.internal.common.explorer.data.network.model.Wal
 import com.walletconnect.android.internal.common.explorer.data.network.model.SupportedStandardDTO
 import com.walletconnect.android.internal.common.explorer.data.network.model.WalletListingDTO
 import com.walletconnect.android.internal.common.model.ProjectId
+import com.walletconnect.android.utils.isWalletInstalled
 
 class ExplorerRepository(
+    private val context: Context,
     private val explorerService: ExplorerService,
     private val projectId: ProjectId,
     private val explorerApiUrl: String
@@ -84,7 +87,7 @@ class ExplorerRepository(
             nativeLink = mobile.native,
             universalLink = mobile.universal,
             playStoreLink = app.android
-        )
+        ).apply { isWalletInstalled = context.packageManager.isWalletInstalled(this) }
     }
 
     private fun String.buildWalletImageUrl(): String {