Merge pull request #222 from ABMatrix/master

correct gasLimit
web3swift-team · Oct 19, 2019 · 9f3fb48 · 9f3fb48
2 parents a45f86b + eab0871
commit 9f3fb48
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Sources/web3swift/Transaction/EthereumTransaction.swift b/Sources/web3swift/Transaction/EthereumTransaction.swift
@@ -332,6 +332,8 @@ public extension EthereumTransaction {
             switch gL {
             case .manual(let value):
                 tx.gasLimit = value
+            case .limited(let value):
+                tx.gasLimit = value
             default:
                 tx.gasLimit = BigUInt(UInt64(21000))
             }

diff --git a/Sources/web3swift/Web3/Web3+Options.swift b/Sources/web3swift/Web3/Web3+Options.swift
@@ -125,10 +125,7 @@ public struct TransactionOptions {
         var options = TransactionOptions()
         if let gas = json["gas"] as? String, let gasBiguint = BigUInt(gas.stripHexPrefix().lowercased(), radix: 16) {
             options.gasLimit = .limited(gasBiguint)
-        } else {
-            options.gasLimit = .automatic
-        }
-        if let gasLimit = json["gasLimit"] as? String, let gasgasLimitBiguint = BigUInt(gasLimit.stripHexPrefix().lowercased(), radix: 16) {
+        } else if let gasLimit = json["gasLimit"] as? String, let gasgasLimitBiguint = BigUInt(gasLimit.stripHexPrefix().lowercased(), radix: 16) {
             options.gasLimit = .limited(gasgasLimitBiguint)
         } else {
             options.gasLimit = .automatic