Merge pull request #897 from WalletConnect/develop

1.6.7
WalletConnect · Jun 6, 2023 · 2a6adfc · 2a6adfc
2 parents 49b2975 + 58639ef
commit 2a6adfc
Show file tree

Hide file tree

Showing 29 changed files with 238 additions and 246 deletions.
diff --git a/.github/actions/run_tests_without_building/action.yml b/.github/actions/run_tests_without_building/action.yml
@@ -52,13 +52,22 @@ runs:
       shell: bash
       run: make smoke_tests RELAY_HOST=${{ inputs.relay-endpoint }} PROJECT_ID=${{ inputs.project-id }}
 
+    - name: Slack Notification for Failure
+      if: failure() && matrix.type == 'smoke-tests'
+      uses: 8398a7/action-slack@v3
+      with:
+        status: ${{ job.status }}
+        text: The smoke tests failed in the CI pipeline. Check the logs for more details.
+      env:
+        SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+
     - name: Publish Test Report
       uses: mikepenz/action-junit-report@v3
       if: success() || failure()
       with:
           check_name: ${{ inputs.type }} junit report
           report_paths: 'test_results/report.junit'
-       
+
     - name: Zip test artifacts
       if: always()
       shell: bash
@@ -70,4 +79,4 @@ runs:
       with:
         name: ${{ inputs.type }} test_results
         path: ./artifacts.zip
-        if-no-files-found: warn
+        if-no-files-found: warn
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -3,8 +3,6 @@
 # it takes pull request name
 # and automatically commit it as a package version
 # pull request name should always be a version of a new release
-# 
-# After version bump publishing Cocoapods release
 
 name: cd
 
@@ -13,29 +11,21 @@ on:
     branches: [ main ]
 env:
   PACKAGE_VERSION: ${{ github.event.pull_request.title }}
-
 jobs:
   set-user-agent:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
         with:
-          fetch-depth: 0
           token: ${{ secrets.GH_TOKEN }}
 
       - name: Set User Agent
         shell: bash
         run: ./.github/scripts/set-user-agent.sh
-
       - uses: stefanzweifel/git-auto-commit-action@v4
         with:
           commit_message: Set User Agent
-          tagging_message: ${{ github.event.pull_request.title }}
-          skip_checkout: true
 
-      - name: Publish to CocoaPod register
-        env:
-          COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
+      - name: Lint CocoaPods
         run: |
-          pod trunk push WalletConnectSwiftV2.podspec --verbose --allow-warnings
-
+          pod lib lint WalletConnectSwiftV2.podspec --verbose --allow-warnings
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,15 +1,27 @@
 name: ci
 
 on:
-  pull_request:
-    branches: [ main, develop ]
+  pull_request_target:
+    branches:
+      - develop
+      - main
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.event.pull_request.number || github.ref_name }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
+  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request_target' && github.event.pull_request.number || github.ref_name }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request_target' }}
+    
 jobs:
+  authorize:
+    environment:
+      ${{ (github.event_name == 'pull_request_target' &&
+      github.event.pull_request.head.repo.full_name != github.repository) &&
+      'external' || 'internal' }}
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo ✓
+
   prepare:
+    needs: authorize
     runs-on: macos-12
     steps:
       - uses: actions/checkout@v3
@@ -60,12 +72,6 @@ jobs:
       shell: bash
       run: make relay_tests RELAY_HOST=relay.walletconnect.com PROJECT_ID=${{ secrets.PROJECT_ID }}
 
-    # Smoke tests
-    - name: Run smoke tests
-      if: matrix.type == 'smoke-tests'
-      shell: bash
-      run: make smoke_tests RELAY_HOST=relay.walletconnect.com PROJECT_ID=${{ secrets.PROJECT_ID }}
-
     - name: Publish Test Report
       uses: mikepenz/action-junit-report@v3
       if: success() || failure()

diff --git a/.github/workflows/ci_v2.yml b/.github/workflows/ci_v2.yml
diff --git a/.github/workflows/cocoapods.yml b/.github/workflows/cocoapods.yml
@@ -0,0 +1,18 @@
+name: cocoapods
+
+on:
+  release:
+    types: [ published ]
+jobs:
+  set-user-agent:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.GH_TOKEN }}
+
+      - name: Publish to CocoaPod register
+        env:
+          COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
+        run: |
+          pod trunk push WalletConnectSwiftV2.podspec --verbose --allow-warnings
diff --git a/.github/workflows/intake.yml b/.github/workflows/intake.yml
diff --git a/Example/DApp/Sign/Connect/ConnectViewController.swift b/Example/DApp/Sign/Connect/ConnectViewController.swift
@@ -63,7 +63,7 @@ class ConnectViewController: UIViewController, UITableViewDataSource, UITableVie
     }
 
     @objc func connectWithExampleWallet() {
-        let url = URL(string: "https://walletconnect.com/wc?uri=\(uri.absoluteString)")!
+        let url = URL(string: "walletapp://wc?uri=\(uri.deeplinkUri)")!
         DispatchQueue.main.async {
             UIApplication.shared.open(url, options: [:]) { [weak self] _ in
                 self?.dismiss(animated: true, completion: nil)

diff --git a/Example/ExampleApp.xcodeproj/project.pbxproj b/Example/ExampleApp.xcodeproj/project.pbxproj
@@ -192,6 +192,7 @@
 		A5E22D222840C8D300E36487 /* WalletEngine.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E22D212840C8D300E36487 /* WalletEngine.swift */; };
 		A5E22D242840C8DB00E36487 /* SafariEngine.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E22D232840C8DB00E36487 /* SafariEngine.swift */; };
 		A5E22D2C2840EAC300E36487 /* XCUIElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E22D2B2840EAC300E36487 /* XCUIElement.swift */; };
