Squashed commit of the following:

commit 2f090dd
Merge: 0016aee 6cb1440
Author: Yaroslav <[email protected]>
Date:   Wed Mar 23 19:47:00 2022 +0300

    Merge pull request #502 from skywinder/master

commit 6cb1440
Merge: d6c0a4c 0016aee
Author: Yaroslav <[email protected]>
Date:   Wed Mar 23 19:39:51 2022 +0300

    Merge pull request #501 from skywinder/develop

commit 0016aee
Merge: 239887d 11517aa
Author: Yaroslav <[email protected]>
Date:   Wed Mar 23 19:13:41 2022 +0300

    Merge pull request #498 from mloit/feature/bug-fix-rollup

commit d6c0a4c
Author: Yaroslav <[email protected]>
Date:   Wed Mar 23 19:00:43 2022 +0300

    Update podspec version.

commit b6abf2e
Merge: ff538e8 239887d
Author: Yaroslav <[email protected]>
Date:   Wed Mar 23 18:58:00 2022 +0300

    Merge pull request #500 from skywinder/develop

commit 239887d
Author: Yaroslav <[email protected]>
Date:   Wed Mar 23 18:11:18 2022 +0300

    Update github action settings

    Try to fix ci/cd run cancelling issue.

commit c781699
Merge: e1b0306 52002db
Author: Yaroslav <[email protected]>
Date:   Wed Mar 23 15:56:32 2022 +0300

    Merge pull request #496 from mloit/feature/remove-unused-file

commit 52002db
Author: mloit <[email protected]>
Date:   Wed Mar 23 07:59:50 2022 -0400

    updated the xcode project file to reflect the file status change.

commit e1b0306
Merge: e6f526e 17d7321
Author: Yaroslav <[email protected]>
Date:   Wed Mar 23 13:52:45 2022 +0300

    Merge pull request #481 from mloit/fix-random-init

commit e6f526e
Merge: f85ab50 1edf2f6
Author: Yaroslav <[email protected]>
Date:   Wed Mar 23 13:26:38 2022 +0300

    Merge pull request #490 from mloit/remove-dead-code

commit 17d7321
Merge: cd5746d f85ab50
Author: Yaroslav <[email protected]>
Date:   Wed Mar 23 13:22:31 2022 +0300

    Merge branch 'develop' into fix-random-init

commit f85ab50
Merge: 5edab19 9d84b4a
Author: Yaroslav <[email protected]>
Date:   Wed Mar 23 11:45:05 2022 +0300

    Merge pull request #467 from mloit/tolerate1559

commit 11517aa
Author: mloit <[email protected]>
Date:   Tue Mar 22 23:38:04 2022 -0400

    fix unsafe forced unwrap in transaction signers

commit 4774e99
Author: mloit <[email protected]>
Date:   Tue Mar 22 23:28:49 2022 -0400

    fix typo in function name
    changed 'Signle' to 'Single'
    corrected all calling occurences

commit 7fd2043
Author: mloit <[email protected]>
Date:   Tue Mar 22 23:26:46 2022 -0400

    bugfix: if let makes no sense if the input won't produce an optional
    As it was it would throw a decode error instead of returning nil
    this was exposed when I fixed the coding key for callOnBlock, which typically isn't present

commit b6000e9
Author: mloit <[email protected]>
Date:   Mon Mar 21 13:32:57 2022 -0400

    fix TransactionOptions decoding of callOnBlock using incorrect key of .nonce

commit 30711bb
Author: mloit <[email protected]>
Date:   Mon Mar 21 13:30:45 2022 -0400

    PR #440 bugfix, replace the fallthrough's with the desired action, as falling through caused erroneous decoding.

commit e9b53c0
Author: mloit <[email protected]>
Date:   Mon Mar 21 13:28:38 2022 -0400

    Restore failing #440 PR

commit 9046350
Author: mloit <[email protected]>
Date:   Tue Mar 22 14:41:39 2022 -0400

    File is empty and unused since 2018, I'm pretty sure we don't need it

commit 1edf2f6
Author: Mark Loit <[email protected]>
Date:   Sun Mar 20 12:02:04 2022 -0400

    more nil coalescing to clean up the original code

commit 529d9ec
Author: mloit <[email protected]>
Date:   Sun Mar 20 11:44:25 2022 -0400

    nil coalescing

