Merge branch 'develop' into bugfix/IOS-8253_kaspa_84

tangem · Oct 16, 2024 · fe2c2c1 · fe2c2c1
2 parents 64f9d57 + 2622a9f
commit fe2c2c1
Show file tree

Hide file tree

Showing 18 changed files with 154 additions and 121 deletions.
diff --git a/Podfile b/Podfile
@@ -46,7 +46,6 @@ target 'Tangem' do
 
  # Pods for Tangem
  pod 'Moya'
- pod 'WalletConnectSwiftV2', :git => 'https://github.com/WalletConnect/WalletConnectSwiftV2', :tag => '1.18.7'
  pod 'Kingfisher', '~> 7.11.0'
 
  # Helpers
@@ -240,4 +239,4 @@ def add_spm_package_to_target(project, target_name, url, product_name, requireme
  end
 
  project.save
-end
+end
diff --git a/Podfile.lock b/Podfile.lock
@@ -162,46 +162,6 @@ PODS:
  - SwiftDate (7.0.0)
  - SwiftyJSON (5.0.1)
  - TangemSdk (3.10.0)
- - WalletConnectSwiftV2 (1.18.7):
- - WalletConnectSwiftV2/WalletConnect (= 1.18.7)
- - WalletConnectSwiftV2/Commons (1.18.7)
- - WalletConnectSwiftV2/HTTPClient (1.18.7)
- - WalletConnectSwiftV2/JSONRPC (1.18.7):
- - WalletConnectSwiftV2/Commons
- - WalletConnectSwiftV2/WalletConnect (1.18.7):
- - WalletConnectSwiftV2/WalletConnectAuth
- - WalletConnectSwiftV2/WalletConnectPush
- - WalletConnectSwiftV2/WalletConnectSign
- - WalletConnectSwiftV2/WalletConnectVerify
- - WalletConnectSwiftV2/WalletConnectAuth (1.18.7):
- - WalletConnectSwiftV2/WalletConnectPairing
- - WalletConnectSwiftV2/WalletConnectSigner
- - WalletConnectSwiftV2/WalletConnectVerify
- - WalletConnectSwiftV2/WalletConnectJWT (1.18.7):
- - WalletConnectSwiftV2/WalletConnectKMS
- - WalletConnectSwiftV2/WalletConnectKMS (1.18.7):
- - WalletConnectSwiftV2/WalletConnectUtils
- - WalletConnectSwiftV2/WalletConnectNetworking (1.18.7):
- - WalletConnectSwiftV2/HTTPClient
- - WalletConnectSwiftV2/WalletConnectRelay
- - WalletConnectSwiftV2/WalletConnectPairing (1.18.7):
- - WalletConnectSwiftV2/WalletConnectNetworking
- - WalletConnectSwiftV2/WalletConnectPush (1.18.7):
- - WalletConnectSwiftV2/WalletConnectJWT
- - WalletConnectSwiftV2/WalletConnectNetworking
- - WalletConnectSwiftV2/WalletConnectRelay (1.18.7):
- - WalletConnectSwiftV2/WalletConnectJWT
- - WalletConnectSwiftV2/WalletConnectSign (1.18.7):
- - WalletConnectSwiftV2/WalletConnectPairing
- - WalletConnectSwiftV2/WalletConnectSigner
- - WalletConnectSwiftV2/WalletConnectVerify
- - WalletConnectSwiftV2/WalletConnectSigner (1.18.7):
- - WalletConnectSwiftV2/WalletConnectNetworking
- - WalletConnectSwiftV2/WalletConnectUtils (1.18.7):
- - WalletConnectSwiftV2/JSONRPC
- - WalletConnectSwiftV2/WalletConnectVerify (1.18.7):
- - WalletConnectSwiftV2/WalletConnectNetworking
- - WalletConnectSwiftV2/WalletConnectUtils
 
 DEPENDENCIES:
  - AmplitudeSwift (= 1.6.2)
@@ -218,7 +178,6 @@ DEPENDENCIES:
  - Solana.Swift (from `https://github.com/tangem/Solana.Swift`, tag `1.2.0-tangem11`)
  - SwiftyJSON (from `https://github.com/tangem/SwiftyJSON.git`, tag `5.0.1-tangem1`)
  - TangemSdk (from `https://github.com/Tangem/tangem-sdk-ios.git`, tag `develop-313`)
- - WalletConnectSwiftV2 (from `https://github.com/WalletConnect/WalletConnectSwiftV2`, tag `1.18.7`)
 
 SPEC REPOS:
  trunk:
@@ -265,9 +224,6 @@ EXTERNAL SOURCES:
  TangemSdk:
  :git: https://github.com/Tangem/tangem-sdk-ios.git
  :tag: develop-313
- WalletConnectSwiftV2:
- :git: https://github.com/WalletConnect/WalletConnectSwiftV2
- :tag: 1.18.7
 
 CHECKOUT OPTIONS:
  BinanceChain:
@@ -285,9 +241,6 @@ CHECKOUT OPTIONS:
  TangemSdk:
  :git: https://github.com/Tangem/tangem-sdk-ios.git
  :tag: develop-313
- WalletConnectSwiftV2:
- :git: https://github.com/WalletConnect/WalletConnectSwiftV2
- :tag: 1.18.7
 
 SPEC CHECKSUMS:
  Alamofire: f36a35757af4587d8e4f4bfa223ad10be2422b8c
@@ -321,8 +274,7 @@ SPEC CHECKSUMS:
  SwiftDate: bbc26e26fc8c0c33fbee8c140c5e8a68293a148a
  SwiftyJSON: c0bd75b5969785b3d9ae41d5709fe75bc5de4002
  TangemSdk: 145675e87bf4720d13968510b19e03b5402ed028
- WalletConnectSwiftV2: 5ea47db4d86e39fc749b66a05a661af9e87b277d
 
-PODFILE CHECKSUM: 9eb8ddab260a5ed0182d1b2d3bb9486d9e7f171c
+PODFILE CHECKSUM: b73c95d2625485d99f65c2c7a213292dc108805b
 
 COCOAPODS: 1.15.2
diff --git a/Tangem/App/Services/WalletConnect/Utilities/WalletConnectMessageHandler.swift b/Tangem/App/Services/WalletConnect/Utilities/WalletConnectMessageHandler.swift
@@ -6,7 +6,7 @@
 // Copyright © 2023 Tangem AG. All rights reserved.
 //
 
-import WalletConnectSwiftV2
+import WalletConnectUtils
 
 protocol WalletConnectMessageHandler {
  var event: WalletConnectEvent { get }

diff --git a/Tangem/App/Services/WalletConnect/WalletConnectCryptoProvider.swift b/Tangem/App/Services/WalletConnect/WalletConnectCryptoProvider.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import CryptoSwift
-import WalletConnectSwiftV2
+import ReownWalletKit
 import TangemSdk
 
 struct WalletConnectCryptoProvider: CryptoProvider {

diff --git a/...ect/WalletConnectV2Service/Handlers/SignHandling/WalletConnectV2PersonalSignHandler.swift b/...ect/WalletConnectV2Service/Handlers/SignHandling/WalletConnectV2PersonalSignHandler.swift
@@ -9,8 +9,8 @@
 import Foundation
 import CryptoSwift
 import enum BlockchainSdk.Blockchain
-import struct WalletConnectSwiftV2.AnyCodable
-import enum WalletConnectSwiftV2.RPCResult
+import struct Commons.AnyCodable
+import enum JSONRPC.RPCResult
 
 struct WalletConnectV2PersonalSignHandler {
  private let message: String

diff --git a/...etConnect/WalletConnectV2Service/Handlers/SignHandling/WalletConnectV2SignTypedData.swift b/...etConnect/WalletConnectV2Service/Handlers/SignHandling/WalletConnectV2SignTypedData.swift
@@ -8,8 +8,8 @@
 
 import Foundation
 import enum BlockchainSdk.Blockchain
-import struct WalletConnectSwiftV2.AnyCodable
-import enum WalletConnectSwiftV2.RPCResult
+import struct Commons.AnyCodable
+import enum JSONRPC.RPCResult
 
 struct WalletConnectV2SignTypedDataHandler {
  private let message: String

diff --git a/...ConnectV2Service/Handlers/TransactionHandling/WalletConnectV2SendTransactionHandler.swift b/...ConnectV2Service/Handlers/TransactionHandling/WalletConnectV2SendTransactionHandler.swift
@@ -8,8 +8,8 @@
 
 import Foundation
 import BlockchainSdk
-import struct WalletConnectSwiftV2.AnyCodable
-import enum WalletConnectSwiftV2.RPCResult
+import struct Commons.AnyCodable
+import enum JSONRPC.RPCResult
 
 class WalletConnectV2SendTransactionHandler {
  private let wcTransaction: WalletConnectEthTransaction

diff --git a/...ConnectV2Service/Handlers/TransactionHandling/WalletConnectV2SignTransactionHandler.swift b/...ConnectV2Service/Handlers/TransactionHandling/WalletConnectV2SignTransactionHandler.swift
@@ -8,8 +8,8 @@
 
 import Foundation
 import BlockchainSdk
-import struct WalletConnectSwiftV2.AnyCodable
-import enum WalletConnectSwiftV2.RPCResult
+import struct Commons.AnyCodable
+import enum JSONRPC.RPCResult
 
 class WalletConnectV2SignTransactionHandler {
  private let ethTransaction: WalletConnectEthTransaction

diff --git a/...rvices/WalletConnect/WalletConnectV2Service/Handlers/WalletConnectV2HandlersFactory.swift b/...rvices/WalletConnect/WalletConnectV2Service/Handlers/WalletConnectV2HandlersFactory.swift
@@ -7,7 +7,7 @@
 //
 
 import BlockchainSdk
-import struct WalletConnectSwiftV2.AnyCodable
+import struct Commons.AnyCodable
 
 protocol WalletConnectHandlersCreator: AnyObject {
  func createHandler(

diff --git a/...rvices/WalletConnect/WalletConnectV2Service/Handlers/WalletConnectV2HandlersService.swift b/...rvices/WalletConnect/WalletConnectV2Service/Handlers/WalletConnectV2HandlersService.swift
@@ -8,8 +8,8 @@
 
 import Foundation
 import enum BlockchainSdk.Blockchain
-import struct WalletConnectSwiftV2.Request
-import enum WalletConnectSwiftV2.RPCResult
+import struct WalletConnectSign.Request
+import enum JSONRPC.RPCResult
 
 protocol WalletConnectV2HandlersServicing {
  func handle(

diff --git a/.../WalletConnect/WalletConnectV2Service/Utilities/WalletConnectV2DefaultSocketFactory.swift b/.../WalletConnect/WalletConnectV2Service/Utilities/WalletConnectV2DefaultSocketFactory.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import WalletConnectSwiftV2
+import ReownWalletKit
 
 class WalletConnectV2DefaultSocketFactory: WebSocketFactory {
  /// `create(with url: URL)` is called from internal entities of WalletConnectSwiftV2 lib

diff --git a/...vices/WalletConnect/WalletConnectV2Service/Utilities/WalletConnectV2MessageComposer.swift b/...vices/WalletConnect/WalletConnectV2Service/Utilities/WalletConnectV2MessageComposer.swift
@@ -7,7 +7,7 @@
 //
 
 import BlockchainSdk
-import WalletConnectSwiftV2
+import ReownWalletKit
 
 protocol WalletConnectV2MessageComposable {
  func makeMessage(for proposal: Session.Proposal, targetBlockchains: [String]) -> String

diff --git a/...em/App/Services/WalletConnect/WalletConnectV2Service/Utilities/WalletConnectV2Utils.swift b/...em/App/Services/WalletConnect/WalletConnectV2Service/Utilities/WalletConnectV2Utils.swift
@@ -7,8 +7,9 @@
 //
 
 import Foundation
-import WalletConnectSwiftV2
+import WalletConnectUtils
 import BlockchainSdk
+import WalletConnectSign
 
 struct WalletConnectV2Utils {
  private let evmNamespace = "eip155"
@@ -93,7 +94,7 @@ struct WalletConnectV2Utils {
  continue
  }
 
- var supportedChains = Set<WalletConnectSwiftV2.Blockchain>()
+ var supportedChains = Set<WalletConnectUtils.Blockchain>()
  let accounts: [[Account]] = chains.compactMap { wcBlockchain in
  guard let blockchain = createBlockchain(for: wcBlockchain) else {
  unsupportedEVMBlockchains.append(wcBlockchain.reference)
@@ -127,7 +128,7 @@ struct WalletConnectV2Utils {
  continue
  }
 
- var supportedChains = Set<WalletConnectSwiftV2.Blockchain>()
+ var supportedChains = Set<WalletConnectUtils.Blockchain>()
  let accounts: [[Account]] = chains.compactMap { wcBlockchain in
  guard let blockchain = createBlockchain(for: wcBlockchain) else {
  return nil
@@ -204,7 +205,7 @@ struct WalletConnectV2Utils {
  )
  }
 
- func createBlockchain(for wcBlockchain: WalletConnectSwiftV2.Blockchain) -> BlockchainMeta? {
+ func createBlockchain(for wcBlockchain: WalletConnectUtils.Blockchain) -> BlockchainMeta? {
  switch wcBlockchain.namespace {
  case evmNamespace:
  let blockchains = SupportedBlockchains.all
@@ -239,7 +240,7 @@ struct WalletConnectV2Utils {
  }
 
  private func createBlockchainNetwork(
- from wcBlockchain: WalletConnectSwiftV2.Blockchain,
+ from wcBlockchain: WalletConnectUtils.Blockchain,
  with address: String,
  walletModelProvider: WalletConnectWalletModelProvider
  ) -> BlockchainNetwork? {