fix initializing KeystoreV3 with JSON that misses 0x prefix for address field EthereumAddress now requires 0x prefix explicitly and properly inits from both uppercased and lowercased addresses

Author: Alex Vlasov

web3swift/KeystoreManager/Classes/EthereumAddress.swift

@@ -79,7 +79,14 @@ public struct EthereumAddress: Equatable {
         case .normal:
             guard let data = Data.fromHex(addressString) else {return nil}
             guard data.count == 20 else {return nil}
-            if (!ignoreChecksum && data.toHexString().addHexPrefix() != addressString) {
+            if !addressString.hasHexPrefix() {
+                return nil
+            }
+            if (!ignoreChecksum && data.toHexString().uppercased() != addressString.stripHexPrefix()) { // cover edge case if address is not completely UPPERCASED and potentially missing 0x prefix
+                let checksummedAddress = EthereumAddress.toChecksumAddress(data.toHexString().addHexPrefix())
+                guard checksummedAddress == addressString else {return nil}
+            }
+            if (!ignoreChecksum && data.toHexString().addHexPrefix() != addressString.stripHexPrefix()) { // cover edge case if address not completely lowercased and potentially missing 0x prefix
                 let checksummedAddress = EthereumAddress.toChecksumAddress(data.toHexString().addHexPrefix())
                 guard checksummedAddress == addressString else {return nil}
             }

web3swift/KeystoreManager/Classes/EthereumKeystoreV3.swift

@@ -59,7 +59,7 @@ public class EthereumKeystoreV3: AbstractKeystore {
         if (keystoreParams.crypto.version != nil && keystoreParams.crypto.version != "1") {return nil}
         self.keystoreParams = keystoreParams
         if keystoreParams.address != nil {
-            self.address = EthereumAddress(keystoreParams.address!)
+            self.address = EthereumAddress(keystoreParams.address!.addHexPrefix())
         } else {
             return nil
         }

web3swiftTests/web3swiftTests.swift

@@ -124,6 +124,9 @@ class web3swiftTests: XCTestCase {
         let keystore = try! EthereumKeystoreV3(password: "");
         XCTAssertNotNil(keystore)
         let account = keystore!.addresses![0]
+        print(account)
+        let data = try! keystore!.serialize()
+        print(try! JSONSerialization.jsonObject(with: data!, options: JSONSerialization.ReadingOptions(rawValue:0)))
         let key = try! keystore!.UNSAFE_getPrivateKeyData(password: "", account: account)
         XCTAssertNotNil(key)
     }