reset to original state (or close to it) --- prep for refactor of EthereumTransaction

Author: mloit

Sources/web3swift/Contract/EthereumContract.swift

@@ -114,41 +114,25 @@ public struct EthereumContract: ContractProtocol {
         } else if extraData != Data() {
             fullData.append(extraData)
         }
-        var opts = TransactionOptions()
-        opts.gasPrice = .manual(0)
-        opts.gasLimit = .manual(0)
-        opts.value = 0
-        opts.to = to
-
-        return EthereumTransaction(to: to, data: fullData, options: opts)
+        let transaction = EthereumTransaction(gasPrice: BigUInt(0), gasLimit: BigUInt(0), to: to, value: BigUInt(0), data: fullData)
+        return transaction
     }
 
     public func method(_ method: String = "fallback", parameters: [AnyObject] = [AnyObject](), extraData: Data = Data()) -> EthereumTransaction? {
         guard let to = self.address else {return nil}
 
         if (method == "fallback") {
-            var opts = TransactionOptions()
-            opts.gasPrice = .manual(0)
-            opts.gasLimit = .manual(0)
-            opts.value = 0
-            opts.to = to
-
-            return EthereumTransaction(to: to, data: extraData, options: opts)
-
+            let transaction = EthereumTransaction(gasPrice: BigUInt(0), gasLimit: BigUInt(0), to: to, value: BigUInt(0), data: extraData)
+            return transaction
         }
         let foundMethod = self.methods.filter { (key, value) -> Bool in
             return key == method
         }
         guard foundMethod.count == 1 else {return nil}
         let abiMethod = foundMethod[method]
-        guard let encodedData = abiMethod?.encodeParameters(parameters) else { return nil }
-        var opts = TransactionOptions()
-        opts.gasPrice = .manual(0)
-        opts.gasLimit = .manual(0)
-        opts.value = 0
-        opts.to = to
-
-        return EthereumTransaction(to: to, data: encodedData, options: opts)
+        guard let encodedData = abiMethod?.encodeParameters(parameters) else {return nil}
+        let transaction = EthereumTransaction(gasPrice: BigUInt(0), gasLimit: BigUInt(0), to: to, value: BigUInt(0), data: encodedData)
+        return transaction
     }
 
     public func parseEvent(_ eventLog: EventLog) -> (eventName: String?, eventData: [String: Any]?) {

Sources/web3swift/HookedFunctions/Web3+BrowserFunctions.swift

@@ -132,17 +132,13 @@ extension web3.BrowserFunctions {
         do {
             var transaction = trans
             var options = opts
-            var gasOptions = TransactionOptions()
             guard let _ = options.from else {return (nil, nil)}
             let gasPrice = try self.web3.eth.getGasPrice()
-            gasOptions.gasPrice = .manual(gasPrice)
+            transaction.gasPrice = gasPrice
             options.gasPrice = .manual(gasPrice)
             guard let gasEstimate = self.estimateGas(transaction, transactionOptions: options) else {return (nil, nil)}
-            gasOptions.gasLimit = .limited(gasEstimate)
+            transaction.gasLimit = gasEstimate
             options.gasLimit = .limited(gasEstimate)
-
-            transaction.applyOptions(gasOptions)
-
             print(transaction)
             return (transaction, options)
         } catch {
@@ -173,28 +169,26 @@ extension web3.BrowserFunctions {
     public func signTransaction(_ trans: EthereumTransaction, transactionOptions: TransactionOptions, password: String = "web3swift") -> String? {
         do {
             var transaction = trans
-            var gasOptions = TransactionOptions()
-            guard let from = transactionOptions.from else { return nil }
-            guard let keystoreManager = self.web3.provider.attachedKeystoreManager else { return nil }
-            guard let gasPricePolicy = transactionOptions.gasPrice else { return nil }
-            guard let gasLimitPolicy = transactionOptions.gasLimit else { return nil }
-            guard let noncePolicy = transactionOptions.nonce else { return nil }
+            guard let from = transactionOptions.from else {return nil}
+            guard let keystoreManager = self.web3.provider.attachedKeystoreManager else {return nil}
+            guard let gasPricePolicy = transactionOptions.gasPrice else {return nil}
+            guard let gasLimitPolicy = transactionOptions.gasLimit else {return nil}
+            guard let noncePolicy = transactionOptions.nonce else {return nil}
             switch gasPricePolicy {
             case .manual(let gasPrice):
-                gasOptions.gasPrice = .manual(gasPrice)
+                transaction.gasPrice = gasPrice
             default:
                 let gasPrice = try self.web3.eth.getGasPrice()
-                gasOptions.gasPrice = .manual(gasPrice)
+                transaction.gasPrice = gasPrice
             }
 
             switch gasLimitPolicy {
             case .manual(let gasLimit):
-                gasOptions.gasLimit = .manual(gasLimit)
+                transaction.gasLimit = gasLimit
             default:
                 let gasLimit = try self.web3.eth.estimateGas(transaction, transactionOptions: transactionOptions)
-                gasOptions.gasLimit = .manual(gasLimit)
+                transaction.gasLimit = gasLimit
             }
-            transaction.applyOptions(gasOptions)
 
             switch noncePolicy {
             case .manual(let nonce):
@@ -211,7 +205,7 @@ extension web3.BrowserFunctions {
             guard let keystore = keystoreManager.walletForAddress(from) else {return nil}
             try Web3Signer.signTX(transaction: &transaction, keystore: keystore, account: from, password: password)
             print(transaction)
-            let signedData = transaction.encode()?.toHexString().addHexPrefix()
+            let signedData = transaction.encode(forSignature: false, chainID: nil)?.toHexString().addHexPrefix()
             return signedData
         } catch {
             return nil

Tests/web3swiftTests/localTests/web3swiftBasicLocalNodeTests.swift

@@ -92,9 +92,7 @@ class web3swiftBasicLocalNodeTests: XCTestCase {
         print("Balance after from: " + balanceAfterFrom.description)
 
         XCTAssert(balanceAfterTo - balanceBeforeTo == valueToSend)
-        let options = details.transaction.getOptions()
-        let txnGasPrice = options.resolveGasPrice(0)
-        XCTAssert(balanceBeforeFrom - (balanceAfterFrom + receipt.gasUsed * txnGasPrice) == valueToSend)
+        XCTAssert(balanceBeforeFrom - (balanceAfterFrom + receipt.gasUsed * details.transaction.gasPrice) == valueToSend)
     }
 
     // FIXME: Crashes on CI/CD