Merge pull request #558 from WalletConnect/develop

[Chat] Chat alpha
WalletConnect · Oct 28, 2022 · 3013d46 · 3013d46
2 parents 528410e + f733a44
commit 3013d46
Show file tree

Hide file tree

Showing 32 changed files with 105 additions and 95 deletions.
diff --git a/.github/actions/ci/action.yml b/.github/actions/ci/action.yml
@@ -24,6 +24,7 @@ runs:
         -scheme WalletConnect \
         -clonedSourcePackagesDirPath SourcePackagesCache \
         -destination 'platform=iOS Simulator,name=iPhone 13' \
+        -derivedDataPath DerivedDataCache \
         test"
 
     # Integration tests
@@ -37,7 +38,8 @@ runs:
         -project Example/ExampleApp.xcodeproj \ 
         -scheme IntegrationTests \
         -clonedSourcePackagesDirPath SourcePackagesCache \
-        -destination 'platform=iOS Simulator,name=iPhone 13' \ 
+        -destination 'platform=iOS Simulator,name=iPhone 13' \
+        -derivedDataPath DerivedDataCache \
         RELAY_HOST='$RELAY_ENDPOINT' \
         PROJECT_ID='$PROJECT_ID' \
         test"
@@ -50,6 +52,7 @@ runs:
        -project Example/ExampleApp.xcodeproj \
        -scheme Wallet \
        -clonedSourcePackagesDirPath SourcePackagesCache \
+       -derivedDataPath DerivedDataCache \
        -sdk iphonesimulator"
 
     # DApp build
@@ -60,6 +63,7 @@ runs:
         -project Example/ExampleApp.xcodeproj \
         -scheme DApp \
         -clonedSourcePackagesDirPath SourcePackagesCache \
+        -derivedDataPath DerivedDataCache \
         -sdk iphonesimulator"
 
     # UI tests
@@ -69,6 +73,7 @@ runs:
       run: "xcodebuild \
         -project Example/ExampleApp.xcodeproj \
         -scheme UITests \
+        -derivedDataPath DerivedDataCache \
         -clonedSourcePackagesDirPath SourcePackagesCache \
         -destination 'platform=iOS Simulator,name=iPhone 13' test"
       continue-on-error: true
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,6 +33,7 @@ jobs:
         path: |
           .build
           SourcePackagesCache
+          DerivedDataCache
         key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
         restore-keys: |
           ${{ runner.os }}-spm-

diff --git a/Example/ExampleApp.xcodeproj/project.pbxproj b/Example/ExampleApp.xcodeproj/project.pbxproj
@@ -84,7 +84,6 @@
 		A5629AE42876E6D200094373 /* ThreadViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5629AE32876E6D200094373 /* ThreadViewModel.swift */; };
 		A5629AE828772A0100094373 /* InviteViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5629AE728772A0100094373 /* InviteViewModel.swift */; };
 		A5629AEA2877F2D600094373 /* WalletConnectChat in Frameworks */ = {isa = PBXBuildFile; productRef = A5629AE92877F2D600094373 /* WalletConnectChat */; };
-		A5629AED2877F6A600094373 /* ChatFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5629AEC2877F6A600094373 /* ChatFactory.swift */; };
 		A5629AF02877F73000094373 /* SocketFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5629AEF2877F73000094373 /* SocketFactory.swift */; };
 		A5629AF22877F75100094373 /* Starscream in Frameworks */ = {isa = PBXBuildFile; productRef = A5629AF12877F75100094373 /* Starscream */; };
 		A578FA322873036400AA7720 /* InputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A578FA312873036400AA7720 /* InputView.swift */; };
@@ -277,7 +276,6 @@
 		A5629ADD2876CC6E00094373 /* InviteListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InviteListView.swift; sourceTree = "<group>"; };
 		A5629AE32876E6D200094373 /* ThreadViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreadViewModel.swift; sourceTree = "<group>"; };
 		A5629AE728772A0100094373 /* InviteViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InviteViewModel.swift; sourceTree = "<group>"; };
-		A5629AEC2877F6A600094373 /* ChatFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatFactory.swift; sourceTree = "<group>"; };
 		A5629AEF2877F73000094373 /* SocketFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SocketFactory.swift; sourceTree = "<group>"; };
 		A578FA312873036400AA7720 /* InputView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputView.swift; sourceTree = "<group>"; };
 		A578FA34287304A300AA7720 /* Color.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Color.swift; sourceTree = "<group>"; };
@@ -717,7 +715,6 @@
 			isa = PBXGroup;
 			children = (
 				A5629AA82876A23100094373 /* ChatService.swift */,
