Merge pull request #64 from reown-com/develop

1.1.0

.github/workflows/ci.yml

@@ -73,7 +73,11 @@ jobs:
     - name: Run Relay integration tests
       if: matrix.type == 'relay-tests'
       shell: bash
-      run: make relay_tests RELAY_HOST=relay.walletconnect.com PROJECT_ID=${{ secrets.PROJECT_ID }}
+      run: make relay_tests \
+        RELAY_HOST=relay.walletconnect.com \
+        PROJECT_ID=${{ secrets.PROJECT_ID }} \
+        BUNDLE_ID_PRESENT_PROJECT_ID=${{ secrets.BUNDLE_ID_PRESENT_PROJECT_ID }} \
+        BUNDLE_ID_NOT_PRESENT_PROJECT_ID=${{ secrets.BUNDLE_ID_NOT_PRESENT_PROJECT_ID }}
 
     - name: Publish Test Report
       uses: mikepenz/action-junit-report@v3

Configuration.xcconfig

@@ -26,5 +26,9 @@ EXPLORER_HOST = explorer-api.walletconnect.com
 // pimloco bundler url including api key
 // PIMLICO_BUNDLER_URL = PIMLICO_BUNDLER_URL
 
+// BUNDLE_ID_PRESENT_PROJECT_ID = BUNDLE_ID_PRESENT_PROJECT_ID
+
+// BUNDLE_ID_NOT_PRESENT_PROJECT_ID = BUNDLE_ID_NOT_PRESENT_PROJECT_ID
+
 // rpc url
 // RPC_URL = RPC_URL

