Merge pull request #80 from WalletConnect/develop

Develop

.swiftpm/xcode/xcshareddata/xcschemes/WalletConnect.xcscheme

@@ -124,6 +124,16 @@
                ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "WalletConnectKMSTests"
+               BuildableName = "WalletConnectKMSTests"
+               BlueprintName = "WalletConnectKMSTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

Example/DApp/ClientDelegate.swift

@@ -1,4 +1,5 @@
 import WalletConnect
+import Relayer
 
 class ClientDelegate: WalletConnectClientDelegate {
     var client: WalletConnectClient
@@ -13,12 +14,8 @@ class ClientDelegate: WalletConnectClientDelegate {
             description: "a description",
             url: "wallet.connect",
             icons: ["https://gblobscdn.gitbook.com/spaces%2F-LJJeCjcLrr53DcT1Ml7%2Favatar.png?alt=media"])
-        self.client = WalletConnectClient(
-            metadata: metadata,
-            projectId: "52af113ee0c1e1a20f4995730196c13e",
-            isController: false,
-            relayHost: "relay.dev.walletconnect.com"
-        )
+        let relayer = Relayer(relayHost: "relay.dev.walletconnect.com", projectId: "52af113ee0c1e1a20f4995730196c13e")
+        self.client = WalletConnectClient(metadata: metadata, relayer: relayer)
         client.delegate = self
     }
 
@@ -34,7 +31,7 @@ class ClientDelegate: WalletConnectClientDelegate {
         onSessionResponse?(sessionResponse)
     }
 
-    func didUpdate(sessionTopic: String, accounts: Set<String>) {
+    func didUpdate(sessionTopic: String, accounts: Set<Account>) {
     }
 
     func didUpgrade(sessionTopic: String, permissions: Session.Permissions) {

Example/DApp/Connect/ConnectViewController.swift

@@ -86,7 +86,7 @@ class ConnectViewController: UIViewController, UITableViewDataSource, UITableVie
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "pairing_cell", for: indexPath)
-        cell.textLabel?.text = activePairings[indexPath.row].peer!.name
+        cell.textLabel?.text = activePairings[indexPath.row].peer?.name ?? ""
         return cell
     }
 

Example/ExampleApp.xcodeproj/project.pbxproj

@@ -754,7 +754,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = W5R8AG9K22;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = DApp/Info.plist;
@@ -786,7 +786,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = W5R8AG9K22;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = DApp/Info.plist;

Example/ExampleApp/Responder/ResponderViewController.swift

@@ -15,7 +15,6 @@ final class ResponderViewController: UIViewController {
         return WalletConnectClient(
             metadata: metadata,
             projectId: "52af113ee0c1e1a20f4995730196c13e",
-            isController: true,
             relayHost: "relay.dev.walletconnect.com"
         )
     }()
@@ -151,15 +150,15 @@ extension ResponderViewController: SessionViewControllerDelegate {
         print("[RESPONDER] Approving session...")
         let proposal = currentProposal!
         currentProposal = nil
-        let accounts = proposal.permissions.blockchains.map {$0+":\(account)"}
-        client.approve(proposal: proposal, accounts: Set(accounts))
+        let accounts = Set(proposal.permissions.blockchains.compactMap { Account($0+":\(account)") })
+        client.approve(proposal: proposal, accounts: accounts)
     }
 
     func didRejectSession() {
         print("did reject session")
         let proposal = currentProposal!
         currentProposal = nil
-        client.reject(proposal: proposal, reason: Reason(code: 0, message: "reject"))
+        client.reject(proposal: proposal, reason: .disapprovedChains)
     }
 }
 
@@ -197,7 +196,7 @@ extension ResponderViewController: WalletConnectClientDelegate {
 
     }
 
-    func didUpdate(sessionTopic: String, accounts: Set<String>) {
+    func didUpdate(sessionTopic: String, accounts: Set<Account>) {
 
     }
 

Package.swift

@@ -12,34 +12,38 @@ let package = Package(
         .library(
             name: "WalletConnect",
             targets: ["WalletConnect"]),
-    ],
-    dependencies: [
-
     ],
     targets: [
         .target(
             name: "WalletConnect",
-            dependencies: ["Relayer", "WalletConnectUtils"],
+            dependencies: ["Relayer", "WalletConnectUtils", "WalletConnectKMS"],
             path: "Sources/WalletConnect"),
         .target(
             name: "Relayer",
             dependencies: ["WalletConnectUtils"],
             path: "Sources/Relayer"),
+        .target(
+            name: "WalletConnectKMS",
+            dependencies: ["WalletConnectUtils"],
+            path: "Sources/WalletConnectKMS"),
         .target(
             name: "WalletConnectUtils",
             dependencies: []),
         .testTarget(
             name: "WalletConnectTests",
-            dependencies: ["WalletConnect", "TestingUtils"]),
+            dependencies: ["WalletConnect", "TestingUtils", "WalletConnectKMS"]),
         .testTarget(
             name: "IntegrationTests",
-            dependencies: ["WalletConnect", "TestingUtils"]),
+            dependencies: ["WalletConnect", "TestingUtils", "WalletConnectKMS"]),
         .testTarget(
             name: "RelayerTests",
             dependencies: ["Relayer", "WalletConnectUtils", "TestingUtils"]),
+        .testTarget(
+            name: "WalletConnectKMSTests",
+            dependencies: ["WalletConnectKMS", "WalletConnectUtils", "TestingUtils"]),
         .target(
             name: "TestingUtils",
-            dependencies: ["WalletConnectUtils"],
+            dependencies: ["WalletConnectUtils", "WalletConnectKMS"],
             path: "Tests/TestingUtils"),
     ],
     swiftLanguageVersions: [.v5]

