re-apply changes to Web3+Structures undone by merge

Author: mloit

Sources/web3swift/Web3/Web3+Structures.swift

@@ -7,123 +7,6 @@
 import Foundation
 import BigInt
 
-extension TransactionOptions: Decodable {
-    enum CodingKeys: String, CodingKey {
-        case to
-        case from
-        case gasPrice
-        case gas
-        case value
-        case nonce
-        case callOnBlock
-    }
-
-    public init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-
-        if let gasLimit = try? container.decodeHex(BigUInt.self, forKey: .gas) {
-            self.gasLimit = .manual(gasLimit)
-        } else {
-            self.gasLimit = .automatic
-        }
-
-        if let gasPrice = try? container.decodeHex(BigUInt.self, forKey: .gasPrice) {
-            self.gasPrice = .manual(gasPrice)
-        } else {
-            self.gasPrice = .automatic
-        }
-
-        let toString = try container.decode(String?.self, forKey: .to)
-        var to: EthereumAddress?
-        if toString == nil || toString == "0x" || toString == "0x0" {
-            to = EthereumAddress.contractDeploymentAddress()
-        } else {
-            guard let addressString = toString else {throw Web3Error.dataError}
-            guard let ethAddr = EthereumAddress(addressString) else {throw Web3Error.dataError}
-            to = ethAddr
-        }
-        self.to = to
-        let from = try container.decodeIfPresent(EthereumAddress.self, forKey: .to)
-        //        var from: EthereumAddress?
-        //        if fromString != nil {
-        //            guard let ethAddr = EthereumAddress(toString) else {throw Web3Error.dataError}
-        //            from = ethAddr
-        //        }
-        self.from = from
-
-        self.value = try container.decodeHex(BigUInt.self, forKey: .value)
-
-        if let nonce = try? container.decodeHex(BigUInt.self, forKey: .nonce) {
-            self.nonce = .manual(nonce)
-        } else {
-            self.nonce = .pending
-        }
-
-        if let callOnBlock = try? container.decodeHex(BigUInt.self, forKey: .callOnBlock) {
-            self.callOnBlock = .exactBlockNumber(callOnBlock)
-        } else {
-            self.callOnBlock = .pending
-        }
-    }
-}
-
-extension EthereumTransaction: Decodable {
-    enum CodingKeys: String, CodingKey {
-        case to
-        case data
-        case input
-        case nonce
-        case v
-        case r
-        case s
-        case value
-        case type  // present in EIP-1559 transaction objects
-    }
-
-    public init(from decoder: Decoder) throws {
-        let options = try TransactionOptions(from: decoder)
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-
-        if let data = try? container.decodeHex(Data.self, forKey: .data) {
-            self.data = data
-        } else {
-            guard let data = try? container.decodeHex(Data.self, forKey: .input) else { throw Web3Error.dataError }
-            self.data = data
-        }
-
-        nonce = try container.decodeHex(BigUInt.self, forKey: .nonce)
-        v = try container.decodeHex(BigUInt.self, forKey: .v)
-        r = try container.decodeHex(BigUInt.self, forKey: .r)
-        s = try container.decodeHex(BigUInt.self, forKey: .s)
-
-        guard let to = options.to,
-            let gasLimit = options.gasLimit,
-            let gasPrice = options.gasPrice else { throw Web3Error.dataError }
-
-        self.to = to
-        self.value = options.value
-
-        switch gasPrice {
-        case let .manual(gasPriceValue):
-            self.gasPrice = gasPriceValue
-        default:
-            self.gasPrice = 5000000000
-        }
-
-        switch gasLimit {
-        case let .manual(gasLimitValue):
-            self.gasLimit = gasLimitValue
-        default:
-            self.gasLimit = 21000
-        }
-
-        let inferedChainID = self.inferedChainID
-        if self.inferedChainID != nil && self.v >= BigUInt(37) {
-            self.chainID = inferedChainID
-        }
-    }
-}
-
 public struct TransactionDetails: Decodable {
     public var blockHash: Data?
     public var blockNumber: BigUInt?