Merge pull request #1127 from WalletConnect/develop

1.8.3
WalletConnect · Sep 20, 2023 · 192ff62 · 192ff62
2 parents 4f8789b + d432511
commit 192ff62
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 33 deletions.
diff --git a/Example/IntegrationTests/Push/NotifyTests.swift b/Example/IntegrationTests/Push/NotifyTests.swift
@@ -74,14 +74,15 @@ final class NotifyTests: XCTestCase {
  environment: .sandbox)
  let keyserverURL = URL(string: "https://keys.walletconnect.com")!
  let client = NotifyClientFactory.create(keyserverURL: keyserverURL,
- logger: notifyLogger,
- keyValueStorage: keyValueStorage,
- keychainStorage: keychain,
- groupKeychainStorage: KeychainStorageMock(),
- networkInteractor: networkingInteractor,
- pairingRegisterer: pairingClient,
- pushClient: pushClient,
- crypto: DefaultCryptoProvider())
+ logger: notifyLogger,
+ keyValueStorage: keyValueStorage,
+ keychainStorage: keychain,
+ groupKeychainStorage: KeychainStorageMock(),
+ networkInteractor: networkingInteractor,
+ pairingRegisterer: pairingClient,
+ pushClient: pushClient,
+ crypto: DefaultCryptoProvider(),
+ notifyHost: InputConfig.notifyHost)
  return client
  }
 

