Merge pull request #662 from nova-wallet/develop

6.2.0 Wallet Connect
novasamatech · May 15, 2023 · d090f9d · d090f9d
2 parents 5de1fe5 + 1a1cd01
commit d090f9d
Show file tree

Hide file tree

Showing 241 changed files with 9,658 additions and 2,318 deletions.
diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml
@@ -102,6 +102,7 @@ jobs:
           ACALA_TEST_AUTH_TOKEN: ${{ secrets.ACALA_TEST_AUTH_TOKEN }}
           MOONBEAM_API_KEY: ${{ secrets.MOONBEAM_API_KEY }}
           MOONBEAM_TEST_API_KEY: ${{ secrets.MOONBEAM_TEST_API_KEY }}
+          WC_PROJECT_ID: ${{ secrets.WC_PROJECT_ID }}
         run: xcodebuild archive -archivePath ./AdHoc.xcarchive -scheme novawallet -workspace novawallet.xcworkspace -configuration ${{ github.event.inputs.config }}
 
       - name: Export Staging archive

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -55,6 +55,7 @@ jobs:
           ACALA_TEST_AUTH_TOKEN: ${{ secrets.ACALA_TEST_AUTH_TOKEN }}
           MOONBEAM_API_KEY: ${{ secrets.MOONBEAM_API_KEY }}
           MOONBEAM_TEST_API_KEY: ${{ secrets.MOONBEAM_TEST_API_KEY }}
+          WC_PROJECT_ID: ${{ secrets.WC_PROJECT_ID }}
         run: |
           # xcrun xctrace returns via stderr, not the expected stdout (see https://developer.apple.com/forums/thread/663959)
           # device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}'`

diff --git a/.github/workflows/push_develop.yml b/.github/workflows/push_develop.yml
@@ -78,6 +78,7 @@ jobs:
           ACALA_TEST_AUTH_TOKEN: ${{ secrets.ACALA_TEST_AUTH_TOKEN }}
           MOONBEAM_API_KEY: ${{ secrets.MOONBEAM_API_KEY }}
           MOONBEAM_TEST_API_KEY: ${{ secrets.MOONBEAM_TEST_API_KEY }}
+          WC_PROJECT_ID: ${{ secrets.WC_PROJECT_ID }}
         run: xcodebuild archive -archivePath ./AdHoc.xcarchive -scheme novawallet -workspace novawallet.xcworkspace -configuration Dev
 
       - name: Export archive

diff --git a/Podfile b/Podfile
@@ -23,7 +23,9 @@ abstract_target 'novawalletAll' do
   pod 'Starscream', :git => 'https://github.com/ERussel/Starscream.git', :tag => '4.0.5'
   pod 'CDMarkdownKit', :git => 'https://github.com/nova-wallet/CDMarkdownKit.git', :tag => '2.5.2'
   pod 'web3swift', :git => 'https://github.com/web3swift-team/web3swift.git', :tag => '3.0.6'
-
+  pod 'WalletConnectSwiftV2', :git => 'https://github.com/WalletConnect/WalletConnectSwiftV2.git', :tag => '1.5.14'
+  pod 'EthereumSignTypedDataUtil', :git => 'https://github.com/ERussel/EthereumSignTypedDataUtil.git', :tag => '0.1.3'
+
   target 'novawalletTests' do
     inherit! :search_paths
 

diff --git a/Podfile.lock b/Podfile.lock
@@ -15,6 +15,9 @@ PODS:
   - Cuckoo (1.7.1):
     - Cuckoo/Swift (= 1.7.1)
   - Cuckoo/Swift (1.7.1)
+  - EthereumSignTypedDataUtil (0.1.2):
+    - BigInt (~> 5.0)
+    - CryptoSwift (~> 1.4)
   - FireMock (3.1)
   - IrohaCrypto/BIP39 (0.9.0):
     - IrohaCrypto/Common
@@ -119,6 +122,25 @@ PODS:
     - BigInt (~> 5.0)
   - SwiftyBeaver (1.9.3)
   - TweetNacl (1.0.2)
+  - WalletConnectSwiftV2 (1.5.14):
+    - WalletConnectSwiftV2/WalletConnect (= 1.5.14)
+  - WalletConnectSwiftV2/Commons (1.5.14)
+  - WalletConnectSwiftV2/JSONRPC (1.5.14):
+    - WalletConnectSwiftV2/Commons
+  - WalletConnectSwiftV2/WalletConnect (1.5.14):
+    - WalletConnectSwiftV2/WalletConnectPairing
+  - WalletConnectSwiftV2/WalletConnectJWT (1.5.14):
+    - WalletConnectSwiftV2/WalletConnectKMS
+  - WalletConnectSwiftV2/WalletConnectKMS (1.5.14):
+    - WalletConnectSwiftV2/WalletConnectUtils
+  - WalletConnectSwiftV2/WalletConnectNetworking (1.5.14):
+    - WalletConnectSwiftV2/WalletConnectRelay
+  - WalletConnectSwiftV2/WalletConnectPairing (1.5.14):
+    - WalletConnectSwiftV2/WalletConnectNetworking
+  - WalletConnectSwiftV2/WalletConnectRelay (1.5.14):
+    - WalletConnectSwiftV2/WalletConnectJWT
+  - WalletConnectSwiftV2/WalletConnectUtils (1.5.14):
+    - WalletConnectSwiftV2/JSONRPC
   - Web3Core (3.0.6):
     - BigInt (~> 5.2.0)
     - CryptoSwift (~> 1.5.1)
