Add types to injected accounts in keyring load functions (#464)

* add types to injected accounts

* Update packages/ui-keyring/src/Keyring.ts

Co-authored-by: Jaco <jacogr@gmail.com>

* Update packages/ui-keyring/src/Keyring.ts

Co-authored-by: Jaco <jacogr@gmail.com>

Co-authored-by: Jaco <jacogr@gmail.com>
This commit is contained in:
Antoine Estienne
2021-05-11 13:13:13 +00:00
committed by GitHub
parent db2647aada
commit 99ee4afaf8
+4 -4
View File
@@ -247,7 +247,7 @@ export class Keyring extends Base implements KeyringStruct {
this.rewriteKey(json, key, hexAddr, contractKey);
}
private loadInjected (address: string, meta: KeyringJson$Meta): void {
private loadInjected (address: string, meta: KeyringJson$Meta, type?: KeypairType): void {
const json = {
address,
meta: {
@@ -255,7 +255,7 @@ export class Keyring extends Base implements KeyringStruct {
isInjected: true
}
};
const pair = this.keyring.addFromAddress(address, json.meta);
const pair = this.keyring.addFromAddress(address, json.meta, null, type);
this.accounts.add(this._store, pair.address, json, pair.type);
}
@@ -276,7 +276,7 @@ export class Keyring extends Base implements KeyringStruct {
return true;
}
public loadAll (options: KeyringOptions, injected: { address: string; meta: KeyringJson$Meta }[] = []): void {
public loadAll (options: KeyringOptions, injected: { address: string; meta: KeyringJson$Meta, type?: KeypairType }[] = []): void {
super.initKeyring(options);
this._store.all((key: string, json: KeyringJson): void => {
@@ -300,7 +300,7 @@ export class Keyring extends Base implements KeyringStruct {
injected.forEach((account): void => {
if (this.allowGenesis(account)) {
try {
this.loadInjected(account.address, account.meta);
this.loadInjected(account.address, account.meta, account.type);
} catch (error) {
// ignore
}