Added sample dapp with WC server (WalletConnect#12)

Author: rmeissner

build.gradle

@@ -1,19 +1,49 @@
 buildscript {
     ext {
         versions = [
-                kotlin: "1.3.31",
-                moshi : '1.8.0',
-                okhttp: '3.11.0',
+                kotlin                    : "1.3.31",
+                moshi                     : '1.8.0',
+                okhttp                    : '3.11.0',
+
+                'minSdk'                  : 14,
+                'compileSdk'              : 28,
+                'buildTools'              : '28.0.3',
+                'androidPlugin'           : '3.4.0',
+
+                androidx_app_compat       : '1.0.2',
+                androidx_card_view        : '1.0.0',
+                androidx_constraint_layout: '1.1.3',
+                androidx_lifecycle        : '2.0.0',
+                androidx_test_ext         : '1.1.0',
+                androidx_recycler_view    : '1.0.0',
+                androidx_room             : '2.0.0',
+
+                multidex                  : '2.0.1',
+        ]
+
+        ext.deps = [
+                android: [
+                        'runtime'     : 'com.google.android:android:4.1.1.4',
+                        'gradlePlugin': "com.android.tools.build:gradle:${versions.androidPlugin}",
+                ]
         ]
     }
 
     repositories {
         jcenter()
+        /*
+        google()
+        maven {
+            url uri('../../repo')
+        }
+        */
     }
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.21.0'
+        // How can we move this to the sample folder
+        //classpath deps.android.gradlePlugin
     }
 }
 

lib/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: "kotlin"
+apply plugin: 'maven'
 
 repositories {
     jcenter()

lib/src/main/kotlin/org/walletconnect/Session.kt

@@ -1,9 +1,14 @@
 package org.walletconnect
 
 import java.net.URLDecoder
+import java.net.URLEncoder
 
 interface Session {
     fun init()
+    /**
+     * Send client info to the bridge and wait for a client to connect
+     */
+    fun offer()
     fun approve(accounts: List<String>, chainId: Long)
     fun reject()
     fun update(accounts: List<String>, chainId: Long)
@@ -14,9 +19,11 @@ interface Session {
 
     fun approveRequest(id: Long, response: Any)
     fun rejectRequest(id: Long, errorCode: Long, errorMsg: String)
+    fun performMethodCall(call: MethodCall, callback: ((Session.MethodCall.Response) -> Unit)? = null)
 
-    fun addCallback(cb: Session.Callback)
-    fun removeCallback(cb: Session.Callback)
+    fun addCallback(cb: Callback)
+    fun removeCallback(cb: Callback)
+    fun clearCallbacks()
 
     data class Config(
         val handshakeTopic: String,
@@ -25,6 +32,8 @@ interface Session {
         val protocol: String = "wc",
         val version: Int = 1
     ) {
+        fun toWCUri(): String =
+                "wc:$handshakeTopic@$version?bridge=${URLEncoder.encode(bridge, "UTF-8")}&key=$key"
         companion object {
             fun fromWCUri(uri: String): Config {
                 val protocolSeparator = uri.indexOf(':')
@@ -82,8 +91,8 @@ interface Session {
         interface Builder {
             fun build(
                 url: String,
-                statusHandler: (Session.Transport.Status) -> Unit,
-                messageHandler: (Session.Transport.Message) -> Unit
+                statusHandler: (Status) -> Unit,
+                messageHandler: (Message) -> Unit
             ): Transport
         }
 

lib/src/main/kotlin/org/walletconnect/impls/MoshiPayloadAdapter.kt

@@ -13,7 +13,7 @@ import org.bouncycastle.crypto.params.KeyParameter
 import org.bouncycastle.crypto.params.ParametersWithIV
 import org.walletconnect.Session
 import org.walletconnect.nullOnThrow
-import org.walletconnect.types.intoMap
+import org.walletconnect.types.*
 import org.walleth.khex.hexToByteArray
 import org.walleth.khex.toNoPrefixHexString
 import java.security.SecureRandom
@@ -113,28 +113,12 @@ class MoshiPayloadAdapter(moshi: Moshi) : Session.PayloadAdapter {
             } ?: throw IllegalArgumentException("Invalid json")
         }
 
-    private fun Map<String, *>.getId(): Long =
-        (this["id"] as? Double)?.toLong() ?: throw IllegalArgumentException("id missing")
-
-    private fun Map<String, *>.toSessionRequest(): Session.MethodCall.SessionRequest {
-        val params = this["params"] as? List<*> ?: throw IllegalArgumentException("params missing")
-        val data = params.firstOrNull() as? Map<*, *> ?: throw IllegalArgumentException("Invalid params")
-
-        return Session.MethodCall.SessionRequest(
-            getId(),
-            data.extractPeerData()
-        )
-    }
-
     private fun Map<String, *>.toSessionUpdate(): Session.MethodCall.SessionUpdate {
         val params = this["params"] as? List<*> ?: throw IllegalArgumentException("params missing")
-        val data = params.firstOrNull() as? Map<*, *> ?: throw IllegalArgumentException("Invalid params")
-        val approved = data["approved"] as? Boolean ?: throw IllegalArgumentException("approved missing")
-        val chainId = data["chainId"] as? Long
-        val accounts = nullOnThrow { (data["accounts"] as? List<*>)?.toStringList() }
+        val data = params.firstOrNull() as? Map<String, *> ?: throw IllegalArgumentException("Invalid params")
         return Session.MethodCall.SessionUpdate(
             getId(),
-            Session.SessionParams(approved, chainId, accounts, nullOnThrow { data.extractPeerData() })
+            data.extractSessionParams()
         )
     }
 
@@ -176,31 +160,6 @@ class MoshiPayloadAdapter(moshi: Moshi) : Session.PayloadAdapter {
         )
     }
 
-    private fun Map<*, *>.extractError(): Session.Error {
-        val code = (this["code"] as? Double)?.toLong()
-        val message = this["message"] as? String
-        return Session.Error(code ?: 0, message ?: "Unknown error")
-    }
-
-    private fun Map<*, *>.extractPeerData(): Session.PeerData {
-        val peerId = this["peerId"] as? String ?: throw IllegalArgumentException("peerId missing")
-        val peerMeta = this["peerMeta"] as? Map<*, *>
-        return Session.PeerData(peerId, peerMeta.extractPeerMeta())
-    }
-
-    private fun Map<*, *>?.extractPeerMeta(): Session.PeerMeta {
-        val description = this?.get("description") as? String
-        val url = this?.get("url") as? String
-        val name = this?.get("name") as? String
-        val icons = nullOnThrow { (this?.get("icons") as? List<*>)?.toStringList() }
-        return Session.PeerMeta(url, name, description, icons)
-    }
-
-    private fun List<*>.toStringList(): List<String> =
-        this.map {
-            (it as? String) ?: throw IllegalArgumentException("List contains non-String values")
-        }
-
     /**
      * Convert INTO request bytes
      */