Merge branch 'develop' into present-request-on-repairing

# Conflicts: # Example/IntegrationTests/Pairing/PairingTests.swift # Example/IntegrationTests/Push/PushTests.swift
WalletConnect · Sep 4, 2023 · c8c2065 · c8c2065
2 parents c07e556 + fdbfd82
commit c8c2065
Show file tree

Hide file tree

Showing 205 changed files with 2,910 additions and 2,697 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -69,7 +69,7 @@ jobs:
     - name: Run integration tests
       if: matrix.type == 'integration-tests'
       shell: bash
-      run: make integration_tests RELAY_HOST=relay.walletconnect.com PROJECT_ID=${{ secrets.PROJECT_ID }} CAST_HOST=cast.walletconnect.com GM_DAPP_PROJECT_ID=${{ secrets.GM_DAPP_PROJECT_ID }} GM_DAPP_PROJECT_SECRET=${{ secrets.GM_DAPP_PROJECT_SECRET }} JS_CLIENT_API_HOST=test-automation-api.walletconnect.com
+      run: make integration_tests RELAY_HOST=relay.walletconnect.com PROJECT_ID=${{ secrets.PROJECT_ID }} CAST_HOST=notify.walletconnect.com GM_DAPP_PROJECT_ID=${{ secrets.GM_DAPP_PROJECT_ID }} GM_DAPP_PROJECT_SECRET=${{ secrets.GM_DAPP_PROJECT_SECRET }} JS_CLIENT_API_HOST=test-automation-api.walletconnect.com
 
     # Relay Integration tests
     - name: Run Relay integration tests

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -35,4 +35,4 @@ jobs:
         APPLE_KEY_CONTENT: ${{ secrets.APPLE_KEY_CONTENT }}
         WALLETAPP_SENTRY_DSN: ${{ secrets.WALLETAPP_SENTRY_DSN }}
       run: |
-        make release_all APPLE_ID=${{ secrets.APPLE_ID }} TOKEN=$(echo -n $GH_USER:$GH_TOKEN | base64) PROJECT_ID=${{ secrets.RELEASE_PROJECT_ID }} WALLETAPP_SENTRY_DSN=${{ secrets.WALLETAPP_SENTRY_DSN }}
+        make release_all APPLE_ID=${{ secrets.APPLE_ID }} TOKEN=$(echo -n $GH_USER:$GH_TOKEN | base64) PROJECT_ID=${{ secrets.RELEASE_PROJECT_ID }} WALLETAPP_SENTRY_DSN=${{ secrets.WALLETAPP_SENTRY_DSN }} MIXPANEL_TOKEN=${{secrets.MIXPANEL_TOKEN}}
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/NotifyTests.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/NotifyTests.xcscheme
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1430"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "NotifyTests"
+               BuildableName = "NotifyTests"
+               BlueprintName = "NotifyTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </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">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/...data/xcschemes/WalletConnectPush.xcscheme → ...ta/xcschemes/WalletConnectNotify.xcscheme b/...data/xcschemes/WalletConnectPush.xcscheme → ...ta/xcschemes/WalletConnectNotify.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1410"
-   version = "1.3">
+   LastUpgradeVersion = "1430"
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -14,24 +14,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "WalletConnectPush"
-               BuildableName = "WalletConnectPush"
-               BlueprintName = "WalletConnectPush"
-               ReferencedContainer = "container:..">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "NotifyTests"
-               BuildableName = "NotifyTests"
-               BlueprintName = "NotifyTests"
-               ReferencedContainer = "container:..">
+               BlueprintIdentifier = "WalletConnectNotify"
+               BuildableName = "WalletConnectNotify"
+               BlueprintName = "WalletConnectNotify"
+               ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -40,19 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "NotifyTests"
-               BuildableName = "NotifyTests"
-               BlueprintName = "NotifyTests"
-               ReferencedContainer = "container:..">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -74,10 +49,10 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "WalletConnectPush"
-            BuildableName = "WalletConnectPush"
-            BlueprintName = "WalletConnectPush"
-            ReferencedContainer = "container:..">
+            BlueprintIdentifier = "WalletConnectNotify"
+            BuildableName = "WalletConnectNotify"
+            BlueprintName = "WalletConnectNotify"
+            ReferencedContainer = "container:">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>

