Merge branch 'develop' into master

Author: skywinder

CHANGELOG.md

@@ -319,7 +319,7 @@ let tx = contract.write(
     transactionOptions: options)!
 ```
 
-##### Read Transaction to call smart contract method
+##### Read Transaction from call smart contract method
 
 ```swift
 let walletAddress = EthereumAddress(wallet.address)! // Your wallet address

Documentation/Usage.md

@@ -44,10 +44,6 @@ This guide is provided in order to ease the transition of existing applications
 
 ---
 
-## Follow naming convention
-
-Now you have to do "import Web3swift" (capitalization!) instead of "import web3swift" to follow naming convention.
-
 ## New pods
 
 Now EthereumAddress and Ethereum ABI are separate projects. Use "//import EthereumAddress" and "import Ethereum ABI" everywhere you use them.
@@ -256,7 +252,7 @@ let balanceString = Web3.Utils.formatToEthereumUnits(balance, toUnits: .eth, dec
 
 // web3swift 2.0
 let address = EthereumAddress("<Address>")!
-let web3Main = Web3.InfuraMainnetWeb3()
+let web3 = Web3.InfuraMainnetWeb3()
 let balance = try web3.eth.getBalance(address: address)
 let balanceString = Web3.Utils.formatToEthereumUnits(balance, toUnits: .eth, decimals: 3)
 ```

Documentation/web3swift 2.0 Migration Guide.md

@@ -10,7 +10,7 @@ let package = Package(
     .library(name: "web3swift", targets: ["web3swift"]),
     ],
   dependencies: [
-    .package(url: "https://github.com/attaswift/BigInt.git", from: "3.1.0"),
+    .package(url: "https://github.com/attaswift/BigInt.git", from: "5.0"),
     .package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.8.4"),
     .package(url: "https://github.com/daltoniam/Starscream.git", from: "3.1.0"),
     .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", from: "1.0.0"),

Package.swift

@@ -20,6 +20,11 @@
 - [Core features](#core-features)
 - [Installation](#installation)
   - [Example usage](#example-usage)
+      - [Send Ether](#send-ether)
+      - [Send ERC-20 Token](#send-erc-20-token)
+      - [Write Transaction and call smart contract method](#write-transaction-and-call-smart-contract-method)
+  - [Web3View example](#web3view-example)
+  - [Build from source](#build-from-source)
   - [Requirements](#requirements)
   - [Migration Guides](#migration-guides)
 - [Documentation](#documentation)
@@ -51,7 +56,7 @@
 
     - [x] **[BIP32](https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki) (HD Wallets), [BIP39](https://github.com/bitcoin/bips/blob/master/bip-0039.mediawiki) (Seed phrases), [BIP44](https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki) (Key generation prefixes)**
 - [x] **[EIP-20](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-20.md)** (Standart interface for tokens - ERC-20), **[EIP-67](https://github.com/ethereum/EIPs/issues/67)** (Standard URI scheme), **[EIP-155](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-155.md)** (Replay attacks protection)
-    - [x] **And many others ** *(For more details about this EIP's look at [Documentation page](https://github.com/matter-labs/web3swift/blob/master/Documentation/))*: EIP-681, EIP-721, EIP-165, EIP-777, EIP-820, EIP-888, EIP-1400, EIP-1410, EIP-1594, EIP-1643, EIP-1644, EIP-1633, EIP-721, EIP-1155, EIP-1376, ST-20
+    - [x] **And many others** *(For details about this EIP's look at [Documentation page](https://github.com/matter-labs/web3swift/blob/master/Documentation/))*: EIP-681, EIP-721, EIP-165, EIP-777, EIP-820, EIP-888, EIP-1400, EIP-1410, EIP-1594, EIP-1643, EIP-1644, EIP-1633, EIP-721, EIP-1155, EIP-1376, ST-20
 
 - [x] 🗜 **Batched requests** in concurrent mode
 - [x] **RLP encoding**
@@ -116,9 +121,91 @@ github "matter-labs/web3swift" "master"
 
 Run `carthage update` to build the framework. By default, Carthage performs checkouts and creates a new directory 'Carthage' in the same location as your Cartfile. Open this directory, go to 'Build' directory, choose iOS or macOS directory, and use the selected directory framework in your Xcode project.
 
+- Swift Package
+Open xcode setting and add this repo as a source
+
 ### Example usage
 
-**Web3View example:**
+
+##### Send Ether
+
+```swift
+let value: String = "1.0" // In Ether
+let walletAddress = EthereumAddress(wallet.address)! // Your wallet address
+let toAddress = EthereumAddress(toAddressString)!
+let contract = web3.contract(Web3.Utils.coldWalletABI, at: toAddress, abiVersion: 2)!
+let amount = Web3.Utils.parseToBigUInt(value, units: .eth)
+var options = TransactionOptions.defaultOptions
+options.value = amount
+options.from = walletAddress
+options.gasPrice = .automatic
+options.gasLimit = .automatic
+let tx = contract.write(
+    "fallback",
+    parameters: [AnyObject](),
+    extraData: Data(),
+    transactionOptions: options)!
+```
+
+##### Send ERC-20 Token
+
+```swift
+let web3 = Web3.InfuraMainnetWeb3() 
+let value: String = "1.0" // In Tokens
+let walletAddress = EthereumAddress(wallet.address)! // Your wallet address
+let toAddress = EthereumAddress(toAddressString)!
+let erc20ContractAddress = EthereumAddress(token.address)!
+let contract = web3.contract(Web3.Utils.erc20ABI, at: erc20ContractAddress, abiVersion: 2)!
+let amount = Web3.Utils.parseToBigUInt(value, units: .eth)
+var options = TransactionOptions.defaultOptions
+options.value = amount
+options.from = walletAddress
+options.gasPrice = .automatic
+options.gasLimit = .automatic
+let method = "transfer"
+let tx = contract.write(
+    method,
+    parameters: [toAddress, amount] as [AnyObject],
+    extraData: Data(),
+    transactionOptions: options)!
+```
+
+
+##### Get account balance
+```swift
+let web3 = Web3.InfuraMainnetWeb3() 
+let address = EthereumAddress("<Address>")!
+let balance = try web3.eth.getBalance(address: address)
+let balanceString = Web3.Utils.formatToEthereumUnits(balance, toUnits: .eth, decimals: 3)
+```
+
+##### Write Transaction and call smart contract method
+
+```swift
+let web3 = Web3.InfuraMainnetWeb3() 
+let value: String = "0.0" // Any amount of Ether you need to send
+let walletAddress = EthereumAddress(wallet.address)! // Your wallet address
+let contractMethod = "SOMECONTRACTMETHOD" // Contract method you want to write
+let contractABI = "..." // Contract ABI
+let contractAddress = EthereumAddress(contractAddressString)!
+let abiVersion = 2 // Contract ABI version
+let parameters: [AnyObject] = [...]() // Parameters for contract method
+let extraData: Data = Data() // Extra data for contract method
+let contract = web3.contract(contractABI, at: contractAddress, abiVersion: abiVersion)!
+let amount = Web3.Utils.parseToBigUInt(value, units: .eth)
+var options = TransactionOptions.defaultOptions
+options.value = amount
+options.from = walletAddress
+options.gasPrice = .automatic
+options.gasLimit = .automatic
+let tx = contract.write(
+    contractMethod,
+    parameters: parameters,
+    extraData: extraData,
+    transactionOptions: options)!
+```
+
+### Web3View example
 
 You can see how to our demo project: **WKWebView with injected "web3" provider**:
 
@@ -129,10 +216,10 @@ pod install
 open ./web3swiftBrowser.xcworkspace
 ```
 
-### Build from source:
+### Build from source
 
 - Clone repo
-- Instal dependencies via  `./carthage-build.sh --platform iOS` (temo workaround, foe of Carthage bug.For  more details please look at https://github.com/Carthage/Carthage/issues/3019#issuecomment-665136323)
+- Instal dependencies via  `./carthage-build.sh --platform iOS` (temp workaround, foe of Carthage bug. [For details please look at](https://github.com/Carthage/Carthage/issues/3019#issuecomment-665136323)
 
 ### Requirements
 
@@ -206,9 +293,9 @@ If you use any of our libraries for work, see if your employers would be interes
 We want to continue to do everything we can to move the needle forward.
 
 - **Support us** via [@gitcoin Grant program](https://gitcoin.co/grants/358/web3swift)
-- Ether wallet address: `0xe22b8979739d724343bd002f9f432f5990879901`
+- Ether wallet address: `0x6A3738c6299f45c31697aceA647D49EdCC9C28A4`
 
-![Donate](http://qrcoder.ru/code/?0xe22b8979739d724343bd002f9f432f5990879901&4&0)
+<img src="https://raw.githubusercontent.com/matter-labs/web3swift/develop/img/Ether-donations.jpeg" width="300" />
 
 ### Future steps 
 

README.md

@@ -6,7 +6,6 @@
 //  Copyright © 2017 Samaritan. All rights reserved.
 //
 
-import UIKit
 import WebKit
 
 /// Bridge for WKWebView and JavaScript
@@ -197,7 +196,7 @@ public extension WKWebView {
     }
 
     /// Bridge for WKWebView and JavaScript. Initialize `lazy`
-    public var bridge: Bridge {
+    var bridge: Bridge {
         if let bridge = objc_getAssociatedObject(self, &STPrivateStatic.bridgeKey) as? Bridge {
             return bridge
         }
@@ -207,7 +206,7 @@ public extension WKWebView {
     }
 
     /// Remove Bridge And Reset, All the handlers will be removed
-    public func removeBridge() {
+    func removeBridge() {
         if let bridge = objc_getAssociatedObject(self, &STPrivateStatic.bridgeKey) as? Bridge {
             let userContentController = bridge.configuration.userContentController
             userContentController.removeScriptMessageHandler(forName: Bridge.name)
@@ -218,7 +217,7 @@ public extension WKWebView {
 
 fileprivate extension WKWebView {
 
-    fileprivate func st_dispatchBridgeEvent(_ eventName: String,
+    func st_dispatchBridgeEvent(_ eventName: String,
                                             parameters: [String: Any],
                                             results: Bridge.Results,
                                             completionHandler: ((Any?, Error?) -> Void)? = nil) {

Sources/web3swift/Browser/Bridge.swift

@@ -6,7 +6,6 @@
 //  Copyright © 2020 Matter Labs. All rights reserved.
 //
 
-import UIKit
 import WebKit
 
 open class BrowserViewController: UIViewController {

Sources/web3swift/Browser/BrowserViewController.swift

@@ -193,7 +193,7 @@ public struct RLP {
                 return false
             case .data(_):
                 return true
-            case .list(_):
+            case .list(_, _, _):
                 return false
             }
         }
@@ -204,7 +204,7 @@ public struct RLP {
                 return false
             case .data(_):
                 return false
-            case .list(_):
+            case .list(_,_,_):
                 return true
             }
         }

Sources/web3swift/SwiftRLP/RLP.swift

@@ -32,7 +32,7 @@ extension EthereumBloomFilter {
     }
 
     static func bloom9(_ data: Data) -> BigUInt {
-        var b = data.sha3(.keccak256)
+        let b = data.sha3(.keccak256)
         var r = BigUInt(0)
         let mask = BigUInt(2047)
         for i in stride(from: 0, to: 6, by: 2) {

Sources/web3swift/Transaction/BloomFilter.swift

@@ -17,6 +17,7 @@ public struct EthereumTransaction: CustomStringConvertible {
     // The destination address of the message, left undefined for a contract-creation transaction.
     public var to: EthereumAddress
     // (optional) The value transferred for the transaction in wei, also the endowment if it’s a contract-creation transaction.
+    // TODO - split EthereumTransaction to two classes: with optional and required value property, depends on type of transaction
     public var value: BigUInt?
     public var data: Data
     public var v: BigUInt = BigUInt(1)
@@ -165,18 +166,18 @@ public struct EthereumTransaction: CustomStringConvertible {
     public func encode(forSignature:Bool = false, chainID: BigUInt? = nil) -> Data? {
         if (forSignature) {
             if chainID != nil  {
-                let fields = [self.nonce, self.gasPrice, self.gasLimit, self.to.addressData, self.value, self.data, chainID!, BigUInt(0), BigUInt(0)] as [AnyObject]
+                let fields = [self.nonce, self.gasPrice, self.gasLimit, self.to.addressData, self.value!, self.data, chainID!, BigUInt(0), BigUInt(0)] as [AnyObject]
                 return RLP.encode(fields)
             }
             else if self.chainID != nil  {
-                let fields = [self.nonce, self.gasPrice, self.gasLimit, self.to.addressData, self.value, self.data, self.chainID!, BigUInt(0), BigUInt(0)] as [AnyObject]
+                let fields = [self.nonce, self.gasPrice, self.gasLimit, self.to.addressData, self.value!, self.data, self.chainID!, BigUInt(0), BigUInt(0)] as [AnyObject]
                 return RLP.encode(fields)
             } else {
-                let fields = [self.nonce, self.gasPrice, self.gasLimit, self.to.addressData, self.value, self.data] as [AnyObject]
+                let fields = [self.nonce, self.gasPrice, self.gasLimit, self.to.addressData, self.value!, self.data] as [AnyObject]
                 return RLP.encode(fields)
             }
         } else {
-            let fields = [self.nonce, self.gasPrice, self.gasLimit, self.to.addressData, self.value, self.data, self.v, self.r, self.s] as [AnyObject]
+            let fields = [self.nonce, self.gasPrice, self.gasLimit, self.to.addressData, self.value!, self.data, self.v, self.r, self.s] as [AnyObject]
             return RLP.encode(fields)
         }
     }