@@ -132,6 +154,7 @@ DEPENDENCIES:
   - CDMarkdownKit (from `https://github.com/nova-wallet/CDMarkdownKit.git`, tag `2.5.2`)
   - CommonWallet/Core (from `https://github.com/ERussel/Capital-iOS.git`, tag `1.16.0`)
   - Cuckoo
+  - EthereumSignTypedDataUtil (from `https://github.com/ERussel/EthereumSignTypedDataUtil.git`, tag `0.1.3`)
   - FireMock
   - Kingfisher
   - R.swift
@@ -149,6 +172,7 @@ DEPENDENCIES:
   - SwiftLint
   - SwiftRLP (from `https://github.com/ERussel/SwiftRLP.git`)
   - SwiftyBeaver
+  - WalletConnectSwiftV2 (from `https://github.com/WalletConnect/WalletConnectSwiftV2.git`, tag `1.5.14`)
   - web3swift (from `https://github.com/web3swift-team/web3swift.git`, tag `3.0.6`)
 
 SPEC REPOS:
@@ -185,6 +209,9 @@ EXTERNAL SOURCES:
   CommonWallet:
     :git: https://github.com/ERussel/Capital-iOS.git
     :tag: 1.16.0
+  EthereumSignTypedDataUtil:
+    :git: https://github.com/ERussel/EthereumSignTypedDataUtil.git
+    :tag: 0.1.3
   SoraUI:
     :git: https://github.com/ERussel/UIkit-iOS.git
     :tag: 1.11.1
@@ -199,6 +226,9 @@ EXTERNAL SOURCES:
     :tag: 3.0.0
   SwiftRLP:
     :git: https://github.com/ERussel/SwiftRLP.git
+  WalletConnectSwiftV2:
+    :git: https://github.com/WalletConnect/WalletConnectSwiftV2.git
+    :tag: 1.5.14
   web3swift:
     :git: https://github.com/web3swift-team/web3swift.git
     :tag: 3.0.6
@@ -210,6 +240,9 @@ CHECKOUT OPTIONS:
   CommonWallet:
     :git: https://github.com/ERussel/Capital-iOS.git
     :tag: 1.16.0
+  EthereumSignTypedDataUtil:
+    :git: https://github.com/ERussel/EthereumSignTypedDataUtil.git
+    :tag: 0.1.3
   SoraUI:
     :git: https://github.com/ERussel/UIkit-iOS.git
     :tag: 1.11.1
@@ -225,6 +258,9 @@ CHECKOUT OPTIONS:
   SwiftRLP:
     :commit: 809e68a002d19ee3d8bbeb72577224b7513e7e8e
     :git: https://github.com/ERussel/SwiftRLP.git
+  WalletConnectSwiftV2:
+    :git: https://github.com/WalletConnect/WalletConnectSwiftV2.git
+    :tag: 1.5.14
   web3swift:
     :git: https://github.com/web3swift-team/web3swift.git
     :tag: 3.0.6
@@ -236,6 +272,7 @@ SPEC CHECKSUMS:
   CommonWallet: 59fdbf5511d6fcdc38496db4baf425dd0cf29274
   CryptoSwift: c4f2debceb38bf44c80659afe009f71e23e4a082
   Cuckoo: 9e258d68137c411df47c6390f72901d5276b4f03
+  EthereumSignTypedDataUtil: ae4e33b21e51ee046a86a65b02843090b8bbd3f9
   FireMock: 3eed872059c12f94855413347da83b9d6d1a6fac
   IrohaCrypto: 6be75a4268cd1f5cec4231c6d3f95cb03f723fd3
   keccak.c: 859583afdaccb4e4fcc0f0096064d101580313f4
@@ -259,10 +296,11 @@ SPEC CHECKSUMS:
   SwiftRLP: f58417bfceecd45394fc619ccad14cf16e4ae6c1
   SwiftyBeaver: 2e8acd6fc90c6d0a27055867a290794926d57c02
   TweetNacl: 3abf4d1d2082b0114e7a67410e300892448951e6
+  WalletConnectSwiftV2: ff5cb17196b583a72c8ab826dd236ab3aa7b2c39
   Web3Core: 4a62a109cac056915d2d5023606438c89e229a1e
   web3swift: 944e76579b953a7b7e81dbb351c6dc0ed1defe63
   xxHash-Swift: 30bd6a7507b3b7348a277c49b1cb6346c2905ec7
 
-PODFILE CHECKSUM: d2daa233583206c3f8d6339682d46159dc00e408
+PODFILE CHECKSUM: 17dc836b964fd661520c3c70f3d2c1d46620dd66
 
 COCOAPODS: 1.11.3