commit df358d4
Author: Mark Loit <[email protected]>
Date:   Sun Mar 20 00:24:25 2022 -0400

    refactored to work with Decodable stream

commit dc0d85b
Author: Mark Loit <[email protected]>
Date:   Sun Mar 20 00:23:12 2022 -0400

    restoreWeb3+BrowserFunctions before proper refactor to remove reliance on the old json initializers in Transaction and TransactionOptions

commit 482589d
Author: Mark Loit <[email protected]>
Date:   Sat Mar 19 20:42:41 2022 -0400

    Changed the parsing in TransactionInBlock to properly use the Decodable protocol instead of switching over to JSON parsing
    Removed all the old (now completely dead) JSON based parsing code. No point in keeping the JSON code as it duplicates the Decodable code, and makes code maintenance more difficult

commit 9d84b4a
Author: Mark Loit <[email protected]>
Date:   Wed Mar 16 15:32:14 2022 -0400

    refactor to remove force unwraps

commit cd5746d
Author: Mark Loit <[email protected]>
Date:   Sun Mar 13 20:40:30 2022 -0400

    fix buffer overrun issue (#470) where initialization with random bytes ignored the passed length and used a fixed length of 32 bytes. This results in only the first 32 bytes of larger objects being initialized, and overruns beyond the end for smaller objects.

commit 051f94f
Author: Mark Loit <[email protected]>
Date:   Thu Feb 10 00:11:30 2022 -0500

    Provide basic tolerance to EIP-1559 data
    Test for the envelope 'type' if 0 or not present we assume legacy and can continue, otherwise abort as it is 1559 [or future] and we don't know its encoding
    Added some basic garbage-in garbage out checks to prevent calculations from generating an overflow. This will mean what comes out is garbage, but at least it didn't crash.

Author: mloit

.github/workflows/ci.yml

@@ -23,7 +23,9 @@ jobs:
   spm:
     name: Swift Package Manager 5.4
     runs-on: macOS-11
-    concurrency: spm
+    concurrency: 
+      group: spm-${{ github.run_id }}
+      cancel-in-progress: false
     env:
       DEVELOPER_DIR: /Applications/Xcode_12.5.1.app/Contents/Developer
     steps:
@@ -45,7 +47,9 @@ jobs:
   carthage:
     name: Carthage
     runs-on: macOS-11
-    concurrency: carthage
+    concurrency: 
+      group: carthage-${{ github.run_id }}
+      cancel-in-progress: false
     env:
       DEVELOPER_DIR: /Applications/Xcode_12.5.1.app/Contents/Developer
     strategy:

Sources/web3swift/Convenience/Data+Extension.swift

@@ -48,7 +48,7 @@ public extension Data {
             let result = data.withUnsafeMutableBytes { (body: UnsafeMutableRawBufferPointer) -> Int32? in
                 if let bodyAddress = body.baseAddress, body.count > 0 {
                     let pointer = bodyAddress.assumingMemoryBound(to: UInt8.self)
-                    return SecRandomCopyBytes(kSecRandomDefault, 32, pointer)
+                    return SecRandomCopyBytes(kSecRandomDefault, length, pointer)
                 } else {
                     return nil
                 }

Sources/web3swift/Convenience/SECP256k1.swift

@@ -341,7 +341,7 @@ extension SECP256K1 {
             let result = data.withUnsafeMutableBytes { (mutableRBBytes) -> Int32? in
                 if let mutableRBytes = mutableRBBytes.baseAddress, mutableRBBytes.count > 0 {
                     let mutableBytes = mutableRBytes.assumingMemoryBound(to: UInt8.self)
-                    return SecRandomCopyBytes(kSecRandomDefault, 32, mutableBytes)
+                    return SecRandomCopyBytes(kSecRandomDefault, length, mutableBytes)
                 } else {
                     return nil
                 }

Sources/web3swift/EthereumABI/ABIDecoding.swift

@@ -21,7 +21,7 @@ extension ABIDecoder {
         var toReturn = [AnyObject]()
         var consumed: UInt64 = 0
         for i in 0 ..< types.count {
-            let (v, c) = decodeSignleType(type: types[i], data: data, pointer: consumed)
+            let (v, c) = decodeSingleType(type: types[i], data: data, pointer: consumed)
             guard let valueUnwrapped = v, let consumedUnwrapped = c else {return nil}
             toReturn.append(valueUnwrapped)
             consumed = consumed + consumedUnwrapped
@@ -30,7 +30,7 @@ extension ABIDecoder {
         return toReturn
     }
 
-    public static func decodeSignleType(type: ABI.Element.ParameterType, data: Data, pointer: UInt64 = 0) -> (value: AnyObject?, bytesConsumed: UInt64?) {
+    public static func decodeSingleType(type: ABI.Element.ParameterType, data: Data, pointer: UInt64 = 0) -> (value: AnyObject?, bytesConsumed: UInt64?) {
         let (elData, nextPtr) = followTheData(type: type, data: data, pointer: pointer)
         guard let elementItself = elData, let nextElementPointer = nextPtr else {
             return (nil, nil)
@@ -115,7 +115,7 @@ extension ABIDecoder {
                     var subpointer: UInt64 = 32
                     var toReturn = [AnyObject]()
                     for _ in 0 ..< length {
-                        let (v, c) = decodeSignleType(type: subType, data: elementItself, pointer: subpointer)
+                        let (v, c) = decodeSingleType(type: subType, data: elementItself, pointer: subpointer)
                         guard let valueUnwrapped = v, let consumedUnwrapped = c else {break}
                         toReturn.append(valueUnwrapped)
                         subpointer = subpointer + consumedUnwrapped
@@ -132,7 +132,7 @@ extension ABIDecoder {
                     var toReturn = [AnyObject]()
                     //                    print("Dynamic array sub element itself: \n" + dataSlice.toHexString())
                     for _ in 0 ..< length {
-                        let (v, c) = decodeSignleType(type: subType, data: dataSlice, pointer: subpointer)
+                        let (v, c) = decodeSingleType(type: subType, data: dataSlice, pointer: subpointer)
                         guard let valueUnwrapped = v, let consumedUnwrapped = c else {break}
                         toReturn.append(valueUnwrapped)
                         if (subType.isStatic) {
@@ -150,7 +150,7 @@ extension ABIDecoder {
                 var toReturn = [AnyObject]()
                 var consumed: UInt64 = 0
                 for _ in 0 ..< length {
-                    let (v, c) = decodeSignleType(type: subType, data: elementItself, pointer: consumed)
+                    let (v, c) = decodeSingleType(type: subType, data: elementItself, pointer: consumed)
                     guard let valueUnwrapped = v, let consumedUnwrapped = c else {return (nil, nil)}
                     toReturn.append(valueUnwrapped)
                     consumed = consumed + consumedUnwrapped
@@ -168,10 +168,28 @@ extension ABIDecoder {
             var toReturn = [AnyObject]()
             var consumed: UInt64 = 0
             for i in 0 ..< subTypes.count {
-                let (v, c) = decodeSignleType(type: subTypes[i], data: elementItself, pointer: consumed)
+                let (v, c) = decodeSingleType(type: subTypes[i], data: elementItself, pointer: consumed)
                 guard let valueUnwrapped = v, let consumedUnwrapped = c else {return (nil, nil)}
                 toReturn.append(valueUnwrapped)
-                consumed = consumed + consumedUnwrapped
+                /*
+                 When decoding a tuple that is not static or an array with a subtype that is not static, the second value in the tuple returned by decodeSignleType is a pointer to the next element, NOT the length of the consumed element. So when decoding such an element, consumed should be set to consumedUnwrapped, NOT incremented by consumedUnwrapped.
+                 */
+                switch subTypes[i] {
+                case .array(type: let subType, length: _):
+                    if !subType.isStatic {
+                        consumed = consumedUnwrapped
+                    } else {
+                        consumed = consumed + consumedUnwrapped
+                    }
+                case .tuple(types: _):
+                    if !subTypes[i].isStatic {
+                        consumed = consumedUnwrapped
+                    } else {
+                        consumed = consumed + consumedUnwrapped
+                    }
+                default:
+                    consumed = consumed + consumedUnwrapped
+                }
             }
             //            print("Tuple element is: \n" + String(describing: toReturn))
             if type.isStatic {
@@ -251,11 +269,11 @@ extension ABIDecoder {
             let data = logs[i+1]
             let input = indexedInputs[i]
             if !input.type.isStatic || input.type.isArray || input.type.memoryUsage != 32 {
-                let (v, _) = ABIDecoder.decodeSignleType(type: .bytes(length: 32), data: data)
+                let (v, _) = ABIDecoder.decodeSingleType(type: .bytes(length: 32), data: data)
                 guard let valueUnwrapped = v else {return nil}
                 indexedValues.append(valueUnwrapped)
             } else {
-                let (v, _) = ABIDecoder.decodeSignleType(type: input.type, data: data)
+                let (v, _) = ABIDecoder.decodeSingleType(type: input.type, data: data)
                 guard let valueUnwrapped = v else {return nil}
                 indexedValues.append(valueUnwrapped)
             }

Sources/web3swift/HookedFunctions/Web3+BrowserFunctions.swift

@@ -70,15 +70,18 @@ extension web3.BrowserFunctions {
     }
 
     public func sendTransaction(_ transactionJSON: [String: Any], password: String = "web3swift") -> [String: Any]? {
-        guard let transaction = EthereumTransaction.fromJSON(transactionJSON) else {return nil}
-        guard let options = TransactionOptions.fromJSON(transactionJSON) else {return nil}
-        var transactionOptions = TransactionOptions()
-        transactionOptions.from = options.from
-        transactionOptions.to = options.to
-        transactionOptions.value = options.value != nil ? options.value! : BigUInt(0)
-        transactionOptions.gasLimit = options.gasLimit != nil ? options.gasLimit! : .automatic
-        transactionOptions.gasPrice = options.gasPrice != nil ? options.gasPrice! : .automatic
-        return self.sendTransaction(transaction, transactionOptions: transactionOptions, password: password)
+        do {
+          let jsonData: Data = try JSONSerialization.data(withJSONObject: transactionJSON, options: [])
+          let transaction: EthereumTransaction = try JSONDecoder().decode(EthereumTransaction.self, from: jsonData)
+          let options: TransactionOptions = try JSONDecoder().decode(TransactionOptions.self, from: jsonData)
+          var transactionOptions = TransactionOptions()
+          transactionOptions.from = options.from
+          transactionOptions.to = options.to
+          transactionOptions.value = options.value ?? 0
+          transactionOptions.gasLimit = options.gasLimit ?? .automatic
+          transactionOptions.gasPrice = options.gasPrice ?? .automatic
+          return self.sendTransaction(transaction, transactionOptions: transactionOptions, password: password)
+        } catch { return nil }
     }
 
     public func sendTransaction(_ transaction: EthereumTransaction, transactionOptions: TransactionOptions, password: String = "web3swift") -> [String: Any]? {
@@ -91,15 +94,18 @@ extension web3.BrowserFunctions {
     }
 
     public func estimateGas(_ transactionJSON: [String: Any]) -> BigUInt? {
-        guard let transaction = EthereumTransaction.fromJSON(transactionJSON) else {return nil}
-        guard let options = TransactionOptions.fromJSON(transactionJSON) else {return nil}
-        var transactionOptions = TransactionOptions()
-        transactionOptions.from = options.from
-        transactionOptions.to = options.to
-        transactionOptions.value = options.value != nil ? options.value! : BigUInt(0)
-        transactionOptions.gasLimit = .automatic
-        transactionOptions.gasPrice = options.gasPrice != nil ? options.gasPrice! : .automatic
-        return self.estimateGas(transaction, transactionOptions: transactionOptions)
+        do {
+            let jsonData: Data = try JSONSerialization.data(withJSONObject: transactionJSON, options: [])
+            let transaction: EthereumTransaction = try JSONDecoder().decode(EthereumTransaction.self, from: jsonData)
+            let options: TransactionOptions = try JSONDecoder().decode(TransactionOptions.self, from: jsonData)
+            var transactionOptions = TransactionOptions()
+            transactionOptions.from = options.from
+            transactionOptions.to = options.to
+            transactionOptions.value = options.value ?? 0
+            transactionOptions.gasLimit = .automatic
+            transactionOptions.gasPrice = options.gasPrice ?? .automatic
+            return self.estimateGas(transaction, transactionOptions: transactionOptions)
+        } catch { return nil }
     }
 
     public func estimateGas(_ transaction: EthereumTransaction, transactionOptions: TransactionOptions) -> BigUInt? {
@@ -112,9 +118,10 @@ extension web3.BrowserFunctions {
     }
 
     public func prepareTxForApproval(_ transactionJSON: [String: Any]) -> (transaction: EthereumTransaction?, options: TransactionOptions?) {
-        guard let transaction = EthereumTransaction.fromJSON(transactionJSON) else {return (nil, nil)}
-        guard let options = TransactionOptions.fromJSON(transactionJSON) else {return (nil, nil)}
         do {
+            let jsonData: Data = try JSONSerialization.data(withJSONObject: transactionJSON, options: [])
+            let transaction: EthereumTransaction = try JSONDecoder().decode(EthereumTransaction.self, from: jsonData)
+            let options: TransactionOptions = try JSONDecoder().decode(TransactionOptions.self, from: jsonData)
             return try self.prepareTxForApproval(transaction, options: options)
         } catch {
             return (nil, nil)
@@ -140,20 +147,23 @@ extension web3.BrowserFunctions {
     }
 
     public func signTransaction(_ transactionJSON: [String: Any], password: String = "web3swift") -> String? {
-        guard let transaction = EthereumTransaction.fromJSON(transactionJSON) else {return nil}
-        guard let options = TransactionOptions.fromJSON(transactionJSON) else {return nil}
-        var transactionOptions = TransactionOptions()
-        transactionOptions.from = options.from
-        transactionOptions.to = options.to
-        transactionOptions.value = options.value != nil ? options.value! : BigUInt(0)
-        transactionOptions.gasLimit = options.gasLimit != nil ? options.gasLimit! : .automatic
-        transactionOptions.gasPrice = options.gasPrice != nil ? options.gasPrice! : .automatic
-        if let nonceString = transactionJSON["nonce"] as? String, let nonce = BigUInt(nonceString.stripHexPrefix(), radix: 16) {
-            transactionOptions.nonce = .manual(nonce)
-        } else {
-            transactionOptions.nonce = .pending
-        }
-        return self.signTransaction(transaction, transactionOptions: transactionOptions, password: password)
+        do {
+            let jsonData: Data = try JSONSerialization.data(withJSONObject: transactionJSON, options: [])
+            let transaction: EthereumTransaction = try JSONDecoder().decode(EthereumTransaction.self, from: jsonData)
+            let options: TransactionOptions = try JSONDecoder().decode(TransactionOptions.self, from: jsonData)
+            var transactionOptions = TransactionOptions()
+            transactionOptions.from = options.from
+            transactionOptions.to = options.to
+            transactionOptions.value = options.value ?? 0
+            transactionOptions.gasLimit = options.gasLimit ?? .automatic
+            transactionOptions.gasPrice = options.gasPrice ?? .automatic
+            if let nonceString = transactionJSON["nonce"] as? String, let nonce = BigUInt(nonceString.stripHexPrefix(), radix: 16) {
+                transactionOptions.nonce = .manual(nonce)
+            } else {
+                transactionOptions.nonce = .pending
+            }
+            return self.signTransaction(transaction, transactionOptions: transactionOptions, password: password)
+        } catch { return nil }
     }
 
     public func signTransaction(_ trans: EthereumTransaction, transactionOptions: TransactionOptions, password: String = "web3swift") -> String? {

Sources/web3swift/Promises/Promise+Web3+Contract+GetIndexedEvents.swift

@@ -26,7 +26,7 @@ public struct EthereumTransaction: CustomStringConvertible {
         get {
             if (self.r == BigUInt(0) && self.s == BigUInt(0)) {
                 return self.v
-            } else if (self.v == BigUInt(27) || self.v == BigUInt(28)) {
+            } else if (self.v == BigUInt(27) || self.v == BigUInt(28) || self.v < BigUInt(35)) {
                 return nil
             } else {
                 return ((self.v - BigUInt(1)) / BigUInt(2)) - BigUInt(17)
@@ -121,11 +121,12 @@ public struct EthereumTransaction: CustomStringConvertible {
         } else if self.v >= 27 && self.v <= 30 {
             d = BigUInt(27)
         }
-        if (self.chainID != nil && self.chainID != BigUInt(0)) {
-            normalizedV = self.v - d - self.chainID! - self.chainID!
-        } else if (inferedChainID != nil) {
-            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
         }
         guard let vData = normalizedV.serialize().setLengthLeft(1) else {return nil}
@@ -349,50 +350,4 @@ public extension EthereumTransaction {
         return tx
     }
 
-    static func fromJSON(_ json: [String: Any]) -> EthereumTransaction? {
-        guard let options = TransactionOptions.fromJSON(json) else {return nil}
-        guard let toString = json["to"] as? String else {return nil}
-        var to: EthereumAddress
-        if toString == "0x" || toString == "0x0" {
-            to = EthereumAddress.contractDeploymentAddress()
-        } else {
-            guard let ethAddr = EthereumAddress(toString) else {return nil}
-            to = ethAddr
-        }
-        //        if (!to.isValid) {
-        //            return nil
-        //        }
-        var dataString = json["data"] as? String
-        if (dataString == nil) {
-            dataString = json["input"] as? String
-        }
-        guard dataString != nil, let data = Data.fromHex(dataString!) else {return nil}
-        var transaction = EthereumTransaction(to: to, data: data, options: options)
-        if let nonceString = json["nonce"] as? String {
-            guard let nonce = BigUInt(nonceString.stripHexPrefix(), radix: 16) else {return nil}
-            transaction.nonce = nonce
-        }
-        if let vString = json["v"] as? String {
-            guard let v = BigUInt(vString.stripHexPrefix(), radix: 16) else {return nil}
-            transaction.v = v
-        }
-        if let rString = json["r"] as? String {
-            guard let r = BigUInt(rString.stripHexPrefix(), radix: 16) else {return nil}
-            transaction.r = r
-        }
-        if let sString = json["s"] as? String {
-            guard let s = BigUInt(sString.stripHexPrefix(), radix: 16) else {return nil}
-            transaction.s = s
-        }
-        if let valueString = json["value"] as? String {
-            guard let value = BigUInt(valueString.stripHexPrefix(), radix: 16) else {return nil}
-            transaction.value = value
-        }
-        let inferedChainID = transaction.inferedChainID
-        if (transaction.inferedChainID != nil && transaction.v >= BigUInt(37)) {
-            transaction.chainID = inferedChainID
-        }
-        return transaction
-    }
-
 }

Sources/web3swift/Transaction/EthereumTransaction.swift

@@ -49,7 +49,7 @@ public struct Web3Signer {
             guard let unmarshalledSignature = SECP256K1.unmarshalSignature(signatureData: serializedSignature) else {
                 return false
             }
-            let originalPublicKey = SECP256K1.privateToPublic(privateKey: privateKey)
+            guard let originalPublicKey = SECP256K1.privateToPublic(privateKey: privateKey) else { return false }
             var d = BigUInt(0)
             if unmarshalledSignature.v >= 0 && unmarshalledSignature.v <= 3 {
                 d = BigUInt(35)
@@ -62,7 +62,7 @@ public struct Web3Signer {
             transaction.r = BigUInt(Data(unmarshalledSignature.r))
             transaction.s = BigUInt(Data(unmarshalledSignature.s))
             let recoveredPublicKey = transaction.recoverPublicKey()
-            if (!(originalPublicKey!.constantTimeComparisonTo(recoveredPublicKey))) {
+            if !(originalPublicKey.constantTimeComparisonTo(recoveredPublicKey)) {
                 return false
             }
             return true
@@ -87,7 +87,7 @@ public struct Web3Signer {
             guard let unmarshalledSignature = SECP256K1.unmarshalSignature(signatureData: serializedSignature) else {
                 return false
             }
-            let originalPublicKey = SECP256K1.privateToPublic(privateKey: privateKey)
+            guard let originalPublicKey = SECP256K1.privateToPublic(privateKey: privateKey) else { return false }
             transaction.chainID = nil
             var d = BigUInt(0)
             var a = BigUInt(0)
@@ -102,7 +102,7 @@ public struct Web3Signer {
             transaction.r = BigUInt(Data(unmarshalledSignature.r))
             transaction.s = BigUInt(Data(unmarshalledSignature.s))
             let recoveredPublicKey = transaction.recoverPublicKey()
-            if (!(originalPublicKey!.constantTimeComparisonTo(recoveredPublicKey))) {
+            if !(originalPublicKey.constantTimeComparisonTo(recoveredPublicKey)) {
                 return false
             }
             return true