Example/ExampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/attaswift/BigInt.git",
         "state": {
           "branch": null,
-          "revision": "793a7fac0bfc318e85994bf6900652e827aef33e",
-          "version": "5.4.1"
+          "revision": "114343a705df4725dfe7ab8a2a326b8883cfd79c",
+          "version": "5.5.1"
         }
       },
       {

Example/ExampleApp.xcodeproj/xcshareddata/xcschemes/BuildAll.xcscheme

@@ -64,10 +64,10 @@
          </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "8445118E2C8B689D00A6A86C"
@@ -119,15 +119,6 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "8445118E2C8B689D00A6A86C"
-            BuildableName = "AppKitLab.app"
-            BlueprintName = "AppKitLab"
-            ReferencedContainer = "container:ExampleApp.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

Example/ExampleApp.xcodeproj/xcshareddata/xcschemes/RelayIntegrationTests.xcscheme

@@ -31,6 +31,16 @@
             value = "$(PROJECT_ID)"
             isEnabled = "YES">
          </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "BUNDLE_ID_NOT_PRESENT_PROJECT_ID"
+            value = "$(BUNDLE_ID_NOT_PRESENT_PROJECT_ID)"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "BUNDLE_ID_PRESENT_PROJECT_ID"
+            value = "$(BUNDLE_ID_PRESENT_PROJECT_ID)"
+            isEnabled = "YES">
+         </EnvironmentVariable>
       </EnvironmentVariables>
       <Testables>
          <TestableReference

Example/ExampleApp.xcodeproj/xcshareddata/xcschemes/WalletConnect.xcscheme

@@ -6,20 +6,6 @@
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "Web3Inbox"
-               BuildableName = "Web3Inbox"
-               BlueprintName = "Web3Inbox"
-               ReferencedContainer = "container:..">
-            </BuildableReference>
-         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
@@ -62,62 +48,6 @@
                ReferencedContainer = "container:..">
             </BuildableReference>
          </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "WalletConnectAuth"
-               BuildableName = "WalletConnectAuth"
-               BlueprintName = "WalletConnectAuth"
-               ReferencedContainer = "container:..">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "Web3Wallet"
-               BuildableName = "Web3Wallet"
-               BlueprintName = "Web3Wallet"
-               ReferencedContainer = "container:..">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "WalletConnectRouter"
-               BuildableName = "WalletConnectRouter"
-               BlueprintName = "WalletConnectRouter"
-               ReferencedContainer = "container:..">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "WalletConnectEcho"
-               BuildableName = "WalletConnectEcho"
-               BlueprintName = "WalletConnectEcho"
-               ReferencedContainer = "container:..">
-            </BuildableReference>
-         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
@@ -132,34 +62,6 @@
                ReferencedContainer = "container:..">
             </BuildableReference>
          </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "NO"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "WalletConnectChat"
-               BuildableName = "WalletConnectChat"
-               BlueprintName = "WalletConnectChat"
-               ReferencedContainer = "container:..">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "NO"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "ChatTests"
-               BuildableName = "ChatTests"
-               BlueprintName = "ChatTests"
-               ReferencedContainer = "container:..">
-            </BuildableReference>
-         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -268,16 +170,6 @@
                ReferencedContainer = "container:..">
             </BuildableReference>
          </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "ReownAppKitTests"
-               BuildableName = "ReownAppKitTests"
-               BlueprintName = "ReownAppKitTests"
-               ReferencedContainer = "container:..">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
@@ -300,9 +192,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "Web3Inbox"
-            BuildableName = "Web3Inbox"
-            BlueprintName = "Web3Inbox"
+            BlueprintIdentifier = "WalletConnectPush"
+            BuildableName = "WalletConnectPush"
+            BlueprintName = "WalletConnectPush"
             ReferencedContainer = "container:..">
          </BuildableReference>
       </MacroExpansion>

Example/RelayIntegrationTests.xctestplan

@@ -4,13 +4,38 @@
       "id" : "3D7BF967-0C62-49DD-ABA1-BDDEE678ED85",
       "name" : "Configuration 1",
       "options" : {
-
+        "environmentVariableEntries" : [
+          {
+            "key" : "RELAY_HOST",
+            "value" : "$(RELAY_HOST)"
+          },
+          {
+            "key" : "PROJECT_ID",
+            "value" : "$(PROJECT_ID)"
+          },
+          {
+            "key" : "BUNDLE_ID_NOT_PRESENT_PROJECT_ID",
+            "value" : "$(BUNDLE_ID_NOT_PRESENT_PROJECT_ID)"
+          },
+          {
+            "key" : "BUNDLE_ID_PRESENT_PROJECT_ID",
+            "value" : "$(BUNDLE_ID_PRESENT_PROJECT_ID)"
+          }
+        ]
       }
     }
   ],
   "defaultOptions" : {
     "codeCoverage" : false,
     "environmentVariableEntries" : [
+      {
+        "key" : "BUNDLE_ID_NOT_PRESENT_PROJECT_ID",
+        "value" : "$(BUNDLE_ID_NOT_PRESENT_PROJECT_ID)"
+      },
+      {
+        "key" : "BUNDLE_ID_PRESENT_PROJECT_ID",
+        "value" : "$(BUNDLE_ID_PRESENT_PROJECT_ID)"
+      },
       {
         "key" : "RELAY_HOST",
         "value" : "$(RELAY_HOST)"

Example/RelayIntegrationTests/RelayClientEndToEndTests.swift

@@ -32,24 +32,11 @@ final class RelayClientEndToEndTests: XCTestCase {
     private var relayA: RelayClient!
     private var relayB: RelayClient!
 
-    func makeRelayClient(prefix: String) -> RelayClient {
+    func makeRelayClient(prefix: String, projectId: String = InputConfig.projectId) -> RelayClient {
         let keyValueStorage = RuntimeKeyValueStorage()
         let logger = ConsoleLogger(prefix: prefix, loggingLevel: .debug)
-        let clientIdStorage = ClientIdStorage(defaults: keyValueStorage, keychain: KeychainStorageMock(), logger: logger)
-        let socketAuthenticator = ClientIdAuthenticator(
-            clientIdStorage: clientIdStorage,
-            logger: ConsoleLoggerMock()
-        )
-        let urlFactory = RelayUrlFactory(
-            relayHost: InputConfig.relayHost,
-            projectId: InputConfig.projectId
-        )
-        let socket = WebSocket(url: urlFactory.create())
-        let webSocketFactory = WebSocketFactoryMock(webSocket: socket)
         let networkMonitor = NetworkMonitor()
 
-        let socketStatusProvider = SocketStatusProvider(socket: socket, logger: logger)
-        let socketConnectionHandler = AutomaticSocketConnectionHandler(socket: socket, subscriptionsTracker: SubscriptionsTracker(logger: logger), logger: logger, socketStatusProvider: socketStatusProvider, clientIdAuthenticator: socketAuthenticator)
 
         let keychain = KeychainStorageMock()
         let relayClient = RelayClientFactory.create(
@@ -58,7 +45,7 @@ final class RelayClientEndToEndTests: XCTestCase {
             keyValueStorage: keyValueStorage,
             keychainStorage: keychain,
             socketFactory: DefaultSocketFactory(),
-            socketConnectionType: .manual, 
+            socketConnectionType: .automatic,
             networkMonitor: networkMonitor,
             logger: logger
         )
@@ -74,38 +61,27 @@ final class RelayClientEndToEndTests: XCTestCase {
         super.tearDown()
     }
 
-//    func testSubscribe() {
-//        relayA = makeRelayClient(prefix: "")
-//
-//        do {
-//            try relayA.connect()
-//        } catch {
-//            XCTFail("Failed to connect: \(error)")
-//        }
-//
-//        let subscribeExpectation = expectation(description: "subscribe call succeeds")
-//        subscribeExpectation.assertForOverFulfill = true
-//        relayA.socketConnectionStatusPublisher.sink { [weak self] status in
-//            guard let self = self else {return}
-//            if status == .connected {
-//                Task(priority: .high) {  try await self.relayA.subscribe(topic: "ecb78f2df880c43d3418ddbf871092b847801932e21765b250cc50b9e96a9131") }
-//                subscribeExpectation.fulfill()
-//            }
-//        }.store(in: &publishers)
-//
-//        wait(for: [subscribeExpectation], timeout: InputConfig.defaultTimeout)
-//    }
-
-    func testEndToEndPayload() {
+    // test_bundleId_present - configured in the cloud to include bundleId for whitelisted apps
+    func testConnectProjectBundleIdPresent() async throws {
+        let randomTopic = String.randomTopic()
+        relayA = makeRelayClient(prefix: "⚽️ X ", projectId: InputConfig.bundleIdPresentProjectId)
+        try await self.relayA.publish(topic: randomTopic, payload: "", tag: 0, prompt: false, ttl: 60)
+        sleep(1)
+    }
+
+    // test_bundleId_not_present - configured in the cloud to not include bundleId for whitelisted apps
+    func testConnectProjectBundleIdNotPresent() async throws{
+        let randomTopic = String.randomTopic()
+        relayA = makeRelayClient(prefix: "⚽️ X ", projectId: InputConfig.bundleIdNotPresentProjectId)
+
+        try await self.relayA.publish(topic: randomTopic, payload: "", tag: 0, prompt: false, ttl: 60)
+        sleep(1)
+    }
+
+    func testEndToEndPayload() async throws {
         relayA = makeRelayClient(prefix: "⚽️ A ")
         relayB = makeRelayClient(prefix: "🏀 B ")
 
-        do {
-            try relayA.connect()
-            try relayB.connect()
-        } catch {
-            XCTFail("Failed to connect: \(error)")
-        }
         let randomTopic = String.randomTopic()
         let payloadA = "A"
         let payloadB = "B"
@@ -120,8 +96,7 @@ final class RelayClientEndToEndTests: XCTestCase {
         expectationA.assertForOverFulfill = false
         expectationB.assertForOverFulfill = false
 
-        relayA.messagePublisher.sink { [weak self] topic, payload, _, _ in
-            guard let self = self else { return }
+        relayA.messagePublisher.sink { topic, payload, _, _ in
             (subscriptionATopic, subscriptionAPayload) = (topic, payload)
             expectationA.fulfill()
         }.store(in: &publishers)
@@ -136,22 +111,11 @@ final class RelayClientEndToEndTests: XCTestCase {
             expectationB.fulfill()
         }.store(in: &publishers)
 
-        relayA.socketConnectionStatusPublisher.sink { [weak self] status in
-            guard let self = self else { return }
-            guard status == .connected else { return }
-            Task(priority: .high) {
-                try await self.relayA.subscribe(topic: randomTopic)
-                try await self.relayA.publish(topic: randomTopic, payload: payloadA, tag: 0, prompt: false, ttl: 60)
-            }
-        }.store(in: &publishers)
+        try await self.relayA.subscribe(topic: randomTopic)
+        try await self.relayA.publish(topic: randomTopic, payload: payloadA, tag: 0, prompt: false, ttl: 60)
+
+        try await self.relayB.subscribe(topic: randomTopic)
 
-        relayB.socketConnectionStatusPublisher.sink { [weak self] status in
-            guard let self = self else { return }
-            guard status == .connected else { return }
-            Task(priority: .high) {
-                try await self.relayB.subscribe(topic: randomTopic)
-            }
-        }.store(in: &publishers)
 
         wait(for: [expectationA, expectationB], timeout: InputConfig.defaultTimeout)