Sort keyring address, remove expired recent (#115)

* Sort keyring address, remove expired recent

* minor fixes
This commit is contained in:
kwingram25
2019-04-12 06:36:48 -04:00
committed by Jaco Greeff
parent c7f9faa768
commit aabb3df18c
2 changed files with 51 additions and 15 deletions
+9
View File
@@ -16,6 +16,8 @@ import Base from './Base';
import { accountKey, addressKey, accountRegex, addressRegex } from './defaults';
import keyringOption from './options';
const RECENT_EXPIRY = 24 * 60 * 60;
// No accounts (or test accounts) should be loaded until after the chain determination.
// Chain determination occurs outside of Keyring. Loading `keyring.loadAll({ type: 'ed25519' | 'sr25519' })` is triggered
// from the API after the chain is received
@@ -165,6 +167,13 @@ export class Keyring extends Base implements KeyringStruct {
}
private loadAddress (json: KeyringJson, key: string) {
const { isRecent, whenCreated = 0 } = json.meta;
if (isRecent && (Date.now() - whenCreated) > RECENT_EXPIRY) {
store.remove(key);
return;
}
const address = this.encodeAddress(
isHex(json.address)
? hexToU8a(json.address)