Merge pull request #206 from BANKEX/develop

Fix parsing transaction details and receipt when transaction was creating a contract

Author: shamatar

web3swift/Transaction/Classes/EthereumTransaction.swift

@@ -271,17 +271,6 @@ public struct EthereumTransaction: CustomStringConvertible {
         if (transaction.inferedChainID != nil && transaction.v >= BigUInt(37)) {
             transaction.chainID = inferedChainID
         }
-//        let hash = json["hash"] as? String
-//        if hash != nil {
-//            let calculatedHash = transaction.hash
-//            let receivedHash = Data.fromHex(hash!)
-//            if (receivedHash != calculatedHash) {
-//                print("hash mismatch, dat")
-//                print(String(describing: transaction))
-//                print(json)
-//                return nil
-//            }
-//        }
         return transaction
     }
 

web3swift/Web3/Classes/Web3+Structures.swift

@@ -56,12 +56,13 @@ extension Web3Options:Decodable {
         let gasPrice = try decodeHexToBigUInt(container, key: .gasPrice)
         self.gasPrice = gasPrice
 
-        let toString = try container.decode(String.self, forKey: .to)
+        let toString = try container.decode(String?.self, forKey: .to)
         var to: EthereumAddress?
-        if toString == "0x" || toString == "0x0" {
+        if toString == nil || toString == "0x" || toString == "0x0" {
             to = EthereumAddress.contractDeploymentAddress()
         } else {
-            guard let ethAddr = EthereumAddress(toString) else {throw Web3Error.dataError}
+            guard let addressString = toString else {throw Web3Error.dataError}
+            guard let ethAddr = EthereumAddress(addressString) else {throw Web3Error.dataError}
             to = ethAddr
         }
         self.to = to

web3swiftTests/web3swift_User_cases.swift

@@ -84,4 +84,26 @@ class web3swift_User_cases: XCTestCase {
         XCTAssert(assembled.gasPrice == options.gasPrice)
     }
 
+    func testParseTransactionDetailsForContractCreation() {
+        let web3 = Web3.InfuraMainnetWeb3()
+        let details = web3.eth.getTransactionDetails("0x1c85b9b7f7c2cbdb3fa264f6b78b226360aa2084c48cf7869b756e0762bd851b")
+        switch details {
+        case .success(let details):
+            print(details)
+            XCTAssert(details.transaction.to == .contractDeploymentAddress())
+        case .failure(let error):
+            print(error)
+            XCTFail()
+        }
+        let receipt = web3.eth.getTransactionReceipt("0x1c85b9b7f7c2cbdb3fa264f6b78b226360aa2084c48cf7869b756e0762bd851b")
+        switch receipt {
+        case .success(let receipt):
+            print(receipt)
+            XCTAssert(receipt.contractAddress != nil)
+        case .failure(let error):
+            print(error)
+            XCTFail()
+        }
+    }
+    
 }