feat(signer-local): add keystore-geth-compat feature

crates/signer-local/Cargo.toml

@@ -58,6 +58,7 @@ yubihsm = { version = "0.42", features = ["mockhsm"] }
 
 [features]
 keystore = ["dep:eth-keystore", "dep:elliptic-curve"]
+keystore-geth-compat = ["keystore", "eth-keystore?/geth-compat"]
 mnemonic = ["dep:coins-bip32", "dep:coins-bip39"]
 mnemonic-all-languages = ["mnemonic", "coins-bip39?/all-langs"]
 yubihsm = ["dep:yubihsm", "dep:elliptic-curve"]

crates/signer-local/src/private_key.rs

@@ -200,7 +200,7 @@ mod tests {
         }
     }
 
-    #[cfg(feature = "keystore")]
+    #[cfg(feature = "keystore-geth-compat")]
     fn test_encrypted_json_keystore(key: LocalSigner<SigningKey>, uuid: &str, dir: &Path) {
         // sign a message using the given key
         let message = "Some data";
@@ -252,6 +252,28 @@ mod tests {
         test_encrypted_json_keystore(key, &uuid, dir.path());
     }
 
+    #[test]
+    #[cfg(feature = "keystore-geth-compat")]
+    fn test_encrypted_json_keystore_with_address() {
+        // create and store an encrypted JSON keystore in this directory
+
+        use std::fs::File;
+
+        use eth_keystore::EthKeystore;
+        let dir = tempdir().unwrap();
+        let mut rng = rand::thread_rng();
+        let (key, uuid) =
+            LocalSigner::<SigningKey>::new_keystore(&dir, &mut rng, "randpsswd", None).unwrap();
+
+        let path = Path::new(dir.path()).join(uuid.clone());
+        let file = File::open(path).unwrap();
+        let keystore = serde_json::from_reader::<_, EthKeystore>(file).unwrap();
+
+        assert!(!keystore.address.is_zero());
+
+        test_encrypted_json_keystore(key, &uuid, dir.path());
+    }
+
     #[test]
     fn signs_msg() {
         let message = "Some data";