RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wallet: options parsing.

Browse Source
This commit is contained in:
Christopher Jeffrey 2016-10-03 15:53:07 -07:00
parent baeb786bb8
commit b45c20b157
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/wallet/account.js
View File

@ -179,12 +179,12 @@ Account.prototype.fromOptions = function fromOptions(options) {
if (this.n > 1) if (this.n > 1)
this.type = Account.types.MULTISIG; this.type = Account.types.MULTISIG;
if (this.m < 1 || this.m > this.n)
throw new Error('m ranges between 1 and n');
if (!this.name) if (!this.name)
this.name = this.accountIndex + ''; this.name = this.accountIndex + '';
if (this.m < 1 || this.m > this.n)
throw new Error('m ranges between 1 and n');
if (options.keys) { if (options.keys) {
assert(Array.isArray(options.keys)); assert(Array.isArray(options.keys));
for (i = 0; i < options.keys.length; i++) for (i = 0; i < options.keys.length; i++)

12
lib/wallet/wallet.js
View File

@ -95,10 +95,10 @@ Wallet.prototype.fromOptions = function fromOptions(options) {
var master = options.master; var master = options.master;
var id, token; var id, token;
if (!master)
master = HD.fromMnemonic(null, this.network);
if (!MasterKey.isMasterKey(master)) { if (!MasterKey.isMasterKey(master)) {
if (!master)
master = HD.fromMnemonic(null, this.network);
if (!HD.isHD(master)) if (!HD.isHD(master))
master = HD.from(master, this.network); master = HD.from(master, this.network);
@ -132,9 +132,6 @@ Wallet.prototype.fromOptions = function fromOptions(options) {
this.accountDepth = options.accountDepth; this.accountDepth = options.accountDepth;
} }
if (!id)
id = this.getID();
if (options.token) { if (options.token) {
assert(Buffer.isBuffer(options.token)); assert(Buffer.isBuffer(options.token));
assert(options.token.length === 32); assert(options.token.length === 32);
@ -146,6 +143,9 @@ Wallet.prototype.fromOptions = function fromOptions(options) {
this.tokenDepth = options.tokenDepth; this.tokenDepth = options.tokenDepth;
} }
if (!id)
id = this.getID();
if (!token) if (!token)
token = this.getToken(this.master.key, this.tokenDepth); token = this.getToken(this.master.key, this.tokenDepth);