Merge pull request #58 from soramitsu/restore-json-generation

fix restore json generation

Author: Viscount88

FearlessUtils/Classes/Keystore/KeystoreBuilder.swift

@@ -11,6 +11,10 @@ public class KeystoreBuilder {
 }
 
 extension KeystoreBuilder: KeystoreBuilding {
+    enum Constants {
+        static let ethereum = "ethereum"
+    }
+    
     public func with(name: String) -> Self {
         self.name = name
         return self
@@ -26,7 +30,7 @@ extension KeystoreBuilder: KeystoreBuilding {
         return self
     }
 
-    public func build(from data: KeystoreData, password: String?) throws -> KeystoreDefinition {
+    public func build(from data: KeystoreData, password: String?, isEthereum: Bool) throws -> KeystoreDefinition {
         let scryptParameters = try ScryptParameters()
 
         let scryptData: Data
@@ -64,17 +68,23 @@ extension KeystoreBuilder: KeystoreBuilding {
         let pcksData = KeystoreConstants.pkcs8Header + secretKeyData +
             KeystoreConstants.pkcs8Divider + data.publicKeyData
         let encrypted = try NaclSecretBox.secretBox(message: pcksData, nonce: nonce, key: encryptionKey)
+
         let encoded = scryptParameters.encode() + nonce + encrypted
 
+        let cryptoType = isEthereum ? Constants.ethereum : data.cryptoType.rawValue
         let encodingType = [KeystoreEncodingType.scrypt.rawValue, KeystoreEncodingType.xsalsa.rawValue]
-        let encodingContent = [KeystoreEncodingContent.pkcs8.rawValue, data.cryptoType.rawValue]
+        let encodingContent = [KeystoreEncodingContent.pkcs8.rawValue, cryptoType]
         let keystoreEncoding = KeystoreEncoding(content: encodingContent,
                                                 type: encodingType,
                                                 version: String(KeystoreConstants.version))
 
+        let isHardware: Bool? = isEthereum ? false : nil
+        let tags: [String]? = isEthereum ? [] : nil
         let meta = KeystoreMeta(name: name,
                                 createdAt: Int64(creationDate.timeIntervalSince1970),
-                                genesisHash: genesisHash)
+                                genesisHash: genesisHash,
+                                isHardware: isHardware,
+                                tags: tags)
 
         return KeystoreDefinition(address: data.address,
                                   encoded: encoded.base64EncodedString(),