Merge branch 'chore/swiftlint-auto-fixes' into chore/swift-lint-cleanup

Author: JeneaVranceanu

Example/myWeb3Wallet/myWeb3Wallet/Appdelegate/AppDelegate.swift

@@ -10,8 +10,6 @@ import UIKit
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
-
-
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
@@ -31,6 +29,4 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // Use this method to release any resources that were specific to the discarded scenes, as they will not return.
     }
 
-
 }
-

Example/myWeb3Wallet/myWeb3Wallet/Appdelegate/SceneDelegate.swift

@@ -11,7 +11,6 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
     var window: UIWindow?
 
-
     func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
         // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`.
         // If using a storyboard, the `window` property will automatically be initialized and attached to the scene.
@@ -47,6 +46,4 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         // to restore the scene back to its current state.
     }
 
-
 }
-

Example/myWeb3Wallet/myWeb3Wallet/ViewController.swift

@@ -14,6 +14,4 @@ class ViewController: UIViewController {
         // Do any additional setup after loading the view.
     }
 
-
 }
-

Example/myWeb3Wallet/myWeb3Wallet/ViewControllers/WalletController/DashboardViewController.swift

@@ -19,7 +19,6 @@ class DashboardViewController: UIViewController {
 
         }
     }
-    
 
     /*
     // MARK: - Navigation

Example/myWeb3Wallet/myWeb3Wallet/ViewControllers/WalletController/SplashViewController.swift

@@ -10,20 +10,19 @@ import UIKit
 class SplashViewController: UIViewController {
 
     @IBOutlet weak var logoView: UIImageView!
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
         UIView.animate(withDuration: 0.9) {
             self.logoView.center.y = self.view.center.y
             Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(self.moveToWalletView), userInfo: nil, repeats: false)
 
         }
-       
 
         // Do any additional setup after loading the view.
     }
-    @objc func moveToWalletView(){
-        
+    @objc func moveToWalletView() {
+
         guard let walletScreen = self.storyboard?.instantiateViewController(withIdentifier: "WalletViewController") as? WalletViewController else {
             #if DEBUG
             printContent("Unable to get Wallet controller")

Example/myWeb3Wallet/myWeb3Wallet/ViewControllers/WalletController/WalletViewController.swift

@@ -8,13 +8,13 @@
 import UIKit
 import web3swift
 class WalletViewController: UIViewController {
-    
+
     @IBOutlet weak var continueButton: UIButton!
     @IBOutlet weak var walletAddressLabel: UILabel!
     @IBOutlet weak var importWalletButton: UIButton!
     @IBOutlet weak var createWalletButton: UIButton!
     var _walletAddress: String {
-        set{
+        set {
             self.continueButton.isHidden = false
             self.walletAddressLabel.text = newValue
         }
@@ -27,23 +27,22 @@ class WalletViewController: UIViewController {
         super.viewDidLoad()
         self.createWalletButton.layer.cornerRadius = 5.0
         self.importWalletButton.layer.cornerRadius = 5.0
-        
+
         // Do any additional setup after loading the view.
     }
-    
-    
+
     @IBAction func onClickCreateWallet(_ sender: UIButton) {
 #if DEBUG
         print("Clicked on Create Wallet Option")
 #endif
         self.createMnemonics()
-        
+
     }
     @IBAction func onClickImportWalletButton(_ sender: UIButton) {
         print("Clicked on import Wallet Option")
         self.showImportALert()
     }
-    
+
     @IBAction func onClickContinueButton(_ sender: UIButton) {
         print("Clicked on COntinue button")
         guard let dashboardScreen = self.storyboard?.instantiateViewController(withIdentifier: "DashboardViewController") as? DashboardViewController else {
@@ -54,7 +53,7 @@ class WalletViewController: UIViewController {
         }
         self.navigationController?.pushViewController(dashboardScreen, animated: true)
     }
-    fileprivate func showImportALert(){
+    fileprivate func showImportALert() {
         let alert = UIAlertController(title: "MyWeb3Wallet", message: "", preferredStyle: .alert)
         alert.addTextField { textfied in
             textfied.placeholder = "Enter mnemonics/private Key"
@@ -69,15 +68,15 @@ class WalletViewController: UIViewController {
             guard let privateKey = alert.textFields?[0].text else { return }
             print(privateKey)
             self.importWalletWith(privateKey: privateKey)
-            
+
         }
         let cancelAction = UIAlertAction(title: "Cancel", style: .cancel)
         alert.addAction(mnemonicsAction)
         alert.addAction(privateKeyAction)
         alert.addAction(cancelAction)
         self.present(alert, animated: true, completion: nil)
     }
-    func importWalletWith(privateKey: String){
+    func importWalletWith(privateKey: String) {
         let formattedKey = privateKey.trimmingCharacters(in: .whitespacesAndNewlines)
         guard let dataKey = Data.fromHex(formattedKey) else {
             self.showAlertMessage(title: "Error", message: "Please enter a valid Private key ", actionName: "Ok")
@@ -94,7 +93,7 @@ class WalletViewController: UIViewController {
 #endif
                 let walletAddress = manager.addresses?.first?.address
                 self.walletAddressLabel.text = walletAddress ?? "0x"
-                
+
                 print(walletAddress)
             } else {
                 print("error")
@@ -109,34 +108,31 @@ class WalletViewController: UIViewController {
             alert.addAction(okAction)
             self.present(alert, animated: true)
         }
-        
-        
-        
+
     }
     func importWalletWith(mnemonics: String) {
-        let walletAddress = try? BIP32Keystore(mnemonics: mnemonics , prefixPath: "m/44'/77777'/0'/0")
+        let walletAddress = try? BIP32Keystore(mnemonics: mnemonics, prefixPath: "m/44'/77777'/0'/0")
         print(walletAddress?.addresses)
         self.walletAddressLabel.text = "\(walletAddress?.addresses?.first?.address ?? "0x")"
-        
+
     }
-    
-    
+
 }
 extension WalletViewController {
-    
-    fileprivate func createMnemonics(){
+
+    fileprivate func createMnemonics() {
         let userDir = NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true)[0]
         let web3KeystoreManager = KeystoreManager.managerForPath(userDir + "/keystore")
         do {
-            if (web3KeystoreManager?.addresses?.count ?? 0 >= 0) {
+            if web3KeystoreManager?.addresses?.count ?? 0 >= 0 {
                 let tempMnemonics = try? BIP39.generateMnemonics(bitsOfEntropy: 256, language: .english)
                 guard let tMnemonics = tempMnemonics else {
                     self.showAlertMessage(title: "", message: "We are unable to create wallet", actionName: "Ok")
                     return
                 }
                 self._mnemonics = tMnemonics
                 print(_mnemonics)
-                let tempWalletAddress = try? BIP32Keystore(mnemonics: self._mnemonics , prefixPath: "m/44'/77777'/0'/0")
+                let tempWalletAddress = try? BIP32Keystore(mnemonics: self._mnemonics, prefixPath: "m/44'/77777'/0'/0")
                 print(tempWalletAddress?.addresses?.first?.address)
                 guard let walletAddress = tempWalletAddress?.addresses?.first else {
                     self.showAlertMessage(title: "", message: "We are unable to create wallet", actionName: "Ok")
@@ -151,9 +147,9 @@ extension WalletViewController {
                 FileManager.default.createFile(atPath: userDir + "/keystore"+"/key.json", contents: keyData, attributes: nil)
             }
         } catch {
-            
+
         }
-        
+
     }
 }
 extension UIViewController {
@@ -163,5 +159,5 @@ extension UIViewController {
         alertController.addAction(action)
         self.present(alertController, animated: true)
     }
-    
+
 }

Sources/Web3Core/EthereumABI/ABIEncoding.swift

@@ -98,7 +98,7 @@ public struct ABIEncoder {
 
     /// Attempts to convert given object into `Data`.
     /// Used as a part of ABI encoding process.
-    /// Supported types are `Data`, `String`, `[UInt8]`, ``EthereumAddress`` and `[IntegerLiteralType]`.
+    /// Supported types are `Data`, `String`, `[UInt8]`, ``EthereumAddress``, `[IntegerLiteralType]` and `Bool`.
     /// Note: if `String` has `0x` prefix an attempt to interpret it as a hexadecimal number will take place. Otherwise, UTF-8 bytes are returned.
     /// - Parameter value: any object.
     /// - Returns: `Data` representation of an object ready for ABI encoding.
@@ -123,6 +123,8 @@ public struct ABIEncoder {
                 bytesArray.append(UInt8(el))
             }
             return Data(bytesArray)
+        case let b as Bool:
+            return b ? Data([UInt8(1)]) : Data(count: 1)
         default:
             return nil
         }

Tests/web3swiftTests/localTests/EIP1559BlockTests.swift

@@ -4,7 +4,6 @@ import BigInt
 @testable
 import web3swift
 
-@testable
 import Web3Core
 
 class EIP1559BlockTests: LocalTestCase {

Tests/web3swiftTests/localTests/UtilitiesTests.swift

@@ -47,4 +47,39 @@ class UtilitiesTests: XCTestCase {
             XCTAssertEqual(test.input.decimals, test.output)
         }
     }
+
+    func testPublicKeyWithNoPrefixToAddress() throws {
+        var address = Utilities.publicToAddress(Data.fromHex("0x18ed2e1ec629e2d3dae7be1103d4f911c24e0c80e70038f5eb5548245c475f504c220d01e1ca419cb1ba4b3393b615e99dd20aa6bf071078f70fd949008e7411")!)?.address
+        XCTAssertEqual(address, "0x28828f43df370651AC5A6cFd02fBD0885Fbb3c00")
+        address = Utilities.publicToAddress(Data.fromHex("0x52972572d465d016d4c501887b8df303eee3ed602c056b1eb09260dfa0da0ab288742f4dc97d9edb6fd946babc002fdfb06f26caf117b9405ed79275763fdb1c")!)?.address
+        XCTAssertEqual(address, "0x6eDBe1F6D48FbF1b053D6c9FA7997C710B84f55F")
+    }
+
+    func testPublicKeyWithPrefixToAddress() throws {
+        var address = Utilities.publicToAddress(Data.fromHex("0x0418ed2e1ec629e2d3dae7be1103d4f911c24e0c80e70038f5eb5548245c475f504c220d01e1ca419cb1ba4b3393b615e99dd20aa6bf071078f70fd949008e7411")!)?.address
+        XCTAssertEqual(address, "0x28828f43df370651AC5A6cFd02fBD0885Fbb3c00")
+        address = Utilities.publicToAddress(Data.fromHex("0x0452972572d465d016d4c501887b8df303eee3ed602c056b1eb09260dfa0da0ab288742f4dc97d9edb6fd946babc002fdfb06f26caf117b9405ed79275763fdb1c")!)?.address
+        XCTAssertEqual(address, "0x6eDBe1F6D48FbF1b053D6c9FA7997C710B84f55F")
+    }
+
+    func testPublicKeyWithInvalidPrefixToAddress() throws {
+        var address = Utilities.publicToAddress(Data.fromHex("0x0318ed2e1ec629e2d3dae7be1103d4f911c24e0c80e70038f5eb5548245c475f504c220d01e1ca419cb1ba4b3393b615e99dd20aa6bf071078f70fd949008e7411")!)?.address
+        XCTAssertEqual(address, nil)
+        address = Utilities.publicToAddress(Data.fromHex("0x0152972572d465d016d4c501887b8df303eee3ed602c056b1eb09260dfa0da0ab288742f4dc97d9edb6fd946babc002fdfb06f26caf117b9405ed79275763fdb1c")!)?.address
+        XCTAssertEqual(address, nil)
+    }
+
+    func testCompressedPublicKeyToAddress() throws {
+        var address = Utilities.publicToAddress(Data.fromHex("0x0318ed2e1ec629e2d3dae7be1103d4f911c24e0c80e70038f5eb5548245c475f50")!)?.address
+        XCTAssertEqual(address, "0x28828f43df370651AC5A6cFd02fBD0885Fbb3c00")
+        address = Utilities.publicToAddress(Data.fromHex("0x0252972572d465d016d4c501887b8df303eee3ed602c056b1eb09260dfa0da0ab2")!)?.address
+        XCTAssertEqual(address, "0x6eDBe1F6D48FbF1b053D6c9FA7997C710B84f55F")
+    }
+
+    func testCompressedPublicKeyWithInvalidPrefixToAddress() throws {
+        var address = Utilities.publicToAddress(Data.fromHex("0x0718ed2e1ec629e2d3dae7be1103d4f911c24e0c80e70038f5eb5548245c475f50")!)?.address
+        XCTAssertEqual(address, nil)
+        address = Utilities.publicToAddress(Data.fromHex("0x0852972572d465d016d4c501887b8df303eee3ed602c056b1eb09260dfa0da0ab2")!)?.address
+        XCTAssertEqual(address, nil)
+    }
 }