fix: Data to HEX string

JeneaVranceanu · JeneaVranceanu · commit f001cecac89a · 2022-10-08T12:25:22.000+01:00
diff --git a/Sources/Core/EthereumNetwork/Request/APIRequest+Methods.swift b/Sources/Core/EthereumNetwork/Request/APIRequest+Methods.swift
@@ -36,7 +36,7 @@ extension APIRequest {
 
         /// This bit of code is purposed to work with literal types that comes in ``Response`` in hexString type.
         /// Currently it's just `Data` and any kind of Integers `(U)Int`, `Big(U)Int`.
-        if Result.self == Data.self || Result.self == UInt.self || Result.self == Int.self || Result.self == BigInt.self || Result.self == BigUInt.self {
+        if Result.self == Data.self || Result.self == UInt.self || Result.self == Int.self || Result.self == BigInt.self || Result.self == BigUInt.self || Result.self == String.self {
             guard let LiteralType = Result.self as? LiteralInitiableFromString.Type else { throw Web3Error.typeError }
             guard let responseAsString = try? JSONDecoder().decode(APIResponse<String>.self, from: data) else { throw Web3Error.dataError }
             guard let literalValue = LiteralType.init(from: responseAsString.result) else { throw Web3Error.dataError }
diff --git a/Sources/web3swift/EthereumAPICalls/Ethereum/Eth+GetBlockByHash.swift b/Sources/web3swift/EthereumAPICalls/Ethereum/Eth+GetBlockByHash.swift
@@ -10,7 +10,6 @@ import Core
 
 extension Web3.Eth {
     public func block(by hash: Data, fullTransactions: Bool = false) async throws -> Block {
-        guard let hexString = String(data: hash, encoding: .utf8)?.addHexPrefix() else { throw Web3Error.dataError }
         let requestCall: APIRequest = .getBlockByHash(hash.toHexString().addHexPrefix(), fullTransactions)
         return try await APIRequest.sendRequest(with: self.provider, for: requestCall).result
     }
diff --git a/Sources/web3swift/EthereumAPICalls/Ethereum/Eth+GetTransactionDetails.swift b/Sources/web3swift/EthereumAPICalls/Ethereum/Eth+GetTransactionDetails.swift
@@ -8,9 +8,11 @@ import BigInt
 import Core
 
 extension Web3.Eth {
-    public func transactionDetails(_ txhash: Data) async throws -> TransactionDetails {
-        guard let hexString = String(data: txhash, encoding: .utf8)?.addHexPrefix() else { throw Web3Error.dataError }
-        let requestCall: APIRequest = .getTransactionByHash(hexString)
-        return try await APIRequest.sendRequest(with: self.provider, for: requestCall).result
+    public func transactionDetails(_ txHash: Data) async throws -> TransactionDetails {
+        try await transactionDetails(txHash.toHexString().addHexPrefix())
+    }
+
+    public func transactionDetails(_ txHash: String) async throws -> TransactionDetails {
+        try await APIRequest.sendRequest(with: self.provider, for: .getTransactionByHash(txHash)).result
     }
 }
diff --git a/Sources/web3swift/EthereumAPICalls/Ethereum/Eth+GetTransactionReceipt.swift b/Sources/web3swift/EthereumAPICalls/Ethereum/Eth+GetTransactionReceipt.swift
@@ -8,9 +8,12 @@ import BigInt
 import Core
 
 extension Web3.Eth {
-    public func transactionReceipt(_ txhash: Data) async throws -> TransactionReceipt {
-        guard let hexString = String(data: txhash, encoding: .utf8)?.addHexPrefix() else { throw Web3Error.dataError }
-        let requestCall: APIRequest = .getTransactionReceipt(hexString)
-        return try await APIRequest.sendRequest(with: self.provider, for: requestCall).result
+    public func transactionReceipt(_ txHash: Data) async throws -> TransactionReceipt {
+        try await transactionReceipt(txHash.toHexString().addHexPrefix())
+    }
+
+    public func transactionReceipt(_ txHash: String) async throws -> TransactionReceipt {
+        try await APIRequest.sendRequest(with: self.provider,
+                                         for: .getTransactionReceipt(txHash)).result
     }
 }
diff --git a/Sources/web3swift/EthereumAPICalls/Ethereum/Eth+SendRawTransaction.swift b/Sources/web3swift/EthereumAPICalls/Ethereum/Eth+SendRawTransaction.swift
@@ -9,8 +9,7 @@ import Core
 
 extension Web3.Eth {
     public func send(raw data: Data) async throws -> TransactionSendingResult {
-        guard let hexString = String(data: data, encoding: .utf8)?.addHexPrefix() else { throw Web3Error.dataError }
-        let request: APIRequest = .sendRawTransaction(hexString)
+        let request: APIRequest = .sendRawTransaction(data.toHexString().addHexPrefix())
         let response: APIResponse<Hash> = try await APIRequest.sendRequest(with: self.provider, for: request)
         return try TransactionSendingResult(data: data, hash: response.result)
     }
diff --git a/Sources/web3swift/Web3/Web3+Contract.swift b/Sources/web3swift/Web3/Web3+Contract.swift
@@ -105,7 +105,7 @@ extension Web3 {
         ///
         /// Returns a "Transaction intermediate" object.
         public func createWriteOperation(_ method: String = "fallback", parameters: [AnyObject] = [AnyObject](), extraData: Data = Data()) -> WriteOperation? {
-            guard var data = self.contract.method(method, parameters: parameters, extraData: extraData) else {return nil}
+            guard let data = self.contract.method(method, parameters: parameters, extraData: extraData) else {return nil}
             transaction.data = data
             if let network = self.web3.provider.network {
                 transaction.chainID = network.chainID
diff --git a/Tests/web3swiftTests/localTests/AdvancedABIv2Tests.swift b/Tests/web3swiftTests/localTests/AdvancedABIv2Tests.swift
@@ -26,11 +26,11 @@ class AdvancedABIv2Tests: LocalTestCase {
         deployTx.transaction.gasLimitPolicy = .manual(3000000)
         // MARK: Sending Data flow
         let result = try await deployTx.writeToChain(password: "web3swift")
-        let txHash = result.hash
+        let txHash = result.hash.stripHexPrefix()
 
         Thread.sleep(forTimeInterval: 1.0)
 
-        let receipt = try await web3.eth.transactionReceipt(txHash.data(using: .utf8)!)
+        let receipt = try await web3.eth.transactionReceipt(Data.fromHex(txHash)!)
         print(receipt)
 
         switch receipt.status {
@@ -62,11 +62,11 @@ class AdvancedABIv2Tests: LocalTestCase {
         deployTx.transaction.from = allAddresses[0]
         deployTx.transaction.gasLimitPolicy = .manual(3000000)
         let result = try await deployTx.writeToChain(password: "web3swift")
-        let txHash = result.hash
+        let txHash = result.hash.stripHexPrefix()
 
         Thread.sleep(forTimeInterval: 1.0)
 
-        let receipt = try await web3.eth.transactionReceipt(txHash.data(using: .utf8)!)
+        let receipt = try await web3.eth.transactionReceipt(Data.fromHex(txHash)!)
         print(receipt)
 
         switch receipt.status {
@@ -98,11 +98,11 @@ class AdvancedABIv2Tests: LocalTestCase {
         deployTx.transaction.from = allAddresses[0]
         deployTx.transaction.gasLimitPolicy = .manual(3000000)
         let result = try await deployTx.writeToChain(password: "web3swift")
-        let txHash = result.hash
+        let txHash = result.hash.stripHexPrefix()
 
         Thread.sleep(forTimeInterval: 1.0)
 
-        let receipt = try await web3.eth.transactionReceipt(txHash.data(using: .utf8)!)
+        let receipt = try await web3.eth.transactionReceipt(Data.fromHex(txHash)!)
         print(receipt)
 
         switch receipt.status {
@@ -133,11 +133,11 @@ class AdvancedABIv2Tests: LocalTestCase {
         deployTx.transaction.from = allAddresses[0]
         deployTx.transaction.gasLimitPolicy = .manual(3000000)
         let result = try await deployTx.writeToChain(password: "web3swift")
-        let txHash = result.hash
+        let txHash = result.hash.stripHexPrefix()
 
         Thread.sleep(forTimeInterval: 1.0)
 
-        let receipt = try await web3.eth.transactionReceipt(txHash.data(using: .utf8)!)
+        let receipt = try await web3.eth.transactionReceipt(Data.fromHex(txHash)!)
         print(receipt)
 
         switch receipt.status {
@@ -169,11 +169,11 @@ class AdvancedABIv2Tests: LocalTestCase {
         deployTx.transaction.from = allAddresses[0]
         deployTx.transaction.gasLimitPolicy = .manual(3000000)
         let result = try await deployTx.writeToChain(password: "web3swift")
-        let txHash = result.hash
+        let txHash = result.hash.stripHexPrefix()
 
         Thread.sleep(forTimeInterval: 1.0)
 
-        let receipt = try await web3.eth.transactionReceipt(txHash.data(using: .utf8)!)
+        let receipt = try await web3.eth.transactionReceipt(Data.fromHex(txHash)!)
         print(receipt)
 
         switch receipt.status {
diff --git a/Tests/web3swiftTests/localTests/BasicLocalNodeTests.swift b/Tests/web3swiftTests/localTests/BasicLocalNodeTests.swift
@@ -28,11 +28,11 @@ class BasicLocalNodeTests: LocalTestCase {
         deployTx.transaction.gasLimitPolicy = .manual(3000000)
 
         let result = try await deployTx.writeToChain(password: "web3swift")
-        let txHash = result.hash
+        let txHash = result.hash.stripHexPrefix()
 
         Thread.sleep(forTimeInterval: 1.0)
 
-        let receipt = try await web3.eth.transactionReceipt(txHash.stripHexPrefix().data(using: .utf8)!)
+        let receipt = try await web3.eth.transactionReceipt(Data.fromHex(txHash)!)
         print(receipt)
 
         switch receipt.status {
@@ -42,12 +42,13 @@ class BasicLocalNodeTests: LocalTestCase {
             break
         }
 
-        let details = try await web3.eth.transactionDetails(txHash.stripHexPrefix().data(using: .utf8)!)
+        let details = try await web3.eth.transactionDetails(Data.fromHex(txHash)!)
         print(details)
     }
 
     func testEthSendExampleWithRemoteSigning() async throws {
         let web3 = try await Web3.new(LocalTestCase.url)
+        web3.addKeystoreManager(LocalTestCase.keyStoreManager)
         let allAddresses = try await web3.eth.ownedAccounts()
         let sendToAddress = EthereumAddress("0xe22b8979739D724343bd002F9f432F5990879901")!
         let contract = web3.contract(Web3.Utils.coldWalletABI, at: sendToAddress, abiVersion: 2)!
@@ -64,12 +65,12 @@ class BasicLocalNodeTests: LocalTestCase {
         print("Balance before to: " + balanceBeforeTo.description)
         print("Balance before from: " + balanceBeforeFrom.description)
 
-        let result = try await sendTx.writeToChain(password: "web3swift")
+        let result = try! await sendTx.writeToChain(password: "web3swift")
         let txHash = result.hash
 
         Thread.sleep(forTimeInterval: 1.0)
 
-        let receipt = try await web3.eth.transactionReceipt(txHash.data(using: .utf8)!)
+        let receipt = try await web3.eth.transactionReceipt(txHash)
         print(receipt)
 
         switch receipt.status {
@@ -79,7 +80,7 @@ class BasicLocalNodeTests: LocalTestCase {
             break
         }
 
-        let details = try await web3.eth.transactionDetails(txHash.data(using: .utf8)!)
+        let details = try await web3.eth.transactionDetails(txHash)
         print(details)
 
 
diff --git a/Tests/web3swiftTests/localTests/LocalTestCase.swift b/Tests/web3swiftTests/localTests/LocalTestCase.swift
@@ -10,6 +10,7 @@ import web3swift
 class LocalTestCase: XCTestCase {
 
     static let url = URL(string: "http://127.0.0.1:8545")!
+    static let keyStoreManager: KeystoreManager = KeystoreManager([try! EthereumKeystoreV3(password: "web3swift")!])
 
     override func setUp() async throws {
         let web3 = try! await Web3.new(LocalTestCase.url)
diff --git a/Tests/web3swiftTests/localTests/PersonalSignatureTests.swift b/Tests/web3swiftTests/localTests/PersonalSignatureTests.swift
@@ -43,11 +43,11 @@ class PersonalSignatureTests: XCTestCase {
         deployTx.transaction.from = allAddresses[0]
         deployTx.transaction.gasLimitPolicy = .manual(3000000)
         let deployResult = try await deployTx.writeToChain(password: "web3swift")
-        let txHash = deployResult.hash
+        let txHash = Data.fromHex(deployResult.hash.stripHexPrefix())!
         
         Thread.sleep(forTimeInterval: 1.0)
         
-        let receipt = try await web3.eth.transactionReceipt(txHash.data(using: .utf8)!)
+        let receipt = try await web3.eth.transactionReceipt(txHash)
         print(receipt)
         
         switch receipt.status {
@@ -76,13 +76,13 @@ class PersonalSignatureTests: XCTestCase {
         var tx = contract.createReadOperation("hashPersonalMessage", parameters: [message as AnyObject])
         tx?.transaction.from = expectedAddress
         var result = try await tx!.callContractMethod()
-        guard let hash = result["hash"]! as? Data else {return XCTFail()}
+        guard let hash = result["hash"]! as? Data else { return XCTFail() }
         XCTAssert(Utilities.hashPersonalMessage(message.data(using: .utf8)!)! == hash)
         
         tx = contract.createReadOperation("recoverSigner", parameters: [message, unmarshalledSignature.v, Data(unmarshalledSignature.r), Data(unmarshalledSignature.s)] as [AnyObject])
         tx?.transaction.from = expectedAddress
         result = try await tx!.callContractMethod()
-        guard let signer = result["signer"]! as? EthereumAddress else {return XCTFail()}
+        guard let signer = result["signer"]! as? EthereumAddress else { return XCTFail() }
         XCTAssert(signer == expectedAddress)
     }
     
diff --git a/Tests/web3swiftTests/localTests/TestHelpers.swift b/Tests/web3swiftTests/localTests/TestHelpers.swift
@@ -34,11 +34,11 @@ class TestHelpers {
         deployTx.transaction.from = allAddresses[0]
         deployTx.transaction.gasLimitPolicy = .manual(3000000)
         let result = try await deployTx.writeToChain(password: "web3swift")
-        let txHash = result.hash
+        let txHash = Data.fromHex(result.hash.stripHexPrefix())!
         
         Thread.sleep(forTimeInterval: 1.0)
         
-        let receipt = try await web3.eth.transactionReceipt(txHash.data(using: .utf8)!)
+        let receipt = try await web3.eth.transactionReceipt(txHash)
         print(receipt)
         
         switch receipt.status {
diff --git a/Tests/web3swiftTests/localTests/TransactionsTests.swift b/Tests/web3swiftTests/localTests/TransactionsTests.swift
@@ -639,12 +639,12 @@ class TransactionsTests: XCTestCase {
             writeTX.transaction.value = value!
             writeTX.transaction.gasLimitPolicy = .manual(78423)
             let result = try await writeTX.writeToChain(password: "")
-            let txHash = result.hash
-            print("Transaction with hash " + txHash)
+            let txHash = Data.fromHex(result.hash.stripHexPrefix())!
+            print("Transaction with hash " + result.hash)
 
             Thread.sleep(forTimeInterval: 1.0)
 
-            let receipt = try await web3.eth.transactionReceipt(txHash.data(using: .utf8)!)
+            let receipt = try await web3.eth.transactionReceipt(txHash)
             print(receipt)
             XCTAssert(receipt.status == .ok)
 
@@ -655,7 +655,7 @@ class TransactionsTests: XCTestCase {
                 break
             }
 
-            let details = try await web3.eth.transactionDetails(txHash.data(using: .utf8)!)
+            let details = try await web3.eth.transactionDetails(txHash)
             print(details)
             // FIXME: Reenable this test.
 //            XCTAssertEqual(details.transaction.gasLimit, BigUInt(78423))
diff --git a/Tests/web3swiftTests/localTests/UserCases.swift b/Tests/web3swiftTests/localTests/UserCases.swift
@@ -81,11 +81,11 @@ class UserCases: XCTestCase {
         deployTx.transaction.from = allAddresses[0]
         deployTx.transaction.gasLimitPolicy = .manual(3000000)
         let result = try await deployTx.writeToChain(password: "web3swift")
-        let txHash = result.hash
+        let txHash = Data.fromHex(result.hash.stripHexPrefix())!
 
         Thread.sleep(forTimeInterval: 1.0)
 
-        let receipt = try await web3.eth.transactionReceipt(txHash.data(using: .utf8)!)
+        let receipt = try await web3.eth.transactionReceipt(txHash)
         print(receipt)
         XCTAssert(receipt.contractAddress != nil)
 
@@ -96,7 +96,7 @@ class UserCases: XCTestCase {
             break
         }
 
-        let details = try await web3.eth.transactionDetails(txHash.data(using: .utf8)!)
+        let details = try await web3.eth.transactionDetails(txHash)
         print(details)
         XCTAssert(details.transaction.to == .contractDeploymentAddress())
     }
diff --git a/Tests/web3swiftTests/remoteTests/InfuraTests.swift b/Tests/web3swiftTests/remoteTests/InfuraTests.swift
@@ -27,6 +27,12 @@ class InfuraTests: XCTestCase {
         let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
         let result = try await web3.eth.block(by: "0x6d05ba24da6b7a1af22dc6cc2a1fe42f58b2a5ea4c406b19c8cf672ed8ec0695", fullTransactions: false)
     }
+
+    func testGetBlockByHash_hashAsData() async throws {
+        let blockHash = Data.fromHex("6d05ba24da6b7a1af22dc6cc2a1fe42f58b2a5ea4c406b19c8cf672ed8ec0695")!
+        let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
+        let result = try await web3.eth.block(by: blockHash, fullTransactions: false)
+    }
     
     func testGetBlockByNumber1() async throws {
         let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ import Core`
`10`	`10`
`11`	`11`	`extension Web3.Eth {`
`12`	`12`	`public func block(by hash: Data, fullTransactions: Bool = false) async throws -> Block {`
`13`		`- guard let hexString = String(data: hash, encoding: .utf8)?.addHexPrefix() else { throw Web3Error.dataError }`
`14`	`13`	`let requestCall: APIRequest = .getBlockByHash(hash.toHexString().addHexPrefix(), fullTransactions)`
`15`	`14`	`return try await APIRequest.sendRequest(with: self.provider, for: requestCall).result`
`16`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,7 @@ import Core`
`9`	`9`
`10`	`10`	`extension Web3.Eth {`
`11`	`11`	`public func send(raw data: Data) async throws -> TransactionSendingResult {`
`12`		`- guard let hexString = String(data: data, encoding: .utf8)?.addHexPrefix() else { throw Web3Error.dataError }`
`13`		`- let request: APIRequest = .sendRawTransaction(hexString)`
	`12`	`+ let request: APIRequest = .sendRawTransaction(data.toHexString().addHexPrefix())`
`14`	`13`	`let response: APIResponse<Hash> = try await APIRequest.sendRequest(with: self.provider, for: request)`
`15`	`14`	`return try TransactionSendingResult(data: data, hash: response.result)`
`16`	`15`	`}`