Merge pull request #1278 from WalletConnect/feature/get-notifications…

…-history [Notify] Notifications history
WalletConnect · Jan 19, 2024 · bd97abb · bd97abb
2 parents 1a5784e + c531985
commit bd97abb
Show file tree

Hide file tree

Showing 36 changed files with 333 additions and 429 deletions.
diff --git a/Example/ExampleApp.xcodeproj/project.pbxproj b/Example/ExampleApp.xcodeproj/project.pbxproj
@@ -61,7 +61,6 @@
 		A50D53C32ABA055700A4FD8B /* NotifyPreferencesRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A50D53BE2ABA055700A4FD8B /* NotifyPreferencesRouter.swift */; };
 		A50D53C42ABA055700A4FD8B /* NotifyPreferencesInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = A50D53BF2ABA055700A4FD8B /* NotifyPreferencesInteractor.swift */; };
 		A50D53C52ABA055700A4FD8B /* NotifyPreferencesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A50D53C02ABA055700A4FD8B /* NotifyPreferencesView.swift */; };
-		A50DF19D2A25084A0036EA6C /* WalletConnectHistory in Frameworks */ = {isa = PBXBuildFile; productRef = A50DF19C2A25084A0036EA6C /* WalletConnectHistory */; };
 		A50F3946288005B200064555 /* Types.swift in Sources */ = {isa = PBXBuildFile; fileRef = A50F3945288005B200064555 /* Types.swift */; };
 		A51606F82A2F47BD00CACB92 /* DefaultBIP44Provider.swift in Sources */ = {isa = PBXBuildFile; fileRef = A51606F72A2F47BD00CACB92 /* DefaultBIP44Provider.swift */; };
 		A51606F92A2F47BD00CACB92 /* DefaultBIP44Provider.swift in Sources */ = {isa = PBXBuildFile; fileRef = A51606F72A2F47BD00CACB92 /* DefaultBIP44Provider.swift */; };
@@ -79,7 +78,6 @@
 		A518B31428E33A6500A2CE93 /* InputConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = A518B31328E33A6500A2CE93 /* InputConfig.swift */; };
 		A51AC0D928E436A3001BACF9 /* InputConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = A51AC0D828E436A3001BACF9 /* InputConfig.swift */; };
 		A51AC0DF28E4379F001BACF9 /* InputConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = A51AC0DE28E4379F001BACF9 /* InputConfig.swift */; };
-		A5321C2B2A250367006CADC3 /* HistoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5321C2A2A250367006CADC3 /* HistoryTests.swift */; };
 		A5417BBE299BFC3E00B469F3 /* ImportAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5417BBD299BFC3E00B469F3 /* ImportAccount.swift */; };
 		A541959E2934BFEF0035AD19 /* CacaoSignerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A541959A2934BFEF0035AD19 /* CacaoSignerTests.swift */; };
 		A541959F2934BFEF0035AD19 /* SignerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A541959B2934BFEF0035AD19 /* SignerTests.swift */; };
@@ -177,6 +175,7 @@
 		A5B6C0F32A6EAB1700927332 /* WalletConnectNotify in Frameworks */ = {isa = PBXBuildFile; productRef = A5B6C0F22A6EAB1700927332 /* WalletConnectNotify */; };
 		A5B6C0F52A6EAB2800927332 /* WalletConnectNotify in Frameworks */ = {isa = PBXBuildFile; productRef = A5B6C0F42A6EAB2800927332 /* WalletConnectNotify */; };
 		A5B6C0F72A6EAB3200927332 /* WalletConnectNotify in Frameworks */ = {isa = PBXBuildFile; productRef = A5B6C0F62A6EAB3200927332 /* WalletConnectNotify */; };
