Merge branch 'develop' of github.com:WalletConnect/WalletConnectSwift…

…V2 into refactor-sign-client-tests # Conflicts: # Example/ExampleApp.xcodeproj/project.pbxproj
WalletConnect · Nov 20, 2023 · 1f568af · 1f568af
2 parents 486a348 + 3628405
commit 1f568af
Show file tree

Hide file tree

Showing 145 changed files with 2,761 additions and 1,652 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,7 +1,7 @@
 name: ci
 
 on:
-  pull_request_target:
+  pull_request:
     branches:
       - develop
       - main
@@ -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=notify.walletconnect.com EXPLORER_HOST=explorer-api.walletconnect.com GM_DAPP_PROJECT_ID=${{ secrets.GM_DAPP_PROJECT_ID }} GM_DAPP_PROJECT_SECRET=${{ secrets.GM_DAPP_PROJECT_SECRET }} GM_DAPP_HOST=gm.walletconnect.com 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 EXPLORER_HOST=explorer-api.walletconnect.com GM_DAPP_PROJECT_ID=${{ secrets.GM_DAPP_PROJECT_ID }} GM_DAPP_PROJECT_SECRET=${{ secrets.GM_DAPP_PROJECT_SECRET }} GM_DAPP_HOST=wc-notify-swift-integration-tests-prod.pages.dev JS_CLIENT_API_HOST=test-automation-api.walletconnect.com
 
     # Relay Integration tests
     - name: Run Relay integration tests

diff --git a/.github/workflows/cocoapods.yml b/.github/workflows/cocoapods.yml
@@ -5,7 +5,8 @@ on:
     types: [ published ]
 jobs:
   set-user-agent:
-    runs-on: macos-latest
+    runs-on: 
+      group: apple-silicon
     steps:
       - uses: actions/checkout@v2
         with:

diff --git a/Example/DApp/ApplicationLayer/Application.swift b/Example/DApp/ApplicationLayer/Application.swift
@@ -0,0 +1,8 @@
+import Foundation
+
+import WalletConnectUtils
+
+final class Application {
+    var uri: WalletConnectURI?
+    var requestSent = false
+}
diff --git a/Example/DApp/Assets.xcassets/auth.imageset/Contents.json b/Example/DApp/Assets.xcassets/auth.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "auth.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/Example/DApp/Assets.xcassets/auth.imageset/auth.pdf b/Example/DApp/Assets.xcassets/auth.imageset/auth.pdf
diff --git a/Example/DApp/Assets.xcassets/copy.imageset/Contents.json b/Example/DApp/Assets.xcassets/copy.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "copy.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Example/DApp/Assets.xcassets/copy.imageset/copy.pdf b/Example/DApp/Assets.xcassets/copy.imageset/copy.pdf
diff --git a/Example/DApp/Assets.xcassets/ethereum.imageset/Contents.json b/Example/DApp/Assets.xcassets/ethereum.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "eth.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Example/DApp/Assets.xcassets/ethereum.imageset/eth.pdf b/Example/DApp/Assets.xcassets/ethereum.imageset/eth.pdf
diff --git a/Example/DApp/Assets.xcassets/exit.imageset/Contents.json b/Example/DApp/Assets.xcassets/exit.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "exit.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Example/DApp/Assets.xcassets/exit.imageset/exit.pdf b/Example/DApp/Assets.xcassets/exit.imageset/exit.pdf
diff --git a/Example/DApp/Assets.xcassets/pen.imageset/Contents.json b/Example/DApp/Assets.xcassets/pen.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "pen.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/Example/DApp/Assets.xcassets/pen.imageset/pen.pdf b/Example/DApp/Assets.xcassets/pen.imageset/pen.pdf
diff --git a/Example/DApp/Assets.xcassets/polygon.imageset/Contents.json b/Example/DApp/Assets.xcassets/polygon.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "matic.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Example/DApp/Assets.xcassets/polygon.imageset/matic.pdf b/Example/DApp/Assets.xcassets/polygon.imageset/matic.pdf
diff --git a/Example/DApp/Assets.xcassets/profile.imageset/Contents.json b/Example/DApp/Assets.xcassets/profile.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "profile.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Example/DApp/Assets.xcassets/profile.imageset/profile.pdf b/Example/DApp/Assets.xcassets/profile.imageset/profile.pdf
diff --git a/Example/DApp/Assets.xcassets/solana.imageset/Contents.json b/Example/DApp/Assets.xcassets/solana.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "sol.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Example/DApp/Assets.xcassets/solana.imageset/sol.pdf b/Example/DApp/Assets.xcassets/solana.imageset/sol.pdf
diff --git a/Example/DApp/Auth/AuthCoordinator.swift b/Example/DApp/Auth/AuthCoordinator.swift
diff --git a/Example/DApp/Auth/AuthView.swift b/Example/DApp/Auth/AuthView.swift
diff --git a/Example/DApp/Auth/AuthViewModel.swift b/Example/DApp/Auth/AuthViewModel.swift
diff --git a/Example/DApp/Info.plist b/Example/DApp/Info.plist
@@ -9,7 +9,7 @@
 			<string>Editor</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>dapp</string>
+				<string>wcdapp</string>
 			</array>
 		</dict>
 	</array>

diff --git a/Example/DApp/Modules/Auth/AuthInteractor.swift b/Example/DApp/Modules/Auth/AuthInteractor.swift
@@ -0,0 +1,3 @@
+import Foundation
+
+final class AuthInteractor {}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import Foundation

		final class AuthInteractor {}