-				A5629AEC2877F6A600094373 /* ChatFactory.swift */,
 				A5C20225287EB099007E3188 /* AccountNameResolver.swift */,
 				A5C2022C287EC3F0007E3188 /* RegisterService.swift */,
 			);
@@ -1452,7 +1449,6 @@
 				A59EBEFA28B54A2A003EDAAF /* AuthRequestRouter.swift in Sources */,
 				A5629AF02877F73000094373 /* SocketFactory.swift in Sources */,
 				A55CAAB228B92AFF00844382 /* ScanRouter.swift in Sources */,
-				A5629AED2877F6A600094373 /* ChatFactory.swift in Sources */,
 				A5C20221287EA5B8007E3188 /* TextFieldView.swift in Sources */,
 				A5C2022B287EB89A007E3188 /* WelcomeInteractor.swift in Sources */,
 				A5C2020C287D9DEE007E3188 /* WelcomePresenter.swift in Sources */,

diff --git a/Example/ExampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Example/ExampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -33,8 +33,8 @@
         "repositoryURL": "https://github.com/Boilertalk/secp256k1.swift.git",
         "state": {
           "branch": null,
-          "revision": "45e458ec3be46cf0a6eb68bc947f797852dc65d8",
-          "version": "0.1.6"
+          "revision": "cd187c632fb812fd93711a9f7e644adb7e5f97f0",
+          "version": "0.1.7"
         }
       },
       {

diff --git a/Example/IntegrationTests/Chat/ChatTests.swift b/Example/IntegrationTests/Chat/ChatTests.swift
@@ -1,6 +1,6 @@
 import Foundation
 import XCTest
-@testable import Chat
+@testable import WalletConnectChat
 import WalletConnectUtils
 @testable import WalletConnectKMS
 import WalletConnectRelay
@@ -29,8 +29,8 @@ final class ChatTests: XCTestCase {
         let inviteExpectation = expectation(description: "invitation expectation")
         let inviteeAccount = Account(chainIdentifier: "eip155:1", address: "0x3627523167367216556273151")!
         let inviterAccount = Account(chainIdentifier: "eip155:1", address: "0x36275231673672234423f")!
-        let pubKey = try! await invitee.register(account: inviteeAccount)
-        try! await inviter.invite(publicKey: pubKey, peerAccount: inviteeAccount, openingMessage: "", account: inviterAccount)
+        try! await invitee.register(account: inviteeAccount)
+        try! await inviter.invite(peerAccount: inviteeAccount, openingMessage: "", account: inviterAccount)
         invitee.invitePublisher.sink { _ in
             inviteExpectation.fulfill()
         }.store(in: &publishers)
@@ -44,9 +44,8 @@ final class ChatTests: XCTestCase {
         let inviterAccount = Account(chainIdentifier: "eip155:1", address: "0x36275231673672234423f")!
 
         Task(priority: .high) {
-            let pubKey = try! await invitee.register(account: inviteeAccount)
-
-            try! await inviter.invite(publicKey: pubKey, peerAccount: inviteeAccount, openingMessage: "opening message", account: inviterAccount)
+            try! await invitee.register(account: inviteeAccount)
+            try! await inviter.invite(peerAccount: inviteeAccount, openingMessage: "opening message", account: inviterAccount)
         }
 
         invitee.invitePublisher.sink { [unowned self] invite in
@@ -72,8 +71,8 @@ final class ChatTests: XCTestCase {
         let inviterAccount = Account(chainIdentifier: "eip155:1", address: "0x36275231673672234423f")!
 
         Task(priority: .high) {
-            let pubKey = try! await invitee.register(account: inviteeAccount)
-            try! await inviter.invite(publicKey: pubKey, peerAccount: inviteeAccount, openingMessage: "opening message", account: inviterAccount)
+            try! await invitee.register(account: inviteeAccount)
+            try! await inviter.invite(peerAccount: inviteeAccount, openingMessage: "opening message", account: inviterAccount)
         }
 
         invitee.invitePublisher.sink { [unowned self] invite in

diff --git a/Example/IntegrationTests/Chat/RegistryTests.swift b/Example/IntegrationTests/Chat/RegistryTests.swift
@@ -2,7 +2,7 @@ import XCTest
 import WalletConnectNetworking
 import WalletConnectKMS
 import WalletConnectUtils
-@testable import Chat
+@testable import WalletConnectChat
 
 final class RegistryTests: XCTestCase {
 

diff --git a/Example/IntegrationTests/Stubs/InputConfig.swift b/Example/IntegrationTests/Stubs/InputConfig.swift
@@ -11,7 +11,7 @@ struct InputConfig {
     }
 
     static var defaultTimeout: TimeInterval {
-        return 30
+        return 45
     }
 
     private static func config(for key: String) -> String? {

diff --git a/Example/Showcase/Classes/ApplicationLayer/Application.swift b/Example/Showcase/Classes/ApplicationLayer/Application.swift
@@ -1,10 +1,10 @@
 import Foundation
-import Chat
+import WalletConnectChat
 
 final class Application {
 
     lazy var chatService: ChatService = {
-        return ChatService(client: ChatFactory.create())
+        return ChatService(client: Chat.instance)
     }()
 
     lazy var accountStorage: AccountStorage = {

diff --git a/Example/Showcase/Classes/DomainLayer/Chat/ChatFactory.swift b/Example/Showcase/Classes/DomainLayer/Chat/ChatFactory.swift
diff --git a/Example/Showcase/Classes/DomainLayer/Chat/ChatService.swift b/Example/Showcase/Classes/DomainLayer/Chat/ChatService.swift
@@ -1,6 +1,6 @@
 import Foundation
 import Combine
-import Chat
+import WalletConnectChat
 import WalletConnectRelay
 
 typealias Stream<T> = AsyncPublisher<AnyPublisher<T, Never>>
@@ -21,23 +21,23 @@ final class ChatService {
         return client.messagePublisher.values
     }
 
-    var threadPublisher: Stream<Chat.Thread> {
+    var threadPublisher: Stream<WalletConnectChat.Thread> {
         return client.newThreadPublisher.values
     }
 
     var invitePublisher: Stream<Invite> {
         return client.invitePublisher.values
     }
 
-    func getMessages(thread: Chat.Thread) async -> [Chat.Message] {
+    func getMessages(thread: WalletConnectChat.Thread) async -> [WalletConnectChat.Message] {
         await client.getMessages(topic: thread.topic)
     }
 
-    func getThreads() async -> [Chat.Thread] {
+    func getThreads() async -> [WalletConnectChat.Thread] {
         await client.getThreads()
     }
 
-    func getInvites(account: Account) async -> [Chat.Invite] {
+    func getInvites(account: Account) async -> [WalletConnectChat.Invite] {
         client.getInvites(account: account)
     }
 
@@ -53,8 +53,8 @@ final class ChatService {
         try await client.reject(inviteId: invite.id)
     }
 
-    func invite(peerPubkey publicKey: String, peerAccount: Account, message: String, selfAccount: Account) async throws {
-        try await client.invite(publicKey: publicKey, peerAccount: peerAccount, openingMessage: message, account: selfAccount)
+    func invite(peerAccount: Account, message: String, selfAccount: Account) async throws {
+        try await client.invite(peerAccount: peerAccount, openingMessage: message, account: selfAccount)
     }
 
     func register(account: Account) async throws {

diff --git a/Example/Showcase/Classes/PresentationLayer/Chat/Chat/ChatInteractor.swift b/Example/Showcase/Classes/PresentationLayer/Chat/Chat/ChatInteractor.swift
@@ -1,5 +1,5 @@
 import Foundation
-import Chat
+import WalletConnectChat
 
 final class ChatInteractor {
 
@@ -9,7 +9,7 @@ final class ChatInteractor {
         self.chatService = chatService
     }
 
-    func getMessages(thread: Chat.Thread) async -> [Message] {
+    func getMessages(thread: WalletConnectChat.Thread) async -> [Message] {
         return await chatService.getMessages(thread: thread)
     }
 

diff --git a/Example/Showcase/Classes/PresentationLayer/Chat/Chat/ChatModule.swift b/Example/Showcase/Classes/PresentationLayer/Chat/Chat/ChatModule.swift
@@ -1,10 +1,10 @@
 import SwiftUI
-import Chat
+import WalletConnectChat
 
 final class ChatModule {
 
     @discardableResult
-    static func create(thread: Chat.Thread, app: Application) -> UIViewController {
+    static func create(thread: WalletConnectChat.Thread, app: Application) -> UIViewController {
         let router = ChatRouter(app: app)
         let interactor = ChatInteractor(chatService: app.chatService)
         let presenter = ChatPresenter(thread: thread, interactor: interactor, router: router)

diff --git a/Example/Showcase/Classes/PresentationLayer/Chat/Chat/ChatPresenter.swift b/Example/Showcase/Classes/PresentationLayer/Chat/Chat/ChatPresenter.swift
@@ -1,18 +1,18 @@
 import UIKit
 import Combine
-import Chat
+import WalletConnectChat
 
 final class ChatPresenter: ObservableObject {
 
-    private let thread: Chat.Thread
+    private let thread: WalletConnectChat.Thread
     private let interactor: ChatInteractor
     private let router: ChatRouter
     private var disposeBag = Set<AnyCancellable>()
 
     @Published var messages: [MessageViewModel] = []
     @Published var input: String = .empty
 
-    init(thread: Chat.Thread, interactor: ChatInteractor, router: ChatRouter) {
+    init(thread: WalletConnectChat.Thread, interactor: ChatInteractor, router: ChatRouter) {
         self.thread = thread
         self.interactor = interactor
         self.router = router

diff --git a/Example/Showcase/Classes/PresentationLayer/Chat/Chat/Models/MessageViewModel.swift b/Example/Showcase/Classes/PresentationLayer/Chat/Chat/Models/MessageViewModel.swift
@@ -1,11 +1,11 @@
 import Foundation
-import Chat
+import WalletConnectChat
 
 struct MessageViewModel {
     private let message: Message
-    private let thread: Chat.Thread
+    private let thread: WalletConnectChat.Thread
 
-    init(message: Message, thread: Chat.Thread) {
+    init(message: Message, thread: WalletConnectChat.Thread) {
         self.message = message
         self.thread = thread
     }

diff --git a/Example/Showcase/Classes/PresentationLayer/Chat/ChatList/ChatListInteractor.swift b/Example/Showcase/Classes/PresentationLayer/Chat/ChatList/ChatListInteractor.swift
@@ -1,4 +1,4 @@
-import Chat
+import WalletConnectChat
 
 final class ChatListInteractor {
 
@@ -10,11 +10,11 @@ final class ChatListInteractor {
         self.accountStorage = accountStorage
     }
 
-    func getThreads() async -> [Chat.Thread] {
+    func getThreads() async -> [WalletConnectChat.Thread] {
         return await chatService.getThreads()
     }
 
-    func threadsSubscription() -> Stream<Chat.Thread> {
+    func threadsSubscription() -> Stream<WalletConnectChat.Thread> {
         return chatService.threadPublisher
     }
 

diff --git a/Example/Showcase/Classes/PresentationLayer/Chat/ChatList/ChatListRouter.swift b/Example/Showcase/Classes/PresentationLayer/Chat/ChatList/ChatListRouter.swift
@@ -1,5 +1,5 @@
 import UIKit
-import Chat
+import WalletConnectChat
 
 final class ChatListRouter {
 
@@ -21,7 +21,7 @@ final class ChatListRouter {
         InviteListModule.create(app: app, account: account).push(from: viewController)
     }
 
-    func presentChat(thread: Chat.Thread) {
+    func presentChat(thread: WalletConnectChat.Thread) {
         ChatModule.create(thread: thread, app: app).push(from: viewController)
     }
 

diff --git a/Example/Showcase/Classes/PresentationLayer/Chat/ChatList/Models/ThreadViewModel.swift b/Example/Showcase/Classes/PresentationLayer/Chat/ChatList/Models/ThreadViewModel.swift
@@ -1,8 +1,8 @@
 import Foundation
-import Chat
+import WalletConnectChat
 
 struct ThreadViewModel: Identifiable {
-    let thread: Chat.Thread
+    let thread: WalletConnectChat.Thread
 
     var topic: String {
         return thread.topic

diff --git a/Example/Showcase/Classes/PresentationLayer/Chat/Invite/InviteInteractor.swift b/Example/Showcase/Classes/PresentationLayer/Chat/Invite/InviteInteractor.swift
@@ -6,7 +6,6 @@ final class InviteInteractor {
     }
 
     func invite(peerAccount: Account, message: String, selfAccount: Account) async {
-        let publicKey = try! await chatService.resolve(account: peerAccount)
-        try! await chatService.invite(peerPubkey: publicKey, peerAccount: peerAccount, message: message, selfAccount: selfAccount)
+        try! await chatService.invite(peerAccount: peerAccount, message: message, selfAccount: selfAccount)
     }
 }
diff --git a/Example/Showcase/Classes/PresentationLayer/Chat/InviteList/InviteListInteractor.swift b/Example/Showcase/Classes/PresentationLayer/Chat/InviteList/InviteListInteractor.swift
@@ -1,4 +1,4 @@
-import Chat
+import WalletConnectChat
 
 final class InviteListInteractor {
     private let chatService: ChatService

diff --git a/Example/Showcase/Classes/PresentationLayer/Chat/InviteList/InviteListPresenter.swift b/Example/Showcase/Classes/PresentationLayer/Chat/InviteList/InviteListPresenter.swift
@@ -1,6 +1,6 @@
 import UIKit
 import Combine
-import Chat
+import WalletConnectChat
 
 final class InviteListPresenter: ObservableObject {
 

diff --git a/Example/Showcase/Classes/PresentationLayer/Chat/InviteList/Models/InviteViewModel.swift b/Example/Showcase/Classes/PresentationLayer/Chat/InviteList/Models/InviteViewModel.swift
@@ -1,5 +1,5 @@
 import Foundation
-import Chat
+import WalletConnectChat
 
 struct InviteViewModel {
     let invite: Invite