Use account in the key file instead of decoding it from the mnemonic. F…

…ixes #751
informalsystems · Apr 8, 2021 · c21c9a9 · c21c9a9
1 parent 68e276e
commit c21c9a9
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/relayer/src/keyring/store.rs b/relayer/src/keyring/store.rs
@@ -185,10 +185,17 @@ impl KeyRing {
         let key_file: KeyFile =
             serde_json::from_str(key_file_content).map_err(|e| Kind::InvalidKey.context(e))?;
 
-        let key = self
+        let mut key = self
             .key_from_mnemonic(&key_file.mnemonic)
             .map_err(|e| Kind::InvalidMnemonic.context(e))?;
 
+        // Use the account in the key file, otherwise the one decoded from
+        // the mnemonic will have the configured account prefix which may
+        // not match the one in the key file.
+        //
+        // TODO: Implement proper deserialization of the the KeyFile into a KeyEntry.
+        key.account = key_file.address;
+
         Ok(key)
     }