pezkuwichain/pezkuwi-ui
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-ui.git synced 2026-06-13 19:11:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add createUri and createExternal (#96)

Browse Source 
* Add createUri and createExternal

* Update signatures

* Expose uiSettings.availableCryptos
This commit is contained in:
Jaco Greeff
2019-03-19 10:15:25 +01:00
committed by GitHub
parent 9e1771bd78
commit 10d22e2b84
5 changed files with 64 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/ui-keyring/src/Keyring.ts
+37 -18
View File
@@ -3,12 +3,13 @@
// of the Apache-2.0 license. See the LICENSE file for details.
import { KeyringPair, KeyringPair$Meta, KeyringPair$Json } from '@polkadot/keyring/types';
import { KeypairType } from '@polkadot/util-crypto/types';
import { SingleAddress } from './observable/types';
import { KeyringAddress, KeyringJson, KeyringJson$Meta, KeyringOptions, KeyringStruct } from './types';
import { CreateResult, KeyringAddress, KeyringJson, KeyringJson$Meta, KeyringOptions, KeyringStruct } from './types';
import store from 'store';
import createPair from '@polkadot/keyring/pair';
import { hexToU8a, isHex, isString } from '@polkadot/util';
import { hexToU8a, isHex, isString, u8aToHex } from '@polkadot/util';
import env from './observable/development';
import Base from './Base';
@@ -36,28 +37,42 @@ export class Keyring extends Base implements KeyringStruct {
return pair.toJson(password);
}
createAccount (seed: Uint8Array, password?: string, meta: KeyringPair$Meta = {}): KeyringPair {
const pair = this.keyring.addFromSeed(seed, meta);
createAccount (seed: Uint8Array, password?: string, meta?: KeyringPair$Meta): KeyringPair {
console.warn('createAccount deprecated, use createUri instead');
this.saveAccount(pair, password);
return pair;
return this.createUri(u8aToHex(seed), password, meta).pair;
}
createAccountExternal (publicKey: Uint8Array, meta: KeyringPair$Meta = {}): KeyringPair {
createAccountExternal (publicKey: Uint8Array, meta?: KeyringPair$Meta): KeyringPair {
console.warn('createAccountExternal deprecated, use createUri instead');
return this.createExternal(publicKey, meta).pair;
}
createAccountMnemonic (seed: string, password?: string, meta?: KeyringPair$Meta): KeyringPair {
console.warn('createAccountMnemonic deprecated, use createUri instead');
return this.createUri(seed, password, meta).pair;
}
createExternal (publicKey: Uint8Array, meta: KeyringPair$Meta = {}): CreateResult {
const pair = this.keyring.addFromAddress(publicKey, { ...meta, isExternal: true }, null);
const json = this.saveAccount(pair);
this.saveAccount(pair);
return pair;
return {
json,
pair
};
}
createAccountMnemonic (seed: string, password?: string, meta: KeyringPair$Meta = {}): KeyringPair {
const pair = this.keyring.addFromMnemonic(seed, meta);
createUri (suri: string, password?: string, meta: KeyringPair$Meta = {}, type?: KeypairType): CreateResult {
const pair = this.keyring.addFromUri(suri, meta, type);
const json = this.saveAccount(pair, password);
this.saveAccount(pair, password);
return pair;
return {
json,
pair
};
}
encryptAccount (pair: KeyringPair, password: string): void {
@@ -185,13 +200,15 @@ export class Keyring extends Base implements KeyringStruct {
return pair;
}
saveAccount (pair: KeyringPair, password?: string): void {
saveAccount (pair: KeyringPair, password?: string): KeyringPair$Json {
this.addTimestamp(pair);
const json = pair.toJson(password);
this.keyring.addFromJson(json);
this.accounts.add(json.address, json);
return json;
}
saveAccountMeta (pair: KeyringPair, meta: KeyringPair$Meta): void {
@@ -204,7 +221,7 @@ export class Keyring extends Base implements KeyringStruct {
this.accounts.add(json.address, json);
}
saveAddress (address: string, meta: KeyringPair$Meta): void {
saveAddress (address: string, meta: KeyringPair$Meta): KeyringPair$Json {
const available = this.addresses.subject.getValue();
const json = (available[address] && available[address].json) || {
@@ -222,6 +239,8 @@ export class Keyring extends Base implements KeyringStruct {
delete json.meta.isRecent;
this.addresses.add(address, json);
return json as KeyringPair$Json;
}
saveRecent (address: string): SingleAddress {