Persist chainId (#22)

* Persist chainId * add chainid to store item * use persisted chainId
trustwallet · Sep 30, 2020 · dac3a66 · dac3a66
1 parent 98a170d
commit dac3a66
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/walletconnect/src/main/java/com/trustwallet/walletconnect/WCClient.kt b/walletconnect/src/main/java/com/trustwallet/walletconnect/WCClient.kt
@@ -58,6 +58,9 @@ open class WCClient (
 
     var remotePeerId: String? = null
         private set
+
+    var chainId: String? = null
+        private set
 
     var isConnected: Boolean = false
         private set
@@ -155,7 +158,7 @@ open class WCClient (
         check(handshakeId > 0) { "handshakeId must be greater than 0 on session approve" }
 
         val result = WCApproveSessionResponse(
-            chainId = chainId,
+            chainId = this.chainId?.toIntOrNull() ?: chainId,
             accounts = accounts,
             peerId = peerId,
             peerMeta = peerMeta
@@ -175,7 +178,7 @@ open class WCClient (
             params = listOf(
                 WCSessionUpdate(
                     approved = approved,
-                    chainId = chainId,
+                    chainId = this.chainId?.toIntOrNull() ?: chainId,
                     accounts = accounts
                 )
             )
@@ -257,6 +260,7 @@ open class WCClient (
                         .firstOrNull() ?: throw InvalidJsonRpcParamsException(request.id)
                 handshakeId = request.id
                 remotePeerId = param.peerId
+                chainId = param.chainId
                 onSessionRequest(request.id, param.peerMeta)
             }
             WCMethod.SESSION_UPDATE -> {

diff --git a/walletconnect/src/main/java/com/trustwallet/walletconnect/WCSessionStore.kt b/walletconnect/src/main/java/com/trustwallet/walletconnect/WCSessionStore.kt
@@ -6,6 +6,7 @@ import java.util.*
 
 data class WCSessionStoreItem(
         val session: WCSession,
+        val chainId: Int,
         val peerId: String,
         val remotePeerId: String,
         val remotePeerMeta: WCPeerMeta,

diff --git a/walletconnect/src/test/java/com/trustwallet/walletconnect/WCSessionStoreTests.kt b/walletconnect/src/test/java/com/trustwallet/walletconnect/WCSessionStoreTests.kt
@@ -32,7 +32,7 @@ class WCSessionStoreTests {
     fun test_store() {
         val topic = "topic_1"
         val session = WCSession.from("wc:$topic@1?bridge=https%3A%2F%2Fbridge.walletconnect.org&key=some_key")!!
-        val item = WCSessionStoreItem(session, "peerId", "remotePeerId", WCPeerMeta(name = "Some DApp", url = "https://dapp.com"))
+        val item = WCSessionStoreItem(session, 56, "peerId", "remotePeerId", WCPeerMeta(name = "Some DApp", url = "https://dapp.com"))
 
         storage.session = item
         Assert.assertNotNull(sharedPreferences.getString(SESSION_KEY, null))
@@ -42,7 +42,7 @@ class WCSessionStoreTests {
     fun test_remove() {
         val topic = "topic_1"
         val session = WCSession.from("wc:$topic@1?bridge=https%3A%2F%2Fbridge.walletconnect.org&key=some_key")!!
-        val item = WCSessionStoreItem(session, "peerId","remotePeerId", WCPeerMeta(name = "Some DApp", url = "https://dapp.com"))
+        val item = WCSessionStoreItem(session, 56, "peerId","remotePeerId", WCPeerMeta(name = "Some DApp", url = "https://dapp.com"))
 
         storage.session = item
         storage.session = null