lil-org/tokenary
1
1
Fork 0
mirror of https://github.com/lil-org/tokenary.git synced 2024-12-03 06:25:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
Vadim Zakharenko 2021-06-13 13:42:42 +03:00 committed by Ivan Grachyov
parent 4f55977cac
commit 3bcd4c6ce1
5 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Encrypted Ink.xcodeproj/project.pbxproj
View File

@ -21,7 +21,6 @@
0DB7291E2674E2DB0011F7A1 /* EIP712Signable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DB7290F2674E2DB0011F7A1 /* EIP712Signable.swift */; };
0DB7291F2674E2DB0011F7A1 /* EIP712Representable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DB729102674E2DB0011F7A1 /* EIP712Representable.swift */; };
0DB729202674E2DB0011F7A1 /* EIP712Domain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DB729112674E2DB0011F7A1 /* EIP712Domain.swift */; };
0DC750BE2675FEED00A2963C /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DC750BD2675FEED00A2963C /* Errors.swift */; };
2C1995402674C4B900A8E370 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C19953F2674C4B900A8E370 /* AppDelegate.swift */; };
2C1995422674C4B900A8E370 /* ImportViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C1995412674C4B900A8E370 /* ImportViewController.swift */; };
2C1995442674C4BA00A8E370 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2C1995432674C4BA00A8E370 /* Assets.xcassets */; };
@ -56,7 +55,6 @@
0DB7290F2674E2DB0011F7A1 /* EIP712Signable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EIP712Signable.swift; sourceTree = "<group>"; };
0DB729102674E2DB0011F7A1 /* EIP712Representable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EIP712Representable.swift; sourceTree = "<group>"; };
0DB729112674E2DB0011F7A1 /* EIP712Domain.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EIP712Domain.swift; sourceTree = "<group>"; };
0DC750BD2675FEED00A2963C /* Errors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Errors.swift; sourceTree = "<group>"; };
133FE10DD9778DE6E9745037 /* Pods-Encrypted Ink.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Encrypted Ink.debug.xcconfig"; path = "Target Support Files/Pods-Encrypted Ink/Pods-Encrypted Ink.debug.xcconfig"; sourceTree = "<group>"; };
2179E47ED166F2C33B9718BA /* Pods-Encrypted Ink.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Encrypted Ink.release.xcconfig"; path = "Target Support Files/Pods-Encrypted Ink/Pods-Encrypted Ink.release.xcconfig"; sourceTree = "<group>"; };
2C19953C2674C4B900A8E370 /* Encrypted Ink.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Encrypted Ink.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@ -154,7 +152,6 @@
2C19953F2674C4B900A8E370 /* AppDelegate.swift */,
2C8A09C5267513FC00993638 /* Agent.swift */,
2C8A09D626751A0C00993638 /* WalletConnect.swift */,
0DC750BD2675FEED00A2963C /* Errors.swift */,
2C8A09D32675184700993638 /* Window.swift */,
2C8A09C92675142700993638 /* Screens */,
2C8A09C2267513A700993638 /* Ethereum */,
@ -347,7 +344,6 @@
0DB729152674E2DB0011F7A1 /* EIP712Error.swift in Sources */,
2C8A09C6267513FC00993638 /* Agent.swift in Sources */,
2C8A09D42675184700993638 /* Window.swift in Sources */,
0DC750BE2675FEED00A2963C /* Errors.swift in Sources */,
0DB7291A2674E2DB0011F7A1 /* EIP712Type.swift in Sources */,
0DB7291D2674E2DB0011F7A1 /* EIP712Hashable.swift in Sources */,
0DB729162674E2DB0011F7A1 /* EIP712SimpleValue.swift in Sources */,

5
Encrypted Ink/Errors.swift
View File

@ -1,5 +0,0 @@
// Copyright © 2021 Encrypted Ink. All rights reserved.
enum Errors: Error {
case unknown
}

5
Encrypted Ink/Ethereum/AccountsService.swift
View File

@ -39,6 +39,11 @@ struct AccountsService {
return loadAccountsFromKeychain() ?? []
}
static func getAccountForAddress(_ address: String) -> Account? {
let allAccounts = getAccounts()
return allAccounts.first(where: { $0.address == address.lowercased() })
}
private static func saveInKeychain(accounts: [Account]) {
guard let data = try? JSONEncoder().encode(accounts) else { return }
let query = [kSecClass as String: kSecClassGenericPassword as String,

9
Encrypted Ink/Ethereum/Ethereum.swift
View File

@ -19,6 +19,11 @@ struct Account: Codable {
}
struct Ethereum {
enum Errors: Error {
case invalidInputData
case failedToSendTransaction
}
private static let network: Network = AlchemyNetwork(
chain: "mainnet",
@ -60,7 +65,7 @@ struct Ethereum {
static func sign(transaction: Transaction, account: Account) throws -> String {
guard transaction.transactionsCount != nil, transaction.gasPrice != nil, transaction.gasEstimate != nil else {
throw Errors.unknown
throw Errors.invalidInputData
}
let bytes = signedTransactionBytes(transaction: transaction, account: account)
return try bytes.value().toPrefixedHexString()
@ -70,7 +75,7 @@ struct Ethereum {
let bytes = signedTransactionBytes(transaction: transaction, account: account)
let response = try SendRawTransactionProcedure(network: network, transactionBytes: bytes).call()
guard let hash = response["result"].string else {
throw Errors.unknown
throw Errors.failedToSendTransaction
}
return hash
}

10
Encrypted Ink/WalletConnect.swift
View File

@ -99,7 +99,7 @@ class WalletConnect {
func sendTransaction(id: Int64, wct: WCEthereumTransaction, address: String, interactor: WCInteractor?) {
guard
let account = getAccountForAddress(address)
let account = AccountsService.getAccountForAddress(address)
else {
rejectRequest(id: id, interactor: interactor, message: "Failed for some reason")
return
@ -120,7 +120,7 @@ class WalletConnect {
func sign(id: Int64, message: String?, payload: WCEthereumSignPayload, address: String, interactor: WCInteractor?) {
guard
let message = message,
let account = getAccountForAddress(address)
let account = AccountsService.getAccountForAddress(address)
else {
rejectRequest(id: id, interactor: interactor, message: "Failed for some reason")
return
@ -141,10 +141,4 @@ class WalletConnect {
interactor?.approveRequest(id: id, result: result).cauterize()
}
private func getAccountForAddress(_ address: String) -> Account? {
let allAccounts = AccountsService.getAccounts()
return allAccounts.filter({ $0.address.lowercased() == address.lowercased() }).first
}
}