Merge branch 'develop' into feat/solidity-sha3

Author: yaroslavyaroslav

.swiftlint.yml

@@ -0,0 +1,44 @@
+excluded:
+  - Carthage
+  - Pods
+  - .build
+  - Build
+  - DerivedData
+
+disabled_rules:
+  - type_name
+  - identifier_name
+  - line_length
+  - multiple_closures_with_trailing_closure
+  - todo
+
+opt_in_rules:
+ - weak_delegate
+ - unused_import
+ - unneeded_parentheses_in_closure_argument
+ - trailing_closure
+ - static_operator
+ - redundant_nil_coalescing
+ - override_in_extension
+ - legacy_objc_type
+ - implicitly_unwrapped_optional
+ - force_unwrapping
+ - empty_string
+ - closure_body_length
+ - fallthrough
+
+# force warnings
+force_cast: error
+force_try: error 
+
+custom_rules:
+  commented_out_code: 
+    included: ".*\\.swift" # regex that defines paths to include during linting. optional.
+    excluded: ".*Test(s)?\\.swift" # regex that defines paths to exclude during linting. optional
+    name: "Commented out code" # rule name. optional.
+    regex: "^\\/\\/\\s*(@|\\.?([a-z]|(\\})))" # matching pattern
+    capture_group: 0 # number of regex capture group to highlight the rule violation at. optional.
+    match_kinds: # SyntaxKinds to match. optional.
+      - comment
+    message: "No commented code in devel branch allowed." # violation message. optional.
+    severity: warning # violation severity. optional.

Package.swift

@@ -1,12 +1,11 @@
-// swift-tools-version:5.4
+// swift-tools-version: 5.4
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
-
 #if os(macOS)
 let excludeFiles = [
-    "./Browser/BrowserViewController.swift", // Because of inheriting iOS only class failed to build on macOS.
+    "./Browser/BrowserViewController.swift" // Because of inheriting iOS only class failed to build on macOS.
 ]
 #elseif os(iOS)
 let excludeFiles: String = []
@@ -20,7 +19,7 @@ let package = Package(
     products: [
         .library(name: "web3swift", targets: ["web3swift"])
     ],
-    
+
     dependencies: [
         .package(url: "https://github.com/attaswift/BigInt.git", from: "5.3.0"),
         .package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.16.2"),
@@ -60,6 +59,6 @@ let package = Package(
                 .copy("../../../TestToken/Helpers/TokenBasics/IERC20.sol"),
                 .copy("../../../TestToken/Token/Web3SwiftToken.sol")
             ]
-        ),
+        )
     ]
 )

[email protected]

@@ -1,23 +1,23 @@
-// swift-tools-version:5.0
+// swift-tools-version: 5.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "Web3swift",
     platforms: [
-        .macOS(.v10_12), .iOS(.v11),
+        .macOS(.v10_12), .iOS(.v11)
     ],
     products: [
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(name: "web3swift", targets: ["web3swift"]),
     ],
-    
+
     dependencies: [
         .package(url: "https://github.com/attaswift/BigInt.git", from: "5.3.0"),
         .package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.15.4"),
         .package(url: "https://github.com/daltoniam/Starscream.git", from: "4.0.4"),
-        .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", from: "1.4.2"),
+        .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", from: "1.4.2")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -30,6 +30,6 @@ let package = Package(
             ]),
         .testTarget(
             name: "web3swiftTests",
-            dependencies: ["web3swift"]),
+            dependencies: ["web3swift"])
     ]
 )

Sources/web3swift/Browser/Bridge.swift

