Merge pull request #281 from matter-labs/master

Master

Author: skywinder

Example/web3swiftBrowser/Pods/Pods.xcodeproj/project.pbxproj

@@ -10,7 +10,7 @@ let package = Package(
     .library(name: "web3swift", targets: ["web3swift"]),
     ],
   dependencies: [
-    .package(url: "https://github.com/attaswift/BigInt.git", from: "5.0"),
+    .package(url: "https://github.com/attaswift/BigInt.git", from: "5.0.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

@@ -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)
         }
     }