This commit is contained in:
Christopher Jeffrey 2016-05-31 23:19:13 -07:00
parent 6d7602ddfa
commit 4bdaf0ec74
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD

View File

@ -2316,13 +2316,13 @@ Account.parseRaw = function parseRaw(data) {
var accountIndex = p.readU32();
var receiveDepth = p.readU32();
var changeDepth = p.readU32();
var accountKey = bcoin.hd.PublicKey.fromRaw(p.readBytes(82));
var accountKey = bcoin.hd.fromRaw(p.readBytes(82));
var count = p.readU8();
var keys = [];
var i;
for (i = 0; i < count; i++)
keys.push(bcoin.hd.PublicKey.fromRaw(p.readBytes(82)));
keys.push(bcoin.hd.fromRaw(p.readBytes(82)));
return {
network: network.type,
@ -2402,7 +2402,7 @@ MasterKey.prototype.toKey = function toKey(passphrase) {
xprivkey = this.xprivkey;
}
return bcoin.hd.PrivateKey.fromRaw(xprivkey);
return bcoin.hd.fromRaw(xprivkey);
};
MasterKey.prototype.decrypt = function decrypt(passphrase) {
@ -2473,7 +2473,7 @@ MasterKey.fromRaw = function fromRaw(raw) {
data.xprivkey = p.readBytes(82);
if (!data.encrypted)
data.key = bcoin.hd.PrivateKey.fromRaw(data.xprivkey);
data.key = bcoin.hd.fromRaw(data.xprivkey);
return new MasterKey(data);
};
@ -2537,7 +2537,7 @@ MasterKey.fromJSON = function fromJSON(json) {
}
if (!data.encrypted)
data.key = bcoin.hd.PrivateKey.fromRaw(data.xprivkey);
data.key = bcoin.hd.fromRaw(data.xprivkey);
return new MasterKey(data);
};