Merge branch 'develop' into native-socket

# Conflicts: # Example/ExampleApp.xcodeproj/project.pbxproj # Example/WalletApp/ApplicationLayer/ConfigurationService.swift
WalletConnect · Oct 23, 2023 · 1ab4dbe · 1ab4dbe
2 parents cf8168e + 9d89baf
commit 1ab4dbe
Show file tree

Hide file tree

Showing 201 changed files with 4,066 additions and 1,321 deletions.
diff --git a/.github/actions/run_tests_without_building/action.yml b/.github/actions/run_tests_without_building/action.yml
@@ -24,6 +24,10 @@ inputs:
   gm-dapp-project-secret:
     description: 'GM DApp Project Secret'
     required: false
+  gm-dapp-host:
+    description: 'GM DApp Host'
+    required: false
+    default: 'gm.walletconnect.com'
   js-client-api-host:
     description: 'JS Client Api Host'
     required: false
@@ -55,7 +59,7 @@ runs:
     - name: Run integration tests
       if: inputs.type == 'integration-tests'
       shell: bash
-      run: make integration_tests RELAY_HOST=${{ inputs.relay-endpoint }} PROJECT_ID=${{ inputs.project-id }} CAST_HOST=${{ inputs.notify-endpoint }} GM_DAPP_PROJECT_ID=${{ inputs.gm-dapp-project-id }} GM_DAPP_PROJECT_SECRET=${{ inputs.gm-dapp-project-secret }} JS_CLIENT_API_HOST=${{ inputs.js-client-api-host }}
+      run: make integration_tests RELAY_HOST=${{ inputs.relay-endpoint }} PROJECT_ID=${{ inputs.project-id }} CAST_HOST=${{ inputs.notify-endpoint }} GM_DAPP_PROJECT_ID=${{ inputs.gm-dapp-project-id }} GM_DAPP_PROJECT_SECRET=${{ inputs.gm-dapp-project-secret }} GM_DAPP_HOST=${{ inputs.gm-dapp-host }} JS_CLIENT_API_HOST=${{ inputs.js-client-api-host }}
 
     # Relay Integration tests
     - name: Run Relay integration tests
@@ -73,7 +77,7 @@ runs:
     - name: Run notify tests
       if: inputs.type == 'notify-tests'
       shell: bash
-      run: make notify_tests RELAY_HOST=${{ inputs.relay-endpoint }} PROJECT_ID=${{ inputs.project-id }} CAST_HOST=${{ inputs.notify-endpoint }} GM_DAPP_PROJECT_ID=${{ inputs.gm-dapp-project-id }} GM_DAPP_PROJECT_SECRET=${{ inputs.gm-dapp-project-secret }}
+      run: make notify_tests RELAY_HOST=${{ inputs.relay-endpoint }} PROJECT_ID=${{ inputs.project-id }} CAST_HOST=${{ inputs.notify-endpoint }} GM_DAPP_PROJECT_ID=${{ inputs.gm-dapp-project-id }} GM_DAPP_PROJECT_SECRET=${{ inputs.gm-dapp-project-secret }} GM_DAPP_HOST=${{ inputs.gm-dapp-host }}
 
     - name: Run x-platform protocol tests
       if: inputs.type == 'x-platform-protocol-tests'

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -13,7 +13,8 @@ env:
   PACKAGE_VERSION: ${{ github.event.pull_request.title }}
 jobs:
   set-user-agent:
-    runs-on: macos-latest
+    runs-on: 
+      group: apple-silicon
     steps:
       - uses: actions/checkout@v2
         with:

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=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
+      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 }} GM_DAPP_HOST=gm.walletconnect.com 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
@@ -9,7 +9,8 @@ on:
 
 jobs:
   build:
-    runs-on: macos-12
+    runs-on: 
+      group: apple-silicon
 
     steps:
     - uses: actions/checkout@v3
@@ -35,4 +36,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 }} MIXPANEL_TOKEN=${{secrets.MIXPANEL_TOKEN}}
+        make release_wallet 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/Configuration.xcconfig b/Configuration.xcconfig
@@ -9,6 +9,9 @@ RELAY_HOST = relay.walletconnect.com
 // Uncomment next line and paste dapp's project secret to run all the notify tests
 // GM_DAPP_PROJECT_SECRET = GM_DAPP_PROJECT_SECRET
 
+// Uncomment next line and paste dapp's host to run all the notify tests
+// GM_DAPP_HOST = GM_DAPP_HOST
+
 // Uncomment next line and paste js client's api host to run x-platform tests
 // JS_CLIENT_API_HOST = JS_CLIENT_API_HOST
 

diff --git a/Example/ExampleApp.xcodeproj/IntegrationTests.xctestplan b/Example/ExampleApp.xcodeproj/IntegrationTests.xctestplan
@@ -15,6 +15,10 @@
         "key" : "RELAY_HOST",
         "value" : "$(RELAY_HOST)"
       },
+      {
+        "key" : "GM_DAPP_HOST",
+        "value" : "$(GM_DAPP_HOST)"
+      },
       {
         "key" : "JS_CLIENT_API_HOST",
         "value" : "$(JS_CLIENT_API_HOST)"
@@ -48,7 +52,10 @@
       "skippedTests" : [
         "AuthTests\/testEIP1271RespondSuccess()",
         "ChatTests",
-        "ENSResolverTests"
+        "ENSResolverTests",
+        "HistoryTests",
+        "SyncDerivationServiceTests",
+        "SyncTests"
       ],
       "target" : {
         "containerPath" : "container:ExampleApp.xcodeproj",