@@ -10,76 +10,76 @@ import WebKit
 
 /// Bridge for WKWebView and JavaScript
 open class Bridge: NSObject {
-    
+
     static let name: String = "pacific"
-    
+
     fileprivate static let callbackEventName = "PacificDidReceiveNativeCallback"
     fileprivate static let postEventName = "PacificDidReceiveNativeBroadcast"
-    
+
     fileprivate enum MessageKey {
         static let action = "action"
         static let parameters = "parameters"
         static let callback = "callback"
         static let printable = "print"
     }
-    
+
     public struct JSError {
         public let code: Int
         public let description: String
-        
+
         public init(code: Int, description: String) {
             self.code = code
             self.description = description
         }
     }
-    
+
     /// Used to callback to webpage whether a message from webpage was handled successful or encountered an error.
     ///
     /// - success: The result of message was successful
     ///
     /// - failure: Unable to handle the message, notify js with error by **Object Error** { code: Int, description: String}
     ///
     public enum Results {
-        
+
         case success([String: Any]?)
-        
+
         case failure(JSError)
     }
-    
+
     /// Bridge Callback to webpage
     /// - Parameter results: Value pass to webpage
     public typealias Callback = (_ results: Results) -> Void
-    
+
     /// Closure when js send message to native
     /// - Parameter parameters: js parameters
     /// - Parameter callback: callback func
     public typealias Handler = (_ parameters: [String: Any]?, _ callback: @escaping Callback) -> Void
-    
+
     public typealias DefaultHandler = (_ name: String, _ parameters: [String: Any]?, _ callback: @escaping Callback) -> Void
-    
+
     private(set) var handlers = [String: Handler]()
-    
+
     public var defaultHandler: DefaultHandler?
-    
+
     fileprivate let configuration: WKWebViewConfiguration
     fileprivate weak var webView: WKWebView?
-    
+
     /// Print message body from webpage automatically.
     public var printScriptMessageAutomatically = false
-    
+
     deinit {
         configuration.removeObserver(self, forKeyPath: #keyPath(WKWebViewConfiguration.userContentController))
         configuration.userContentController.removeScriptMessageHandler(forName: Bridge.name)
     }
-    
+
     fileprivate init(webView: WKWebView) {
         self.webView = webView
         self.configuration = webView.configuration
         super.init()
         configuration.addObserver(self, forKeyPath: #keyPath(WKWebViewConfiguration.userContentController), options: [.new, .old], context: nil)
         configuration.userContentController.add(self, name: Bridge.name)
     }
-    
+
     /// Register to handle action
     /// - Parameter handler: closure when handle message from webpage
     /// - parameter action: name of action
@@ -95,13 +95,13 @@ open class Bridge: NSObject {
     public func register(_ handler: @escaping Handler, for action: String) {
         handlers[action] = handler
     }
-    
+
     /// Unregister an action
     /// - Parameters action: name of action
     public func unregister(for action: String) {
         handlers[action] = nil
     }
-    
+
     /// send action to webpage
     /// - Parameter action: action listened by js `window.bridge.on(**action**, handler)`
     /// - Parameter parameters: parameters pass to js
@@ -114,16 +114,16 @@ open class Bridge: NSObject {
         guard let webView = webView else { return }
         webView.st_dispatchBridgeEvent(Bridge.postEventName, parameters: ["name": action], results: .success(parameters), completionHandler: nil)
     }
-    
+
     /// Evaluates the given JavaScript string.
     /// - Parameter javaScriptString:  The JavaScript string to evaluate.
     /// - Parameter completion: A block to invoke when script evaluation completes or fails.
     public func evaluate(_ javaScriptString: String, completion: ((Any?, Error?) -> Void)? = nil) {
         guard let webView = webView else { return }
         webView.evaluateJavaScript(javaScriptString, completionHandler: completion)
     }
-    
-    open override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
+
+    open override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey: Any]?, context: UnsafeMutableRawPointer?) {
         if let obj = object as? WKWebViewConfiguration, let kp = keyPath, obj == configuration && kp == #keyPath(WKWebViewConfiguration.userContentController) {
             if let change = change {
                 if let oldContentController = change[.oldKey] as? WKUserContentController {
@@ -138,7 +138,7 @@ open class Bridge: NSObject {
 }
 
 extension Bridge: WKScriptMessageHandler {
-    
+
     /*! @abstract Invoked when a script message is received from a webpage.
      @param userContentController The user content controller invoking the
      delegate method.
@@ -171,7 +171,7 @@ extension Bridge: WKScriptMessageHandler {
             }
             return
         }
-      
+
         if let callbackID = (body[MessageKey.callback] as? NSNumber) {
             handler(body[MessageKey.parameters] as? [String: Any]) { [weak self] (results) in
                 guard let strongSelf = self else {
@@ -190,11 +190,11 @@ extension Bridge: WKScriptMessageHandler {
 }
 
 public extension WKWebView {
-    
+
     private struct STPrivateStatic {
         fileprivate static var bridgeKey = "STPrivateStatic.bridgeKey"
     }
-    
+
     /// Bridge for WKWebView and JavaScript. Initialize `lazy`
     var bridge: Bridge {
         if let bridge = objc_getAssociatedObject(self, &STPrivateStatic.bridgeKey) as? Bridge {
@@ -204,7 +204,7 @@ public extension WKWebView {
         objc_setAssociatedObject(self, &STPrivateStatic.bridgeKey, bridge, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
         return bridge
     }
-    
+
     /// Remove Bridge And Reset, All the handlers will be removed
     func removeBridge() {
         if let bridge = objc_getAssociatedObject(self, &STPrivateStatic.bridgeKey) as? Bridge {
@@ -216,12 +216,12 @@ public extension WKWebView {
 }
 
 fileprivate extension WKWebView {
-    
+
     func st_dispatchBridgeEvent(_ eventName: String,
                                             parameters: [String: Any],
                                             results: Bridge.Results,
                                             completionHandler: ((Any?, Error?) -> Void)? = nil) {
-        
+
         var eventDetail: [String: Any] = parameters
         switch results {
         case .failure(let error):
@@ -234,7 +234,7 @@ fileprivate extension WKWebView {
         if
             let _data = try? JSONSerialization.data(withJSONObject: eventBody, options: JSONSerialization.WritingOptions()),
             let eventString = String(data: _data, encoding: .utf8) {
-            
+
             jsString = "(function() { var event = new CustomEvent('\(eventName)', \(eventString)); document.dispatchEvent(event)}());"
         } else {
             // When JSON Not Serializable, Invoke with Default Parameters