README.md

@@ -24,10 +24,8 @@ You usually want to have a single instance of a client in you app.
                                    icons: [String]?)
         let client = WalletConnectClient(metadata: AppMetadata,
                             projectId: String,
-                            isController: Bool,
                             relayHost: String)
 ```
-The `controller` client will always be the "wallet" which is exposing blockchain accounts to a "dapp" and therefore is also in charge of signing.
 
 After instantiation of a client set its delegate.
 #### Pair Clients

Sources/Relayer/AppStateObserving.swift

@@ -0,0 +1,48 @@
+
+import Foundation
+#if os(iOS)
+import UIKit
+#endif
+
+protocol AppStateObserving {
+    var onWillEnterForeground: (()->())? {get set}
+    var onWillEnterBackground: (()->())? {get set}
+}
+
+class AppStateObserver: AppStateObserving {
+    @objc var onWillEnterForeground: (() -> ())?
+
+    @objc var onWillEnterBackground: (() -> ())?
+
+    init() {
+        subscribeNotificationCenter()
+    }
+
+    private func subscribeNotificationCenter() {
+#if os(iOS)
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(appWillEnterForeground),
+            name: UIApplication.willEnterForegroundNotification,
+            object: nil)
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(appWillEnterBackground),
+            name: UIApplication.willResignActiveNotification,
+            object: nil)
+#endif
+    }
+
+    @objc
+    private func appWillEnterBackground() {
+        onWillEnterBackground?()
+    }
+
+    @objc
+    private func appWillEnterForeground() {
+        onWillEnterForeground?()
+    }
+
+}
+
+

Sources/Relayer/Dispatching.swift

@@ -6,60 +6,53 @@ protocol Dispatching {
     var onDisconnect: (()->())? {get set}
     var onMessage: ((String) -> ())? {get set}
     func send(_ string: String, completion: @escaping (Error?)->())
-    func connect()
-    func disconnect(closeCode: URLSessionWebSocketTask.CloseCode)
+    func connect() throws
+    func disconnect(closeCode: URLSessionWebSocketTask.CloseCode) throws
 }
 
 final class Dispatcher: NSObject, Dispatching {
     var onConnect: (() -> ())?
     var onDisconnect: (() -> ())?
     var onMessage: ((String) -> ())?
     private var textFramesQueue = Queue<String>()
-    private var networkMonitor: NetworkMonitoring
-    private let url: URL
     var socket: WebSocketSessionProtocol
     var socketConnectionObserver: SocketConnectionObserving
+    var socketConnectionHandler: SocketConnectionHandler
 
-    init(url: URL,
-         networkMonitor: NetworkMonitoring = NetworkMonitor(),
-         socket: WebSocketSessionProtocol,
-         socketConnectionObserver: SocketConnectionObserving) {
-        self.url = url
-        self.networkMonitor = networkMonitor
+    init(socket: WebSocketSessionProtocol,
+         socketConnectionObserver: SocketConnectionObserving,
+         socketConnectionHandler: SocketConnectionHandler) {
         self.socket = socket
         self.socketConnectionObserver = socketConnectionObserver
+        self.socketConnectionHandler = socketConnectionHandler
         super.init()
         setUpWebSocketSession()
         setUpSocketConnectionObserving()
-        setUpNetworkMonitoring()
-        socket.connect(on: url)
     }
 
     func send(_ string: String, completion: @escaping (Error?) -> Void) {
         if socket.isConnected {
             self.socket.send(string, completionHandler: completion)
+            //TODO - enqueue     if fails
         } else {
             textFramesQueue.enqueue(string)
         }
     }
 
-    func connect() {
-        if !socket.isConnected {
-            socket.connect(on: url)
-        }
+    func connect() throws {
+        try socketConnectionHandler.handleConnect()
     }
 
-    func disconnect(closeCode: URLSessionWebSocketTask.CloseCode) {
-        socket.disconnect(with: closeCode)
-        onDisconnect?()
+    func disconnect(closeCode: URLSessionWebSocketTask.CloseCode) throws {
+        try socketConnectionHandler.handleDisconnect(closeCode: closeCode)
     }
 
     private func setUpWebSocketSession() {
         socket.onMessageReceived = { [weak self] in
             self?.onMessage?($0)
         }
         socket.onMessageError = { error in
-            print(error)
+            print("WebSocket Error \(error)")
         }
     }
 
@@ -73,16 +66,6 @@ final class Dispatcher: NSObject, Dispatching {
         }
     }
 
-    private func setUpNetworkMonitoring() {
-        networkMonitor.onSatisfied = { [weak self] in
-            self?.connect()
-        }
-        networkMonitor.onUnsatisfied = { [weak self] in
-            self?.disconnect(closeCode: .goingAway)
-        }
-        networkMonitor.startMonitoring()
-    }
-
     private func dequeuePendingTextFrames() {
         while let frame = textFramesQueue.dequeue() {
             send(frame) { error in
@@ -93,4 +76,3 @@ final class Dispatcher: NSObject, Dispatching {
         }
     }
 }
-

Sources/Relayer/NetworkMonitoring.swift

@@ -26,3 +26,4 @@ class NetworkMonitor: NetworkMonitoring {
         monitor.start(queue: monitorQueue)
     }
 }
+

Sources/Relayer/RelayJSONRPC.swift

@@ -14,6 +14,7 @@ enum RelayJSONRPC {
         let topic: String
         let message: String
         let ttl: Int
+        let prompt: Bool?
     }
 
     struct SubscribeParams: Codable, Equatable {