Merge pull request #95 from matterinc/2.0

introduce a fix for invalid value in gas estimation, call and send transactions
web3swift-team · Nov 20, 2018 · 46018b7 · 46018b7
2 parents 5708ea4 + 601d091
commit 46018b7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/web3swift.podspec b/web3swift.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 s.name             = "web3swift"
-s.version          = "2.0.1"
+s.version          = "2.0.4"
 s.summary          = "Web3 implementation in vanilla Swift for iOS ans macOS"
 
 s.description      = <<-DESC

diff --git a/web3swift/Transaction/Classes/EthereumTransaction.swift b/web3swift/Transaction/Classes/EthereumTransaction.swift
@@ -322,13 +322,10 @@ public struct EthereumTransaction: CustomStringConvertible {
     static func createRequest(method: JSONRPCmethod, transaction: EthereumTransaction, transactionOptions: TransactionOptions?) -> JSONRPCrequest? {
         let onBlock = transactionOptions?.callOnBlock?.stringValue
         var request = JSONRPCrequest()
-        var tx = transaction
+//        var tx = transaction
         request.method = method
         let from = transactionOptions?.from
-        if transactionOptions != nil, transactionOptions!.value != nil {
-            tx.value = transactionOptions!.value!
-        }
-        guard var txParams = tx.encodeAsDictionary(from: from) else {return nil}
+        guard var txParams = transaction.encodeAsDictionary(from: from) else {return nil}
         if method == .estimateGas || transactionOptions?.gasLimit == nil {
             txParams.gas = nil
         }

diff --git a/web3swift/Web3/Classes/Web3+MutatingTransaction.swift b/web3swift/Web3/Classes/Web3+MutatingTransaction.swift
@@ -37,7 +37,9 @@ public class WriteTransaction: ReadTransaction {
             }
 
             var mergedOptions = self.transactionOptions.merge(transactionOptions)
-
+            if mergedOptions.value != nil {
+                assembledTransaction.value = mergedOptions.value!
+            }
             var forAssemblyPipeline : (EthereumTransaction, EthereumContract, TransactionOptions) = (assembledTransaction, self.contract, mergedOptions)
 
             for hook in self.web3.preAssemblyHooks {

diff --git a/web3swift/Web3/Classes/Web3+ReadingTransaction.swift b/web3swift/Web3/Classes/Web3+ReadingTransaction.swift
@@ -30,7 +30,7 @@ public class ReadTransaction {
     }
 
     public func callPromise(transactionOptions: TransactionOptions? = nil) -> Promise<[String: Any]> {
-        let assembledTransaction : EthereumTransaction = self.transaction
+        var assembledTransaction : EthereumTransaction = self.transaction
         let queue = self.web3.requestDispatcher.queue
         let returnPromise = Promise<[String:Any]> { seal in
             let mergedOptions = self.transactionOptions.merge(transactionOptions)
@@ -39,6 +39,9 @@ public class ReadTransaction {
             optionsForCall.to = mergedOptions.to
             optionsForCall.value = mergedOptions.value
             optionsForCall.callOnBlock = mergedOptions.callOnBlock
+            if mergedOptions.value != nil {
+                assembledTransaction.value = mergedOptions.value!
+            }
             let callPromise : Promise<Data> = self.web3.eth.callPromise(assembledTransaction, transactionOptions: optionsForCall)
             callPromise.done(on: queue) {(data:Data) throws in
                 do {
@@ -63,7 +66,7 @@ public class ReadTransaction {
     }
 
     public func estimateGasPromise(transactionOptions: TransactionOptions? = nil) -> Promise<BigUInt>{
-        let assembledTransaction : EthereumTransaction = self.transaction
+        var assembledTransaction : EthereumTransaction = self.transaction
         let queue = self.web3.requestDispatcher.queue
         let returnPromise = Promise<BigUInt> { seal in
             let mergedOptions = self.transactionOptions.merge(transactionOptions)
@@ -72,6 +75,9 @@ public class ReadTransaction {
             optionsForGasEstimation.to = mergedOptions.to
             optionsForGasEstimation.value = mergedOptions.value
             optionsForGasEstimation.callOnBlock = mergedOptions.callOnBlock
+            if mergedOptions.value != nil {
+                assembledTransaction.value = mergedOptions.value!
+            }
             let promise = self.web3.eth.estimateGasPromise(assembledTransaction, transactionOptions: optionsForGasEstimation)
             promise.done(on: queue) {(estimate: BigUInt) in
                 seal.fulfill(estimate)