diff --git a/Example/IntegrationTests/Push/Publisher.swift b/Example/IntegrationTests/Push/Publisher.swift
@@ -3,15 +3,7 @@ import Foundation
 
 class Publisher {
  func notify(topic: String, account: Account, message: NotifyMessage) async throws {
- let url = URL(string: "https://\(InputConfig.castHost)/\(InputConfig.gmDappProjectId)/notify")!
- print("________________________________________")
- print("________________________________________")
- print("________________________________________")
- print(InputConfig.gmDappHost)
- print("________________________________________")
- print("________________________________________")
- print("________________________________________")
-
+ let url = URL(string: "https://\(InputConfig.notifyHost)/\(InputConfig.gmDappProjectId)/notify")!
  var request = URLRequest(url: url)
  let notifyRequestPayload = NotifyRequest(notification: message, accounts: [account])
  let encoder = JSONEncoder()

diff --git a/Example/Shared/Tests/InputConfig.swift b/Example/Shared/Tests/InputConfig.swift
@@ -6,10 +6,6 @@ struct InputConfig {
  return config(for: "RELAY_HOST")!
  }
 
- static var castHost: String {
- return config(for: "CAST_HOST")!
- }
-
  static var gmDappProjectId: String {
  return config(for: "GM_DAPP_PROJECT_ID")!
  }
@@ -26,6 +22,10 @@ struct InputConfig {
  return config(for: "JS_CLIENT_API_HOST")!
  }
 
+ static var notifyHost: String {
+ return config(for: "CAST_HOST")!
+ }
+
  static var relayUrl: String {
  return "wss://\(relayHost)"
  }

diff --git a/Sources/WalletConnectNotify/Client/Wallet/NotifyClientFactory.swift b/Sources/WalletConnectNotify/Client/Wallet/NotifyClientFactory.swift
@@ -2,7 +2,7 @@ import Foundation
 
 public struct NotifyClientFactory {
 
- public static func create(groupIdentifier: String, networkInteractor: NetworkInteracting, pairingRegisterer: PairingRegisterer, pushClient: PushClient, crypto: CryptoProvider) -> NotifyClient {
+ public static func create(groupIdentifier: String, networkInteractor: NetworkInteracting, pairingRegisterer: PairingRegisterer, pushClient: PushClient, crypto: CryptoProvider, notifyHost: String) -> NotifyClient {
  let logger = ConsoleLogger(prefix: "🔔",loggingLevel: .debug)
  let keyValueStorage = UserDefaults.standard
  let keyserverURL = URL(string: "https://keys.walletconnect.com")!
@@ -18,7 +18,8 @@ public struct NotifyClientFactory {
  networkInteractor: networkInteractor,
  pairingRegisterer: pairingRegisterer,
  pushClient: pushClient,
- crypto: crypto
+ crypto: crypto,
+ notifyHost: notifyHost
  )
  }
 
@@ -31,7 +32,8 @@ public struct NotifyClientFactory {
  networkInteractor: NetworkInteracting,
  pairingRegisterer: PairingRegisterer,
  pushClient: PushClient,
- crypto: CryptoProvider
+ crypto: CryptoProvider,
+ notifyHost: String
  ) -> NotifyClient {
  let kms = KeyManagementService(keychain: keychainStorage)
  let subscriptionStore = KeyedDatabase<NotifySubscription>(storage: keyValueStorage, identifier: NotifyStorageIdntifiers.notifySubscription)
@@ -56,7 +58,7 @@ public struct NotifyClientFactory {
 
  let subscriptionsAutoUpdater = SubscriptionsAutoUpdater(notifyUpdateRequester: notifyUpdateRequester, logger: logger, notifyStorage: notifyStorage)
 
- let notifyWatchSubscriptionsRequester = NotifyWatchSubscriptionsRequester(keyserverURL: keyserverURL, networkingInteractor: networkInteractor, identityClient: identityClient, logger: logger, kms: kms, webDidResolver: webDidResolver)
+ let notifyWatchSubscriptionsRequester = NotifyWatchSubscriptionsRequester(keyserverURL: keyserverURL, networkingInteractor: networkInteractor, identityClient: identityClient, logger: logger, kms: kms, webDidResolver: webDidResolver, notifyHost: notifyHost)
  let notifySubscriptionsBuilder = NotifySubscriptionsBuilder(notifyConfigProvider: notifyConfigProvider)
  let notifyWatchSubscriptionsResponseSubscriber = NotifyWatchSubscriptionsResponseSubscriber(networkingInteractor: networkInteractor, kms: kms, logger: logger, notifyStorage: notifyStorage, groupKeychainStorage: groupKeychainStorage, notifySubscriptionsBuilder: notifySubscriptionsBuilder)
  let notifySubscriptionsChangedRequestSubscriber = NotifySubscriptionsChangedRequestSubscriber(keyserver: keyserverURL, networkingInteractor: networkInteractor, kms: kms, identityClient: identityClient, logger: logger, groupKeychainStorage: groupKeychainStorage, notifyStorage: notifyStorage, notifySubscriptionsBuilder: notifySubscriptionsBuilder)

diff --git a/...Wallet/ProtocolEngine/wc_notifyWatchSubscriptions/NotifyWatchSubscriptionsRequester.swift b/...Wallet/ProtocolEngine/wc_notifyWatchSubscriptions/NotifyWatchSubscriptionsRequester.swift
@@ -9,7 +9,7 @@ class NotifyWatchSubscriptionsRequester {
  private let kms: KeyManagementService
  private let logger: ConsoleLogging
  private let webDidResolver: NotifyWebDidResolver
- private let notifyServerUrl = "notify.walletconnect.com"
+ private let notifyHost: String
  private var account: Account?
  private var publishers = Set<AnyCancellable>()
 
@@ -18,14 +18,16 @@ class NotifyWatchSubscriptionsRequester {
  identityClient: IdentityClient,
  logger: ConsoleLogging,
  kms: KeyManagementService,
- webDidResolver: NotifyWebDidResolver
+ webDidResolver: NotifyWebDidResolver,
+ notifyHost: String
  ) {
  self.keyserverURL = keyserverURL
  self.identityClient = identityClient
  self.networkingInteractor = networkingInteractor
  self.logger = logger
  self.kms = kms
  self.webDidResolver = webDidResolver
+ self.notifyHost = notifyHost
  setUpWatchSubscriptionsOnSocketConnection()
  }
 
@@ -49,8 +51,8 @@ class NotifyWatchSubscriptionsRequester {
 
  logger.debug("Watching subscriptions")
 
- let notifyServerPublicKey = try await webDidResolver.resolveAgreementKey(domain: notifyServerUrl)
- let notifyServerAuthenticationKey = try await webDidResolver.resolveAuthenticationKey(domain: notifyServerUrl)
+ let notifyServerPublicKey = try await webDidResolver.resolveAgreementKey(domain: notifyHost)
+ let notifyServerAuthenticationKey = try await webDidResolver.resolveAuthenticationKey(domain: notifyHost)
  let notifyServerAuthenticationDidKey = DIDKey(rawData: notifyServerAuthenticationKey)
  let watchSubscriptionsTopic = notifyServerPublicKey.rawRepresentation.sha256().toHexString()
 

diff --git a/Sources/WalletConnectNotify/Notify.swift b/Sources/WalletConnectNotify/Notify.swift
@@ -11,7 +11,8 @@ public class Notify {
  networkInteractor: Networking.interactor,
  pairingRegisterer: Pair.registerer,
  pushClient: Push.instance,
- crypto: config.crypto
+ crypto: config.crypto,
+ notifyHost: config.notifyHost
  )
  }()
 
@@ -20,8 +21,8 @@ public class Notify {
  private init() { }
 
  /// Wallet's configuration method
- static public func configure(pushHost: String = "echo.walletconnect.com", groupIdentifier: String, environment: APNSEnvironment, crypto: CryptoProvider) {
- Notify.config = Notify.Config(pushHost: pushHost, groupIdentifier: groupIdentifier, environment: environment, crypto: crypto)
+ static public func configure(pushHost: String = "echo.walletconnect.com", groupIdentifier: String, environment: APNSEnvironment, crypto: CryptoProvider, notifyHost: String = "notify.walletconnect.com") {
+ Notify.config = Notify.Config(pushHost: pushHost, groupIdentifier: groupIdentifier, environment: environment, crypto: crypto, notifyHost: notifyHost)
  }
 
 }
diff --git a/Sources/WalletConnectNotify/NotifyConfig.swift b/Sources/WalletConnectNotify/NotifyConfig.swift
@@ -6,5 +6,6 @@ extension Notify {
  let groupIdentifier: String
  let environment: APNSEnvironment
  let crypto: CryptoProvider
+ let notifyHost: String
  }
 }
diff --git a/Sources/WalletConnectRelay/PackageConfig.json b/Sources/WalletConnectRelay/PackageConfig.json
@@ -1 +1 @@
-{"version": "1.8.2"}
+{"version": "1.8.3"}