+		A5B814FA2B5AAA2F00AECCFD /* WalletConnectIdentity in Frameworks */ = {isa = PBXBuildFile; productRef = A5B814F92B5AAA2F00AECCFD /* WalletConnectIdentity */; };
 		A5BB7FA328B6A50400707FC6 /* WalletConnectAuth in Frameworks */ = {isa = PBXBuildFile; productRef = A5BB7FA228B6A50400707FC6 /* WalletConnectAuth */; };
 		A5BB7FAD28B6AA7D00707FC6 /* QRCodeGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5BB7FAC28B6AA7D00707FC6 /* QRCodeGenerator.swift */; };
 		A5C2020B287D9DEE007E3188 /* WelcomeModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5C20206287D9DEE007E3188 /* WelcomeModule.swift */; };
@@ -475,7 +474,6 @@
 		A518B31328E33A6500A2CE93 /* InputConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InputConfig.swift; sourceTree = "<group>"; };
 		A51AC0D828E436A3001BACF9 /* InputConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputConfig.swift; sourceTree = "<group>"; };
 		A51AC0DE28E4379F001BACF9 /* InputConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputConfig.swift; sourceTree = "<group>"; };
-		A5321C2A2A250367006CADC3 /* HistoryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryTests.swift; sourceTree = "<group>"; };
 		A5417BBD299BFC3E00B469F3 /* ImportAccount.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImportAccount.swift; sourceTree = "<group>"; };
 		A541959A2934BFEF0035AD19 /* CacaoSignerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CacaoSignerTests.swift; sourceTree = "<group>"; };
 		A541959B2934BFEF0035AD19 /* SignerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SignerTests.swift; sourceTree = "<group>"; };
@@ -766,8 +764,8 @@
 			files = (
 				A5E03DFF2864662500888481 /* WalletConnect in Frameworks */,
 				A561C80529DFCD4500DF540D /* WalletConnectSync in Frameworks */,
+				A5B814FA2B5AAA2F00AECCFD /* WalletConnectIdentity in Frameworks */,
 				A5E03DF52864651200888481 /* Starscream in Frameworks */,
-				A50DF19D2A25084A0036EA6C /* WalletConnectHistory in Frameworks */,
 				A5C8BE85292FE20B006CC85C /* Web3 in Frameworks */,
 				84DDB4ED28ABB663003D66ED /* WalletConnectAuth in Frameworks */,
 				C5DD5BE1294E09E3008FD3A4 /* Web3Wallet in Frameworks */,
@@ -1047,14 +1045,6 @@
 			path = Settings;
 			sourceTree = "<group>";
 		};
-		A5321C292A25035A006CADC3 /* History */ = {
-			isa = PBXGroup;
-			children = (
-				A5321C2A2A250367006CADC3 /* HistoryTests.swift */,
-			);
-			path = History;
-			sourceTree = "<group>";
-		};
 		A54195992934BFDD0035AD19 /* Signer */ = {
 			isa = PBXGroup;
 			children = (
@@ -1481,7 +1471,6 @@
 			isa = PBXGroup;
 			children = (
 				847F07FE2A25DBC700B2A5A4 /* XPlatform */,
-				A5321C292A25035A006CADC3 /* History */,
 				A561C80129DFCCD300DF540D /* Sync */,
 				849D7A91292E2115006A2BD4 /* Push */,
 				84CEC64728D8A98900D081A8 /* Pairing */,
@@ -2107,8 +2096,8 @@
 				C5DD5BE0294E09E3008FD3A4 /* Web3Wallet */,
 				A561C80429DFCD4500DF540D /* WalletConnectSync */,
 				A573C53A29EC365800E3CBFD /* HDWalletKit */,
-				A50DF19C2A25084A0036EA6C /* WalletConnectHistory */,
 				A5B6C0F22A6EAB1700927332 /* WalletConnectNotify */,
+				A5B814F92B5AAA2F00AECCFD /* WalletConnectIdentity */,
 			);
 			productName = IntegrationTests;
 			productReference = A5E03DED286464DB00888481 /* IntegrationTests.xctest */;
@@ -2488,7 +2477,6 @@
 				84FE684628ACDB4700C893FF /* RequestParams.swift in Sources */,
 				7694A5262874296A0001257E /* RegistryTests.swift in Sources */,
 				A541959F2934BFEF0035AD19 /* SignerTests.swift in Sources */,
-				A5321C2B2A250367006CADC3 /* HistoryTests.swift in Sources */,
 				A58A1ECC29BF458600A82A20 /* ENSResolverTests.swift in Sources */,
 				A5E03DFA286465C700888481 /* SignClientTests.swift in Sources */,
 				84A6E3C32A386BBC008A0571 /* Publisher.swift in Sources */,
@@ -3444,10 +3432,6 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = WalletConnectAuth;
 		};
-		A50DF19C2A25084A0036EA6C /* WalletConnectHistory */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = WalletConnectHistory;
-		};
 		A54195A42934E83F0035AD19 /* Web3 */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = A5AE354528A1A2AC0059AE8A /* XCRemoteSwiftPackageReference "Web3" */;
