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

fix private key encryption. style changes.

Browse Source
This commit is contained in:
Christopher Jeffrey 2015-12-19 14:00:23 -08:00
parent 75afb6d953
commit b20bcf701b
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/bcoin/block.js
View File

@ -261,9 +261,9 @@ Block.fromJSON = function fromJSON(json) {
parser = new bcoin.protocol.parser(); parser = new bcoin.protocol.parser();
data = json.subtype === 'merkleblock' ? data = json.subtype === 'merkleblock'
parser.parseMerkleBlock(raw) : ? parser.parseMerkleBlock(raw)
parser.parseBlock(raw); : parser.parseBlock(raw);
data._network = json._network; data._network = json._network;

4
lib/bcoin/hd.js
View File

@ -587,10 +587,6 @@ HDPub.prototype.deriveString = function(path) {
return this.pair.verify.apply(this.pair, arguments); return this.pair.verify.apply(this.pair, arguments);
}; };
// HD.prototype.inspect = function inspect() {
// return this.pair.inspect.apply(this.pair, arguments);
// };
HD.prototype.__defineGetter__('pub', function() { HD.prototype.__defineGetter__('pub', function() {
return this.pair.pub; return this.pair.pub;
}); });

18
lib/bcoin/wallet.js
View File

@ -24,19 +24,20 @@ function Wallet(options, passphrase) {
EventEmitter.call(this); EventEmitter.call(this);
// bcoin.wallet('scope', 'password')
if (typeof options === 'string' && typeof passphrase === 'string') { if (typeof options === 'string' && typeof passphrase === 'string') {
options = { options = {
scope: options, scope: options,
passphrase: passphrase passphrase: passphrase
}; };
} }
if (!options) if (!options)
options = {}; options = {};
this.options = options; this.options = options;
this.compressed = typeof options.compressed !== 'undefined' ? this.compressed = typeof options.compressed !== 'undefined'
options.compressed : true; ? options.compressed
: true;
this.storage = options.storage; this.storage = options.storage;
this.label = options.label || ''; this.label = options.label || '';
this.key = null; this.key = null;
@ -164,9 +165,6 @@ Wallet.prototype.multisig = function multisig(options) {
if (this.keys.length > this.n) if (this.keys.length > this.n)
throw new Error('No more than ' + this.n + ' are necessary'); throw new Error('No more than ' + this.n + ' are necessary');
// if (this.keys.length < this.m)
// throw new Error(this.m + ' public keys required');
}; };
Wallet.prototype.addKey = function addKey(key) { Wallet.prototype.addKey = function addKey(key) {
@ -324,6 +322,7 @@ Wallet.hash2addr = function hash2addr(hash, prefix) {
hash = [ prefix ].concat(hash); hash = [ prefix ].concat(hash);
addr = hash.concat(utils.checksum(hash)); addr = hash.concat(utils.checksum(hash));
return utils.toBase58(addr); return utils.toBase58(addr);
}; };
@ -350,6 +349,7 @@ Wallet.addr2hash = function addr2hash(addr, prefix) {
if (addr.length !== 25) if (addr.length !== 25)
return []; return [];
if (addr[0] !== prefix) if (addr[0] !== prefix)
return []; return [];
@ -576,9 +576,6 @@ Wallet.prototype.fill = function fill(tx, cb) {
}; };
Wallet.prototype.toJSON = function toJSON(encrypt) { Wallet.prototype.toJSON = function toJSON(encrypt) {
encrypt = encrypt || function(msg) {
return msg;
};
return { return {
v: 1, v: 1,
type: 'wallet', type: 'wallet',
@ -615,10 +612,11 @@ Wallet.prototype.toJSON = function toJSON(encrypt) {
Wallet.fromJSON = function fromJSON(json, decrypt) { Wallet.fromJSON = function fromJSON(json, decrypt) {
assert.equal(json.v, 1); assert.equal(json.v, 1);
assert.equal(json.type, 'wallet'); assert.equal(json.type, 'wallet');
if (json.network) if (json.network)
assert.equal(json.network, network.type); assert.equal(json.network, network.type);
if (decrypt) if (json.encrypted && decrypt)
json.priv = decrypt(json.priv); json.priv = decrypt(json.priv);
var priv, pub, compressed, key, w; var priv, pub, compressed, key, w;