Merge pull request #904 from WalletConnect/develop

1.6.8

.github/actions/build/action.yml

@@ -13,15 +13,14 @@ runs:
   using: "composite"
   steps: 
     - uses: actions/checkout@v3
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
 
     - uses: actions/cache@v3
       with:
         path: |
           **/SourcePackagesCache
-          DerivedDataCache
         key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
-        restore-keys: |
-          ${{ runner.os }}-spm-
 
     - name: Build for testing
       shell: bash

.github/actions/run_tests_without_building/action.yml

@@ -11,6 +11,9 @@ inputs:
   project-id:
     description: 'WalletConnect project id'
     required: true
+  slack-webhook-url:
+    description: 'Smoke tests slack webhoook url'
+    required: true
 
 runs:
   using: "composite"
@@ -53,13 +56,13 @@ runs:
       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'
+      if: failure() && (inputs.type == 'smoke-tests' || inputs.type == 'relay-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 }}
+        SLACK_WEBHOOK_URL: ${{ inputs.slack-webhook-url }}
 
     - name: Publish Test Report
       uses: mikepenz/action-junit-report@v3

.github/workflows/build_artifacts.yml

@@ -25,10 +25,7 @@ jobs:
       with:
         path: |
           **/SourcePackagesCache
-          DerivedDataCache
         key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
-        restore-keys: |
-          ${{ runner.os }}-spm-
 
     - name: Build for testing on workflow_dispatch
       if: ${{ github.event_name == 'workflow_dispatch' }}

.github/workflows/cd.yml

@@ -28,4 +28,4 @@ jobs:
 
       - name: Lint CocoaPods
         run: |
-          pod lib lint WalletConnectSwiftV2.podspec --verbose --allow-warnings
+          pod lib lint --verbose --no-clean --quick --allow-warnings --platforms=ios WalletConnectSwiftV2.podspec

.github/workflows/ci.yml

@@ -25,6 +25,8 @@ jobs:
     runs-on: macos-12
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - uses: ./.github/actions/build
         with:
@@ -41,6 +43,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
 
     - uses: actions/cache/restore@v3
       with:

.gitignore

@@ -10,7 +10,6 @@ xcuserdata/
 # Swift Package Manager
 Packages/
 Package.pins
-Package.resolved
 /*.xcodeproj
 
 # Fastlane

.swiftpm/xcode/xcshareddata/xcschemes/WalletConnectHistory.xcscheme

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1430"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "WalletConnectHistory"
+               BuildableName = "WalletConnectHistory"
+               BlueprintName = "WalletConnectHistory"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "WalletConnectHistory"
+            BuildableName = "WalletConnectHistory"
+            BlueprintName = "WalletConnectHistory"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Example/DApp/SceneDelegate.swift

@@ -2,6 +2,7 @@ import UIKit
 import Auth
 import WalletConnectRelay
 import WalletConnectNetworking
+import Web3Modal
 
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
@@ -13,6 +14,15 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
         Networking.configure(projectId: InputConfig.projectId, socketFactory: DefaultSocketFactory())
         Auth.configure(crypto: DefaultCryptoProvider())
+
+        let metadata = AppMetadata(
+            name: "Swift Dapp",
+            description: "WalletConnect DApp sample",
+            url: "wallet.connect",
+            icons: ["https://avatars.githubusercontent.com/u/37784886"]
+        )
+
+        Web3Modal.configure(projectId: InputConfig.projectId, metadata: metadata)
 
         setupWindow(scene: scene)
     }

Example/DApp/Sign/Connect/ConnectViewController.swift

@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
-import WalletConnectSign
-import WalletConnectPairing
+import Web3Modal
 
 class ConnectViewController: UIViewController, UITableViewDataSource, UITableViewDelegate {
     let uri: WalletConnectURI

Example/DApp/Sign/SelectChain/SelectChainViewController.swift

@@ -1,6 +1,5 @@
 import Foundation
-import WalletConnectSign
-import WalletConnectPairing
+import Web3Modal
 import UIKit
 import Combine
 
@@ -70,16 +69,18 @@ class SelectChainViewController: UIViewController, UITableViewDataSource {
         let sessionProperties: [String: String] = [
             "caip154-mandatory": "true"
         ]
+
         Task {
-            let uri = try await Pair.instance.create()
-            try await Sign.instance.connect(
+            Web3Modal.set(sessionParams: .init(
                 requiredNamespaces: namespaces,
                 optionalNamespaces: optionalNamespaces,
-                sessionProperties: sessionProperties,
-                topic: uri.topic
-            )
-            showConnectScreen(uri: uri)
+                sessionProperties: sessionProperties
+            ))
+
+            let uri = try await Web3Modal.instance.connect(topic: nil)
         }
+
+        Web3Modal.present(from: self)
     }
 
     @objc

Example/ExampleApp.xcodeproj/IntegrationTests.xctestplan

@@ -30,7 +30,8 @@
     {
       "skippedTests" : [
         "AuthTests\/testEIP1271RespondSuccess()",
-        "ChatTests"
+        "ChatTests",
+        "ENSResolverTests"
       ],
       "target" : {
         "containerPath" : "container:ExampleApp.xcodeproj",