diff --git a/.swiftlint.yml b/.swiftlint.yml index 2889ef7fc..7249f4345 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -1,4 +1,4 @@ -swiftlint_version: 0.25.1 +swiftlint_version: 0.40.3 disabled_rules: - cyclomatic_complexity - force_cast diff --git a/AlphaWallet.xcodeproj/project.pbxproj b/AlphaWallet.xcodeproj/project.pbxproj index dff6fe62c..e65b06cda 100644 --- a/AlphaWallet.xcodeproj/project.pbxproj +++ b/AlphaWallet.xcodeproj/project.pbxproj @@ -4118,7 +4118,7 @@ "${BUILT_PRODUCTS_DIR}/SwiftyXMLParser/SwiftyXMLParser.framework", "${BUILT_PRODUCTS_DIR}/TrezorCrypto/TrezorCrypto.framework", "${BUILT_PRODUCTS_DIR}/TrustKeystore/TrustKeystore.framework", - "${BUILT_PRODUCTS_DIR}/TrustWalletCore/TrustWalletCore.framework", + "${BUILT_PRODUCTS_DIR}/TrustWalletCore/WalletCore.framework", "${BUILT_PRODUCTS_DIR}/libsodium/libsodium.framework", "${BUILT_PRODUCTS_DIR}/secp256k1_ios/secp256k1_ios.framework", "${BUILT_PRODUCTS_DIR}/web3swift/web3swift.framework", @@ -4158,7 +4158,7 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyXMLParser.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TrezorCrypto.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TrustKeystore.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TrustWalletCore.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WalletCore.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libsodium.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/secp256k1_ios.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/web3swift.framework", @@ -5185,7 +5185,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_VERSION = 4.0; - VALID_ARCHS = arm64; + VALID_ARCHS = "$(ARCHS_STANDARD)"; }; name = Debug; }; @@ -5241,7 +5241,7 @@ SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_VERSION = 4.0; VALIDATE_PRODUCT = YES; - VALID_ARCHS = arm64; + VALID_ARCHS = "$(ARCHS_STANDARD)"; }; name = Release; }; @@ -5282,7 +5282,7 @@ SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift.h "; SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = "arm64 armv7 armv7s"; + VALID_ARCHS = "$(ARCHS_STANDARD)"; VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; @@ -5323,7 +5323,7 @@ SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift.h "; SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = "arm64 armv7 armv7s"; + VALID_ARCHS = "$(ARCHS_STANDARD)"; VERSIONING_SYSTEM = "apple-generic"; }; name = Release; @@ -5344,6 +5344,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AlphaWallet.app/AlphaWallet"; + VALID_ARCHS = "$(ARCHS_STANDARD)"; }; name = Debug; }; @@ -5363,6 +5364,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AlphaWallet.app/AlphaWallet"; + VALID_ARCHS = "$(ARCHS_STANDARD)"; }; name = Release; }; @@ -5383,6 +5385,7 @@ PROVISIONING_PROFILE_SPECIFIER = new; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = Trust; + VALID_ARCHS = "$(ARCHS_STANDARD)"; }; name = Debug; }; @@ -5402,6 +5405,7 @@ PROVISIONING_PROFILE_SPECIFIER = new; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = Trust; + VALID_ARCHS = "$(ARCHS_STANDARD)"; }; name = Release; }; diff --git a/AlphaWallet/Core/Types/AlphaWalletAddress.swift b/AlphaWallet/Core/Types/AlphaWalletAddress.swift index 78b798a5c..ec72a9584 100644 --- a/AlphaWallet/Core/Types/AlphaWalletAddress.swift +++ b/AlphaWallet/Core/Types/AlphaWalletAddress.swift @@ -3,7 +3,7 @@ import Foundation //TODO remove all dependencies import TrustKeystore -import TrustWalletCore +import WalletCore ///Use an enum as a namespace until Swift has proper namespaces enum AlphaWallet {} diff --git a/AlphaWallet/KeyManagement/EtherKeystore.swift b/AlphaWallet/KeyManagement/EtherKeystore.swift index 151bed2d8..7338a142f 100644 --- a/AlphaWallet/KeyManagement/EtherKeystore.swift +++ b/AlphaWallet/KeyManagement/EtherKeystore.swift @@ -5,7 +5,7 @@ import LocalAuthentication import BigInt import KeychainSwift import Result -import TrustWalletCore +import WalletCore import web3swift enum EtherKeystoreError: LocalizedError { @@ -324,7 +324,7 @@ open class EtherKeystore: Keystore { let firstAccountIndex = UInt32(0) let externalChangeConstant = UInt32(0) let addressIndex = UInt32(0) - let privateKey = wallet.getKey(purpose: .bip44, coin: .ethereum, account: firstAccountIndex, change: externalChangeConstant, address: addressIndex) + let privateKey = wallet.getKeyBIP44(coin: .ethereum, account: firstAccountIndex, change: externalChangeConstant, address: addressIndex) return privateKey.data } diff --git a/AlphaWallet/Market/OrderHandler.swift b/AlphaWallet/Market/OrderHandler.swift index 7b5a5a509..2ecb1fad1 100644 --- a/AlphaWallet/Market/OrderHandler.swift +++ b/AlphaWallet/Market/OrderHandler.swift @@ -1,7 +1,7 @@ // Copyright © 2018 Stormbird PTE. LTD. import BigInt -import TrustWalletCore +import WalletCore public struct Order { var price: BigUInt diff --git a/AlphaWallet/Tokens/Coordinators/ClaimOrderCoordinator.swift b/AlphaWallet/Tokens/Coordinators/ClaimOrderCoordinator.swift index 01fc249b6..abe13d7d9 100644 --- a/AlphaWallet/Tokens/Coordinators/ClaimOrderCoordinator.swift +++ b/AlphaWallet/Tokens/Coordinators/ClaimOrderCoordinator.swift @@ -20,7 +20,7 @@ class ClaimOrderCoordinator { s: String, contractAddress: AlphaWallet.Address, recipient: AlphaWallet.Address, - completion: @escaping (Result) -> Void + completion: @escaping (Swift.Result) -> Void ) { if let tokenIds = signedOrder.order.tokenIds, !tokenIds.isEmpty { @@ -44,7 +44,7 @@ class ClaimOrderCoordinator { r: String, s: String, contractAddress: AlphaWallet.Address, - completion: @escaping (Result) -> Void) { + completion: @escaping (Swift.Result) -> Void) { do { let parameters: [Any] = [expiry, indices.map({ BigUInt($0) }), BigUInt(v), Data(hex: r), Data(hex: s)] let arrayType: ABIType @@ -75,7 +75,7 @@ class ClaimOrderCoordinator { r: String, s: String, recipient: AlphaWallet.Address, - completion: @escaping (Result) -> Void) { + completion: @escaping (Swift.Result) -> Void) { do { let parameters: [Any] = [expiry, tokenIds, BigUInt(v), Data(hex: r), Data(hex: s), TrustKeystore.Address(address: recipient)] @@ -101,7 +101,7 @@ class ClaimOrderCoordinator { r: String, s: String, recipient: AlphaWallet.Address, - completion: @escaping (Result) -> Void + completion: @escaping (Swift.Result) -> Void ) { do { let parameters: [Any] = [ diff --git a/AlphaWallet/UI/Form/HDWallet+Extension.swift b/AlphaWallet/UI/Form/HDWallet+Extension.swift index 28c84e0c3..bcfcdca09 100644 --- a/AlphaWallet/UI/Form/HDWallet+Extension.swift +++ b/AlphaWallet/UI/Form/HDWallet+Extension.swift @@ -2,7 +2,7 @@ import Foundation import BigInt -import TrustWalletCore +import WalletCore extension HDWallet { static let mnemonicWordCount = 12 diff --git a/AlphaWallet/UI/Form/MnemonicInWordListRule.swift b/AlphaWallet/UI/Form/MnemonicInWordListRule.swift index 33f45df71..63289b24b 100644 --- a/AlphaWallet/UI/Form/MnemonicInWordListRule.swift +++ b/AlphaWallet/UI/Form/MnemonicInWordListRule.swift @@ -2,7 +2,7 @@ import Foundation import Eureka -import TrustWalletCore +import WalletCore struct MnemonicInWordListRule: RuleType { public init() { diff --git a/AlphaWallet/UI/Form/MnemonicLengthRule.swift b/AlphaWallet/UI/Form/MnemonicLengthRule.swift index 1526ab051..d8e7a7eb6 100644 --- a/AlphaWallet/UI/Form/MnemonicLengthRule.swift +++ b/AlphaWallet/UI/Form/MnemonicLengthRule.swift @@ -2,7 +2,7 @@ import Foundation import Eureka -import TrustWalletCore +import WalletCore struct MnemonicLengthRule: RuleType { public init() { diff --git a/AlphaWallet/Wallet/ViewControllers/ImportWalletViewController.swift b/AlphaWallet/Wallet/ViewControllers/ImportWalletViewController.swift index 31d3ab5f0..612392687 100644 --- a/AlphaWallet/Wallet/ViewControllers/ImportWalletViewController.swift +++ b/AlphaWallet/Wallet/ViewControllers/ImportWalletViewController.swift @@ -1,7 +1,7 @@ // Copyright © 2018 Stormbird PTE. LTD. import UIKit -import TrustWalletCore +import WalletCore protocol ImportWalletViewControllerDelegate: class { func didImportAccount(account: Wallet, in viewController: ImportWalletViewController) @@ -503,12 +503,17 @@ class ImportWalletViewController: UIViewController { let types = ["public.text", "public.content", "public.item", "public.data"] let controller = UIDocumentPickerViewController(documentTypes: types, in: .import) controller.delegate = self + switch UIDevice.current.userInterfaceIdiom { case .pad: controller.modalPresentationStyle = .formSheet - case .unspecified, .tv, .carPlay, .phone: + case .phone: + controller.makePresentationFullScreenForiOS13Migration() + //NOTE: allow to support version xCode 11.7 and xCode 12 + default: controller.makePresentationFullScreenForiOS13Migration() } + present(controller, animated: true, completion: nil) } diff --git a/AlphaWalletTests/Core/Types/HDWalletTest.swift b/AlphaWalletTests/Core/Types/HDWalletTest.swift index 75aa48a50..cac603902 100644 --- a/AlphaWalletTests/Core/Types/HDWalletTest.swift +++ b/AlphaWalletTests/Core/Types/HDWalletTest.swift @@ -2,7 +2,7 @@ import XCTest @testable import AlphaWallet -import TrustWalletCore +import WalletCore class HDWalletTest: XCTestCase { func testComputeSeedFromEnglishMnemonic() { diff --git a/AlphaWalletTests/EtherClient/EtherKeystoreTests.swift b/AlphaWalletTests/EtherClient/EtherKeystoreTests.swift index 675bef9ea..c8dfa0276 100644 --- a/AlphaWalletTests/EtherClient/EtherKeystoreTests.swift +++ b/AlphaWalletTests/EtherClient/EtherKeystoreTests.swift @@ -6,7 +6,7 @@ import LocalAuthentication import BigInt import KeychainSwift import TrustKeystore -import TrustWalletCore +import WalletCore class EtherKeystoreTests: XCTestCase { diff --git a/AlphaWalletTests/Market/ViewControllers/ImportTokenViewControllerTests.swift b/AlphaWalletTests/Market/ViewControllers/ImportTokenViewControllerTests.swift index 64d90792e..7dfdf2f46 100644 --- a/AlphaWalletTests/Market/ViewControllers/ImportTokenViewControllerTests.swift +++ b/AlphaWalletTests/Market/ViewControllers/ImportTokenViewControllerTests.swift @@ -7,7 +7,6 @@ import UIKit class ImportTokenViewControllerTests: FBSnapshotTestCase { override func setUp() { super.setUp() - isDeviceAgnostic = true recordMode = false } diff --git a/AlphaWalletTests/Redeem/CreateRedeemTests.swift b/AlphaWalletTests/Redeem/CreateRedeemTests.swift index 303f4d744..a487ef805 100644 --- a/AlphaWalletTests/Redeem/CreateRedeemTests.swift +++ b/AlphaWalletTests/Redeem/CreateRedeemTests.swift @@ -5,7 +5,7 @@ import Foundation @testable import AlphaWallet import XCTest import BigInt -import TrustWalletCore +import WalletCore class CreateRedeemTests: XCTestCase { let keyStore = FakeEtherKeystore() diff --git a/AlphaWalletTests/Sell/ViewControllers/EnterSellTokensCardPriceQuantityViewControllerTests.swift b/AlphaWalletTests/Sell/ViewControllers/EnterSellTokensCardPriceQuantityViewControllerTests.swift index 963d09cf3..9325d048c 100644 --- a/AlphaWalletTests/Sell/ViewControllers/EnterSellTokensCardPriceQuantityViewControllerTests.swift +++ b/AlphaWalletTests/Sell/ViewControllers/EnterSellTokensCardPriceQuantityViewControllerTests.swift @@ -7,7 +7,6 @@ import UIKit class EnterSellTokensCardPriceQuantityViewControllerTests: FBSnapshotTestCase { override func setUp() { super.setUp() - isDeviceAgnostic = true recordMode = false } diff --git a/AlphaWalletTests/Transfer/ViewControllers/TransferTokensCardQuantitySelectionViewControllerTests.swift b/AlphaWalletTests/Transfer/ViewControllers/TransferTokensCardQuantitySelectionViewControllerTests.swift index 77380e909..1fe588bcf 100644 --- a/AlphaWalletTests/Transfer/ViewControllers/TransferTokensCardQuantitySelectionViewControllerTests.swift +++ b/AlphaWalletTests/Transfer/ViewControllers/TransferTokensCardQuantitySelectionViewControllerTests.swift @@ -7,7 +7,6 @@ import UIKit class TransferTokensCardQuantitySelectionViewControllerTests: FBSnapshotTestCase { override func setUp() { super.setUp() - isDeviceAgnostic = true recordMode = false } diff --git a/Podfile b/Podfile index 3bf045022..3ba5c650c 100644 --- a/Podfile +++ b/Podfile @@ -1,4 +1,4 @@ -platform :ios, '10.0' +platform :ios, '12.0' inhibit_all_warnings! source 'https://cdn.cocoapods.org/' @@ -8,31 +8,31 @@ target 'AlphaWallet' do pod 'R.swift' pod 'JSONRPCKit', '~> 2.0.0' pod 'APIKit' - pod 'Eureka', '~> 5.2.1' + pod 'Eureka', :git=> 'https://github.com/xmartlabs/Eureka.git', :commit => '5c54e2607632ce586010e50e91d9adcb6bb3909e' pod 'MBProgressHUD' pod 'StatefulViewController' pod 'QRCodeReaderViewController', :git=>'https://github.com/AlphaWallet/QRCodeReaderViewController.git', :commit=>'30d1a2a7d167d0d207ae0ae3a4d81bcf473d7a65' - pod 'KeychainSwift', :git=>'https://github.com/AlphaWallet/keychain-swift.git', :branch=>'alphawallet' + pod 'KeychainSwift', :git=>'https://github.com/AlphaWallet/keychain-swift.git', :commit=> 'b797d40a9d08ec509db4335140cf2259b226e6a2' pod 'SwiftLint' pod 'SeedStackViewController' pod 'RealmSwift', '~> 5.4.0' pod 'Moya', '~> 10.0.1' pod 'JavaScriptKit' - pod 'CryptoSwift' + pod 'CryptoSwift', '~> 1.0' pod 'SwiftyXMLParser', :git => 'https://github.com/yahoojapan/SwiftyXMLParser.git' pod 'Kingfisher' pod 'AlphaWalletWeb3Provider', :git=>'https://github.com/AlphaWallet/AlphaWallet-web3-provider', :commit => '1c1aafb566361e7067e69f6e38b0fdc30b801429' pod 'TrezorCrypto', :git=>'https://github.com/AlphaWallet/trezor-crypto-ios.git', :commit => '50c16ba5527e269bbc838e80aee5bac0fe304cc7' - pod 'TrustKeystore', :git => 'https://github.com/alpha-wallet/trust-keystore.git', :commit => '37f7eaf9531cb4e33d06129543b3a56972f59d2a' + pod 'TrustKeystore', :git => 'https://github.com/alpha-wallet/trust-keystore.git', :commit => 'c0bdc4f6ffc117b103e19d17b83109d4f5a0e764' pod 'SwiftyJSON' - pod 'web3swift', :git => 'https://github.com/alpha-wallet/web3swift.git', :commit => 'd863662b08f112dee48538a04ab704244e9c7bae' + pod 'web3swift', :git => 'https://github.com/AlphaWallet/web3swift.git', :commit=> '169e50e29b60df72351c689a002005d2e2bc7559' pod 'SAMKeychain' pod 'PromiseKit/CorePromise' pod 'PromiseKit/Alamofire' #To force SWXMLHash which Macaw depends on to be Swift >= 4 pod 'SWXMLHash', '~> 5.0.0' - pod "Macaw", :git => 'https://github.com/alpha-wallet/Macaw.git', :commit => 'e1f4eb1d2b81676fb10e9835c5e2ce9e9f51faf9' + pod "Macaw", :git => 'https://github.com/AlphaWallet/Macaw.git', :commit=> 'aa4389b0dce39f754d454f3c19f71f0ef577c403' pod "Kanna", :git => 'https://github.com/tid-kijyun/Kanna.git', :commit => '06a04bc28783ccbb40efba355dee845a024033e8' pod 'TrustWalletCore' pod 'AWSSNS' @@ -53,20 +53,27 @@ end post_install do |installer| installer.pods_project.targets.each do |target| + if ['TrustKeystore'].include? target.name target.build_configurations.each do |config| config.build_settings['SWIFT_OPTIMIZATION_LEVEL'] = '-Owholemodule' end end - if [ - 'Result', - 'SwiftyXMLParser', - 'JSONRPCKit', - 'SWXMLHash' - ].include? target.name + if ['Result', 'SwiftyXMLParser', 'JSONRPCKit', 'SWXMLHash'].include? target.name target.build_configurations.each do |config| config.build_settings['SWIFT_VERSION'] = '4.2' end end + + target.build_configurations.each do |config| + if ['Kingfisher'].include? target.name + #no op + else + #xCode 12 requires minimum IPHONEOS_DEPLOYMENT_TARGET 9.0 + if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] <= '8.0' + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '9.0'; + end + end + end end end diff --git a/Podfile.lock b/Podfile.lock index 9d2ca196d..7999df6bc 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,40 +1,39 @@ PODS: - - Alamofire (4.7.2) + - Alamofire (4.9.1) - Alamofire-Synchronous (4.0.0): - Alamofire (~> 4.0) - AlphaWalletWeb3Provider (0.3.0) - APIKit (5.1.0) - - AWSCore (2.6.28) - - AWSSNS (2.6.28): - - AWSCore (= 2.6.28) - - BigInt (3.0.1): + - AWSCore (2.18.0) + - AWSSNS (2.18.0): + - AWSCore (= 2.18.0) + - BigInt (3.1.0): - SipHash (~> 1.2) - - CryptoSwift (0.10.0) + - CryptoSwift (1.3.2) - Eureka (5.2.1) - - iOSSnapshotTestCase (3.0.0): - - iOSSnapshotTestCase/SwiftSupport (= 3.0.0) - - iOSSnapshotTestCase/Core (3.0.0) - - iOSSnapshotTestCase/SwiftSupport (3.0.0): + - iOSSnapshotTestCase (6.2.0): + - iOSSnapshotTestCase/SwiftSupport (= 6.2.0) + - iOSSnapshotTestCase/Core (6.2.0) + - iOSSnapshotTestCase/SwiftSupport (6.2.0): - iOSSnapshotTestCase/Core - - JavaScriptKit (1.0.0): - - Result (~> 3.1) + - JavaScriptKit (2.0.1) - JSONRPCKit (2.0.3): - Result (~> 3.0) - Kanna (5.0.0) - KeychainSwift (10.0.0) - - Kingfisher (5.13.2): - - Kingfisher/Core (= 5.13.2) - - Kingfisher/Core (5.13.2) + - Kingfisher (5.15.7): + - Kingfisher/Core (= 5.15.7) + - Kingfisher/Core (5.15.7) - libsodium (1.0.12) - Macaw (0.9.5): - SWXMLHash - - MBProgressHUD (1.1.0) - - Mixpanel-swift (2.7.3): - - Mixpanel-swift/Complete (= 2.7.3) - - Mixpanel-swift/Complete (2.7.3) - - Moya (10.0.1): - - Moya/Core (= 10.0.1) - - Moya/Core (10.0.1): + - MBProgressHUD (1.2.0) + - Mixpanel-swift (2.8.0): + - Mixpanel-swift/Complete (= 2.8.0) + - Mixpanel-swift/Complete (2.8.0) + - Moya (10.0.2): + - Moya/Core (= 10.0.2) + - Moya/Core (10.0.2): - Alamofire (~> 4.1) - Result (~> 3.0) - PromiseKit (6.3.5): @@ -50,37 +49,41 @@ PODS: - PromiseKit/UIKit (6.3.5): - PromiseKit/CorePromise - QRCodeReaderViewController (4.0.2) - - R.swift (5.1.0): - - R.swift.Library (~> 5.1.0) - - R.swift.Library (5.1.0) - - Realm (5.4.0): - - Realm/Headers (= 5.4.0) - - Realm/Headers (5.4.0) - - RealmSwift (5.4.0): - - Realm (= 5.4.0) + - R.swift (5.2.2): + - R.swift.Library (~> 5.2.0) + - R.swift.Library (5.2.0) + - Realm (5.4.8): + - Realm/Headers (= 5.4.8) + - Realm/Headers (5.4.8) + - RealmSwift (5.4.8): + - Realm (= 5.4.8) - Result (3.2.4) - SAMKeychain (1.5.3) - secp256k1_ios (0.1.3) - SeedStackViewController (0.5.1) - - SipHash (1.2.0) + - SipHash (1.2.2) - StatefulViewController (3.0) - - SwiftLint (0.25.1) - - SwiftProtobuf (1.3.1) - - SwiftyJSON (4.0.0) - - SwiftyXMLParser (4.1.0) + - SwiftLint (0.40.3) + - SwiftProtobuf (1.13.0) + - SwiftyJSON (5.0.0) + - SwiftyXMLParser (5.1.0) - SWXMLHash (5.0.1) - TrezorCrypto (0.0.9) - TrustKeystore (0.1.3): - - CryptoSwift (~> 0.10.0) + - CryptoSwift (~> 1.0) - secp256k1_ios (~> 0.1.0) - TrezorCrypto - - TrustWalletCore (0.5.0): - - SwiftProtobuf (~> 1.3.0) + - TrustWalletCore (2.3.3): + - TrustWalletCore/Core (= 2.3.3) + - TrustWalletCore/Core (2.3.3): + - TrustWalletCore/Types + - TrustWalletCore/Types (2.3.3): + - SwiftProtobuf - web3swift (0.9.0): - Alamofire (~> 4.7) - Alamofire-Synchronous (~> 4.0) - - BigInt (~> 3.0.1) - - CryptoSwift (~> 0.10.0) + - BigInt (~> 3.0) + - CryptoSwift (~> 1.0) - libsodium (~> 1.0.12) - PromiseKit (~> 6.3.0) - Result (~> 3.1) @@ -91,15 +94,15 @@ DEPENDENCIES: - APIKit - AWSSNS - BigInt (~> 3.0) - - CryptoSwift - - Eureka (~> 5.2.1) + - CryptoSwift (~> 1.0) + - Eureka (from `https://github.com/xmartlabs/Eureka.git`, commit `5c54e2607632ce586010e50e91d9adcb6bb3909e`) - iOSSnapshotTestCase - JavaScriptKit - JSONRPCKit (~> 2.0.0) - Kanna (from `https://github.com/tid-kijyun/Kanna.git`, commit `06a04bc28783ccbb40efba355dee845a024033e8`) - - KeychainSwift (from `https://github.com/AlphaWallet/keychain-swift.git`, branch `alphawallet`) + - KeychainSwift (from `https://github.com/AlphaWallet/keychain-swift.git`, commit `b797d40a9d08ec509db4335140cf2259b226e6a2`) - Kingfisher - - Macaw (from `https://github.com/alpha-wallet/Macaw.git`, commit `e1f4eb1d2b81676fb10e9835c5e2ce9e9f51faf9`) + - Macaw (from `https://github.com/AlphaWallet/Macaw.git`, commit `aa4389b0dce39f754d454f3c19f71f0ef577c403`) - MBProgressHUD - Mixpanel-swift - Moya (~> 10.0.1) @@ -116,13 +119,14 @@ DEPENDENCIES: - SwiftyXMLParser (from `https://github.com/yahoojapan/SwiftyXMLParser.git`) - SWXMLHash (~> 5.0.0) - TrezorCrypto (from `https://github.com/AlphaWallet/trezor-crypto-ios.git`, commit `50c16ba5527e269bbc838e80aee5bac0fe304cc7`) - - TrustKeystore (from `https://github.com/alpha-wallet/trust-keystore.git`, commit `37f7eaf9531cb4e33d06129543b3a56972f59d2a`) + - TrustKeystore (from `https://github.com/alpha-wallet/trust-keystore.git`, commit `c0bdc4f6ffc117b103e19d17b83109d4f5a0e764`) - TrustWalletCore - - web3swift (from `https://github.com/alpha-wallet/web3swift.git`, commit `d863662b08f112dee48538a04ab704244e9c7bae`) + - web3swift (from `https://github.com/AlphaWallet/web3swift.git`, commit `169e50e29b60df72351c689a002005d2e2bc7559`) SPEC REPOS: - https://github.com/CocoaPods/Specs.git: + trunk: - Alamofire + - Alamofire-Synchronous - APIKit - AWSCore - AWSSNS @@ -132,11 +136,15 @@ SPEC REPOS: - JavaScriptKit - JSONRPCKit - Kingfisher + - libsodium - MBProgressHUD + - Mixpanel-swift - Moya - PromiseKit - R.swift - R.swift.Library + - Realm + - RealmSwift - Result - SAMKeychain - secp256k1_ios @@ -148,27 +156,23 @@ SPEC REPOS: - SwiftyJSON - SWXMLHash - TrustWalletCore - trunk: - - Alamofire-Synchronous - - Eureka - - libsodium - - Mixpanel-swift - - Realm - - RealmSwift EXTERNAL SOURCES: AlphaWalletWeb3Provider: :commit: 1c1aafb566361e7067e69f6e38b0fdc30b801429 :git: https://github.com/AlphaWallet/AlphaWallet-web3-provider + Eureka: + :commit: 5c54e2607632ce586010e50e91d9adcb6bb3909e + :git: https://github.com/xmartlabs/Eureka.git Kanna: :commit: 06a04bc28783ccbb40efba355dee845a024033e8 :git: https://github.com/tid-kijyun/Kanna.git KeychainSwift: - :branch: alphawallet + :commit: b797d40a9d08ec509db4335140cf2259b226e6a2 :git: https://github.com/AlphaWallet/keychain-swift.git Macaw: - :commit: e1f4eb1d2b81676fb10e9835c5e2ce9e9f51faf9 - :git: https://github.com/alpha-wallet/Macaw.git + :commit: aa4389b0dce39f754d454f3c19f71f0ef577c403 + :git: https://github.com/AlphaWallet/Macaw.git QRCodeReaderViewController: :commit: 30d1a2a7d167d0d207ae0ae3a4d81bcf473d7a65 :git: https://github.com/AlphaWallet/QRCodeReaderViewController.git @@ -178,16 +182,19 @@ EXTERNAL SOURCES: :commit: 50c16ba5527e269bbc838e80aee5bac0fe304cc7 :git: https://github.com/AlphaWallet/trezor-crypto-ios.git TrustKeystore: - :commit: 37f7eaf9531cb4e33d06129543b3a56972f59d2a + :commit: c0bdc4f6ffc117b103e19d17b83109d4f5a0e764 :git: https://github.com/alpha-wallet/trust-keystore.git web3swift: - :commit: d863662b08f112dee48538a04ab704244e9c7bae - :git: https://github.com/alpha-wallet/web3swift.git + :commit: 169e50e29b60df72351c689a002005d2e2bc7559 + :git: https://github.com/AlphaWallet/web3swift.git CHECKOUT OPTIONS: AlphaWalletWeb3Provider: :commit: 1c1aafb566361e7067e69f6e38b0fdc30b801429 :git: https://github.com/AlphaWallet/AlphaWallet-web3-provider + Eureka: + :commit: 5c54e2607632ce586010e50e91d9adcb6bb3909e + :git: https://github.com/xmartlabs/Eureka.git Kanna: :commit: 06a04bc28783ccbb40efba355dee845a024033e8 :git: https://github.com/tid-kijyun/Kanna.git @@ -195,67 +202,67 @@ CHECKOUT OPTIONS: :commit: b797d40a9d08ec509db4335140cf2259b226e6a2 :git: https://github.com/AlphaWallet/keychain-swift.git Macaw: - :commit: e1f4eb1d2b81676fb10e9835c5e2ce9e9f51faf9 - :git: https://github.com/alpha-wallet/Macaw.git + :commit: aa4389b0dce39f754d454f3c19f71f0ef577c403 + :git: https://github.com/AlphaWallet/Macaw.git QRCodeReaderViewController: :commit: 30d1a2a7d167d0d207ae0ae3a4d81bcf473d7a65 :git: https://github.com/AlphaWallet/QRCodeReaderViewController.git SwiftyXMLParser: - :commit: 1ddcad0a09efb85f2325d994c2169cd9ba116ae3 + :commit: 0ca0e992ce0135169c715a6580b99f3e99c503e7 :git: https://github.com/yahoojapan/SwiftyXMLParser.git TrezorCrypto: :commit: 50c16ba5527e269bbc838e80aee5bac0fe304cc7 :git: https://github.com/AlphaWallet/trezor-crypto-ios.git TrustKeystore: - :commit: 37f7eaf9531cb4e33d06129543b3a56972f59d2a + :commit: c0bdc4f6ffc117b103e19d17b83109d4f5a0e764 :git: https://github.com/alpha-wallet/trust-keystore.git web3swift: - :commit: d863662b08f112dee48538a04ab704244e9c7bae - :git: https://github.com/alpha-wallet/web3swift.git + :commit: 169e50e29b60df72351c689a002005d2e2bc7559 + :git: https://github.com/AlphaWallet/web3swift.git SPEC CHECKSUMS: - Alamofire: e4fa87002c137ba2d8d634d2c51fabcda0d5c223 + Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18 Alamofire-Synchronous: eedf1e6e961c3795a63c74990b3f7d9fbfac7e50 AlphaWalletWeb3Provider: 80a88f0fc80443fb973b0a17f5ca0c80a2247d63 APIKit: 9e1a4069608bf0ae5238811e6cfc26928ad4d01e - AWSCore: f75fcf5b2f4325da49ae1f7cb5484778d3b0acc6 - AWSSNS: a67710a80c8d380e34248b16e503e0719f02a28d - BigInt: 8e8a52161c745cd3ab78e3dc346a9fbee51e6cf6 - CryptoSwift: 6c778d69282bed3b4e975ff97a79d074f20bb011 + AWSCore: e8cc7fd06efa211328942cc7c9f6dddbe889a115 + AWSSNS: d3ed65985986d5393de2793259e457e466997b55 + BigInt: 76b5dfdfa3e2e478d4ffdf161aeede5502e2742f + CryptoSwift: 093499be1a94b0cae36e6c26b70870668cb56060 Eureka: c883105488e05bc65539f583246ecf9657cabbfe - iOSSnapshotTestCase: 23984ffe05289728d646cbb6a7a10b4fb1c93440 - JavaScriptKit: 9ff565209e6efe21bcb9c6d6ca3e863a67a8ecf7 + iOSSnapshotTestCase: 9ab44cb5aa62b84d31847f40680112e15ec579a6 + JavaScriptKit: 33a7abbd6e03bf12e3f19f0f8ee753e748a361c1 JSONRPCKit: b2991f2f242d72022083f9d869140dabd26d65c7 Kanna: a32875df62975f8f4b871e933b4ea1a5c3b8be0f KeychainSwift: c0d1b0c2901b9873f07f0e560fde92929069e863 - Kingfisher: d342c8354c10c3d85a27d6d4c42c41285924b898 + Kingfisher: 6e1a13523fcb1c86924ce53affe4ac957e544d59 libsodium: 9a8faa5ef2fa0d2d57bd7f7d79bf8fb7c1a9f0ea Macaw: 9fcfcff649927df9a78074608191f8efb0fa582e - MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9 - Mixpanel-swift: 0624c84b0746e3434d5a286ca590bd5769625d28 - Moya: 9e621707ff754eeb51ff3ec51a3d54e517c0733a + MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406 + Mixpanel-swift: c16e5d3f7862b4a2f9b6b69b7e19ccacc3b12007 + Moya: 2b0531a9fef318e0bc484030c3db1e6f279ccb66 PromiseKit: 32c36425387e9cfc7f1206f27bfd906d0b53c0d6 QRCodeReaderViewController: e8f27d035b3e72b1d4b1c61ff66458287e3be0ff - R.swift: 8cbc4fc69b740305b6a17c8a8ed968eb788962d9 - R.swift.Library: fa85ce1e0d0b7e818cd9e080df910ba54d2776cc - Realm: 8949757d76e2451a53d727954c607e49c2542b77 - RealmSwift: 0b7d7121e842724188123c6086831ae6d2952050 + R.swift: 7c52cdc57a66840ffe6cbd8a823d732059d42a32 + R.swift.Library: 5ba4f1631300caf9a4d890186930da85d540769d + Realm: 042bbb59227a0159eda397b8a5a49fbd67495ce7 + RealmSwift: 15ddd6b3398ebfc99810811c44f095df1313adb3 Result: d2d07204ce72856f1fd9130bbe42c35a7b0fea10 SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c secp256k1_ios: ac9ef04e761f43c58012b28548afa91493761f17 SeedStackViewController: 4d37c51ec4b0a47daf563ce8f692fde2b703955b - SipHash: c6e9e43e9c531b5bc6602545130c26194a6d31ce + SipHash: fad90a4683e420c52ef28063063dbbce248ea6d4 StatefulViewController: 4803bf900d44de26074344998e10e041113b5931 - SwiftLint: ce933681be10c3266e82576dad676fa815a602e9 - SwiftProtobuf: 84cd6b8f4fd2fc3d9fbd80a0aaf2e957d52824ec - SwiftyJSON: 070dabdcb1beb81b247c65ffa3a79dbbfb3b48aa - SwiftyXMLParser: b5a79fb8a730903703d0a92d30752a0b05158967 + SwiftLint: dfd554ff0dff17288ee574814ccdd5cea85d76f7 + SwiftProtobuf: fd4693388a96c8c2df35d3b063272b0e7c499d00 + SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7 + SwiftyXMLParser: c39a7854b7d32e447e19d0fabdd98696fe26f03a SWXMLHash: 9cc0c2e4807926c74377724aa8722ee5707a0485 TrezorCrypto: bfeea47a052dca2c77d4a39e1e183865e52de14d - TrustKeystore: 26efa8079f6451d02ce64b906d3ff240fd71d7ca - TrustWalletCore: dd8c81d5958f1eb737abea1e14675efcc6a104aa - web3swift: 1597d4997976d21325882db4c523f1dfd5459406 + TrustKeystore: 3d8b4571c66648fb985015c96b3185440bb837fe + TrustWalletCore: 84a87886e55b4efa875b452926d3ba58a32359c8 + web3swift: 06118d4c4edc801444aaa995bbbddeda176b97ef -PODFILE CHECKSUM: 0316d0f99f78f33ba3a5a3805c877a60cb4d9975 +PODFILE CHECKSUM: d284670f6269632d01f9c22fd6699ba293e4f2e6 -COCOAPODS: 1.8.4 +COCOAPODS: 1.10.0