Update WalletConnect to 1.35.2

horizontalsystems · Oct 4, 2024 · 31668be · 31668be
1 parent df5d43e
commit 31668be
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 26 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -171,15 +171,19 @@ android {
 
     configurations.all { c ->
         c.resolutionStrategy.dependencySubstitution {
-            substitute module('org.bouncycastle:bcprov-jdk15to18:1.68') using module('org.bouncycastle:bcprov-jdk15on:1.65')
+            substitute module('org.bouncycastle:bcprov-jdk15on:1.65.01') using module('org.bouncycastle:bcprov-jdk18on:1.77')
+            substitute module('org.bouncycastle:bcprov-jdk15on:1.70') using module('org.bouncycastle:bcprov-jdk18on:1.77')
+            substitute module('org.bouncycastle:bcprov-jdk15on:1.66') using module('org.bouncycastle:bcprov-jdk18on:1.77')
+            substitute module('org.bouncycastle:bcprov-jdk15to18:1.68') using module('org.bouncycastle:bcprov-jdk18on:1.77')
             substitute module('com.google.protobuf:protobuf-java:3.6.1') using module('com.google.protobuf:protobuf-javalite:3.21.1')
             substitute module('net.jcip:jcip-annotations:1.0') using module('com.github.stephenc.jcip:jcip-annotations:1.0-1')
 
-            substitute module('com.tinder.scarlet:scarlet:0.1.12') using module('com.github.WalletConnect.Scarlet:scarlet:1.0.0')
-            substitute module('com.tinder.scarlet:websocket-okhttp:0.1.12') using module('com.github.WalletConnect.Scarlet:websocket-okhttp:1.0.0')
-            substitute module('com.tinder.scarlet:stream-adapter-rxjava2:0.1.12') using module('com.github.WalletConnect.Scarlet:stream-adapter-rxjava2:1.0.0')
-            substitute module('com.tinder.scarlet:message-adapter-gson:0.1.12') using module('com.github.WalletConnect.Scarlet:message-adapter-gson:1.0.0')
-            substitute module('com.tinder.scarlet:lifecycle-android:0.1.12') using module('com.github.WalletConnect.Scarlet:lifecycle-android:1.0.0')
+            substitute module('com.tinder.scarlet:scarlet-core:0.1.12') using module('com.walletconnect.Scarlet:scarlet-core:1.0.1')
+            substitute module('com.tinder.scarlet:scarlet:0.1.12') using module('com.walletconnect.Scarlet:scarlet:1.0.1')
+            substitute module('com.tinder.scarlet:websocket-okhttp:0.1.12') using module('com.walletconnect.Scarlet:websocket-okhttp:1.0.1')
+            substitute module('com.tinder.scarlet:stream-adapter-built-in:0.1.12') using module('com.walletconnect.Scarlet:stream-adapter-built-in:1.0.1')
+            substitute module('com.tinder.scarlet:message-adapter-built-in:0.1.12') using module('com.walletconnect.Scarlet:message-adapter-built-in:1.0.1')
+            substitute module('com.tinder.scarlet:lifecycle-android:0.1.12') using module('com.walletconnect.Scarlet:lifecycle-android:1.0.1')
         }
 
         resolutionStrategy.eachDependency { details ->
@@ -293,7 +297,7 @@ dependencies {
     }
 
     // WalletConnect V2
-    implementation(platform("com.walletconnect:android-bom:1.15.0"))
+    implementation(platform("com.walletconnect:android-bom:1.35.2"))
     implementation 'com.walletconnect:web3wallet'
     implementation 'com.walletconnect:android-core'
 

diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/walletconnect/WCDelegate.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/walletconnect/WCDelegate.kt
@@ -1,5 +1,6 @@
 package io.horizontalsystems.bankwallet.modules.walletconnect
 
+import android.util.Log
 import com.walletconnect.android.Core
 import com.walletconnect.android.CoreClient
 import com.walletconnect.web3.wallet.client.Wallet
@@ -129,25 +130,25 @@ object WCDelegate : Web3Wallet.WalletDelegate, CoreClient.CoreDelegate {
         }
     }
 
-//    override fun onProposalExpired(proposal: Wallet.Model.ExpiredProposal) {
-//        Log.e("TAG", "onProposalExpired: ", )
-//    }
-//
-//    override fun onRequestExpired(request: Wallet.Model.ExpiredRequest) {
-//        Log.e("TAG", "onRequestExpired: ", )
-//    }
-//
-//    override fun onSessionExtend(session: Wallet.Model.Session) {
-//        Log.e("TAG", "onSessionExtend: ", )
-//    }
-//
-//    override fun onPairingExpired(expiredPairing: Core.Model.ExpiredPairing) {
-//        Log.e("TAG", "onPairingExpired: ", )
-//    }
-//
-//    override fun onPairingState(pairingState: Core.Model.PairingState) {
-//        Log.e("TAG", "onPairingState: $pairingState", )
-//    }
+    override fun onProposalExpired(proposal: Wallet.Model.ExpiredProposal) {
+        Log.e("TAG", "onProposalExpired: ", )
+    }
+
+    override fun onRequestExpired(request: Wallet.Model.ExpiredRequest) {
+        Log.e("TAG", "onRequestExpired: ", )
+    }
+
+    override fun onSessionExtend(session: Wallet.Model.Session) {
+        Log.e("TAG", "onSessionExtend: ", )
+    }
+
+    override fun onPairingExpired(expiredPairing: Core.Model.ExpiredPairing) {
+        Log.e("TAG", "onPairingExpired: ", )
+    }
+
+    override fun onPairingState(pairingState: Core.Model.PairingState) {
+        Log.e("TAG", "onPairingState: $pairingState", )
+    }
 
 //    fun deleteAccountAllPairings(currentAccountTopics: List<String>) {
 //        Web3Wallet.getListOfActiveSessions()