convert the rest of structures to swift 4 style deserialization

Alex Vlasov · Alex Vlasov · commit 90c9eff5c0ab · 2018-06-18T17:41:55.000+03:00
diff --git a/web3swift.xcodeproj/project.pbxproj b/web3swift.xcodeproj/project.pbxproj
@@ -145,6 +145,10 @@
 		81A1824320D7AA750016741F /* Promise+Web3+Eth+SendTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81A1824120D7AA750016741F /* Promise+Web3+Eth+SendTransaction.swift */; };
 		81A1824520D7B91B0016741F /* Promise+Web3+Intermediate+Send.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81A1824420D7B91B0016741F /* Promise+Web3+Intermediate+Send.swift */; };
 		81A1824620D7B91B0016741F /* Promise+Web3+Intermediate+Send.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81A1824420D7B91B0016741F /* Promise+Web3+Intermediate+Send.swift */; };
+		81A1824820D7DDA20016741F /* Promise+Web3+Personal+Sign.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81A1824720D7DDA20016741F /* Promise+Web3+Personal+Sign.swift */; };
+		81A1824920D7DDA20016741F /* Promise+Web3+Personal+Sign.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81A1824720D7DDA20016741F /* Promise+Web3+Personal+Sign.swift */; };
+		81A1824B20D7DF1B0016741F /* Promise+Web3+Personal+UnlockAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81A1824A20D7DF1B0016741F /* Promise+Web3+Personal+UnlockAccount.swift */; };
+		81A1824C20D7DF1B0016741F /* Promise+Web3+Personal+UnlockAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81A1824A20D7DF1B0016741F /* Promise+Web3+Personal+UnlockAccount.swift */; };
 		81BEDE1D20852F75002CD87D /* Web3+PersonalOperations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81BEDE1C20852F75002CD87D /* Web3+PersonalOperations.swift */; };
 		81BEDE1E20852F75002CD87D /* Web3+PersonalOperations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81BEDE1C20852F75002CD87D /* Web3+PersonalOperations.swift */; };
 		81C0FCF220440EB500D82FAF /* Web3+Protocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81C0FCF120440EB500D82FAF /* Web3+Protocols.swift */; };
@@ -311,6 +315,8 @@
 		81A1823F20D79FDB0016741F /* Promise+Web3+Eth+EstimateGas.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Promise+Web3+Eth+EstimateGas.swift"; sourceTree = "<group>"; };
 		81A1824120D7AA750016741F /* Promise+Web3+Eth+SendTransaction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Promise+Web3+Eth+SendTransaction.swift"; sourceTree = "<group>"; };
 		81A1824420D7B91B0016741F /* Promise+Web3+Intermediate+Send.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Promise+Web3+Intermediate+Send.swift"; sourceTree = "<group>"; };
+		81A1824720D7DDA20016741F /* Promise+Web3+Personal+Sign.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Promise+Web3+Personal+Sign.swift"; sourceTree = "<group>"; };
+		81A1824A20D7DF1B0016741F /* Promise+Web3+Personal+UnlockAccount.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Promise+Web3+Personal+UnlockAccount.swift"; sourceTree = "<group>"; };
 		81BEDE1C20852F75002CD87D /* Web3+PersonalOperations.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Web3+PersonalOperations.swift"; sourceTree = "<group>"; };
 		81C0FCEF20440C3600D82FAF /* Web3+Wallet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Web3+Wallet.swift"; sourceTree = "<group>"; };
 		81C0FCF120440EB500D82FAF /* Web3+Protocols.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Web3+Protocols.swift"; sourceTree = "<group>"; };
@@ -633,6 +639,8 @@
 				81A1823F20D79FDB0016741F /* Promise+Web3+Eth+EstimateGas.swift */,
 				81A1824120D7AA750016741F /* Promise+Web3+Eth+SendTransaction.swift */,
 				81A1824420D7B91B0016741F /* Promise+Web3+Intermediate+Send.swift */,
