Delete old HTTP(S) network code.

Sources/web3swift/Web3/Web3+Instance.swift

@@ -12,12 +12,6 @@ import BigInt
 public class web3 {
     public var provider: Web3Provider
     public var transactionOptions: TransactionOptions = TransactionOptions.defaultOptions
-    public var defaultBlock = "latest"
-
-    /// Add a provider request to the dispatch queue.
-    public func dispatch(_ request: JSONRPCrequest) async throws -> JSONRPCresponse {
-         try await provider.sendAsync(request)
-    }
 
     /// Raw initializer using a Web3Provider protocol object, dispatch queue and request dispatcher.
     public init(provider prov: Web3Provider) {

Sources/web3swift/Web3/Web3+JSONRPC.swift

@@ -23,237 +23,6 @@ public struct Counter {
     }
 }
 
-/// JSON RPC request structure for serialization and deserialization purposes.
-//public struct JSONRPCrequest<T: Encodable>: Encodable {
-public struct JSONRPCrequest: Encodable {
-    public var jsonrpc: String = "2.0"
-    public var method: JSONRPCmethod?
-    public var params: [RequestParameter] = []
-    public var id: UInt = Counter.increment()
-
-    enum CodingKeys: String, CodingKey {
-        case jsonrpc
-        case method
-        case params
-        case id
-    }
-
-    public func encode(to encoder: Encoder) throws {
-        var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encode(jsonrpc, forKey: .jsonrpc)
-        try container.encode(method?.rawValue, forKey: .method)
-        try container.encode(params, forKey: .params)
-        try container.encode(id, forKey: .id)
-    }
-
-    public var isValid: Bool {
-        get {
-            if self.method == nil {
-                return false
-            }
-            guard let method = self.method else {return false}
-            return method.requiredNumOfParameters == self.params.count
-        }
-    }
-}
-
-/// JSON RPC batch request structure for serialization and deserialization purposes.
-public struct JSONRPCrequestBatch: Encodable {
-    var requests: [JSONRPCrequest]
-
-    public func encode(to encoder: Encoder) throws {
-        var container = encoder.singleValueContainer()
-        try container.encode(self.requests)
-    }
-}
-
-/// JSON RPC response structure for serialization and deserialization purposes.
-public struct JSONRPCresponse: Decodable{
-    public var id: Int
-    public var jsonrpc = "2.0"
-    public var result: Any?
-    public var error: ErrorMessage?
-    public var message: String?
-
-    enum JSONRPCresponseKeys: String, CodingKey {
-        case id = "id"
-        case jsonrpc = "jsonrpc"
-        case result = "result"
-        case error = "error"
-    }
-
-    public init(id: Int, jsonrpc: String, result: Any?, error: ErrorMessage?) {
-        self.id = id
-        self.jsonrpc = jsonrpc
-        self.result = result
-        self.error = error
-    }
-
-    public struct ErrorMessage: Decodable {
-        public var code: Int
-        public var message: String
-    }
-
-    internal var decodableTypes: [Decodable.Type] = [
-        [EventLog].self,
-        [TransactionDetails].self,
-        [TransactionReceipt].self,
-        [Block].self,
-        [String].self,
-        [Int].self,
-        [Bool].self,
-        EventLog.self,
-        TransactionDetails.self,
-        TransactionReceipt.self,
-        Block.self,
-        String.self,
-        Int.self,
-        Bool.self,
-        [String: String].self,
-        [String: Int].self,
-        [String: [String: [String: [String]]]].self,
-        Web3.Oracle.FeeHistory.self
-    ]
-
-    // FIXME: Make me a real generic
-    public init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: JSONRPCresponseKeys.self)
-        let id: Int = try container.decode(Int.self, forKey: .id)
-        let jsonrpc: String = try container.decode(String.self, forKey: .jsonrpc)
-        let errorMessage = try container.decodeIfPresent(ErrorMessage.self, forKey: .error)
-        if errorMessage != nil {
-            self.init(id: id, jsonrpc: jsonrpc, result: nil, error: errorMessage)
-            return
-        }
-        // TODO: make me generic (DecodableFromHex or Decodable)
-        /// This is all available types of `result` to init
-        /// Now its type is `Any?`, since you're typecasting this any to exact each response,
-        /// coz you're knowing response to what request it would be,
-        /// and you're could be sure about API Response structure.
-        ///
-        /// So since we're typecasting this explicitly each tyme, `result` property could be set
-        /// to protocol type like `Decodable` or `DevodableFromHex` or something,
-        /// and this code could be reduced so hard.
-        var result: Any? = nil
-        if let rawValue = try? container.decodeIfPresent(String.self, forKey: .result) {
-            result = rawValue
-        } else if let rawValue = try? container.decodeIfPresent(Int.self, forKey: .result) {
-            result = rawValue
-        } else if let rawValue = try? container.decodeIfPresent(Bool.self, forKey: .result) {
-            result = rawValue
-        } else if let rawValue = try? container.decodeIfPresent(EventLog.self, forKey: .result) {
-            result = rawValue
-        } else if let rawValue = try? container.decodeIfPresent(Block.self, forKey: .result) {
-            result = rawValue
-        } else if let rawValue = try? container.decodeIfPresent(TransactionReceipt.self, forKey: .result) {
-            result = rawValue
-        } else if let rawValue = try? container.decodeIfPresent(TransactionDetails.self, forKey: .result) {
-            result = rawValue
-        } else if let rawValue = try? container.decodeIfPresent([EventLog].self, forKey: .result) {
-            result = rawValue
-        } else if let rawValue = try? container.decodeIfPresent([Block].self, forKey: .result) {
-            result = rawValue
-        } else if let rawValue = try? container.decodeIfPresent([TransactionReceipt].self, forKey: .result) {
-            result = rawValue
-        } else if let rawValue = try? container.decodeIfPresent([TransactionDetails].self, forKey: .result) {
-            result = rawValue
-        } else if let rawValue = try? container.decodeIfPresent(TxPoolStatus.self, forKey: .result) {
-            result = rawValue
-        } else if let rawValue = try? container.decodeIfPresent(TxPoolContent.self, forKey: .result) {
-            result = rawValue
-        } else if let rawValue = try? container.decodeIfPresent([Bool].self, forKey: .result) {
-            result = rawValue
-        } else if let rawValue = try? container.decodeIfPresent([Int].self, forKey: .result) {
-            result = rawValue
-        } else if let rawValue = try? container.decodeIfPresent([String].self, forKey: .result) {
-            result = rawValue
-        } else if let rawValue = try? container.decodeIfPresent([String: String].self, forKey: .result) {
-            result = rawValue
-        } else if let rawValue = try? container.decodeIfPresent([String: Int].self, forKey: .result) {
-            result = rawValue
-        } else if let rawValue = try? container.decodeIfPresent([String: [String: [String: String]]].self, forKey: .result) {
-            result = rawValue
-        } else if let rawValue = try? container.decodeIfPresent([String: [String: [String: [String: String?]]]].self, forKey: .result) {
-            result = rawValue
-        } else if let rawValue = try? container.decodeIfPresent(Web3.Oracle.FeeHistory.self, forKey: .result) {
-            result = rawValue
-        }
-        self.init(id: id, jsonrpc: jsonrpc, result: result, error: nil)
-    }
-
-    // FIXME: Make me a real generic
-    // MARK: - This fits for DecodableFromHex
-    /// Get the JSON RCP reponse value by deserializing it into some native <T> class.
-    ///
-    /// Returns nil if serialization fails
-    public func getValue<T>() -> T? {
-        let type = T.self
-
-        if type == BigUInt.self {
-            guard let string = self.result as? String else {return nil}
-            guard let value = BigUInt(string.stripHexPrefix(), radix: 16) else {return nil}
-            return value as? T
-        } else if type == BigInt.self {
-            guard let string = self.result as? String else {return nil}
-            guard let value = BigInt(string.stripHexPrefix(), radix: 16) else {return nil}
-            return value as? T
-        } else if type == Data.self {
-            guard let string = self.result as? String else {return nil}
-            guard let value = Data.fromHex(string) else {return nil}
-            return value as? T
-        } else if type == EthereumAddress.self {
-            guard let string = self.result as? String else {return nil}
-            guard let value = EthereumAddress(string, ignoreChecksum: true) else {return nil}
-            return value as? T
-        }
-//        else if slf == String.self {
-//            guard let value = self.result as? T else {return nil}
-//            return value
-//        } else if slf == Int.self {
-//            guard let value = self.result as? T else {return nil}
-//            return value
-//        }
-        else if type == [BigUInt].self {
-            guard let string = self.result as? [String] else {return nil}
-            let values = string.compactMap { (str) -> BigUInt? in
-                return BigUInt(str.stripHexPrefix(), radix: 16)
-            }
-            return values as? T
-        } else if type == [BigInt].self {
-            guard let string = self.result as? [String] else {return nil}
-            let values = string.compactMap { (str) -> BigInt? in
-                return BigInt(str.stripHexPrefix(), radix: 16)
-            }
-            return values as? T
-        } else if type == [Data].self {
-            guard let string = self.result as? [String] else {return nil}
-            let values = string.compactMap { (str) -> Data? in
-                return Data.fromHex(str)
-            }
-            return values as? T
-        } else if type == [EthereumAddress].self {
-            guard let string = self.result as? [String] else {return nil}
-            let values = string.compactMap { (str) -> EthereumAddress? in
-                return EthereumAddress(str, ignoreChecksum: true)
-            }
-            return values as? T
-        }
-        guard let value = self.result as? T  else {return nil}
-        return value
-    }
-}
-
-/// JSON RPC batch response structure for serialization and deserialization purposes.
-public struct JSONRPCresponseBatch: Decodable {
-    var responses: [JSONRPCresponse]
-
-    public init(from decoder: Decoder) throws {
-        let container = try decoder.singleValueContainer()
-        let responses = try container.decode([JSONRPCresponse].self)
-        self.responses = responses
-    }
-}
-
 /// Transaction parameters JSON structure for interaction with Ethereum node.
 public struct TransactionParameters: Codable {
     /// accessList parameter JSON structure