Merge pull request #550 from WalletConnect/develop

[Sign] Release v2.0.0

.github/actions/ci/action.yml

@@ -8,6 +8,9 @@ inputs:
     description: 'The endpoint of the relay e.g. relay.walletconnect.com'
     required: false
     default: 'relay.walletconnect.com'
+  project-id:
+    description: 'WalletConnect project id'
+    required: true
 
 runs:
   using: "composite"
@@ -29,12 +32,14 @@ runs:
       shell: bash
       env:
         RELAY_ENDPOINT: ${{ inputs.relay-endpoint }}
+        PROJECT_ID: ${{ inputs.project-id }}
       run: "xcodebuild \
         -project Example/ExampleApp.xcodeproj \ 
         -scheme IntegrationTests \
         -clonedSourcePackagesDirPath SourcePackagesCache \
         -destination 'platform=iOS Simulator,name=iPhone 13' \ 
         RELAY_HOST='$RELAY_ENDPOINT' \
+        PROJECT_ID='$PROJECT_ID' \
         test"
 
     # Wallet build

.github/workflows/ci.yml

@@ -28,12 +28,6 @@ jobs:
     - name: Setup Xcode Version
       uses: maxim-lobanov/setup-xcode@v1
 
-    - name: Resolve Dependencies
-      shell: bash
-      run: "
-        xcodebuild -resolvePackageDependencies -project Example/ExampleApp.xcodeproj -scheme DApp -clonedSourcePackagesDirPath SourcePackagesCache; \
-        xcodebuild -resolvePackageDependencies -project Example/ExampleApp.xcodeproj -scheme WalletConnect -clonedSourcePackagesDirPath SourcePackagesCache"
-
     - uses: actions/cache@v2
       with:
         path: |
@@ -43,9 +37,16 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-spm-
 
+    - name: Resolve Dependencies
+      shell: bash
+      run: "
+        xcodebuild -resolvePackageDependencies -project Example/ExampleApp.xcodeproj -scheme DApp -clonedSourcePackagesDirPath SourcePackagesCache; \
+        xcodebuild -resolvePackageDependencies -project Example/ExampleApp.xcodeproj -scheme WalletConnect -clonedSourcePackagesDirPath SourcePackagesCache"
+
     - uses: ./.github/actions/ci
       with:
         type: ${{ matrix.test-type }}
+        project-id: ${{ secrets.PROJECT_ID }}
 
   test-ui:
     if: github.ref == 'refs/heads/main'

.gitignore

@@ -20,3 +20,6 @@ Package.resolved
 */fastlane/test_output
 */fastlane/README.md
 
+# Configuration
+Configuration.xcconfig
+

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

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

Configuration.xcconfig

@@ -0,0 +1,4 @@
+RELAY_HOST = relay.walletconnect.com
+
+// Uncomment next line and paste your project id. Get this on: https://cloud.walletconnect.com/sign-in
+// PROJECT_ID = YOUR_PROJECT_ID

Example/DApp/Auth/AuthCoordinator.swift

@@ -1,5 +1,6 @@
 import SwiftUI
 import Auth
+import WalletConnectPairing
 
 final class AuthCoordinator {
 
@@ -30,8 +31,7 @@ final class AuthCoordinator {
             url: "wallet.connect",
             icons: ["https://avatars.githubusercontent.com/u/37784886"])
 
-        Auth.configure(metadata: metadata, account: nil)
-
+        Pair.configure(metadata: metadata)
         navigationController.viewControllers = [authViewController]
     }
 }

Example/DApp/Auth/AuthViewModel.swift

@@ -1,6 +1,7 @@
 import UIKit
 import Combine
 import Auth
