Merge pull request #736 from WalletConnect/develop

1.5.0
WalletConnect · Mar 2, 2023 · 605b102 · 605b102
2 parents ca4b8d0 + 4e3b8bd
commit 605b102
Show file tree

Hide file tree

Showing 66 changed files with 827 additions and 614 deletions.
diff --git a/Example/ExampleApp.xcodeproj/project.pbxproj b/Example/ExampleApp.xcodeproj/project.pbxproj
@@ -2812,8 +2812,8 @@
 				INFOPLIST_KEY_NSCameraUsageDescription = "Allow the app to scan for QR codes";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
 				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2846,8 +2846,8 @@
 				INFOPLIST_KEY_NSCameraUsageDescription = "Allow the app to scan for QR codes";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
 				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2958,7 +2958,9 @@
 				INFOPLIST_KEY_NSCameraUsageDescription = "Camera access for scanning QR code";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
+				INFOPLIST_KEY_UIRequiresFullScreen = NO;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2995,7 +2997,9 @@
 				INFOPLIST_KEY_NSCameraUsageDescription = "Camera access for scanning QR code";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
+				INFOPLIST_KEY_UIRequiresFullScreen = NO;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",

diff --git a/...data/xcschemes/WalletConnectEcho.xcscheme → .../xcschemes/WalletConnectIdentity.xcscheme b/...data/xcschemes/WalletConnectEcho.xcscheme → .../xcschemes/WalletConnectIdentity.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1420"
+   LastUpgradeVersion = "1410"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,10 +14,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "WalletConnectEcho"
-               BuildableName = "WalletConnectEcho"
-               BlueprintName = "WalletConnectEcho"
-               ReferencedContainer = "container:">
+               BlueprintIdentifier = "WalletConnectIdentity"
+               BuildableName = "WalletConnectIdentity"
+               BlueprintName = "WalletConnectIdentity"
+               ReferencedContainer = "container:..">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -50,10 +50,10 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "WalletConnectEcho"
-            BuildableName = "WalletConnectEcho"
-            BlueprintName = "WalletConnectEcho"
-            ReferencedContainer = "container:">
+            BlueprintIdentifier = "WalletConnectIdentity"
+            BuildableName = "WalletConnectIdentity"
+            BlueprintName = "WalletConnectIdentity"
+            ReferencedContainer = "container:..">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>