+				81A1824720D7DDA20016741F /* Promise+Web3+Personal+Sign.swift */,
+				81A1824A20D7DF1B0016741F /* Promise+Web3+Personal+UnlockAccount.swift */,
 			);
 			path = Classes;
 			sourceTree = "<group>";
@@ -1048,6 +1056,7 @@
 				8125F0662047D9FF00A0F2FE /* ABIEncoder.swift in Sources */,
 				8113D2C61FD7E1590074282C /* LibSecp256k1Extension.swift in Sources */,
 				81EB1E4B208173D7003BD47F /* Web3+Personal.swift in Sources */,
+				81A1824B20D7DF1B0016741F /* Promise+Web3+Personal+UnlockAccount.swift in Sources */,
 				81A1823A20D79AD40016741F /* Promise+Web3+Eth+SendRawTransaction.swift in Sources */,
 				81D7D97520A3240900A193EC /* EthereumFilterEncodingExtensions.swift in Sources */,
 				817EBB122004FE2F00E02EAA /* BIP32HDNode.swift in Sources */,
@@ -1091,6 +1100,7 @@
 				81166665204565AC008D8AD0 /* Web3+BrowserFunctions.swift in Sources */,
 				81531AA01FE7C07A002192CC /* EthereumKeystoreV3.swift in Sources */,
 				8103BBBA20764A6900499769 /* Web3+DataFetchOperation.swift in Sources */,
+				81A1824820D7DDA20016741F /* Promise+Web3+Personal+Sign.swift in Sources */,
 				8123E1C9200CBAF800B6D3AB /* Data+Extension.swift in Sources */,
 				81C5DA1B2072633300424CD6 /* ABIv2ParameterTypes.swift in Sources */,
 				81FB21EE2077D98A007F9A83 /* SynchronizedQueue.swift in Sources */,
@@ -1190,6 +1200,7 @@
 				81FB21F22078142D007F9A83 /* Web3+Deprecated.swift in Sources */,
 				41948131203630530065A83B /* BIP32KeystoreJSONStructure.swift in Sources */,
 				41948132203630530065A83B /* BIP32HDNode.swift in Sources */,
+				81A1824920D7DDA20016741F /* Promise+Web3+Personal+Sign.swift in Sources */,
 				81A1822620D678590016741F /* Promise+Web3+Eth+GetGasPrice.swift in Sources */,
 				41948133203630530065A83B /* BIP39.swift in Sources */,
 				81C5DA2F2074EBF500424CD6 /* ContractABIv2.swift in Sources */,
@@ -1209,6 +1220,7 @@
 				81A1822920D678BF0016741F /* Promise+Web3+Eth+GetAccounts.swift in Sources */,
 				81C5DA322074EC1E00424CD6 /* ContractProtocol.swift in Sources */,
 				81C5DA232072DFE600424CD6 /* ABIv2TypeParser.swift in Sources */,
+				81A1824C20D7DF1B0016741F /* Promise+Web3+Personal+UnlockAccount.swift in Sources */,
 				41948139203630530065A83B /* LibSecp256k1Extension.swift in Sources */,
 				4194813A203630530065A83B /* DictionaryLiteralJSONSerializer.swift in Sources */,
 				4194813B203630530065A83B /* NSRegularExpressionExtension.swift in Sources */,
diff --git a/web3swift/Promises/Classes/Promise+Web3+Eth+GetBlockByHash.swift b/web3swift/Promises/Classes/Promise+Web3+Eth+GetBlockByHash.swift
@@ -21,12 +21,13 @@ extension web3.Eth {
         let rp = web3.dispatch(request)
         let queue = web3.requestDispatcher.queue
         return rp.map(on: queue ) { response in
-            guard let value: [String: AnyObject] = response.getValue() else {
+            guard let value: Block = response.getValue() else {
                 throw Web3Error.nodeError("Invalid value from Ethereum node")
             }
-            let reencoded = try JSONSerialization.data(withJSONObject: value, options: JSONSerialization.WritingOptions(rawValue: 0))
-            let details = try JSONDecoder().decode(Block.self, from: reencoded)
-            return details
+            return value
+//            let reencoded = try JSONSerialization.data(withJSONObject: value, options: JSONSerialization.WritingOptions(rawValue: 0))
+//            let details = try JSONDecoder().decode(Block.self, from: reencoded)
+//            return details
         }
     }
 }