+import WalletConnectPairing
 
 final class AuthViewModel: ObservableObject {
 
@@ -13,10 +14,10 @@ final class AuthViewModel: ObservableObject {
     private var disposeBag = Set<AnyCancellable>()
 
     @Published var state: SigningState = .none
-    @Published var uri: String?
+    @Published var uriString: String?
 
     var qrImage: UIImage? {
-        return uri.map { QRCodeGenerator.generateQRCode(from: $0) }
+        return uriString.map { QRCodeGenerator.generateQRCode(from: $0) }
     }
 
     init() {
@@ -26,20 +27,22 @@ final class AuthViewModel: ObservableObject {
     @MainActor
     func setupInitialState() async throws {
         state = .none
-        uri = nil
-        uri = try await Auth.instance.request(.stub()).absoluteString
+        uriString = nil
+        let uri = try! await Pair.instance.create()
+        uriString = uri.absoluteString
+        try await Auth.instance.request(.stub(), topic: uri.topic)
     }
 
     func copyDidPressed() {
-        UIPasteboard.general.string = uri
+        UIPasteboard.general.string = uriString
     }
 
     func walletDidPressed() {
 
     }
 
     func deeplinkPressed() {
-        guard let uri = uri else { return }
+        guard let uri = uriString else { return }
         UIApplication.shared.open(URL(string: "showcase://wc?uri=\(uri)")!)
     }
 }

Example/DApp/Common/InputConfig.swift

@@ -0,0 +1,12 @@
+import Foundation
+
+struct InputConfig {
+
+    static var projectId: String {
+        return config(for: "PROJECT_ID")!
+    }
+
+    private static func config(for key: String) -> String? {
+        return Bundle.main.object(forInfoDictionaryKey: key) as? String
+    }
+}

Example/DApp/Info.plist

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>PROJECT_ID</key>
+	<string>$(PROJECT_ID)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>UIApplicationSceneManifest</key>

Example/DApp/SceneDelegate.swift

@@ -1,6 +1,7 @@
 import UIKit
 import Starscream
 import WalletConnectRelay
+import WalletConnectNetworking
 
 extension WebSocket: WebSocketConnecting { }
 
@@ -18,7 +19,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     private let authCoordinator = AuthCoordinator()
 
     func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
-        Relay.configure(projectId: "3ca2919724fbfa5456a25194e369a8b4", socketFactory: SocketFactory())
+        Networking.configure(projectId: InputConfig.projectId, socketFactory: SocketFactory())
 
         setupWindow(scene: scene)
     }

Example/DApp/Sign/Connect/ConnectViewController.swift

@@ -1,10 +1,11 @@
 import Foundation
 import UIKit
 import WalletConnectSign
+import WalletConnectPairing
 
 class ConnectViewController: UIViewController, UITableViewDataSource, UITableViewDelegate {
     let uri: WalletConnectURI
-    let activePairings: [Pairing] = Sign.instance.getPairings()
+    let activePairings: [Pairing] = Pair.instance.getPairings()
     let segmentedControl = UISegmentedControl(items: ["Pairings", "New Pairing"])
 
     init(uri: WalletConnectURI) {

Example/DApp/Sign/ResponseViewController.swift

@@ -23,14 +23,14 @@ class ResponseViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        let record = Sign.instance.getSessionRequestRecord(id: response.result.id)!
+        let record = Sign.instance.getSessionRequestRecord(id: response.id)!
         switch response.result {
         case  .response(let response):
-            responseView.nameLabel.text = "Received Response\n\(record.request.method)"
-            responseView.descriptionLabel.text = try! response.result.get(String.self).description
+            responseView.nameLabel.text = "Received Response\n\(record.method)"
+            responseView.descriptionLabel.text = try! response.get(String.self).description
         case .error(let error):
-            responseView.nameLabel.text = "Received Error\n\(record.request.method)"
-            responseView.descriptionLabel.text = error.error.message
+            responseView.nameLabel.text = "Received Error\n\(record.method)"
+            responseView.descriptionLabel.text = error.message
         }
         responseView.dismissButton.addTarget(self, action: #selector(dismissSelf), for: .touchUpInside)
     }

Example/DApp/Sign/SelectChain/SelectChainViewController.swift

@@ -1,5 +1,6 @@
 import Foundation
 import WalletConnectSign
+import WalletConnectPairing
 import UIKit
 import Combine
 
@@ -15,16 +16,12 @@ class SelectChainViewController: UIViewController, UITableViewDataSource {
     private var publishers = [AnyCancellable]()
 
     let chains = [Chain(name: "Ethereum", id: "eip155:1"), Chain(name: "Polygon", id: "eip155:137")]
-    var onSessionSettled: ((Session) -> Void)?
     override func viewDidLoad() {
         super.viewDidLoad()
         navigationItem.title = "Available Chains"
         selectChainView.tableView.dataSource = self
         selectChainView.connectButton.addTarget(self, action: #selector(connect), for: .touchUpInside)
         selectChainView.openWallet.addTarget(self, action: #selector(openWallet), for: .touchUpInside)
-        Sign.instance.sessionSettlePublisher.sink {[unowned self] session in
-            onSessionSettled?(session)
-        }.store(in: &publishers)
     }
 
     override func loadView() {
@@ -38,8 +35,9 @@ class SelectChainViewController: UIViewController, UITableViewDataSource {
         let blockchains: Set<Blockchain> = [Blockchain("eip155:1")!, Blockchain("eip155:137")!]
         let namespaces: [String: ProposalNamespace] = ["eip155": ProposalNamespace(chains: blockchains, methods: methods, events: [], extensions: nil)]
         Task {
-            let uri = try await Sign.instance.connect(requiredNamespaces: namespaces)
-            showConnectScreen(uri: uri!)
+            let uri = try await Pair.instance.create()
+            try await Sign.instance.connect(requiredNamespaces: namespaces, topic: uri.topic)
+            showConnectScreen(uri: uri)
         }
     }
 

Example/DApp/Sign/SignCoordinator.swift

@@ -2,6 +2,7 @@ import UIKit
 import Combine
 import WalletConnectSign
 import WalletConnectRelay
+import WalletConnectPairing
 
 final class SignCoordinator {
 
@@ -25,7 +26,7 @@ final class SignCoordinator {
             url: "wallet.connect",
             icons: ["https://avatars.githubusercontent.com/u/37784886"])
 
-        Sign.configure(metadata: metadata)
+        Pair.configure(metadata: metadata)
 #if DEBUG
         if CommandLine.arguments.contains("-cleanInstall") {
             try? Sign.instance.cleanup()
@@ -44,6 +45,12 @@ final class SignCoordinator {
                 presentResponse(for: response)
             }.store(in: &publishers)
 
+        Sign.instance.sessionSettlePublisher
+            .receive(on: DispatchQueue.main)
+            .sink { [unowned self] session in
+                showAccountsScreen(session)
+            }.store(in: &publishers)
+
         if let session = Sign.instance.getSessions().first {
             showAccountsScreen(session)
         } else {
@@ -53,9 +60,6 @@ final class SignCoordinator {
 
     private func showSelectChainScreen() {
         let controller = SelectChainViewController()
-        controller.onSessionSettled = { [unowned self] session in
-            showAccountsScreen(session)
-        }
         navigationController.viewControllers = [controller]
     }
 
@@ -64,6 +68,7 @@ final class SignCoordinator {
         controller.onDisconnect = { [unowned self]  in
             showSelectChainScreen()
         }
+        navigationController.presentedViewController?.dismiss(animated: false)
         navigationController.viewControllers = [controller]
     }