Merge pull request #355 from TheWaWaR/fix-keystore-cache-inconsistent

fix: Fix keystore cache inconsistent
nervosnetwork · Dec 11, 2020 · 7a74490 · 7a74490
2 parents 971e19c + b82c4fc
commit 7a74490
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ckb-sdk/src/wallet/keystore/mod.rs b/ckb-sdk/src/wallet/keystore/mod.rs
@@ -72,6 +72,7 @@ impl KeyStore {
         let abs_path = self.storage.store_key(key.filename(), &key, password)?;
         let hash160 = key.hash160().clone();
         self.files.insert(hash160.clone(), abs_path);
+        self.ckb_roots.insert(hash160.clone(), key.ckb_root());
         Ok(hash160)
     }
     pub fn get_accounts(&mut self) -> &HashMap<H160, PathBuf> {
@@ -294,7 +295,7 @@ impl KeyStore {
     }
 
     // NOTE: assume refresh keystore directory is not a hot action
-    fn refresh_dir(&mut self) -> Result<(), Error> {
+    pub fn refresh_dir(&mut self) -> Result<(), Error> {
         let mut files = HashMap::default();
         let mut ckb_roots = HashMap::default();
         for entry in fs::read_dir(&self.keys_dir)? {

diff --git a/src/subcommands/account.rs b/src/subcommands/account.rs
@@ -184,6 +184,9 @@ impl<'a> CliSubCommand for AccountSubCommand<'a> {
                 let only_mainnet_address = m.is_present("only-mainnet-address");
                 let only_testnet_address = m.is_present("only-testnet-address");
                 let partial_fields = only_mainnet_address || only_testnet_address;
+                self.key_store
+                    .refresh_dir()
+                    .map_err(|err| err.to_string())?;
                 let resp = accounts
                     .into_iter()
                     .enumerate()