Merge pull request #1259 from WalletConnect/feature/subscriptions-ind…

…ex-by-app [Notify] Subscriptions index by app
WalletConnect · Dec 21, 2023 · 12dc74c · 12dc74c
2 parents 8218573 + f990620
commit 12dc74c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/Sources/WalletConnectNotify/Client/Wallet/NotifyClientFactory.swift b/Sources/WalletConnectNotify/Client/Wallet/NotifyClientFactory.swift
@@ -7,7 +7,7 @@ public struct NotifyClientFactory {
         let keyserverURL = URL(string: "https://keys.walletconnect.com")!
         let keychainStorage = KeychainStorage(serviceIdentifier: "com.walletconnect.sdk", accessGroup: groupIdentifier)
         let groupKeychainService = GroupKeychainStorage(serviceIdentifier: groupIdentifier)
-        let databasePath = databasePath(appGroup: groupIdentifier, database: "notify.db")
+        let databasePath = databasePath(appGroup: groupIdentifier, database: "notify_v\(version).db")
         let sqlite = DiskSqlite(path: databasePath)
 
         return NotifyClientFactory.create(
@@ -102,4 +102,8 @@ public struct NotifyClientFactory {
 
         return path.absoluteString
     }
+
+    static var version: String {
+        return "1"
+    }
 }
diff --git a/Sources/WalletConnectNotify/Client/Wallet/NotifyDatabase.swift b/Sources/WalletConnectNotify/Client/Wallet/NotifyDatabase.swift
@@ -110,14 +110,15 @@ private extension NotifyDatabase {
 
             try sqlite.execute(sql: """
                 CREATE TABLE IF NOT EXISTS \(Table.subscriptions) (
-                    topic TEXT PRIMARY KEY,
+                    topic TEXT NOT NULL,
                     account TEXT NOT NULL,
                     relay TEXT NOT NULL,
                     metadata TEXT NOT NULL,
                     scope TEXT NOT NULL,
                     expiry TEXT NOT NULL,
                     symKey TEXT NOT NULL,
-                    appAuthenticationKey TEXT NOT NULL
+                    appAuthenticationKey TEXT NOT NULL,
+                    id TEXT PRIMARY KEY
                 );
             """)
 

diff --git a/Sources/WalletConnectNotify/Types/DataStructures/NotifySubscription.swift b/Sources/WalletConnectNotify/Types/DataStructures/NotifySubscription.swift
@@ -1,7 +1,7 @@
 import Foundation
 import Database
 
-public struct NotifySubscription: DatabaseObject, SqliteRow {
+public struct NotifySubscription: Codable, Equatable, SqliteRow {
     public let topic: String
     public let account: Account
     public let relay: RelayProtocolOptions
@@ -11,8 +11,8 @@ public struct NotifySubscription: DatabaseObject, SqliteRow {
     public let symKey: String
     public let appAuthenticationKey: String
 
-    public var databaseId: String {
-        return topic
+    private var id: String {
+        return "\(account.absoluteString)-\(metadata.url)"
     }
 
     public init(decoder: SqliteRowDecoder) throws {
@@ -36,6 +36,7 @@ public struct NotifySubscription: DatabaseObject, SqliteRow {
         encoder.encodeDate(expiry, for: "expiry")
         encoder.encodeString(symKey, for: "symKey")
         encoder.encodeString(appAuthenticationKey, for: "appAuthenticationKey")
+        encoder.encodeString(id, for: "id")
         return encoder
     }