Merge pull request #180 from BANKEX/develop

Bug fix

Author: shamatar

web3swift/BlockExplorer/Classes/BlockExplorer+GetTransactionHistory.swift

@@ -63,41 +63,46 @@ public struct Response: Decodable {
 
 public struct TransactionHistoryRecord: Decodable {
 
-    let id: String
-    let hash: Data
-    let block: BigUInt
-    let addressFrom: EthereumAddress
-    let addressTo: EthereumAddress
-    let isoTime: String
-    let type: TransactionType
-    let status: TransactionStatus
-    let error: String
-    let isContract: Bool
-    let isInner: Bool
-    let value: BigUInt // in wei
-    let token: Token
-    let txFee: BigUInt // in wei
-    let gasUsed: BigUInt // in wei
-    let gasCost: BigUInt // in wei
+    public let id: String
+    public let hash: Data
+    public let block: BigUInt
+    public let addressFrom: EthereumAddress
+    public let addressTo: EthereumAddress
+    public let isoTime: String
+    public let type: TransactionType
+    public let status: TransactionStatus
+    public let error: String
+    public let isContract: Bool
+    public let isInner: Bool
+    public let value: BigUInt // in wei
+    public let token: Token
+    public let txFee: BigUInt // in wei
+    public let gasUsed: BigUInt // in wei
+    public let gasCost: BigUInt // in wei
 
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         id = try container.decode(String.self, forKey: CodingKeys.id)
         let hashString = try container.decode(String.self, forKey: CodingKeys.hash)
-        guard let hashData  = hashString.interpretAsBinaryData() else {
+        guard let hashData  = Data.fromHex(hashString) else {
             throw Web3Error.transactionSerializationError
         }
         hash = hashData
         let intBlock = try container.decode(UInt64.self, forKey: CodingKeys.block)
         block = BigUInt.init(integerLiteral: intBlock)
-        let stringAddressFrom = try container.decode(String.self, forKey: CodingKeys.addressFrom)
-        guard let nativeAddressFrom = EthereumAddress(stringAddressFrom, type: .normal, ignoreChecksum: true) else {
+        var stringAddressFrom = try container.decode(String.self, forKey: CodingKeys.addressFrom)
+        if !stringAddressFrom.hasHexPrefix() {
+            stringAddressFrom = stringAddressFrom.addHexPrefix()
+        }
+        guard let nativeAddressFrom = EthereumAddress(stringAddressFrom) else {
             throw Web3Error.transactionSerializationError
         }
         addressFrom = nativeAddressFrom
-        let stringAddressTo = try container.decode(String.self, forKey: CodingKeys.addressTo)
-        
-        guard let nativeAddressTo = EthereumAddress(stringAddressTo, type: .normal, ignoreChecksum: true) else {
+        var stringAddressTo = try container.decode(String.self, forKey: CodingKeys.addressTo)
+        if !stringAddressTo.hasHexPrefix() {
+            stringAddressTo = stringAddressTo.addHexPrefix()
+        }
+        guard let nativeAddressTo = EthereumAddress(stringAddressTo) else {
             throw Web3Error.transactionSerializationError
         }
         addressTo = nativeAddressTo
@@ -168,10 +173,10 @@ public struct TransactionHistoryRecord: Decodable {
 }
 
 public struct Token: Decodable {
-    let address: EthereumAddress?
-    let name: String
-    let symbol: String
-    let decimal: Int
+    public let address: EthereumAddress?
+    public let name: String
+    public let symbol: String
+    public let decimal: Int
 
     enum CodingKeys: String, CodingKey {
         case address = "addr"

web3swift/BlockExplorer/Classes/BlockExplorer.swift

@@ -9,5 +9,9 @@
 import Foundation
 
 public class BlockExplorer {
-    public var urlStringList = "https://scan.bankex.com/api/list"
+    public var urlStringList: String
+    
+    public init() {
+        urlStringList = "https://scan.bankex.com/api/list"
+    }
 }