diff --git a/Example/IntegrationTests/Chat/ChatTests.swift b/Example/IntegrationTests/Chat/ChatTests.swift
@@ -25,11 +25,17 @@ final class ChatTests: XCTestCase {
     }
 
     func makeClient(prefix: String, account: Account) -> ChatClient {
-        let keyserverURL = URL(string: "https://staging.keys.walletconnect.com")!
+        let keyserverURL = URL(string: "https://keys.walletconnect.com")!
         let logger = ConsoleLogger(suffix: prefix, loggingLevel: .debug)
         let keychain = KeychainStorageMock()
         let relayClient = RelayClient(relayHost: InputConfig.relayHost, projectId: InputConfig.projectId, keychainStorage: keychain, socketFactory: DefaultSocketFactory(), logger: logger)
-        return ChatClientFactory.create(account: account, keyserverURL: keyserverURL, relayClient: relayClient, keychain:  keychain, logger: logger, keyValueStorage: RuntimeKeyValueStorage())
+        let keyValueStorage = RuntimeKeyValueStorage()
+        let networkingInteractor = NetworkingClientFactory.create(
+            relayClient: relayClient,
+            logger: logger,
+            keychainStorage: keychain,
+            keyValueStorage: keyValueStorage)
+        return ChatClientFactory.create(account: account, keyserverURL: keyserverURL, relayClient: relayClient, networkingInteractor: networkingInteractor, keychain:  keychain, logger: logger, keyValueStorage: keyValueStorage)
     }
 
     func testInvite() async throws {

diff --git a/Example/IntegrationTests/Chat/RegistryTests.swift b/Example/IntegrationTests/Chat/RegistryTests.swift
@@ -3,6 +3,7 @@ import WalletConnectNetworking
 import WalletConnectKMS
 import WalletConnectUtils
 @testable import WalletConnectChat
+@testable import WalletConnectIdentity
 
 final class RegistryTests: XCTestCase {
 
@@ -14,14 +15,13 @@ final class RegistryTests: XCTestCase {
     var signer: CacaoMessageSigner!
 
     override func setUp() {
-        let keyserverURL = URL(string: "https://staging.keys.walletconnect.com")!
+        let keyserverURL = URL(string: "https://keys.walletconnect.com")!
         let httpService = HTTPNetworkClient(host: keyserverURL.host!)
-        let accountService = AccountService(currentAccount: account)
-        let identityNetworkService = IdentityNetworkService(accountService: accountService, httpService: httpService)
+        let identityNetworkService = IdentityNetworkService(httpService: httpService)
         let keychain = KeychainStorageMock()
         let ksm = KeyManagementService(keychain: keychain)
         storage = IdentityStorage(keychain: keychain)
-        sut = IdentityService(
+        sut = IdentityService (
             keyserverURL: keyserverURL,
             kms: ksm,
             storage: storage,
@@ -39,12 +39,12 @@ final class RegistryTests: XCTestCase {
         let resolvedAccount = try await sut.resolveIdentity(iss: iss)
         XCTAssertEqual(resolvedAccount, account)
 
-        let recovered = storage.getIdentityKey(for: account)!.publicKey.hexRepresentation
+        let recovered = try storage.getIdentityKey(for: account).publicKey.hexRepresentation
         XCTAssertEqual(publicKey, recovered)
 
         let inviteKey = try await sut.registerInvite(account: account)
 
-        let recoveredKey = storage.getInviteKey(for: account)!
+        let recoveredKey = try storage.getInviteKey(for: account)
         XCTAssertEqual(inviteKey, recoveredKey)
 
         let resolvedKey = try await sut.resolveInvite(account: account)

diff --git a/Example/Showcase/Classes/PresentationLayer/Chat/Chat/Models/MessageViewModel.swift b/Example/Showcase/Classes/PresentationLayer/Chat/Chat/Models/MessageViewModel.swift
@@ -5,7 +5,7 @@ struct MessageViewModel: Identifiable {
     private let message: Message
     private let thread: WalletConnectChat.Thread
 
-    var id: Int64 {
+    var id: UInt64 {
         return message.timestamp
     }
 

diff --git a/Example/Showcase/Classes/PresentationLayer/Web3Inbox/Web3InboxViewController.swift b/Example/Showcase/Classes/PresentationLayer/Web3Inbox/Web3InboxViewController.swift
@@ -19,9 +19,11 @@ final class Web3InboxViewController: UIViewController {
         super.viewDidLoad()
 
         Web3Inbox.configure(account: importAccount.account, onSign: onSing)
-        view = Web3Inbox.instance.getWebView()
 
+        edgesForExtendedLayout = []
         navigationItem.title = "Web3Inbox SDK"
+        navigationItem.largeTitleDisplayMode = .never
+        view = Web3Inbox.instance.getWebView()
     }
 }
 

diff --git a/Example/Showcase/Other/Info.plist b/Example/Showcase/Other/Info.plist
@@ -2,14 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleShortVersionString</key>
-	<string>$(MARKETING_VERSION)</string>
-	<key>CFBundleVersion</key>
-	<string>7</string>
-	<key>PROJECT_ID</key>
-	<string>$(PROJECT_ID)</string>
-	<key>RELAY_HOST</key>
-	<string>$(RELAY_HOST)</string>
 	<key>CFBundleIconName</key>
 	<string>AppIcon</string>
 	<key>CFBundleURLTypes</key>
@@ -30,6 +22,10 @@
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 	</dict>
+	<key>PROJECT_ID</key>
+	<string>$(PROJECT_ID)</string>
+	<key>RELAY_HOST</key>
+	<string>$(RELAY_HOST)</string>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>

diff --git a/Example/WalletApp/Other/Info.plist b/Example/WalletApp/Other/Info.plist
@@ -2,10 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleShortVersionString</key>
-	<string>$(MARKETING_VERSION)</string>
-	<key>CFBundleVersion</key>
-	<string>7</string>
 	<key>CFBundleIconName</key>
 	<string>AppIcon</string>
 	<key>CFBundleURLTypes</key>
@@ -19,6 +15,8 @@
 			</array>
 		</dict>
 	</array>
+	<key>CONFIGURATION</key>
+	<string>$(CONFIGURATION)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>NSAppTransportSecurity</key>
@@ -30,8 +28,6 @@
 	<string>$(PROJECT_ID)</string>
 	<key>SIMULATOR_IDENTIFIER</key>
 	<string>$(SIMULATOR_IDENTIFIER)</string>
-	<key>CONFIGURATION</key>
-	<string>$(CONFIGURATION)</string>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>

diff --git a/Package.swift b/Package.swift
@@ -52,7 +52,7 @@ let package = Package(
             path: "Sources/WalletConnectSign"),
         .target(
             name: "WalletConnectChat",
-            dependencies: ["WalletConnectNetworking", "WalletConnectSigner"],
+            dependencies: ["WalletConnectIdentity", "WalletConnectSigner"],
             path: "Sources/Chat"),
         .target(
             name: "Auth",
@@ -91,6 +91,9 @@ let package = Package(
         .target(
             name: "WalletConnectJWT",
             dependencies: ["WalletConnectKMS"]),
+        .target(
+            name: "WalletConnectIdentity",
+            dependencies: ["WalletConnectNetworking"]),
         .target(
             name: "WalletConnectUtils",
             dependencies: ["JSONRPC"]),

diff --git a/Sources/Chat/Chat.swift b/Sources/Chat/Chat.swift
@@ -8,7 +8,11 @@ public class Chat {
         guard let account = account else {
             fatalError("Error - you must call Chat.configure(_:) before accessing the shared instance.")
         }
-        return ChatClientFactory.create(account: account)
+        return ChatClientFactory.create(
+            account: account,
+            relayClient: Relay.instance,
+            networkingInteractor: Networking.interactor
+        )
     }()
 
     private static var account: Account?

diff --git a/Sources/Chat/ChatClient.swift b/Sources/Chat/ChatClient.swift
@@ -1,16 +1,9 @@
 import Foundation
 import Combine
 
-public enum SigningResult {
-    case signed(CacaoSignature)
-    case rejected
-}
-
-public typealias SigningCallback = (String) async -> SigningResult
-
 public class ChatClient {
     private var publishers = [AnyCancellable]()
-    private let registryService: RegistryService
+    private let identityClient: IdentityClient
     private let messagingService: MessagingService
     private let accountService: AccountService
     private let resubscriptionService: ResubscriptionService
@@ -54,9 +47,17 @@ public class ChatClient {
         return chatStorage.newThreadPublisher
     }
 
+    public var acceptPublisher: AnyPublisher<(String, SentInvite), Never> {
+        return chatStorage.acceptPublisher
+    }
+
+    public var rejectPublisher: AnyPublisher<SentInvite, Never> {
+        return chatStorage.rejectPublisher
+    }
+
     // MARK: - Initialization
 
-    init(registryService: RegistryService,
+    init(identityClient: IdentityClient,
          messagingService: MessagingService,
          accountService: AccountService,
          resubscriptionService: ResubscriptionService,
@@ -67,7 +68,7 @@ public class ChatClient {
          chatStorage: ChatStorage,
          socketConnectionStatusPublisher: AnyPublisher<SocketConnectionStatus, Never>
     ) {
-        self.registryService = registryService
+        self.identityClient = identityClient
         self.messagingService = messagingService
         self.accountService = accountService
         self.resubscriptionService = resubscriptionService
@@ -90,7 +91,7 @@ public class ChatClient {
         isPrivate: Bool = false,
         onSign: @escaping SigningCallback
     ) async throws -> String {
-        let publicKey = try await registryService.register(account: account, onSign: onSign)
+        let publicKey = try await identityClient.register(account: account, onSign: onSign)
 
         accountService.setAccount(account)
 
@@ -107,14 +108,14 @@ public class ChatClient {
     /// Must not unregister invite key but must stop listening for invites
     /// - Parameter onSign: Callback for signing CAIP-122 message to verify blockchain account ownership
     public func unregister(account: Account, onSign: @escaping SigningCallback) async throws {
-        try await registryService.unregister(account: account, onSign: onSign)
+        try await identityClient.unregister(account: account, onSign: onSign)
     }
 
     /// Queries the keyserver with a blockchain account
     /// - Parameter account: CAIP10 blockachain account
     /// - Returns: Returns the invite key
     public func resolve(account: Account) async throws -> String {
-        try await registryService.resolve(account: account)
+        try await identityClient.resolveInvite(account: account)
     }
 
     /// Sends a chat invite
@@ -130,15 +131,17 @@ public class ChatClient {
     /// Stops listening for invites
     /// - Parameter account: CAIP10 blockachain account
     public func goPrivate(account: Account) async throws {
-        try await registryService.goPrivate(account: account)
+        let inviteKey = try await identityClient.goPrivate(account: account)
+        resubscriptionService.unsubscribeFromInvites(inviteKey: inviteKey)
     }
 
     /// Registers an invite key if not yet registered on this client from keyserver
     /// Starts listening for invites
     /// - Parameter account: CAIP10 blockachain account
     /// - Returns: The public invite key
     public func goPublic(account: Account) async throws {
-        try await registryService.goPublic(account: account)
+        let inviteKey = try await identityClient.goPublic(account: account)
+        try await resubscriptionService.subscribeForInvites(inviteKey: inviteKey)
     }
 
     /// Accepts a chat invite by id from account specified as inviteeAccount in Invite