cleanup

Author: pharms-eth

Sources/Web3Core/KeystoreManager/BIP32HDNode.swift

@@ -24,7 +24,7 @@ extension UInt32 {
 
 public class HDNode {
 
-    private struct HDversion{
+    private struct HDversion {
         public static var privatePrefix: Data? = Data.fromHex("0x0488ADE4")
         public static var publicPrefix: Data? = Data.fromHex("0x0488B21E")
 

Sources/Web3Core/KeystoreManager/BIP39.swift

@@ -43,7 +43,7 @@ public enum BIP39Language {
             return " "
         }
     }
-    
+
     init?(language: String) {
         switch language {
         case "english":
@@ -78,49 +78,49 @@ public class BIP39 {
         guard let entropy = entropyOf(size: bitsOfEntropy) else { throw AbstractKeystoreError.noEntropyError }
         return generateMnemonicsFromEntropy(entropy: entropy, language: language)
     }
-    
+
     static public func generateMnemonics(entropy: Int, language: BIP39Language = .english) -> [String]? {
         guard let entropy = entropyOf(size: entropy) else { return nil }
         return generateMnemonicsFrom(entropy: entropy, language: language)
     }
-    
+
     static private func entropyOf(size: Int) -> Data? {
         guard size >= 128 && size <= 256 && size.isMultiple(of: 32) else {
             return nil
         }
-        
+
         return Data.randomBytes(length: size/8)
     }
-    
+
     static func bitarray(from data: Data) -> String {
         data.map {
             let binary = String($0, radix: 2)
             let padding = String(repeating: "0", count: 8 - binary.count)
             return padding + binary
         }.joined()
     }
-    
+
     static func generateChecksum(entropyBytes inputData: Data, checksumLength: Int) -> String? {
         guard let checksumData = inputData.sha256().bitsInRange(0, checksumLength) else {
             return nil
         }
         let checksum = String(checksumData, radix: 2).leftPadding(toLength: checksumLength, withPad: "0")
         return checksum
     }
-    
+
     static public func generateMnemonicsFromEntropy(entropy: Data, language: BIP39Language = .english) -> String? {
         guard entropy.count >= 16, entropy.count & 4 == 0 else {return nil}
         let separator = language.separator
         let wordList = generateMnemonicsFrom(entropy: entropy)
         return wordList.joined(separator: separator)
     }
-    
-    static public func generateMnemonicsFrom(entropy: Data, language: BIP39Language = .english) -> [String]  {
+
+    static public func generateMnemonicsFrom(entropy: Data, language: BIP39Language = .english) -> [String] {
         let entropyBitSize = entropy.count * 8
         let checksum_length = entropyBitSize / 32
-        
+
         var entropy_bits = bitarray(from: entropy)
-        
+
         guard let checksumTest = generateChecksum(entropyBytes: entropy, checksumLength: checksum_length) else {
             return []
         }
@@ -134,12 +134,12 @@ public class BIP39 {
                 language.words[index]
             }
     }
-    
+
     static public func mnemonicsToEntropy(_ mnemonics: String, language: BIP39Language = .english) -> Data? {
         let wordList = mnemonics.components(separatedBy: language.separator)
         return mnemonicsToEntropy(wordList, language: language)
     }
-    
+
     static public func mnemonicsToEntropy(_ mnemonics: [String], language: BIP39Language = .english) -> Data? {
         guard mnemonics.count >= 12 && mnemonics.count.isMultiple(of: 3) && mnemonics.count <= 24 else {return nil}
         var bitString = ""
@@ -165,27 +165,27 @@ public class BIP39 {
         }
         return entropy
     }
-    
+
     static public func seedFromMmemonics(_ mnemonics: [String], password: String = "", language: BIP39Language = .english) -> Data? {
         let wordList = mnemonics.joined(separator: language.separator)
         return seedFromMmemonics(wordList, password: password, language: language)
     }
-    
+
     static public func seedFromMmemonics(_ mnemonics: String, password: String = "", language: BIP39Language = .english) -> Data? {
         if mnemonicsToEntropy(mnemonics, language: language) == nil {
             return nil
         }
         return dataFrom(mnemonics: mnemonics, password: password)
     }
-    
+
     static private func dataFrom(mnemonics: String, password: String) -> Data? {
         guard let mnemData = mnemonics.decomposedStringWithCompatibilityMapping.data(using: .utf8) else {return nil}
         let salt = "mnemonic" + password
         guard let saltData = salt.decomposedStringWithCompatibilityMapping.data(using: .utf8) else {return nil}
         guard let seedArray = try? PKCS5.PBKDF2(password: mnemData.bytes, salt: saltData.bytes, iterations: 2048, keyLength: 64, variant: HMAC.Variant.sha2(.sha512)).calculate() else {return nil}
         return Data(seedArray)
     }
-    
+
     static public func seedFromEntropy(_ entropy: Data, password: String = "", language: BIP39Language = .english) -> Data? {
         guard let mnemonics = generateMnemonicsFromEntropy(entropy: entropy, language: language) else {
             return nil