diff --git a/...data/xcschemes/WalletConnectEcho.xcscheme → ...data/xcschemes/WalletConnectPush.xcscheme b/...data/xcschemes/WalletConnectEcho.xcscheme → ...data/xcschemes/WalletConnectPush.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1410"
-   version = "1.3">
+   LastUpgradeVersion = "1430"
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -14,10 +14,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "WalletConnectEcho"
-               BuildableName = "WalletConnectEcho"
-               BlueprintName = "WalletConnectEcho"
-               ReferencedContainer = "container:..">
+               BlueprintIdentifier = "WalletConnectPush"
+               BuildableName = "WalletConnectPush"
+               BlueprintName = "WalletConnectPush"
+               ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -26,9 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -50,10 +49,10 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "WalletConnectEcho"
-            BuildableName = "WalletConnectEcho"
-            BlueprintName = "WalletConnectEcho"
-            ReferencedContainer = "container:..">
+            BlueprintIdentifier = "WalletConnectPush"
+            BuildableName = "WalletConnectPush"
+            BlueprintName = "WalletConnectPush"
+            ReferencedContainer = "container:">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>

diff --git a/Configuration.xcconfig b/Configuration.xcconfig
@@ -14,4 +14,6 @@ RELAY_HOST = relay.walletconnect.com
 
 // WALLETAPP_SENTRY_DSN = WALLETAPP_SENTRY_DSN
 
-CAST_HOST = cast.walletconnect.com
+// MIXPANEL_TOKEN = MIXPANEL_TOKEN
+
+CAST_HOST = notify.walletconnect.com
diff --git a/Example/DApp/Info.plist b/Example/DApp/Info.plist
@@ -2,6 +2,15 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>metamask</string>
+		<string>trust</string>
+		<string>safe</string>
+		<string>zerion</string>
+		<string>rainbow</string>
+		<string>spot</string>
+	</array>
 	<key>CFBundleVersion</key>
 	<string>7</string>
 	<key>CFBundleShortVersionString</key>

diff --git a/Example/DApp/Sign/Accounts/AccountsViewController.swift b/Example/DApp/Sign/Accounts/AccountsViewController.swift
@@ -1,6 +1,6 @@
 import UIKit
 import WalletConnectSign
-import WalletConnectPush
+import WalletConnectNotify
 import Combine
 
 struct AccountDetails {
@@ -14,7 +14,7 @@ final class AccountsViewController: UIViewController, UITableViewDataSource, UIT
     let session: Session
     var accountsDetails: [AccountDetails] = []
     var onDisconnect: (() -> Void)?
-    var pushSubscription: PushSubscription?
+    var notifySubscription: NotifySubscription?
 
     private var publishers = [AnyCancellable]()
     private let accountsView: AccountsView = {
@@ -54,21 +54,7 @@ final class AccountsViewController: UIViewController, UITableViewDataSource, UIT
             }
         }
     }
-
-    func proposePushSubscription() {
-        let account = session.namespaces.values.first!.accounts.first!
-
-        Task(priority: .high){ try! await Push.dapp.propose(account: account, topic: session.pairingTopic)}
-        Push.dapp.proposalResponsePublisher.sink { result in
-            switch result {
-            case .success(let subscription):
-                self.pushSubscription = subscription
-            case .failure(let error):
-                print(error)
-            }
-        }.store(in: &publishers)
-    }
-
+
     @objc
     private func disconnect() {
         Task {

diff --git a/Example/DApp/Sign/SignCoordinator.swift b/Example/DApp/Sign/SignCoordinator.swift
@@ -45,13 +45,6 @@ final class SignCoordinator {
                 presentResponse(for: response)
             }.store(in: &publishers)
 
-        Sign.instance.sessionSettlePublisher
-            .receive(on: DispatchQueue.main)
-            .sink { [unowned self] session in
-                let vc = showAccountsScreen(session)
-                vc.proposePushSubscription()
-            }.store(in: &publishers)
-
         if let session = Sign.instance.getSessions().first {
             _ = showAccountsScreen(session)
         } else {