+		A74D32BA2A1E25AD00CB8536 /* QueryParameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = A74D32B92A1E25AD00CB8536 /* QueryParameters.swift */; };
 		C5133A78294125CC00A8314C /* Web3 in Frameworks */ = {isa = PBXBuildFile; productRef = C5133A77294125CC00A8314C /* Web3 */; };
 		C53AA4362941251C008EA57C /* DefaultSignerFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = A59CF4F5292F83D50031A42F /* DefaultSignerFactory.swift */; };
 		C55D347F295DD7140004314A /* AuthRequestModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = C55D347A295DD7140004314A /* AuthRequestModule.swift */; };
@@ -508,6 +509,7 @@
 		A5E22D232840C8DB00E36487 /* SafariEngine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SafariEngine.swift; sourceTree = "<group>"; };
 		A5E22D2B2840EAC300E36487 /* XCUIElement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XCUIElement.swift; sourceTree = "<group>"; };
 		A5F48A0528E43D3F0034CBFB /* Configuration.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Configuration.xcconfig; path = ../Configuration.xcconfig; sourceTree = "<group>"; };
+		A74D32B92A1E25AD00CB8536 /* QueryParameters.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QueryParameters.swift; sourceTree = "<group>"; };
 		C55D347A295DD7140004314A /* AuthRequestModule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthRequestModule.swift; sourceTree = "<group>"; };
 		C55D347B295DD7140004314A /* AuthRequestPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthRequestPresenter.swift; sourceTree = "<group>"; };
 		C55D347C295DD7140004314A /* AuthRequestRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthRequestRouter.swift; sourceTree = "<group>"; };
@@ -1616,6 +1618,7 @@
 			children = (
 				C56EE2A2293F6BAF004840D1 /* UIPasteboardWrapper.swift */,
 				C55D349A2965BC2F0004314A /* TagsView.swift */,
+				A74D32B92A1E25AD00CB8536 /* QueryParameters.swift */,
 			);
 			path = Helpers;
 			sourceTree = "<group>";
@@ -2221,6 +2224,7 @@
 				C56EE276293F56D7004840D1 /* UIViewController.swift in Sources */,
 				C56EE275293F56D7004840D1 /* InputConfig.swift in Sources */,
 				C55D3493295DFA750004314A /* WelcomeModule.swift in Sources */,
+				A74D32BA2A1E25AD00CB8536 /* QueryParameters.swift in Sources */,
 				C56EE270293F56D7004840D1 /* String.swift in Sources */,
 				C56EE279293F56D7004840D1 /* Color.swift in Sources */,
 				847BD1E6298A806800076C90 /* NotificationsRouter.swift in Sources */,

diff --git a/Example/IntegrationTests/Pairing/PairingTests.swift b/Example/IntegrationTests/Pairing/PairingTests.swift
@@ -72,7 +72,10 @@ final class PairingTests: XCTestCase {
         let (pairingClient, networkingInteractor, keychain, keyValueStorage) = makeClientDependencies(prefix: prefix)
         let pushLogger = ConsoleLogger(suffix: prefix + " [Push]", loggingLevel: .debug)
         walletPairingClient = pairingClient
-        let echoClient = EchoClientFactory.create(projectId: "", clientId: "", echoHost: "echo.walletconnect.com", environment: .sandbox)
+        let echoClient = EchoClientFactory.create(projectId: "",
+                                                  echoHost: "echo.walletconnect.com",
+                                                  keychainStorage: keychain,
+                                                  environment: .sandbox)
         let keyserverURL = URL(string: "https://keys.walletconnect.com")!
         walletPushClient = WalletPushClientFactory.create(keyserverURL: keyserverURL,
                                                           logger: pushLogger,

diff --git a/Example/IntegrationTests/Push/PushTests.swift b/Example/IntegrationTests/Push/PushTests.swift
@@ -74,7 +74,10 @@ final class PushTests: XCTestCase {
         let (pairingClient, networkingInteractor, keychain, keyValueStorage) = makeClientDependencies(prefix: prefix)
         let pushLogger = ConsoleLogger(suffix: prefix + " [Push]", loggingLevel: .debug)
         walletPairingClient = pairingClient
-        let echoClient = EchoClientFactory.create(projectId: "", clientId: "", echoHost: "echo.walletconnect.com", environment: .sandbox)
+        let echoClient = EchoClientFactory.create(projectId: "",
+                                                  echoHost: "echo.walletconnect.com",
+                                                  keychainStorage: keychain,
+                                                  environment: .sandbox)
         let keyserverURL = URL(string: "https://keys.walletconnect.com")!
         walletPushClient = WalletPushClientFactory.create(keyserverURL: keyserverURL,
                                                           logger: pushLogger,
@@ -167,6 +170,7 @@ final class PushTests: XCTestCase {
                 return
             }
             subscriptionTopic = pushSubscription.topic
+            sleep(1)
             Task(priority: .userInitiated) { try! await walletPushClient.deleteSubscription(topic: pushSubscription.topic)}
         }.store(in: &publishers)