@@ -3530,6 +3514,10 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = WalletConnectNotify;
 		};
+		A5B814F92B5AAA2F00AECCFD /* WalletConnectIdentity */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = WalletConnectIdentity;
+		};
 		A5BB7FA228B6A50400707FC6 /* WalletConnectAuth */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = WalletConnectAuth;

diff --git a/Example/IntegrationTests/Chat/ChatTests.swift b/Example/IntegrationTests/Chat/ChatTests.swift
@@ -4,7 +4,6 @@ import XCTest
 import WalletConnectUtils
 @testable import WalletConnectKMS
 @testable import WalletConnectSync
-@testable import WalletConnectHistory
 import WalletConnectRelay
 import Combine
 import Web3
@@ -71,18 +70,10 @@ final class ChatTests: XCTestCase {
             keychain: keychain
         )
 
-        let historyClient = HistoryClientFactory.create(
-            historyUrl: "https://history.walletconnect.com",
-            relayUrl: "wss://relay.walletconnect.com",
-            keyValueStorage: keyValueStorage,
-            keychain: keychain,
-            logger: logger
-        )
-
         let clientId = try! networkingInteractor.getClientId()
         logger.debug("My client id is: \(clientId)")
 
-        return ChatClientFactory.create(keyserverURL: keyserverURL, relayClient: relayClient, networkingInteractor: networkingInteractor, keychain:  keychain, logger: logger, storage: keyValueStorage, syncClient: syncClient, historyClient: historyClient)
+        return ChatClientFactory.create(keyserverURL: keyserverURL, relayClient: relayClient, networkingInteractor: networkingInteractor, keychain:  keychain, logger: logger, storage: keyValueStorage, syncClient: syncClient)
     }
 
     func testInvite() async throws {

diff --git a/Example/IntegrationTests/History/HistoryTests.swift b/Example/IntegrationTests/History/HistoryTests.swift
diff --git a/Example/IntegrationTests/Pairing/PairingTests.swift b/Example/IntegrationTests/Pairing/PairingTests.swift
@@ -9,7 +9,6 @@ import WalletConnectPush
 @testable import Auth
 @testable import WalletConnectPairing
 @testable import WalletConnectSync
-@testable import WalletConnectHistory
 
 final class PairingTests: XCTestCase {
 

diff --git a/Example/IntegrationTests/Push/NotifyTests.swift b/Example/IntegrationTests/Push/NotifyTests.swift
@@ -165,7 +165,6 @@ final class NotifyTests: XCTestCase {
         }
     }
 
-    /*
     func testWalletCreatesAndUpdatesSubscription() async throws {
         let created = expectation(description: "Subscription created")
 
@@ -202,7 +201,6 @@ final class NotifyTests: XCTestCase {
 
         try await walletNotifyClientA.deleteSubscription(topic: subscription.topic)
     }
-    */
 
     func testNotifyServerSubscribeAndNotifies() async throws {
         let subscribeExpectation = expectation(description: "creates notify subscription")
@@ -255,6 +253,28 @@ final class NotifyTests: XCTestCase {
         }
     }
 
+    func testFetchHistory() async throws {
+        let subscribeExpectation = expectation(description: "fetch notify subscription")
+        let account = Account("eip155:1:0x622b17376F76d72C43527a917f59273247A917b4")!
+
+        var subscription: NotifySubscription!
+        walletNotifyClientA.subscriptionsPublisher
+            .sink { subscriptions in
+                subscription = subscriptions.first
+                subscribeExpectation.fulfill()
+            }.store(in: &publishers)
+
+        try await walletNotifyClientA.register(account: account, domain: gmDappDomain) { message in
+            let privateKey = Data(hex: "c3ff8a0ae33ac5d58e515055c5870fa2f220d070997bd6fd77a5f2c148528ff0")
+            let signer = MessageSignerFactory(signerFactory: DefaultSignerFactory()).create(projectId: InputConfig.projectId)
+            return try! signer.sign(message: message, privateKey: privateKey, type: .eip191)
+        }
+
+        await fulfillment(of: [subscribeExpectation], timeout: InputConfig.defaultTimeout)
+
+        try await walletNotifyClientA.fetchHistory(subscription: subscription)
+        XCTAssertEqual(walletNotifyClientA.getMessageHistory(topic: subscription.topic).count, 41)
+    }
 }
 
 

