Merge pull request #74 from BANKEX/develop

Allow BIP32 keystore init from seed directly Add convenience BIP32 keystore and KeystoreV3 serialization methods Test custom path derivation after saving Add new BIP39 languages

Author: shamatar

Example/web3swiftExample/Podfile.lock

@@ -38,7 +38,7 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   web3swift:
-    :commit: 49c569f76f135efa31f545a63a8599e5c9f6ec13
+    :commit: 72b40c0679a38b3b186669e22af5e1d79b398ac3
     :git: https://github.com/bankex/web3swift.git
 
 SPEC CHECKSUMS:

Example/web3swiftExample/Pods/Manifest.lock

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 s.name             = "web3swift"
-s.version          = "0.5.5"
+s.version          = "0.5.6"
 s.summary          = "Web3 implementation in vanilla Swift for iOS ans macOS"
 
 s.description      = <<-DESC

Example/web3swiftExample/Pods/web3swift/web3swift/KeystoreManager/Classes/BIP32Keystore.swift

@@ -69,11 +69,14 @@ public class BIP32Keystore: AbstractKeystore {
         rootPrefix = keystoreParams!.rootPath!
     }
 
-    public init? (mnemonics: String, password: String = "BANKEXFOUNDATION", mnemonicsPassword: String = "", language: BIP39Language = BIP39Language.english, prefixPath: String = HDNode.defaultPathPrefix) throws {
+    public convenience init? (mnemonics: String, password: String = "BANKEXFOUNDATION", mnemonicsPassword: String = "", language: BIP39Language = BIP39Language.english, prefixPath: String = HDNode.defaultPathPrefix) throws {
         guard var seed = BIP39.seedFromMmemonics(mnemonics, password: mnemonicsPassword, language: language) else {throw AbstractKeystoreError.noEntropyError}
-        guard let prefixNode = HDNode(seed: seed)?.derive(path: prefixPath, derivePrivateKey: true) else {return nil}
         defer{ Data.zero(&seed) }
-        self.mnemonics = mnemonics
+        try self.init(seed: seed, password: password, prefixPath: prefixPath)
+    }
+    
+    public init? (seed: Data, password: String = "BANKEXFOUNDATION", prefixPath: String = HDNode.defaultPathPrefix) throws {
+        guard let prefixNode = HDNode(seed: seed)?.derive(path: prefixPath, derivePrivateKey: true) else {return nil}
         self.rootPrefix = prefixPath
         try createNewAccount(parentNode: prefixNode, password: password)
     }
@@ -243,4 +246,10 @@ public class BIP32Keystore: AbstractKeystore {
         guard decryptedPK?.count == 82 else {return nil}
         return Data(bytes:decryptedPK!)
     }
+    
+    public func serialize() throws -> Data? {
+        guard let params = self.keystoreParams else {return nil}
+        let data = try JSONEncoder().encode(params)
+        return data
+    }
 }

Example/web3swiftExample/Pods/web3swift/web3swift/KeystoreManager/Classes/KeystoreManager.swift

@@ -11,10 +11,39 @@ import CryptoSwift
 
 public enum BIP39Language {
     case english
+    case chinese_simplified
+    case chinese_traditional
+    case japanese
+    case korean
+    case french
+    case italian
+    case spanish
     var words: [String] {
         switch self {
         case .english:
             return englishWords
+        case .chinese_simplified:
+            return simplifiedchineseWords
+        case .chinese_traditional:
+            return traditionalchineseWords
+        case .japanese:
+            return japaneseWords
+        case .korean:
+            return koreanWords
+        case.french:
+            return frenchWords
+        case .italian:
+            return italianWords
+        case .spanish:
+            return spanishWords
+        }
+    }
+    var separator: String {
+        switch self {
+        case .japanese:
+            return "\u{3000}"
+        default:
+            return " "
         }
     }
 }
@@ -36,7 +65,8 @@ public class BIP39 {
             let word = language.words[index]
             wordList.append(word)
         }
-        return wordList.joined(separator: " ")
+        let separator = language.separator
+        return wordList.joined(separator: separator)
     }
 
     static public func generateMnemonics(bitsOfEntropy: Int, language: BIP39Language = BIP39Language.english) throws -> String? {

Example/web3swiftExample/Pods/web3swift/web3swift/Web3/Classes/Web3+Eth.swift

@@ -168,4 +168,10 @@ public class EthereumKeystoreV3: AbstractKeystore {
         guard decryptedPK != nil else {return nil}
         return Data(bytes:decryptedPK!)
     }
+    
+    public func serialize() throws -> Data? {
+        guard let params = self.keystoreParams else {return nil}
+        let data = try JSONEncoder().encode(params)
+        return data
+    }
 }