(FEAT) Upgrade some Trust framework, upgrade to swift 4.1

keccak384 · Jul 10, 2018 · 227265e · 227265e
1 parent db3ca9d
commit 227265e
Show file tree

Hide file tree

Showing 119 changed files with 202 additions and 91 deletions.
diff --git a/Podfile b/Podfile
@@ -20,19 +20,21 @@ target 'Trust' do
   pod 'Lokalise'
   pod 'Moya', '~> 10.0.1'
   pod 'JavaScriptKit'
-  pod 'CryptoSwift', :git=>'https://github.com/krzyzanowskim/CryptoSwift', :branch=>'master'
+  pod 'CryptoSwift', '~> 0.10.0'
   pod 'Fabric'
   pod 'Crashlytics'
   pod 'Kingfisher', '~> 4.0'
-  pod 'TrustKeystore', '~> 0.2.1'
+  pod 'TrustCore', '~> 0.0.7'
+  pod 'TrustKeystore', :git=>'https://github.com/TrustWallet/trust-keystore', :branch=>'master'
   pod 'Branch'
   # pod 'web3swift', :git=>'https://github.com/BANKEX/web3swift', :branch=>'master'
   pod 'SAMKeychain'
-  pod 'TrustWeb3Provider', :git=>'https://github.com/TrustWallet/trust-web3-provider', :branch=>'master'
+  pod 'TrustWeb3Provider', :git=>'https://github.com/TrustWallet/trust-web3-provider', :commit=>'f4e0ebb1b8fa4812637babe85ef975d116543dfd'
   pod 'IQKeyboardManager'
   pod 'SwiftMessages'
   pod 'SwiftChart'
   pod 'MSCircularSlider'
+  pod 'TrustWalletSDK', :git=>'https://github.com/TrustWallet/TrustSDK-iOS', :branch=>'master'
 
   target 'TrustTests' do
     inherit! :search_paths

diff --git a/Podfile.lock b/Podfile.lock
@@ -9,7 +9,7 @@ PODS:
   - Branch/Core (0.22.5)
   - Crashlytics (3.9.3):
     - Fabric (~> 1.7.2)
-  - CryptoSwift (0.8.0)
+  - CryptoSwift (0.10.0)
   - Eureka (4.1.1)
   - Fabric (1.7.2)
   - IQKeyboardManager (5.0.7)
@@ -38,27 +38,32 @@ PODS:
     - Realm (= 3.0.2)
   - Result (3.2.4)
   - SAMKeychain (1.5.3)
-  - secp256k1_ios (0.1.1)
   - SeedStackViewController (0.4.0)
   - SipHash (1.2.0)
   - StatefulViewController (3.0)
   - SwiftChart (1.0.1)
   - SwiftLint (0.24.1)
   - SwiftMessages (4.1.0)
-  - TrezorCrypto (0.0.4)
-  - TrustKeystore (0.2.1):
+  - TrezorCrypto (0.0.6)
+  - TrustCore (0.0.7):
+    - BigInt
+    - TrezorCrypto
+  - TrustKeystore (0.4.1):
     - BigInt
     - CryptoSwift
-    - secp256k1_ios (~> 0.1.0)
     - TrezorCrypto
-  - TrustWeb3Provider (0.1.3)
+    - TrustCore
+  - TrustWalletSDK (0.0.1):
+    - Result
+    - TrustCore
+  - TrustWeb3Provider (0.1.7)
 
 DEPENDENCIES:
   - APIKit
   - BigInt (~> 3.0)
   - Branch
   - Crashlytics
-  - CryptoSwift (from `https://github.com/krzyzanowskim/CryptoSwift`, branch `master`)
+  - CryptoSwift (~> 0.10.0)
   - Eureka (~> 4.1.1)
   - Fabric
   - IQKeyboardManager
@@ -79,8 +84,10 @@ DEPENDENCIES:
   - SwiftChart
   - SwiftLint
   - SwiftMessages
-  - TrustKeystore (~> 0.2.1)
-  - TrustWeb3Provider (from `https://github.com/TrustWallet/trust-web3-provider`, branch `master`)
+  - TrustCore (~> 0.0.7)
+  - TrustKeystore (from `https://github.com/TrustWallet/trust-keystore`, branch `master`)
+  - TrustWalletSDK (from `https://github.com/TrustWallet/TrustSDK-iOS`, branch `master`)
+  - TrustWeb3Provider (from `https://github.com/TrustWallet/trust-web3-provider`, commit `f4e0ebb1b8fa4812637babe85ef975d116543dfd`)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
@@ -89,6 +96,7 @@ SPEC REPOS:
     - BigInt
     - Branch
     - Crashlytics
+    - CryptoSwift
     - Eureka
     - Fabric
     - IQKeyboardManager
@@ -105,41 +113,46 @@ SPEC REPOS:
     - RealmSwift
     - Result
     - SAMKeychain
-    - secp256k1_ios
     - SeedStackViewController
     - SipHash
     - StatefulViewController
     - SwiftChart
     - SwiftLint
     - SwiftMessages
     - TrezorCrypto
