-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '10-wallet' into develop
# Conflicts: # SolardVPNCommunityCoreiOS/SOLARdVPNCommunityCoreiOS/Root/DVPNServer.swift
- Loading branch information
Showing
10 changed files
with
218 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
...unityCoreiOS/SOLARdVPNCommunityCoreiOS/Root/RouteCollections/Wallet/Models/Mnemonic.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| // | ||
| // Mnemonic.swift | ||
| // SOLARdVPNCommunityCoreiOS | ||
| // | ||
| // Created by Viktoriia Kostyleva on 05.10.2022. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| struct Mnemonic: Codable { | ||
| let mnemonic: String | ||
| } |
13 changes: 13 additions & 0 deletions
13
.../SOLARdVPNCommunityCoreiOS/Root/RouteCollections/Wallet/Models/PostMnemonicResponse.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| // | ||
| // PostMnemonicResponse.swift | ||
| // SOLARdVPNCommunityCoreiOS | ||
| // | ||
| // Created by Viktoriia Kostyleva on 05.10.2022. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| struct PostMnemonicResponse: Codable { | ||
| let wallet: Wallet | ||
| let mnemonic: String | ||
| } |
14 changes: 14 additions & 0 deletions
14
...mmunityCoreiOS/SOLARdVPNCommunityCoreiOS/Root/RouteCollections/Wallet/Models/Wallet.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| // | ||
| // Wallet.swift | ||
| // SOLARdVPNCommunityCoreiOS | ||
| // | ||
| // Created by Viktoriia Kostyleva on 04.10.2022. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| struct Wallet: Codable { | ||
| let address: String | ||
| let balance: Int | ||
| let currency: String | ||
| } |
140 changes: 140 additions & 0 deletions
140
...oreiOS/SOLARdVPNCommunityCoreiOS/Root/RouteCollections/Wallet/WalletRouteCollection.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,140 @@ | ||
| // | ||
| // WalletRouteCollection.swift | ||
| // SOLARdVPNCommunityCoreiOS | ||
| // | ||
| // Created by Viktoriia Kostyleva on 04.10.2022. | ||
| // | ||
|
|
||
| import Foundation | ||
| import Vapor | ||
|
|
||
| struct WalletRouteCollection: RouteCollection { | ||
| let context: HasSecurityService & HasWalletStorage & HasWalletService | ||
|
|
||
| func boot(routes: RoutesBuilder) throws { | ||
| routes.get("wallet", use: getWallet) | ||
| routes.put("wallet", use: putWallet) | ||
| routes.post("wallet", use: postWallet) | ||
| routes.delete("wallet", use: deleteWallet) | ||
| } | ||
| } | ||
|
|
||
| extension WalletRouteCollection { | ||
| func getWallet(_ req: Request) async throws -> String { | ||
| try await withCheckedThrowingContinuation({ (continuation: CheckedContinuation<String, Error>) in | ||
| getWallet() { result in | ||
| switch result { | ||
| case let .failure(error): | ||
| continuation.resume(throwing: Abort(.init(statusCode: 500), reason: error.localizedDescription)) | ||
|
|
||
| case let .success(wallet): | ||
| Encoder.encode(model: wallet, continuation: continuation) | ||
| } | ||
| } | ||
| }) | ||
| } | ||
|
|
||
| func putWallet(_ req: Request) async throws -> String { | ||
| let body = try req.content.decode(Mnemonic.self) | ||
|
|
||
| let mnemonic = body.mnemonic.components(separatedBy: .whitespaces) | ||
|
|
||
| return try await withCheckedThrowingContinuation({ (continuation: CheckedContinuation<String, Error>) in | ||
| switch context.securityService.restore(from: mnemonic) { | ||
| case .failure(let error): | ||
| continuation.resume(throwing: Abort(.init(statusCode: 500), reason: error.localizedDescription)) | ||
|
|
||
| case .success(let result): | ||
| guard context.securityService.save(mnemonics: mnemonic, for: result) else { | ||
| continuation.resume(throwing: Abort(.init(statusCode: 500), reason: "Creation failed")) | ||
| return | ||
| } | ||
| context.walletStorage.set(wallet: result) | ||
| context.updateWalletContext() | ||
|
|
||
| getWallet() { result in | ||
| switch result { | ||
| case let .failure(error): | ||
| continuation.resume(throwing: Abort(.init(statusCode: 500), reason: error.localizedDescription)) | ||
|
|
||
| case let .success(wallet): | ||
| Encoder.encode(model: wallet, continuation: continuation) | ||
| } | ||
| } | ||
| } | ||
| }) | ||
| } | ||
|
|
||
| func postWallet(_ req: Request) async throws -> String { | ||
| context.resetWalletContext() | ||
|
|
||
| let address = context.walletStorage.walletAddress | ||
|
|
||
| guard let mnemonic = context.securityService.loadMnemonics(for: address) else { | ||
| throw Abort(.init(statusCode: 500), reason: "Failed to liad mnemonic") | ||
| } | ||
|
|
||
| return try await withCheckedThrowingContinuation({ (continuation: CheckedContinuation<String, Error>) in | ||
| getWallet() { result in | ||
| switch result { | ||
| case let .failure(error): | ||
| continuation.resume(throwing: Abort(.init(statusCode: 500), reason: error.localizedDescription)) | ||
| case let .success(wallet): | ||
| let response = PostMnemonicResponse(wallet: wallet, mnemonic: mnemonic.joined(separator: " ")) | ||
| Encoder.encode(model: response, continuation: continuation) | ||
| } | ||
| } | ||
| }) | ||
| } | ||
|
|
||
| func deleteWallet(_ req: Request) -> Response { | ||
| context.resetWalletContext() | ||
| return Response() | ||
| } | ||
| } | ||
|
|
||
| // MARK: - Private | ||
|
|
||
| extension WalletRouteCollection { | ||
| private func getWallet( | ||
| completion: @escaping (Result<Wallet, Error>) -> Void | ||
| ) { | ||
| fetchBalance() { result in | ||
| switch result { | ||
| case let .failure(error): | ||
| completion(.failure(error)) | ||
|
|
||
| case let .success(balance): | ||
| let address = context.walletStorage.walletAddress | ||
| let wallet = Wallet(address: address, balance: balance, currency: ClientConstants.denom) | ||
|
|
||
| completion(.success(wallet)) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private func fetchBalance( | ||
| completion: @escaping (Result<Int, Error>) -> Void | ||
| ) { | ||
| context.walletService.fetchBalance { result in | ||
| switch result { | ||
| case let .failure(error): | ||
| completion(.failure(error)) | ||
|
|
||
| case let .success(balances): | ||
| guard let balance = balances.first(where: { $0.denom == ClientConstants.denom }) else { | ||
| completion(.success(0)) | ||
| return | ||
| } | ||
|
|
||
| guard let amount = Int(balance.amount) else { | ||
| // TODO: Call completion with error | ||
|
|
||
| return | ||
| } | ||
|
|
||
| completion(.success(amount)) | ||
| } | ||
| } | ||
| } | ||
| } |