refactor to remove force unwraps

Author: mloit

Sources/web3swift/Transaction/EthereumTransaction.swift

@@ -125,10 +125,10 @@ public struct EthereumTransaction: CustomStringConvertible {
         } else if self.v >= 27 && self.v <= 30 {
             d = BigUInt(27)
         }
-        if (self.chainID != nil && self.chainID != BigUInt(0) && self.v >= (d + self.chainID! + self.chainID!)) {
-            normalizedV = self.v - d - self.chainID! - self.chainID!
-        } else if (inferedChainID != nil  && self.v >= (d + self.inferedChainID! + self.inferedChainID!)) {
-            normalizedV = self.v - d - inferedChainID! - inferedChainID!
+        if let testID = self.chainID, testID != BigUInt(0) && self.v >= (d + testID + testID) {
+            normalizedV = self.v - d - testID - testID
+        } else if let testID = inferedChainID, self.v >= (d + testID + testID) {
+            normalizedV = self.v - d - testID - testID
         } else {
             if(d > v) { d = 0 }
             normalizedV = self.v - d

Sources/web3swift/Web3/Web3+Structures.swift

@@ -118,12 +118,11 @@ extension EthereumTransaction:Decodable {
         let container = try decoder.container(keyedBy: CodingKeys.self)
 
         // test to see if it is a EIP-1559 wrapper
-        let envelope = try decodeHexToBigUInt(container, key: .type, allowOptional: true)
-        if( (envelope != nil) && (envelope! != BigInt(0)) ) {
+        if let envelope = try decodeHexToBigUInt(container, key: .type, allowOptional: true) {
             // if present and non-sero we are a new wrapper we can't decode
-            throw Web3Error.dataError
+            if(envelope != BigInt(0)) { throw Web3Error.dataError }
         }
-
+        
         var data = try decodeHexToData(container, key: .data, allowOptional: true)
         if data != nil {
             self.data = data!