Merge pull request #480 from WalletConnect/feature/networking-package…

…-#391 [Refactor] Networking package Part 1 #391
WalletConnect · Sep 2, 2022 · 40735fb · 40735fb
2 parents c32760f + a9f921b
commit 40735fb
Show file tree

Hide file tree

Showing 40 changed files with 389 additions and 477 deletions.
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/WalletConnectChat.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/WalletConnectChat.xcscheme
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1340"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "WalletConnectChat"
+               BuildableName = "WalletConnectChat"
+               BlueprintName = "WalletConnectChat"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "ChatTests"
+               BuildableName = "ChatTests"
+               BlueprintName = "ChatTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "WalletConnectChat"
+            BuildableName = "WalletConnectChat"
+            BlueprintName = "WalletConnectChat"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Example/Showcase/Classes/PresentationLayer/Wallet/Wallet/WalletInteractor.swift b/Example/Showcase/Classes/PresentationLayer/Wallet/Wallet/WalletInteractor.swift
@@ -3,8 +3,8 @@ import Auth
 
 final class WalletInteractor {
 
-    func pair(uri: String) async throws {
-        try await Auth.instance.pair(uri: WalletConnectURI(string: uri)!)
+    func pair(uri: WalletConnectURI) async throws {
+        try await Auth.instance.pair(uri: uri)
     }
 
     var requestPublisher: AnyPublisher<AuthRequest, Never> {

diff --git a/Example/Showcase/Classes/PresentationLayer/Wallet/Wallet/WalletPresenter.swift b/Example/Showcase/Classes/PresentationLayer/Wallet/Wallet/WalletPresenter.swift
@@ -15,13 +15,14 @@ final class WalletPresenter: ObservableObject {
     }
 
     func didPastePairingURI() {
-        guard let uri = UIPasteboard.general.string else { return }
+        guard let string = UIPasteboard.general.string, let uri = WalletConnectURI(string: string) else { return }
         pair(uri: uri)
     }
 
     func didScanPairingURI() {
         router.presentScan { [unowned self] value in
-            self.pair(uri: value)
+            guard let uri = WalletConnectURI(string: value) else { return }
+            self.pair(uri: uri)
             self.router.dismiss()
         } onError: { error in
             print(error.localizedDescription)
@@ -53,7 +54,7 @@ private extension WalletPresenter {
         }.store(in: &disposeBag)
     }
 
-    func pair(uri: String) {
+    func pair(uri: WalletConnectURI) {
         Task(priority: .high) { [unowned self] in
             try await self.interactor.pair(uri: uri)
         }

diff --git a/Package.swift b/Package.swift
@@ -21,7 +21,10 @@ let package = Package(
             targets: ["Auth"]),
         .library(
             name: "WalletConnectRouter",
-            targets: ["WalletConnectRouter"])
+            targets: ["WalletConnectRouter"]),
+        .library(
+            name: "WalletConnectNetworking",
+            targets: ["WalletConnectNetworking"]),
     ],
     dependencies: [
         .package(url: "https://github.com/flypaper0/Web3.swift", .branch("feature/eip-155"))
@@ -33,17 +36,11 @@ let package = Package(
             path: "Sources/WalletConnectSign"),
         .target(
             name: "Chat",
-            dependencies: ["WalletConnectRelay", "WalletConnectUtils", "WalletConnectKMS"],
+            dependencies: ["WalletConnectNetworking"],
             path: "Sources/Chat"),
         .target(
             name: "Auth",
-            dependencies: [
-                "WalletConnectRelay",
-                "WalletConnectUtils",
-                "WalletConnectKMS",
-                "WalletConnectPairing",
-                .product(name: "Web3", package: "Web3.swift")
-            ],
+            dependencies: ["WalletConnectPairing", "WalletConnectNetworking", .product(name: "Web3", package: "Web3.swift")],
             path: "Sources/Auth"),
         .target(
             name: "WalletConnectRelay",
@@ -65,6 +62,9 @@ let package = Package(
         .target(
             name: "Commons",
             dependencies: []),
+        .target(
+            name: "WalletConnectNetworking",
+            dependencies: ["JSONRPC", "WalletConnectKMS", "WalletConnectRelay", "WalletConnectUtils"]),
         .target(
             name: "WalletConnectRouter",
             dependencies: []),
@@ -85,7 +85,7 @@ let package = Package(
             dependencies: ["WalletConnectKMS", "WalletConnectUtils", "TestingUtils"]),
         .target(
             name: "TestingUtils",
-            dependencies: ["WalletConnectUtils", "WalletConnectKMS", "JSONRPC", "WalletConnectPairing"],
+            dependencies: ["WalletConnectPairing", "WalletConnectNetworking"],
             path: "Tests/TestingUtils"),
         .testTarget(
             name: "WalletConnectUtilsTests",

diff --git a/Sources/Auth/AuthClientFactory.swift b/Sources/Auth/AuthClientFactory.swift
@@ -3,6 +3,7 @@ import WalletConnectRelay
 import WalletConnectUtils
 import WalletConnectKMS
 import WalletConnectPairing
+import WalletConnectNetworking
 
 public struct AuthClientFactory {
 
@@ -41,6 +42,7 @@ public struct AuthClientFactory {
                           pendingRequestsProvider: pendingRequestsProvider,
                           cleanupService: cleanupService,
                           logger: logger,
-                          pairingStorage: pairingStore, socketConnectionStatusPublisher: relayClient.socketConnectionStatusPublisher)
+                          pairingStorage: pairingStore,
+                          socketConnectionStatusPublisher: relayClient.socketConnectionStatusPublisher)
     }
 }
diff --git a/Sources/Auth/Services/App/AppPairService.swift b/Sources/Auth/Services/App/AppPairService.swift
@@ -1,6 +1,7 @@
 import Foundation
 import WalletConnectKMS
 import WalletConnectPairing
+import WalletConnectNetworking
 
 actor AppPairService {
     private let networkingInteractor: NetworkInteracting

diff --git a/Sources/Auth/Services/App/AppRequestService.swift b/Sources/Auth/Services/App/AppRequestService.swift
@@ -1,7 +1,8 @@
 import Foundation
+import JSONRPC
+import WalletConnectNetworking
 import WalletConnectUtils
 import WalletConnectKMS
-import JSONRPC
 
 actor AppRequestService {
     private let networkingInteractor: NetworkInteracting

diff --git a/Sources/Auth/Services/App/AppRespondSubscriber.swift b/Sources/Auth/Services/App/AppRespondSubscriber.swift
@@ -1,7 +1,8 @@
-import Combine
 import Foundation
-import WalletConnectUtils
+import Combine
 import JSONRPC
+import WalletConnectNetworking
+import WalletConnectUtils
 import WalletConnectPairing
 
 class AppRespondSubscriber {

diff --git a/Sources/Auth/Services/Wallet/WalletPairService.swift b/Sources/Auth/Services/Wallet/WalletPairService.swift
@@ -1,6 +1,7 @@
 import Foundation
 import WalletConnectKMS
 import WalletConnectPairing
+import WalletConnectNetworking
 
 actor WalletPairService {
     enum Errors: Error {

diff --git a/Sources/Auth/Services/Wallet/WalletRequestSubscriber.swift b/Sources/Auth/Services/Wallet/WalletRequestSubscriber.swift
@@ -1,7 +1,8 @@
-import Combine
 import Foundation
-import WalletConnectUtils
+import Combine
 import JSONRPC
+import WalletConnectNetworking
+import WalletConnectUtils
 import WalletConnectKMS
 
 class WalletRequestSubscriber {

diff --git a/Sources/Auth/Services/Wallet/WalletRespondService.swift b/Sources/Auth/Services/Wallet/WalletRespondService.swift
@@ -1,7 +1,8 @@
 import Foundation
-import WalletConnectKMS
 import JSONRPC
+import WalletConnectKMS
 import WalletConnectUtils
+import WalletConnectNetworking
 
 actor WalletRespondService {
     enum Errors: Error {

diff --git a/Sources/Auth/Types/Errors/AuthError.swift b/Sources/Auth/Types/Errors/AuthError.swift
@@ -1,4 +1,5 @@
 import Foundation
+import WalletConnectNetworking
 
 /// Authentication error
 public enum AuthError: Codable, Equatable, Error {

diff --git a/Sources/Auth/Types/RequestSubscriptionPayload.swift b/Sources/Auth/Types/RequestSubscriptionPayload.swift
diff --git a/Sources/Auth/Types/ResponseSubscriptionPayload.swift b/Sources/Auth/Types/ResponseSubscriptionPayload.swift
diff --git a/Sources/Chat/ChatClient.swift b/Sources/Chat/ChatClient.swift
@@ -2,6 +2,7 @@ import Foundation
 import WalletConnectUtils
 import WalletConnectKMS
 import WalletConnectRelay
+import WalletConnectNetworking
 import Combine
 
 public class ChatClient {
@@ -16,7 +17,7 @@ public class ChatClient {
     private let kms: KeyManagementService
     private let threadStore: Database<Thread>
     private let messagesStore: Database<Message>
-    private let invitePayloadStore: CodableStore<(RequestSubscriptionPayload)>
+    private let invitePayloadStore: CodableStore<RequestSubscriptionPayload>
 
     public let socketConnectionStatusPublisher: AnyPublisher<SocketConnectionStatus, Never>
 
@@ -47,7 +48,7 @@ public class ChatClient {
          kms: KeyManagementService,
          threadStore: Database<Thread>,
          messagesStore: Database<Message>,
-         invitePayloadStore: CodableStore<(RequestSubscriptionPayload)>,
+         invitePayloadStore: CodableStore<RequestSubscriptionPayload>,
          socketConnectionStatusPublisher: AnyPublisher<SocketConnectionStatus, Never>
     ) {
         self.registry = registry
@@ -121,7 +122,7 @@ public class ChatClient {
     public func getInvites(account: Account) -> [Invite] {
         var invites = [Invite]()
         invitePayloadStore.getAll().forEach {
-            guard case .invite(let invite) = $0.request.params else {return}
+            guard let invite = try? $0.request.params?.get(Invite.self) else {return}
             invites.append(invite)
         }
         return invites

diff --git a/Sources/Chat/ChatClientFactory.swift b/Sources/Chat/ChatClientFactory.swift
@@ -2,6 +2,7 @@ import Foundation
 import WalletConnectRelay
 import WalletConnectUtils
 import WalletConnectKMS
+import WalletConnectNetworking
 
 public struct ChatClientFactory {
 
@@ -10,17 +11,18 @@ public struct ChatClientFactory {
         relayClient: RelayClient,
         kms: KeyManagementService,
         logger: ConsoleLogging,
-        keyValueStorage: KeyValueStorage) -> ChatClient {
+        keyValueStorage: KeyValueStorage
+    ) -> ChatClient {
         let topicToRegistryRecordStore = CodableStore<RegistryRecord>(defaults: keyValueStorage, identifier: StorageDomainIdentifiers.topicToInvitationPubKey.rawValue)
         let serialiser = Serializer(kms: kms)
-        let jsonRpcHistory = JsonRpcHistory<ChatRequestParams>(logger: logger, keyValueStore: CodableStore<JsonRpcRecord>(defaults: keyValueStorage, identifier: StorageDomainIdentifiers.jsonRpcHistory.rawValue))
-        let networkingInteractor = NetworkingInteractor(relayClient: relayClient, serializer: serialiser, logger: logger, jsonRpcHistory: jsonRpcHistory)
+        let rpcHistory = RPCHistory(keyValueStore: CodableStore<RPCHistory.Record>(defaults: keyValueStorage, identifier: StorageDomainIdentifiers.jsonRpcHistory.rawValue))
+        let networkingInteractor = NetworkingInteractor(relayClient: relayClient, serializer: serialiser, logger: logger, rpcHistory: rpcHistory)
         let invitePayloadStore = CodableStore<RequestSubscriptionPayload>(defaults: keyValueStorage, identifier: StorageDomainIdentifiers.invite.rawValue)
         let registryService = RegistryService(registry: registry, networkingInteractor: networkingInteractor, kms: kms, logger: logger, topicToRegistryRecordStore: topicToRegistryRecordStore)
         let threadStore = Database<Thread>(keyValueStorage: keyValueStorage, identifier: StorageDomainIdentifiers.threads.rawValue)
         let resubscriptionService = ResubscriptionService(networkingInteractor: networkingInteractor, threadStore: threadStore, logger: logger)
         let invitationHandlingService = InvitationHandlingService(registry: registry, networkingInteractor: networkingInteractor, kms: kms, logger: logger, topicToRegistryRecordStore: topicToRegistryRecordStore, invitePayloadStore: invitePayloadStore, threadsStore: threadStore)
-        let inviteService = InviteService(networkingInteractor: networkingInteractor, kms: kms, threadStore: threadStore, logger: logger)
+        let inviteService = InviteService(networkingInteractor: networkingInteractor, kms: kms, threadStore: threadStore, rpcHistory: rpcHistory, logger: logger)
         let leaveService = LeaveService()
         let messagesStore = Database<Message>(keyValueStorage: keyValueStorage, identifier: StorageDomainIdentifiers.messages.rawValue)
         let messagingService = MessagingService(networkingInteractor: networkingInteractor, messagesStore: messagesStore, threadStore: threadStore, logger: logger)