diff --git a/web3swift/Promises/Classes/Promise+Web3+Eth+GetBlockByNumber.swift b/web3swift/Promises/Classes/Promise+Web3+Eth+GetBlockByNumber.swift
@@ -26,12 +26,13 @@ extension web3.Eth {
         let rp = web3.dispatch(request)
         let queue = web3.requestDispatcher.queue
         return rp.map(on: queue ) { response in
-            guard let value: [String: AnyObject] = response.getValue() else {
+            guard let value: Block = response.getValue() else {
                 throw Web3Error.nodeError("Invalid value from Ethereum node")
             }
-            let reencoded = try JSONSerialization.data(withJSONObject: value, options: JSONSerialization.WritingOptions(rawValue: 0))
-            let details = try JSONDecoder().decode(Block.self, from: reencoded)
-            return details
+            return value
+//            let reencoded = try JSONSerialization.data(withJSONObject: value, options: JSONSerialization.WritingOptions(rawValue: 0))
+//            let details = try JSONDecoder().decode(Block.self, from: reencoded)
+//            return details
         }
     }
 }
diff --git a/web3swift/Promises/Classes/Promise+Web3+Eth+GetTransactionDetails.swift b/web3swift/Promises/Classes/Promise+Web3+Eth+GetTransactionDetails.swift
@@ -21,16 +21,17 @@ extension web3.Eth {
         let rp = web3.dispatch(request)
         let queue = web3.requestDispatcher.queue
         return rp.map(on: queue ) { response in
-            guard let value: [String: AnyObject] = response.getValue() else {
+            guard let value: TransactionDetails = response.getValue() else {
                 throw Web3Error.nodeError("Invalid value from Ethereum node")
             }
+            return value
 //            guard let details = TransactionDetails(value) else {
 //                throw Web3Error.processingError("Can not deserialize transaction details")
 //            }
 //            return details
-            let reencoded = try JSONSerialization.data(withJSONObject: value, options: JSONSerialization.WritingOptions(rawValue: 0))
-            let details = try JSONDecoder().decode(TransactionDetails.self, from: reencoded)
-            return details
+//            let reencoded = try JSONSerialization.data(withJSONObject: value, options: JSONSerialization.WritingOptions(rawValue: 0))
+//            let details = try JSONDecoder().decode(TransactionDetails.self, from: reencoded)
+//            return details
         }
     }
 }
diff --git a/web3swift/Promises/Classes/Promise+Web3+Eth+GetTransactionReceipt.swift b/web3swift/Promises/Classes/Promise+Web3+Eth+GetTransactionReceipt.swift
@@ -21,16 +21,17 @@ extension web3.Eth {
         let rp = web3.dispatch(request)
         let queue = web3.requestDispatcher.queue
         return rp.map(on: queue ) { response in
-            guard let value: [String: AnyObject] = response.getValue() else {
+            guard let value: TransactionReceipt = response.getValue() else {
                 throw Web3Error.nodeError("Invalid value from Ethereum node")
             }
+            return value
 //            guard let details = TransactionReceipt(value) else {
 //                throw Web3Error.processingError("Can not deserialize transaction details")
 //            }
 //            return details
-            let reencoded = try JSONSerialization.data(withJSONObject: value, options: JSONSerialization.WritingOptions(rawValue: 0))
-            let details = try JSONDecoder().decode(TransactionReceipt.self, from: reencoded)
-            return details
+//            let reencoded = try JSONSerialization.data(withJSONObject: value, options: JSONSerialization.WritingOptions(rawValue: 0))
+//            let details = try JSONDecoder().decode(TransactionReceipt.self, from: reencoded)
+//            return details
         }
     }
 }