diff --git a/Example/IntegrationTests/Stubs/PushMessage.swift b/Example/IntegrationTests/Stubs/PushMessage.swift
@@ -9,6 +9,7 @@ extension NotifyMessage {
             body: "body",
             icon: "https://images.unsplash.com/photo-1581224463294-908316338239?ixlib=rb-4.0.3&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=250&q=80",
             url: "https://web3inbox.com",
-            type: type)
+            type: type, 
+            sentAt: Date())
     }
 }
diff --git a/Example/WalletApp/PresentationLayer/Wallet/PushMessages/SubscriptionInteractor.swift b/Example/WalletApp/PresentationLayer/Wallet/PushMessages/SubscriptionInteractor.swift
@@ -30,4 +30,10 @@ final class SubscriptionInteractor {
             try await Notify.instance.deleteSubscription(topic: subscription.topic)
         }
     }
+
+    func fetchHistory() {
+        Task(priority: .high) {
+            try await Notify.instance.fetchHistory(subscription: subscription)
+        }
+    }
 }
diff --git a/Example/WalletApp/PresentationLayer/Wallet/PushMessages/SubscriptionPresenter.swift b/Example/WalletApp/PresentationLayer/Wallet/PushMessages/SubscriptionPresenter.swift
@@ -77,6 +77,8 @@ extension SubscriptionPresenter: SceneViewModel {
 private extension SubscriptionPresenter {
 
     func setupInitialState() {
+        interactor.fetchHistory()
+
         pushMessages = interactor.getPushMessages()
 
         interactor.messagesPublisher

diff --git a/Package.swift b/Package.swift
@@ -43,13 +43,12 @@ let package = Package(
         .library(
             name: "WalletConnectVerify",
             targets: ["WalletConnectVerify"]),
-        .library(
-            name: "WalletConnectHistory",
-            targets: ["WalletConnectHistory"]),
         .library(
             name: "WalletConnectModal",
             targets: ["WalletConnectModal"]),
-
+        .library(
+            name: "WalletConnectIdentity",
+            targets: ["WalletConnectIdentity"]),
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.3.0"),
@@ -62,7 +61,7 @@ let package = Package(
             path: "Sources/WalletConnectSign"),
         .target(
             name: "WalletConnectChat",
-            dependencies: ["WalletConnectIdentity", "WalletConnectSync", "WalletConnectHistory"],
+            dependencies: ["WalletConnectIdentity", "WalletConnectSync"],
             path: "Sources/Chat"),
         .target(
             name: "Auth",
@@ -74,7 +73,7 @@ let package = Package(
             path: "Sources/Web3Wallet"),
         .target(
             name: "WalletConnectNotify",
-            dependencies: ["WalletConnectPairing", "WalletConnectPush", "WalletConnectIdentity", "WalletConnectSigner", "Database"],
+            dependencies: ["WalletConnectIdentity", "WalletConnectPairing", "WalletConnectPush", "WalletConnectSigner", "Database"],
             path: "Sources/WalletConnectNotify"),
         .target(
             name: "WalletConnectPush",
@@ -92,9 +91,6 @@ let package = Package(
         .target(
             name: "WalletConnectPairing",
             dependencies: ["WalletConnectNetworking"]),
-        .target(
-            name: "WalletConnectHistory",
-            dependencies: ["HTTPClient", "WalletConnectRelay"]),
         .target(
             name: "WalletConnectSigner",
             dependencies: ["WalletConnectNetworking"]),

diff --git a/Sources/Chat/Chat.swift b/Sources/Chat/Chat.swift
@@ -12,8 +12,7 @@ public class Chat {
             keyserverUrl: keyserverUrl,
             relayClient: Relay.instance,
             networkingInteractor: Networking.interactor,
-            syncClient: Sync.instance,
-            historyClient: History.instance
+            syncClient: Sync.instance
         )
     }()
 

diff --git a/Sources/Chat/ChatClientFactory.swift b/Sources/Chat/ChatClientFactory.swift
@@ -2,7 +2,7 @@ import Foundation
 
 public struct ChatClientFactory {
 
-    static func create(keyserverUrl: String, relayClient: RelayClient, networkingInteractor: NetworkingInteractor, syncClient: SyncClient, historyClient: HistoryClient) -> ChatClient {
+    static func create(keyserverUrl: String, relayClient: RelayClient, networkingInteractor: NetworkingInteractor, syncClient: SyncClient) -> ChatClient {
         fatalError("fix access group")
         let keychain = KeychainStorage(serviceIdentifier: "com.walletconnect.sdk", accessGroup: "")
         let keyserverURL = URL(string: keyserverUrl)!
@@ -13,8 +13,7 @@ public struct ChatClientFactory {
             keychain: keychain,
             logger: ConsoleLogger(loggingLevel: .debug),
             storage: UserDefaults.standard,
-            syncClient: syncClient,
-            historyClient: historyClient
+            syncClient: syncClient
         )
     }
 
@@ -25,12 +24,10 @@ public struct ChatClientFactory {
         keychain: KeychainStorageProtocol,
         logger: ConsoleLogging,
         storage: KeyValueStorage,
-        syncClient: SyncClient,
-        historyClient: HistoryClient
+        syncClient: SyncClient
     ) -> ChatClient {
         let kms = KeyManagementService(keychain: keychain)
-        let serializer = Serializer(kms: kms, logger: logger)
-        let historyService = HistoryService(historyClient: historyClient, seiralizer: serializer)
+        let historyService = HistoryService()
         let messageStore = KeyedDatabase<Message>(storage: storage, identifier: ChatStorageIdentifiers.messages.rawValue)
         let receivedInviteStore = KeyedDatabase<ReceivedInvite>(storage: storage, identifier: ChatStorageIdentifiers.receivedInvites.rawValue)
         let threadStore: SyncStore<Thread> = SyncStoreFactory.create(name: ChatStorageIdentifiers.thread.rawValue, syncClient: syncClient, storage: storage)

diff --git a/Sources/Chat/ChatImports.swift b/Sources/Chat/ChatImports.swift
@@ -2,5 +2,4 @@
 @_exported import WalletConnectSigner
 @_exported import WalletConnectIdentity
 @_exported import WalletConnectSync
-@_exported import WalletConnectHistory
 #endif