Merge pull request #124 from matter-labs/develop

2.1.0

Author: TonioMacaronio

README.md

@@ -2,12 +2,13 @@
 
 # web3swift
 
-[![Version](https://img.shields.io/cocoapods/v/web3swift.svg?style=flat)](http://cocoapods.org/pods/web3swift)
-[![License](https://img.shields.io/cocoapods/l/web3swift.svg?style=flat)](http://cocoapods.org/pods/web3swift)
-[![Platform](https://img.shields.io/cocoapods/p/web3swift.svg?style=flat)](http://cocoapods.org/pods/web3swift)
+[![Build Status](https://travis-ci.com/matter-labs/web3swift.svg?branch=develop)](https://travis-ci.com/matter-labs/web3swift)
 [![Swift](https://img.shields.io/badge/Swift-4.0-orange.svg?style=flat)](https://developer.apple.com/swift/)
+[![Platform](https://img.shields.io/cocoapods/p/web3swift.svg?style=flat)](http://cocoapods.org/pods/web3swift)
+[![CocoaPods Compatible](https://img.shields.io/cocoapods/v/web3swift.svg?style=flat)](http://cocoapods.org/pods/web3swift)
+[![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
+[![License](https://img.shields.io/cocoapods/l/web3swift.svg?style=flat)](http://cocoapods.org/pods/web3swift)
 [![support](https://brianmacdonald.github.io/Ethonate/svg/eth-support-blue.svg)](https://brianmacdonald.github.io/Ethonate/address#0xe22b8979739d724343bd002f9f432f5990879901)
-[![Build Status](https://travis-ci.com/matterinc/web3swift.svg?branch=develop)](https://travis-ci.com/matterinc/web3swift)
 [![Stackoverflow](https://img.shields.io/badge/stackoverflow-ask-blue.svg)](https://stackoverflow.com/questions/tagged/web3swift)
 
 **web3swift** is your toolbelt for any kind interactions with Ethereum network.

web3swift.xcodeproj/project.pbxproj

@@ -9,7 +9,6 @@ import EthereumAddress
 import EthereumABI
 
 public struct EthereumContract:ContractProtocol {
-    public var options: Web3Options? = Web3Options.defaultOptions()
     public var transactionOptions: TransactionOptions? = TransactionOptions.defaultOptions
     public var address: EthereumAddress? = nil
 

web3swift/Contract/Classes/EthereumContract.swift

@@ -68,13 +68,7 @@ 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 = Web3Options.fromJSON(transactionJSON) else {return nil}
-        var transactionOptions = TransactionOptions()
-        transactionOptions.from = options.from
-        transactionOptions.to = options.to
-        transactionOptions.value = options.value
-        transactionOptions.gasLimit = options.gasLimit != nil ? .limited(options.gasLimit!) : .automatic
-        transactionOptions.gasPrice = options.gasPrice != nil ? .manual(options.gasPrice!) : .automatic
+        guard let transactionOptions = TransactionOptions.fromJSON(transactionJSON) else {return nil}
         return self.sendTransaction(transaction, transactionOptions: transactionOptions, password: password)
     }
 
@@ -89,13 +83,7 @@ extension web3.BrowserFunctions {
 
     public func estimateGas(_ transactionJSON: [String: Any]) -> BigUInt? {
         guard let transaction = EthereumTransaction.fromJSON(transactionJSON) else {return nil}
-        guard let options = Web3Options.fromJSON(transactionJSON) else {return nil}
-        var transactionOptions = TransactionOptions()
-        transactionOptions.from = options.from
-        transactionOptions.to = options.to
-        transactionOptions.value = options.value
-        transactionOptions.gasLimit = .automatic
-        transactionOptions.gasPrice = options.gasPrice != nil ? .manual(options.gasPrice!) : .automatic
+        guard let transactionOptions = TransactionOptions.fromJSON(transactionJSON) else {return nil}
         return self.estimateGas(transaction, transactionOptions: transactionOptions)
     }
 
@@ -134,13 +122,7 @@ 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 = Web3Options.fromJSON(transactionJSON) else {return nil}
-        var transactionOptions = TransactionOptions()
-        transactionOptions.from = options.from
-        transactionOptions.to = options.to
-        transactionOptions.value = options.value
-        transactionOptions.gasLimit = options.gasLimit != nil ? .limited(options.gasLimit!) : .automatic
-        transactionOptions.gasPrice = options.gasPrice != nil ? .manual(options.gasPrice!) : .automatic
+        guard var transactionOptions = TransactionOptions.fromJSON(transactionJSON) else {return nil}
         if let nonceString = transactionJSON["nonce"] as? String, let nonce = BigUInt(nonceString.stripHexPrefix(), radix: 16) {
             transactionOptions.nonce = .manual(nonce)
         } else {

web3swift/HookedFunctions/Classes/Web3+BrowserFunctions.swift

@@ -32,9 +32,6 @@ protocol IERC1155Metadata {
 
 public class ERC1155: IERC1155 {
 
-    @available(*, deprecated, renamed: "transactionOptions")
-    public var options: Web3Options = .init()
-    
     private var _tokenId: BigUInt? = nil
     private var _hasReadProperties: Bool = false
 

web3swift/PrecompiledContracts/ERC1155/Web3+ERC1155.swift

@@ -69,9 +69,6 @@ protocol IERC1376: IERC20 {
 
 public class ERC1376: IERC1376 {
 
-    @available(*, deprecated, renamed: "transactionOptions")
-    public var options: Web3Options = .init()
-    
     private var _name: String? = nil
     private var _symbol: String? = nil
     private var _decimals: UInt8? = nil

web3swift/PrecompiledContracts/ERC1376/Web3+ERC1376.swift

@@ -66,9 +66,6 @@ protocol IERC1400: IERC20 {
 // can be imperatively read and saved
 public class ERC1400: IERC1400 {
 
-    @available(*, deprecated, renamed: "transactionOptions")
-    public var options: Web3Options = .init()
-    
     private var _name: String? = nil
     private var _symbol: String? = nil
     private var _decimals: UInt8? = nil

web3swift/PrecompiledContracts/ERC1400/Web3+ERC1400.swift

@@ -44,9 +44,6 @@ protocol IERC1410: IERC20 {
 
 public class ERC1410: IERC1410 {
 
-    @available(*, deprecated, renamed: "transactionOptions")
-    public var options: Web3Options = .init()
-    
     private var _name: String? = nil
     private var _symbol: String? = nil
     private var _decimals: UInt8? = nil

web3swift/PrecompiledContracts/ERC1410/Web3+ERC1410.swift

@@ -34,9 +34,6 @@ protocol IERC1594: IERC20 {
 
 public class ERC1594: IERC1594 {
 
-    @available(*, deprecated, renamed: "transactionOptions")
-    public var options: Web3Options = .init()
-    
     private var _name: String? = nil
     private var _symbol: String? = nil
     private var _decimals: UInt8? = nil

web3swift/PrecompiledContracts/ERC1594/Web3+ERC1594.swift

@@ -21,9 +21,6 @@ protocol IERC1633: IERC20, IERC165 {
 
 public class ERC1633: IERC1633 {
 
-    @available(*, deprecated, renamed: "transactionOptions")
-    public var options: Web3Options = .init()
-    
     private var _name: String? = nil
     private var _symbol: String? = nil
     private var _decimals: UInt8? = nil