Add Data type support by conforming LiteralInitiableFromString protocol.

- Rename init of `DecodableFromHex` protocol to make it crossing with `LiteralInitiableFromString`.

Author: yaroslavyaroslav

Sources/web3swift/API/HexDecodableProtocols.swift

@@ -6,6 +6,7 @@
 //
 
 import BigInt
+import Foundation
 
 public protocol APIResultType: Decodable { }
 
@@ -37,7 +38,6 @@ extension LiteralInitiableFromString where Self: IntegerInitableWithRadix {
     }
 }
 
-
 extension Int: LiteralInitiableFromString { }
 
 extension UInt: LiteralInitiableFromString { }
@@ -46,6 +46,8 @@ extension BigInt: LiteralInitiableFromString { }
 
 extension BigUInt: LiteralInitiableFromString { }
 
+extension Data: LiteralInitiableFromString { }
+
 public protocol IntegerInitableWithRadix {
     init?<S: StringProtocol>(_ text: S, radix: Int)
 }

Sources/web3swift/Convenience/Decodable+Extensions.swift

@@ -33,7 +33,7 @@ extension KeyedDecodingContainer {
     /// - throws: `Web3Error.dataError` if value associated with key are unable to be initialized as `DecodableFromHex`.
     public func decodeHex<T: DecodableFromHex>(_ type: T.Type, forKey: KeyedDecodingContainer<K>.Key) throws -> T {
         let hexString = try self.decode(String.self, forKey: forKey)
-        guard let value = T(fromHex: hexString) else { throw Web3Error.dataError }
+        guard let value = T(from: hexString) else { throw Web3Error.dataError }
         return value
     }
 
@@ -92,7 +92,7 @@ public extension UnkeyedDecodingContainer {
         var array: [T] = []
         while !isAtEnd {
             let hexString = try decode(String.self)
-            guard let item = T(fromHex: hexString) else { continue }
+            guard let item = T(from: hexString) else { continue }
             array.append(item)
         }
         return array
@@ -119,31 +119,31 @@ public extension UnkeyedDecodingContainer {
 }
 
 public protocol DecodableFromHex: Decodable {
-    init?(fromHex hexString: String)
+    init?(from hexString: String)
 }
 
 extension Data: DecodableFromHex {
-    public init?(fromHex hexString: String) {
+    public init?(from hexString: String) {
         self.init()
         guard let tmp = Self.fromHex(hexString) else { return nil }
         self = tmp
     }
 }
 
 extension UInt: DecodableFromHex {
-    public init?(fromHex hexString: String) {
+    public init?(from hexString: String) {
         self.init(hexString.stripHexPrefix(), radix: 16)
     }
 }
 
 extension BigUInt: DecodableFromHex {
-    public init?(fromHex hexString: String) {
+    public init?(from hexString: String) {
         self.init(hexString.stripHexPrefix(), radix: 16)
     }
 }
 
 extension Date: DecodableFromHex {
-    public init?(fromHex hexString: String) {
+    public init?(from hexString: String) {
         self.init()
         let stripedHexString = hexString.stripHexPrefix()
         guard let timestampInt = UInt(stripedHexString, radix: 16) else { return nil }
@@ -152,7 +152,7 @@ extension Date: DecodableFromHex {
 }
 
 extension EthereumAddress: DecodableFromHex {
-    public init?(fromHex hexString: String) {
+    public init?(from hexString: String) {
         self.init(hexString, ignoreChecksum: true)
     }
 }

Sources/web3swift/EthereumAPICalls/Ethereum/Eth+Call.swift

@@ -14,7 +14,7 @@ extension web3.Eth {
         // FIXME: Add appropriate error
         guard let transactionParameters = transaction.encodeAsDictionary(from: transactionOptions?.from) else { throw Web3Error.unknownError}
         let request: APIRequest = .call(transactionParameters, transactionOptions?.callOnBlock ?? .latest)
-        let response: APIResponse<Data> = try await  APIRequest.sendRequest(with: self.provider, for: request)
+        let response: APIResponse<Data> = try await APIRequest.sendRequest(with: self.provider, for: request)
         return response.result
     }
 }

Sources/web3swift/Transaction/EIP2930Envelope.swift

@@ -333,7 +333,7 @@ public struct AccessListEntry: CustomStringConvertible, Decodable {
         self.storageKeys = []
         if let keyStrings = try? container.decode([String].self, forKey: .storageKeys) {
             for keyString in keyStrings {
-                guard let number = BigUInt(fromHex: keyString) else { throw Web3Error.dataError }
+                guard let number = BigUInt(from: keyString) else { throw Web3Error.dataError }
                 self.storageKeys.append(number)
             }
         }

Tests/web3swiftTests/localTests/EIP1559BlockTests.swift

@@ -7,19 +7,19 @@ import web3swift
 class EIP1559BlockTests: LocalTestCase {
     let uselessBlockPart = (
         number: BigUInt(12_965_000),
-        hash: Data(fromHex: "0xef95f2f1ed3ca60b048b4bf67cde2195961e0bba6f70bcbea9a2c4e133e34b46")!, // "hash":
-        parentHash: Data(fromHex: "0x2302e1c0b972d00932deb5dab9eb2982f570597d9d42504c05d9c2147eaf9c88")!, // "parentHash":
-        nonce: Data(fromHex: "0xfb6e1a62d119228b"), // "nonce":
-        sha3Uncles: Data(fromHex: "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347")!, // "sha3Uncles":
-        receiptsRoot: Data(fromHex: "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347")!, // "receiptsRoot":
-        logsBloom: EthereumBloomFilter(Data(fromHex: "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")!), // "logsBloom":
-        transactionsRoot: Data(fromHex: "0x3a1b03875115b79539e5bd33fb00d8f7b7cd61929d5a3c574f507b8acf415bee")!, // "transactionsRoot":
-        stateRoot: Data(fromHex: "0xf1133199d44695dfa8fd1bcfe424d82854b5cebef75bddd7e40ea94cda515bcb")!, // "stateRoot":
-        miner: EthereumAddress( Data(fromHex: "0x8888f1f195afa192cfee860698584c030f4c9db1")!)!, // "miner":
+        hash: Data(from: "0xef95f2f1ed3ca60b048b4bf67cde2195961e0bba6f70bcbea9a2c4e133e34b46")!, // "hash":
+        parentHash: Data(from: "0x2302e1c0b972d00932deb5dab9eb2982f570597d9d42504c05d9c2147eaf9c88")!, // "parentHash":
+        nonce: Data(from: "0xfb6e1a62d119228b"), // "nonce":
+        sha3Uncles: Data(from: "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347")!, // "sha3Uncles":
+        receiptsRoot: Data(from: "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347")!, // "receiptsRoot":
+        logsBloom: EthereumBloomFilter(Data(from: "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")!), // "logsBloom":
+        transactionsRoot: Data(from: "0x3a1b03875115b79539e5bd33fb00d8f7b7cd61929d5a3c574f507b8acf415bee")!, // "transactionsRoot":
+        stateRoot: Data(from: "0xf1133199d44695dfa8fd1bcfe424d82854b5cebef75bddd7e40ea94cda515bcb")!, // "stateRoot":
+        miner: EthereumAddress( Data(from: "0x8888f1f195afa192cfee860698584c030f4c9db1")!)!, // "miner":
         difficulty: BigUInt(21345678965432), // "difficulty":
         totalDifficulty: BigUInt(324567845321), // "totalDifficulty":
         size: BigUInt(616), // "size":
-        extraData: Data(fromHex: "0x")!, // extraData":
+        extraData: Data(from: "0x")!, // extraData":
         gasLimit: BigUInt(3141592), // "gasLimit":
         gasUsed: BigUInt(21662), // "gasUsed":
         timestamp: Date(), // "timestamp":