ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-01-05 04:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update wallet API

Browse Source
This commit is contained in:
Peter
2019-10-31 22:34:12 +04:00
parent 2c294c7e48
commit e2fad91f81
95 changed files with 8637 additions and 5180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
submodules/WalletCore/Sources/WalletCore.swift
View File

@@ -51,8 +51,8 @@ public protocol TonNetworkProxy: class {
private final class TonInstanceImpl {
private let queue: Queue
private let basePath: String
private let config: String
private let blockchainName: String
fileprivate var config: String
fileprivate var blockchainName: String
private let proxy: TonNetworkProxy?
private var instance: TON?
fileprivate let syncStateProgress = ValuePromise<Float>(0.0)
@@ -122,6 +122,8 @@ public final class TonInstance {
return Signal { subscriber in
let disposable = MetaDisposable()
self.impl.with { impl in
impl.config = config
impl.blockchainName = blockchainName
impl.withInstance { ton in
let cancel = ton.updateConfig(config, blockchainName: blockchainName).start(next: nil, error: { _ in
}, completed: {
@@ -136,6 +138,34 @@ public final class TonInstance {
}
}
public func validateConfig(config: String, blockchainName: String) -> Signal<WalletValidateConfigResult, WalletValidateConfigError> {
return Signal { subscriber in
let disposable = MetaDisposable()
self.impl.with { impl in
impl.withInstance { ton in
let cancel = ton.validateConfig(config, blockchainName: blockchainName).start(next: { result in
guard let result = result as? TONValidatedConfig else {
subscriber.putError(.generic)
return
}
subscriber.putNext(WalletValidateConfigResult(defaultWalletId: result.defaultWalletId))
subscriber.putCompletion()
}, error: { error in
guard let _ = error as? TONError else {
subscriber.putError(.generic)
return
}
subscriber.putError(.generic)
}, completed: nil)
disposable.set(ActionDisposable {
cancel?.dispose()
})
}
}
return disposable
}
}
fileprivate func exportKey(key: TONKey, localPassword: Data) -> Signal<[String], NoError> {
return Signal { subscriber in
let disposable = MetaDisposable()
@@ -226,31 +256,70 @@ public final class TonInstance {
}
}
fileprivate func walletAddress(publicKey: WalletPublicKey) -> Signal<String, NoError> {
fileprivate func getInitialWalletId() -> Signal<Int64, WalletValidateConfigError> {
return Signal { subscriber in
let disposable = MetaDisposable()
self.impl.with { impl in
let config = impl.config
let blockchainName = impl.blockchainName
impl.withInstance { ton in
let cancel = ton.getWalletAccountAddress(withPublicKey: publicKey.rawValue).start(next: { address in
guard let address = address as? String else {
let cancel = ton.validateConfig(config, blockchainName: blockchainName).start(next: { result in
guard let result = result as? TONValidatedConfig else {
subscriber.putError(.generic)
return
}
subscriber.putNext(address)
subscriber.putNext(result.defaultWalletId)
subscriber.putCompletion()
}, error: { _ in
}, completed: {
})
}, error: { error in
guard let _ = error as? TONError else {
subscriber.putError(.generic)
return
}
subscriber.putError(.generic)
}, completed: nil)
disposable.set(ActionDisposable {
cancel?.dispose()
})
}
}
return disposable
}
}
fileprivate func walletAddress(publicKey: WalletPublicKey) -> Signal<String, NoError> {
return self.getInitialWalletId()
|> `catch` { _ -> Signal<Int64, NoError> in
return .single(0)
}
|> mapToSignal { initialWalletId -> Signal<String, NoError> in
return Signal { subscriber in
let disposable = MetaDisposable()
self.impl.with { impl in
impl.withInstance { ton in
let cancel = ton.getWalletAccountAddress(withPublicKey: publicKey.rawValue, initialWalletId: initialWalletId).start(next: { address in
guard let address = address as? String else {
return
}
subscriber.putNext(address)
subscriber.putCompletion()
}, error: { _ in
subscriber.putNext("ERROR")
subscriber.putCompletion()
}, completed: {
})
disposable.set(ActionDisposable {
cancel?.dispose()
})
}
}
return disposable
}
}
}
private func getWalletStateRaw(address: String) -> Signal<TONAccountState, GetWalletStateError> {
return Signal { subscriber in
let disposable = MetaDisposable()
@@ -1263,3 +1332,12 @@ public protocol WalletStorageInterface {
func localWalletConfiguration() -> Signal<LocalWalletConfiguration, NoError>
func updateLocalWalletConfiguration(_ f: @escaping (LocalWalletConfiguration) -> LocalWalletConfiguration) -> Signal<Never, NoError>
}
public struct WalletValidateConfigResult {
public var defaultWalletId: Int64
}
public enum WalletValidateConfigError {
case generic
}