-    - TrustKeystore
+    - TrustCore
 
 EXTERNAL SOURCES:
-  CryptoSwift:
-    :branch: master
-    :git: https://github.com/krzyzanowskim/CryptoSwift
   JSONRPCKit:
     :git: https://github.com/bricklife/JSONRPCKit.git
   QRCodeReaderViewController:
     :branch: master
     :git: https://github.com/yannickl/QRCodeReaderViewController.git
-  TrustWeb3Provider:
+  TrustKeystore:
     :branch: master
+    :git: https://github.com/TrustWallet/trust-keystore
+  TrustWalletSDK:
+    :branch: master
+    :git: https://github.com/TrustWallet/TrustSDK-iOS
+  TrustWeb3Provider:
+    :commit: f4e0ebb1b8fa4812637babe85ef975d116543dfd
     :git: https://github.com/TrustWallet/trust-web3-provider
 
 CHECKOUT OPTIONS:
-  CryptoSwift:
-    :commit: 46cfb548f83b89a13ce99f452223933c31fac5ba
-    :git: https://github.com/krzyzanowskim/CryptoSwift
   JSONRPCKit:
     :commit: 50d19a4f7ec593ac5e07cffa1e11c17f1fbe347d
     :git: https://github.com/bricklife/JSONRPCKit.git
   QRCodeReaderViewController:
     :commit: 80bd79cbeede842949b229f81bc6328f53701c5a
     :git: https://github.com/yannickl/QRCodeReaderViewController.git
+  TrustKeystore:
+    :commit: b338faf76d62efa570bd03088ebceac4e10314da
+    :git: https://github.com/TrustWallet/trust-keystore
+  TrustWalletSDK:
+    :commit: 82c06558df5e6a75bd9c195a4e76536618e76a9a
+    :git: https://github.com/TrustWallet/TrustSDK-iOS
   TrustWeb3Provider:
-    :commit: 52b1eb869f513f18a7c3b4b0e698848a57830cc3
+    :commit: f4e0ebb1b8fa4812637babe85ef975d116543dfd
     :git: https://github.com/TrustWallet/trust-web3-provider
 
 SPEC CHECKSUMS:
@@ -148,7 +161,7 @@ SPEC CHECKSUMS:
   BigInt: 8e8a52161c745cd3ab78e3dc346a9fbee51e6cf6
   Branch: 4f0482418d99e77d15b0e6065ef216c10e24797b
   Crashlytics: dbb07d01876c171c5ccbdf7826410380189e452c
-  CryptoSwift: 475ae2a25439f52412686d68b854c0ca724c8dfd
+  CryptoSwift: 6c778d69282bed3b4e975ff97a79d074f20bb011
   Eureka: b88fb930e42c79f8c03c373d0fcdc28c1d6c50ed
   Fabric: 9cd6a848efcf1b8b07497e0b6a2e7d336353ba15
   IQKeyboardManager: 0bfa4607d39924116b5c0c8b55b5d789288b5cba
@@ -167,17 +180,18 @@ SPEC CHECKSUMS:
   RealmSwift: 695393add1b8f9d5fa75dd16e6355cf3935f71e2
   Result: d2d07204ce72856f1fd9130bbe42c35a7b0fea10
   SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
-  secp256k1_ios: 3c94e6cce14ff03924cb6dc10c5017f17011b79d
   SeedStackViewController: 45e88ca1493a610e74d661d3feced7098f72dbd3
   SipHash: c6e9e43e9c531b5bc6602545130c26194a6d31ce
   StatefulViewController: 4803bf900d44de26074344998e10e041113b5931
   SwiftChart: ba767a678d568a5ee22d419e146a0582865e1aff
   SwiftLint: 2e4b89feed5909c42c3735bbd6745f4345c4b772
   SwiftMessages: 1bacc783c8f10bdfdc57c14860cae8a1f1fa6591
-  TrezorCrypto: 7f87a2296cf13872b21565c29fd9f7882dd00803
-  TrustKeystore: b9fc8e0d72de3e8f9c97f46802172d6f14a004aa
-  TrustWeb3Provider: ac0bdf19b4c6c4d6ec0f03ddb85b83e32bda3a9a
+  TrezorCrypto: bea2dab002f9a5fe885df004694b9ece52dc088b
+  TrustCore: 688df9a241008cf9cfa3842ec8ef28777a8b7534
+  TrustKeystore: fdd5936098af80b9478122bbd3a89477a5389298
+  TrustWalletSDK: 12451433bda69bc07e5a27408449b1f4692879e4
+  TrustWeb3Provider: 50fa391bdf170feb43dd4419992931510a5751d8
 
-PODFILE CHECKSUM: c44cea2059213ae64a9b314edc28706d07974a16
+PODFILE CHECKSUM: 650c47c9216eb40e1894f26d43604256ef4c2c50
 
 COCOAPODS: 1.5.3
diff --git a/Trust.xcodeproj/project.pbxproj b/Trust.xcodeproj/project.pbxproj
@@ -4675,8 +4675,9 @@
 				"${BUILT_PRODUCTS_DIR}/SwiftChart/SwiftChart.framework",
 				"${BUILT_PRODUCTS_DIR}/SwiftMessages/SwiftMessages.framework",
 				"${BUILT_PRODUCTS_DIR}/TrezorCrypto/TrezorCrypto.framework",
+				"${BUILT_PRODUCTS_DIR}/TrustCore/TrustCore.framework",
 				"${BUILT_PRODUCTS_DIR}/TrustKeystore/TrustKeystore.framework",
-				"${BUILT_PRODUCTS_DIR}/secp256k1_ios/secp256k1_ios.framework",
+				"${BUILT_PRODUCTS_DIR}/TrustWalletSDK/TrustWalletSDK.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
@@ -4706,8 +4707,9 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftChart.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftMessages.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TrezorCrypto.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TrustCore.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TrustKeystore.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/secp256k1_ios.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TrustWalletSDK.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;

diff --git a/Trust/Accounts/Coordinators/AccountsCoordinator.swift b/Trust/Accounts/Coordinators/AccountsCoordinator.swift
@@ -2,6 +2,7 @@
 
 import Foundation
 import TrustKeystore
+import TrustCore
 import UIKit
 
 protocol AccountsCoordinatorDelegate: class {

diff --git a/Trust/Accounts/ViewModels/AccountViewModel.swift b/Trust/Accounts/ViewModels/AccountViewModel.swift
@@ -2,6 +2,7 @@
 
 import Foundation
 import TrustKeystore
+import TrustCore
 import UIKit
 
 struct AccountViewModel {

diff --git a/Trust/Accounts/ViewModels/AccountsViewController.swift b/Trust/Accounts/ViewModels/AccountsViewController.swift
@@ -1,6 +1,7 @@
 // Copyright SIX DAY LLC. All rights reserved.
 
 import TrustKeystore
+import TrustCore
 import UIKit
 
 protocol AccountsViewControllerDelegate: class {

diff --git a/Trust/Accounts/ViewModels/AccountsViewModel.swift b/Trust/Accounts/ViewModels/AccountsViewModel.swift
@@ -2,6 +2,7 @@
 
 import Foundation
 import TrustKeystore
+import TrustCore
 
 struct AccountsViewModel {
 

diff --git a/Trust/Accounts/Views/AccountViewCell.swift b/Trust/Accounts/Views/AccountViewCell.swift
@@ -1,6 +1,7 @@
 // Copyright SIX DAY LLC. All rights reserved.
 
 import TrustKeystore
+import TrustCore
 import UIKit
 
 protocol AccountViewCellDelegate: class {

diff --git a/Trust/AppCoordinator.swift b/Trust/AppCoordinator.swift
@@ -2,6 +2,7 @@
 
 import Foundation
 import TrustKeystore
+import TrustCore
 import UIKit
 
 class AppCoordinator: NSObject, Coordinator {
@@ -56,9 +57,8 @@ class AppCoordinator: NSObject, Coordinator {
     }
 
     func inializers() {
-        var paths = NSSearchPathForDirectoriesInDomains(.documentDirectory, .allDomainsMask, true).flatMap { URL(fileURLWithPath: $0) }
+      var paths = NSSearchPathForDirectoriesInDomains(.documentDirectory, .allDomainsMask, true).compactMap { URL(fileURLWithPath: $0) }
         paths.append(keystore.keysDirectory)
-        paths.append(keystore.walletsDirectory)
 
         let initializers: [Initializer] = [
             CrashReportInitializer(),

diff --git a/Trust/Browser/Coordinators/BrowserCoordinator.swift b/Trust/Browser/Coordinators/BrowserCoordinator.swift
@@ -4,6 +4,7 @@ import Foundation
 import UIKit
 import BigInt
 import TrustKeystore
+import TrustCore
 
 protocol BrowserCoordinatorDelegate: class {
     func didSentTransaction(transaction: SentTransaction, in coordinator: BrowserCoordinator)

diff --git a/Trust/Browser/Types/DappAction.swift b/Trust/Browser/Types/DappAction.swift
@@ -3,6 +3,7 @@
 import Foundation
 import BigInt
 import TrustKeystore
+import TrustCore
 
 enum DappAction {
     case signMessage(String)

diff --git a/Trust/Core/Initializers/MirgrationInitializer.swift b/Trust/Core/Initializers/MirgrationInitializer.swift
@@ -3,6 +3,7 @@
 import Foundation
 import RealmSwift
 import TrustKeystore
+import TrustCore
 
 class MigrationInitializer: Initializer {
 

diff --git a/Trust/Core/Types/TrustRealmConfiguration.swift b/Trust/Core/Types/TrustRealmConfiguration.swift
@@ -3,6 +3,7 @@
 import Foundation
 import RealmSwift
 import TrustKeystore
+import TrustCore
 
 struct RealmConfiguration {
 

diff --git a/Trust/Deposit/Coordinators/DepositCoordinator.swift b/Trust/Deposit/Coordinators/DepositCoordinator.swift
@@ -2,6 +2,7 @@
 
 import Foundation
 import TrustKeystore
+import TrustCore
 import UIKit
 
 class DepositCoordinator: Coordinator {