diff --git a/web3swift/Promises/Classes/Promise+Web3+Personal+Sign.swift b/web3swift/Promises/Classes/Promise+Web3+Personal+Sign.swift
@@ -0,0 +1,42 @@
+//
+//  Promise+Web3+Personal+Sign.swift
+//  web3swift
+//
+//  Created by Alexander Vlasov on 18.06.2018.
+//  Copyright © 2018 Bankex Foundation. All rights reserved.
+//
+
+import Foundation
+import BigInt
+import PromiseKit
+
+extension web3.Personal {
+    
+    func sendPersonalMessagePromise(message: Data, from: EthereumAddress, password:String = "BANKEXFOUNDATION") -> Promise<Data> {
+        let queue = web3.requestDispatcher.queue
+        do {
+            if self.web3.provider.attachedKeystoreManager == nil {
+                let hexData = message.toHexString().addHexPrefix()
+                let request = JSONRPCRequestFabric.prepareRequest(.personalSign, parameters: [from.address.lowercased(), hexData])
+                return self.web3.dispatch(request).map(on: queue) {response in
+                    guard let value: Data = response.getValue() else {
+                        throw Web3Error.nodeError("Invalid value from Ethereum node")
+                    }
+                    return value
+                }
+            }
+            guard let signature = try Web3Signer.signPersonalMessage(message, keystore: self.web3.provider.attachedKeystoreManager!, account: from, password: password) else { throw Web3Error.inputError("Failed to locally sign a message") }
+            let returnPromise = Promise<Data>.pending()
+            queue.async {
+                returnPromise.resolver.fulfill(signature)
+            }
+            return returnPromise.promise
+        } catch {
+            let returnPromise = Promise<Data>.pending()
+            queue.async {
+                returnPromise.resolver.reject(error)
+            }
+            return returnPromise.promise
+        }
+    }
+}
diff --git a/web3swift/Promises/Classes/Promise+Web3+Personal+UnlockAccount.swift b/web3swift/Promises/Classes/Promise+Web3+Personal+UnlockAccount.swift
@@ -0,0 +1,41 @@
+//
+//  Promise+Web3+Personal+UnlockAccount.swift
+//  web3swift
+//
+//  Created by Alexander Vlasov on 18.06.2018.
+//  Copyright © 2018 Bankex Foundation. All rights reserved.
+//
+
+import Foundation
+import BigInt
+import PromiseKit
+
+extension web3.Personal {
+    func unlockAccountPromise(account: EthereumAddress, password:String = "BANKEXFOUNDATION", seconds: UInt64 = 300) -> Promise<Bool> {
+        let addr = account.address
+        return unlockAccountPromise(account: addr, password: password, seconds: seconds)
+    }
+    
+    
+    func unlockAccountPromise(account: String, password:String = "BANKEXFOUNDATION", seconds: UInt64 = 300) -> Promise<Bool> {
+        let queue = web3.requestDispatcher.queue
+        do {
+            if self.web3.provider.attachedKeystoreManager == nil {
+                let request = JSONRPCRequestFabric.prepareRequest(.unlockAccount, parameters: [account.lowercased(), password, seconds])
+                return self.web3.dispatch(request).map(on: queue) {response in
+                    guard let value: Bool = response.getValue() else {
+                        throw Web3Error.nodeError("Invalid value from Ethereum node")
+                    }
+                    return value
+                }
+            }
+            throw Web3Error.inputError("Can not unlock a local keystore")
+        } catch {
+            let returnPromise = Promise<Bool>.pending()
+            queue.async {
+                returnPromise.resolver.reject(error)
+            }
+            return returnPromise.promise
+        }
+    }
+}
diff --git a/web3swift/Web3/Classes/Web3+EventParser.swift b/web3swift/Web3/Classes/Web3+EventParser.swift
@@ -7,8 +7,10 @@
 //
 
 import Foundation
