Update SDK
This commit is contained in:
Francisco Gindre
parent
f6709af810
commit
5c69aba7df
2
Podfile
2
Podfile
|
|
@ -1,6 +1,6 @@
|
|||
use_frameworks!
|
||||
target 'accept-zcash-poc' do
|
||||
pod 'ZcashLightClientKit', :git => 'https://github.com/zcash/ZcashLightClientKit.git', :branch => 'key-validation'
|
||||
pod 'ZcashLightClientKit', '~> 0.10.1'
|
||||
end
|
||||
|
||||
post_install do |installer|
|
||||
|
|
|
|||
97
Podfile.lock
97
Podfile.lock
|
|
@ -1,13 +1,13 @@
|
|||
PODS:
|
||||
- CGRPCZlib (1.0.0-alpha.19)
|
||||
- CNIOAtomics (2.26.0)
|
||||
- CNIOBoringSSL (2.10.3)
|
||||
- CNIOBoringSSLShims (2.10.3):
|
||||
- CNIOBoringSSL (= 2.10.3)
|
||||
- CNIODarwin (2.26.0)
|
||||
- CNIOHTTPParser (2.26.0)
|
||||
- CNIOLinux (2.26.0)
|
||||
- CNIOWindows (2.26.0)
|
||||
- CNIOAtomics (2.27.0)
|
||||
- CNIOBoringSSL (2.10.5)
|
||||
- CNIOBoringSSLShims (2.10.5):
|
||||
- CNIOBoringSSL (= 2.10.5)
|
||||
- CNIODarwin (2.27.0)
|
||||
- CNIOHTTPParser (2.27.0)
|
||||
- CNIOLinux (2.27.0)
|
||||
- CNIOWindows (2.27.0)
|
||||
- gRPC-Swift (1.0.0-alpha.19):
|
||||
- CGRPCZlib (= 1.0.0-alpha.19)
|
||||
- Logging (< 2, >= 1.2.0)
|
||||
|
|
@ -20,49 +20,49 @@ PODS:
|
|||
- SQLite.swift (0.12.2):
|
||||
- SQLite.swift/standard (= 0.12.2)
|
||||
- SQLite.swift/standard (0.12.2)
|
||||
- SwiftNIO (2.26.0):
|
||||
- CNIODarwin (= 2.26.0)
|
||||
- CNIOLinux (= 2.26.0)
|
||||
- CNIOWindows (= 2.26.0)
|
||||
- SwiftNIOConcurrencyHelpers (= 2.26.0)
|
||||
- SwiftNIOConcurrencyHelpers (2.26.0):
|
||||
- CNIOAtomics (= 2.26.0)
|
||||
- SwiftNIOFoundationCompat (2.26.0):
|
||||
- SwiftNIO (= 2.26.0)
|
||||
- SwiftNIO (2.27.0):
|
||||
- CNIODarwin (= 2.27.0)
|
||||
- CNIOLinux (= 2.27.0)
|
||||
- CNIOWindows (= 2.27.0)
|
||||
- SwiftNIOConcurrencyHelpers (= 2.27.0)
|
||||
- SwiftNIOConcurrencyHelpers (2.27.0):
|
||||
- CNIOAtomics (= 2.27.0)
|
||||
- SwiftNIOFoundationCompat (2.27.0):
|
||||
- SwiftNIO (= 2.27.0)
|
||||
- SwiftNIOHPACK (1.16.3):
|
||||
- SwiftNIO (< 3, >= 2.18.0)
|
||||
- SwiftNIOConcurrencyHelpers (< 3, >= 2.18.0)
|
||||
- SwiftNIOHTTP1 (< 3, >= 2.18.0)
|
||||
- SwiftNIOHTTP1 (2.26.0):
|
||||
- CNIOHTTPParser (= 2.26.0)
|
||||
- SwiftNIO (= 2.26.0)
|
||||
- SwiftNIOConcurrencyHelpers (= 2.26.0)
|
||||
- SwiftNIOHTTP1 (2.27.0):
|
||||
- CNIOHTTPParser (= 2.27.0)
|
||||
- SwiftNIO (= 2.27.0)
|
||||
- SwiftNIOConcurrencyHelpers (= 2.27.0)
|
||||
- SwiftNIOHTTP2 (1.16.3):
|
||||
- SwiftNIO (< 3, >= 2.18.0)
|
||||
- SwiftNIOConcurrencyHelpers (< 3, >= 2.18.0)
|
||||
- SwiftNIOHPACK (= 1.16.3)
|
||||
- SwiftNIOHTTP1 (< 3, >= 2.18.0)
|
||||
- SwiftNIOTLS (< 3, >= 2.18.0)
|
||||
- SwiftNIOSSL (2.10.3):
|
||||
- CNIOBoringSSL (= 2.10.3)
|
||||
- CNIOBoringSSLShims (= 2.10.3)
|
||||
- SwiftNIOSSL (2.10.5):
|
||||
- CNIOBoringSSL (= 2.10.5)
|
||||
- CNIOBoringSSLShims (= 2.10.5)
|
||||
- SwiftNIO (< 3, >= 2.15.0)
|
||||
- SwiftNIOConcurrencyHelpers (< 3, >= 2.15.0)
|
||||
- SwiftNIOTLS (< 3, >= 2.15.0)
|
||||
- SwiftNIOTLS (2.26.0):
|
||||
- SwiftNIO (= 2.26.0)
|
||||
- SwiftNIOTLS (2.27.0):
|
||||
- SwiftNIO (= 2.27.0)
|
||||
- SwiftNIOTransportServices (1.9.2):
|
||||
- SwiftNIO (< 3, >= 2.19.0)
|
||||
- SwiftNIOConcurrencyHelpers (< 3, >= 2.19.0)
|
||||
- SwiftNIOFoundationCompat (< 3, >= 2.19.0)
|
||||
- SwiftNIOTLS (< 3, >= 2.19.0)
|
||||
- SwiftProtobuf (1.15.0)
|
||||
- ZcashLightClientKit (0.9.3):
|
||||
- ZcashLightClientKit (0.10.1):
|
||||
- gRPC-Swift (= 1.0.0-alpha.19)
|
||||
- SQLite.swift (~> 0.12.2)
|
||||
|
||||
DEPENDENCIES:
|
||||
- ZcashLightClientKit (from `https://github.com/zcash/ZcashLightClientKit.git`, branch `key-validation`)
|
||||
- ZcashLightClientKit (~> 0.10.1)
|
||||
|
||||
SPEC REPOS:
|
||||
trunk:
|
||||
|
|
@ -87,41 +87,32 @@ SPEC REPOS:
|
|||
- SwiftNIOTLS
|
||||
- SwiftNIOTransportServices
|
||||
- SwiftProtobuf
|
||||
|
||||
EXTERNAL SOURCES:
|
||||
ZcashLightClientKit:
|
||||
:branch: key-validation
|
||||
:git: https://github.com/zcash/ZcashLightClientKit.git
|
||||
|
||||
CHECKOUT OPTIONS:
|
||||
ZcashLightClientKit:
|
||||
:commit: 01a55a5e1e64b3875553ace409d6dfbd8f252bf6
|
||||
:git: https://github.com/zcash/ZcashLightClientKit.git
|
||||
- ZcashLightClientKit
|
||||
|
||||
SPEC CHECKSUMS:
|
||||
CGRPCZlib: befd9b92013c647f18aa9b7d9e9231d52e1ced1b
|
||||
CNIOAtomics: 7599e2500f637f1e043047da52efd710d6020dd3
|
||||
CNIOBoringSSL: 8e20acf863216a6d7b75a56fe0567a36147d8ee0
|
||||
CNIOBoringSSLShims: 72cc9d43e6f5d8a137a2699eb08a0c67865c9797
|
||||
CNIODarwin: 68f6ff440e989ef43ca6eb3335f3e5484066fab7
|
||||
CNIOHTTPParser: 26678afdbc27f24d1a3498bf87413bfc3391fbc5
|
||||
CNIOLinux: 5fd92122d58b04508074371d95a1f874310fe8e3
|
||||
CNIOWindows: 0af55cf84c3811318aee91888737e0b124552029
|
||||
CNIOAtomics: 43316aa185f4bd639aa0a9cd49741151bbe8de7f
|
||||
CNIOBoringSSL: 7ff9c35139a115f93269915b9555044d741b2ac9
|
||||
CNIOBoringSSLShims: 6edde63429e353ba78992b2d4d1b0627752a4a43
|
||||
CNIODarwin: 9eb3c09e9f3fc5ed47cecdd032aad926df81e3a6
|
||||
CNIOHTTPParser: c6051552c5f332e4ec0756581e5cbd5632ca24e6
|
||||
CNIOLinux: 79227941d64216792c3c59238b0106b9e0df25bc
|
||||
CNIOWindows: f2baa102255e986467578337ffa2f777cb6bdf7f
|
||||
gRPC-Swift: 75a7a8d7cd08177165ef971159afb84e5130cfc9
|
||||
Logging: beeb016c9c80cf77042d62e83495816847ef108b
|
||||
SQLite.swift: d2b4642190917051ce6bd1d49aab565fe794eea3
|
||||
SwiftNIO: 1f309539cfe7ed42648f505a48c546e83a2f66c3
|
||||
SwiftNIOConcurrencyHelpers: ebbceb814afcd8b4fab86935855f6c8c77ae4285
|
||||
SwiftNIOFoundationCompat: 6869943bce8c6b777114d840f7d795178a7391ae
|
||||
SwiftNIO: 81d33ce8c500b7e41b6cdde5f2f12330b9750219
|
||||
SwiftNIOConcurrencyHelpers: 23fc68bac541a465162d7225d2c743edd2f1012c
|
||||
SwiftNIOFoundationCompat: 0e52ac0e2c9b7b60ff9141eebb64f5a82d974118
|
||||
SwiftNIOHPACK: 38e855a72ae0c5176485ddd039b3933b99daa2b7
|
||||
SwiftNIOHTTP1: 7f7aa111d51d09a97ef1fddb50855074e5e42778
|
||||
SwiftNIOHTTP1: 846277d7fc7661fba655540e529d7ba3c728ca50
|
||||
SwiftNIOHTTP2: de7eff9d32fd347338f85b86c6fd0e13c3fbd1a0
|
||||
SwiftNIOSSL: ac6e05adff65df9a3b518bbd27ff1f152fa82999
|
||||
SwiftNIOTLS: 0faded6aff802c423ddee27828850a8ea4a818d0
|
||||
SwiftNIOSSL: 6a1f0499a5319e823eae0b6f053ecb502bcce3f5
|
||||
SwiftNIOTLS: 4f8df225f03393f08e0b47b4d876ae38167f8a27
|
||||
SwiftNIOTransportServices: 896c9a4ac98698d32aa2feea7657ade219ae80bb
|
||||
SwiftProtobuf: 3320217e9d8fb75f36b40282e78c482640fd75dd
|
||||
ZcashLightClientKit: 2bea7cdf2ddf098795688a198916e9d4ae6c1239
|
||||
ZcashLightClientKit: 64e2b2632d2c1b892d3427dd3b803a041d02583a
|
||||
|
||||
PODFILE CHECKSUM: 475acd7bc72abd32c68bdf0f8ee3ac3311a9cec2
|
||||
PODFILE CHECKSUM: 1954ad4bebcbb26266dcd0ce7f457829d044acb0
|
||||
|
||||
COCOAPODS: 1.10.1
|
||||
|
|
|
|||
|
|
@ -35,39 +35,38 @@ class SimpleLogger: ZcashLightClientKit.Logger {
|
|||
private static let subsystem = Bundle.main.bundleIdentifier!
|
||||
static let oslog = OSLog(subsystem: subsystem, category: "logs")
|
||||
|
||||
func debug(_ message: String, file: String = #file, function: String = #function, line: Int = #line) {
|
||||
func debug(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
|
||||
guard level.rawValue == LogLevel.debug.rawValue else { return }
|
||||
log(level: "DEBUG 🐞", message: message, file: file, function: function, line: line)
|
||||
}
|
||||
|
||||
func error(_ message: String, file: String = #file, function: String = #function, line: Int = #line) {
|
||||
func error(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
|
||||
guard level.rawValue <= LogLevel.error.rawValue else { return }
|
||||
log(level: "ERROR 💥", message: message, file: file, function: function, line: line)
|
||||
}
|
||||
|
||||
func warn(_ message: String, file: String = #file, function: String = #function, line: Int = #line) {
|
||||
func warn(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
|
||||
guard level.rawValue <= LogLevel.warning.rawValue else { return }
|
||||
log(level: "WARNING ⚠️", message: message, file: file, function: function, line: line)
|
||||
}
|
||||
|
||||
func event(_ message: String, file: String = #file, function: String = #function, line: Int = #line) {
|
||||
func event(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
|
||||
guard level.rawValue <= LogLevel.event.rawValue else { return }
|
||||
log(level: "EVENT ⏱", message: message, file: file, function: function, line: line)
|
||||
}
|
||||
|
||||
func info(_ message: String, file: String = #file, function: String = #function, line: Int = #line) {
|
||||
func info(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
|
||||
guard level.rawValue <= LogLevel.info.rawValue else { return }
|
||||
log(level: "INFO ℹ️", message: message, file: file, function: function, line: line)
|
||||
}
|
||||
|
||||
private func log(level: String, message: String, file: String, function: String, line: Int) {
|
||||
let fileName = (file as NSString).lastPathComponent
|
||||
private func log(level: String, message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
|
||||
let fileName = (String(describing: file) as NSString).lastPathComponent
|
||||
switch loggerType {
|
||||
case .printerLog:
|
||||
print("[\(level)] \(fileName) - \(function) - line: \(line) -> \(message)")
|
||||
default:
|
||||
// os_log("[%@] %@ - %@ - Line: %d -> %@", log: Self.oslog, type: .debug, level, fileName, function, line, message)
|
||||
os_log("[%{public}@] %{public}@ - %{public}@ - Line: %{public}d -> %{public}@", level, fileName, function, line, message)
|
||||
os_log("[%{public}@] %{public}@ - %{public}@ - Line: %{public}d -> %{public}@", level, fileName, String(describing: function), line, message)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue