Add expiry

dydxprotocol · Mar 28, 2024 · c11d124 · c11d124
1 parent 6cf69ca
commit c11d124
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -51,7 +51,7 @@ dependencies {
     implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.0')
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
     implementation 'androidx.activity:activity-compose:1.8.2'
-    implementation platform('androidx.compose:compose-bom:2022.10.00')
+    implementation platform('androidx.compose:compose-bom:2024.03.00')
     implementation 'androidx.compose.ui:ui'
     implementation 'androidx.compose.ui:ui-graphics'
     implementation 'androidx.compose.ui:ui-tooling-preview'
@@ -60,7 +60,7 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    androidTestImplementation platform('androidx.compose:compose-bom:2022.10.00')
+    androidTestImplementation platform('androidx.compose:compose-bom:2024.03.00')
     androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
     debugImplementation 'androidx.compose.ui:ui-tooling'
     debugImplementation 'androidx.compose.ui:ui-test-manifest'

diff --git a/cartera/build.gradle b/cartera/build.gradle
@@ -42,7 +42,6 @@ android {
     configurations {
         all {
             exclude group: 'org.bouncycastle', module: 'bcprov-jdk15to18'
-            exclude group: 'org.bouncycastle', module: 'bcprov-jdk15on'
         }
     }
 }

diff --git a/...a/src/main/java/exchange/dydx/cartera/walletprovider/providers/WalletConnectV2Provider.kt b/...a/src/main/java/exchange/dydx/cartera/walletprovider/providers/WalletConnectV2Provider.kt
@@ -65,6 +65,10 @@ class WalletConnectV2Provider(
 
     private var currentPairing: Core.Model.Pairing? = null
 
+    // expiry must be between current timestamp + MIN_INTERVAL and current timestamp + MAX_INTERVAL (MIN_INTERVAL: 300, MAX_INTERVAL: 604800)
+    private val requestExpiry: Long
+        get() = (System.currentTimeMillis() / 1000) + 400
+
     private val dappDelegate = object : SignClient.DappDelegate {
         override fun onSessionApproved(approvedSession: Sign.Model.ApprovedSession) {
             // Triggered when Dapp receives the session approval from wallet
@@ -315,14 +319,15 @@ class WalletConnectV2Provider(
             val namespace = currentSession?.namespace()
             val chainId = currentSession?.chainId()
             return if (sessionTopic != null && account != null && namespace != null && chainId != null) {
-                return Sign.Params.Request(
+                Sign.Params.Request(
                     sessionTopic = sessionTopic,
                     method = "personal_sign",
                     params = "[\"${message}\", \"${account}\"]",
                     chainId = "$namespace:$chainId",
+                    expiry = requestExpiry,
                 )
             } else {
-                return null
+                null
             }
         }
 
@@ -348,6 +353,7 @@ class WalletConnectV2Provider(
                     method = "eth_signTypedData",
                     params = "[\"${account}\", \"${message}\"]",
                     chainId = "$namespace:$chainId",
+                    expiry = requestExpiry,
                 )
             } else {
                 null
@@ -374,6 +380,7 @@ class WalletConnectV2Provider(
                     method = "eth_sendTransaction",
                     params = "[$message]",
                     chainId = "$namespace:$chainId",
+                    expiry = requestExpiry,
                 )
             } else {
                 null
@@ -471,13 +478,19 @@ class WalletConnectV2Provider(
                 val params = requestParams()
                 if (params != null) {
                     reallyMakeRequest(request, params) { result, error ->
-                        completion(result, error)
+                        CoroutineScope(Dispatchers.Main).launch {
+                            completion(result, error)
+                        }
                     }
                 } else {
-                    completion(null, WalletError(CarteraErrorCode.INVALID_SESSION))
+                    CoroutineScope(Dispatchers.Main).launch {
+                        completion(null, WalletError(CarteraErrorCode.INVALID_SESSION))
+                    }
                 }
             } else {
-                completion(null, WalletError(CarteraErrorCode.INVALID_SESSION))
+                CoroutineScope(Dispatchers.Main).launch {
+                    completion(null, WalletError(CarteraErrorCode.INVALID_SESSION))
+                }
             }
         }
     }