-import Result
+import enum Result.Result
 import BigInt
+import PromiseKit
+fileprivate typealias PromiseResult = PromiseKit.Result
 
 extension web3.web3contract {
     public struct EventParser: EventParserProtocol {
@@ -147,3 +149,70 @@ extension web3.web3contract {
         }
     }
 }
+
+extension web3.web3contract {
+    public func getIndexedEventsPromise(eventName: String?, filter: EventFilter, joinWithReceipts: Bool = false) -> Promise<[EventParserResultProtocol]> {
+        let queue = self.web3.requestDispatcher.queue
+        do {
+            guard let rawContract = self.contract as? ContractV2 else {
+                throw Web3Error.nodeError("ABIv1 is not supported for this method")
+            }
+            guard let preEncoding = encodeTopicToGetLogs(contract: rawContract, eventName: eventName, filter: filter) else {
+                throw Web3Error.processingError("Failed to encode topic for request")
+            }
+//            var event: ABIv2.Element.Event? = nil
+            if eventName != nil {
+                guard let _ = rawContract.events[eventName!] else {
+                    throw Web3Error.processingError("No such event in a contract")
+                }
+//                event = ev
+            }
+            let request = JSONRPCRequestFabric.prepareRequest(.getLogs, parameters: [preEncoding])
+            let fetchLogsPromise = self.web3.dispatch(request).map(on: queue) {response throws -> [EventParserResult] in
+                guard let value: [EventLog] = response.getValue() else {
+                    throw Web3Error.nodeError("Empty or malformed response")
+                }
+                let allLogs = value
+                let decodedLogs = allLogs.compactMap({ (log) -> EventParserResult? in
+                    let (n, d) = self.contract.parseEvent(log)
+                    guard let evName = n, let evData = d else {return nil}
+                    var res = EventParserResult(eventName: evName, transactionReceipt: nil, contractAddress: log.address, decodedResult: evData)
+                    res.transactionHash = log.transactionHash
+                    return res
+                }).filter{ (res:EventParserResult?) -> Bool in
+                    if eventName != nil {
+                        if res != nil && res?.eventName == eventName && res?.transactionHash != nil {
+                            return true
+                        }
+                    } else {
+                        if res != nil && res?.transactionHash != nil {
+                            return true
+                        }
+                    }
+                    return false
+                }
+                return decodedLogs
+                }
+            if (!joinWithReceipts) {
+                return fetchLogsPromise.mapValues(on: queue) {res -> EventParserResultProtocol in
+                    return res as EventParserResultProtocol
+                }
+            }
+            return fetchLogsPromise.thenMap(on:queue) {singleEvent in
+                return self.web3.eth.getTransactionReceiptPromise(singleEvent.transactionHash!).map(on: queue) { receipt in
+                    var joinedEvent = singleEvent
+                    joinedEvent.transactionReceipt = receipt
+                    return joinedEvent as EventParserResultProtocol
+                }
+            }
+        } catch {
+            let returnPromise = Promise<[EventParserResultProtocol]>.pending()
+            queue.async {
+                returnPromise.resolver.reject(error)
+            }
+            return returnPromise.promise
+        }
+    }
+}
+
+
diff --git a/web3swift/Web3/Classes/Web3+JSONRPC.swift b/web3swift/Web3/Classes/Web3+JSONRPC.swift
diff --git a/web3swift/Web3/Classes/Web3+Structures.swift b/web3swift/Web3/Classes/Web3+Structures.swift
diff --git a/web3swift/Web3/Classes/Web3+TransactionIntermediate.swift b/web3swift/Web3/Classes/Web3+TransactionIntermediate.swift
diff --git a/web3swiftTests/web3swift_promises_Tests.swift b/web3swiftTests/web3swift_promises_Tests.swift

Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,13 @@ extension web3.Eth {`
`21`	`21`	`let rp = web3.dispatch(request)`
`22`	`22`	`let queue = web3.requestDispatcher.queue`
`23`	`23`	`return rp.map(on: queue ) { response in`
`24`		`- guard let value: [String: AnyObject] = response.getValue() else {`
	`24`	`+ guard let value: Block = response.getValue() else {`
`25`	`25`	`throw Web3Error.nodeError("Invalid value from Ethereum node")`
`26`	`26`	`}`
`27`		`- let reencoded = try JSONSerialization.data(withJSONObject: value, options: JSONSerialization.WritingOptions(rawValue: 0))`
`28`		`- let details = try JSONDecoder().decode(Block.self, from: reencoded)`
`29`		`- return details`
	`27`	`+ return value`
	`28`	`+// let reencoded = try JSONSerialization.data(withJSONObject: value, options: JSONSerialization.WritingOptions(rawValue: 0))`
	`29`	`+// let details = try JSONDecoder().decode(Block.self, from: reencoded)`
	`30`	`+// return details`
`30`	`31`	`}`
`31`	`32`	`}`
`32`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,12 +26,13 @@ extension web3.Eth {`
`26`	`26`	`let rp = web3.dispatch(request)`
`27`	`27`	`let queue = web3.requestDispatcher.queue`
`28`	`28`	`return rp.map(on: queue ) { response in`
`29`		`- guard let value: [String: AnyObject] = response.getValue() else {`
	`29`	`+ guard let value: Block = response.getValue() else {`
`30`	`30`	`throw Web3Error.nodeError("Invalid value from Ethereum node")`
`31`	`31`	`}`
`32`		`- let reencoded = try JSONSerialization.data(withJSONObject: value, options: JSONSerialization.WritingOptions(rawValue: 0))`
`33`		`- let details = try JSONDecoder().decode(Block.self, from: reencoded)`
`34`		`- return details`
	`32`	`+ return value`
	`33`	`+// let reencoded = try JSONSerialization.data(withJSONObject: value, options: JSONSerialization.WritingOptions(rawValue: 0))`
	`34`	`+// let details = try JSONDecoder().decode(Block.self, from: reencoded)`
	`35`	`+// return details`
`35`	`36`	`}`
`36`	`37`	`}`
`37`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,16 +21,17 @@ extension web3.Eth {`
`21`	`21`	`let rp = web3.dispatch(request)`
`22`	`22`	`let queue = web3.requestDispatcher.queue`
`23`	`23`	`return rp.map(on: queue ) { response in`
`24`		`- guard let value: [String: AnyObject] = response.getValue() else {`
	`24`	`+ guard let value: TransactionDetails = response.getValue() else {`
`25`	`25`	`throw Web3Error.nodeError("Invalid value from Ethereum node")`
`26`	`26`	`}`
	`27`	`+ return value`
`27`	`28`	`// guard let details = TransactionDetails(value) else {`
`28`	`29`	`// throw Web3Error.processingError("Can not deserialize transaction details")`
`29`	`30`	`// }`
`30`	`31`	`// return details`
`31`		`- let reencoded = try JSONSerialization.data(withJSONObject: value, options: JSONSerialization.WritingOptions(rawValue: 0))`
`32`		`- let details = try JSONDecoder().decode(TransactionDetails.self, from: reencoded)`
`33`		`- return details`
	`32`	`+// let reencoded = try JSONSerialization.data(withJSONObject: value, options: JSONSerialization.WritingOptions(rawValue: 0))`
	`33`	`+// let details = try JSONDecoder().decode(TransactionDetails.self, from: reencoded)`
	`34`	`+// return details`
`34`	`35`	`}`
`35`	`36`	`}`
`36`	`37`	`}`