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

cleanup hd.

Browse Source
This commit is contained in:
Christopher Jeffrey 2016-02-23 19:27:12 -08:00
parent 9a35cac74f
commit ebee3965f7
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/bcoin/hd.js
View File

@ -668,7 +668,7 @@ HDPrivateKey.prototype._unbuild = function _unbuild(xkey) {
HDPrivateKey.prototype._build = function _build(data) { HDPrivateKey.prototype._build = function _build(data) {
var sequence = new Buffer(82); var sequence = new Buffer(82);
var off = 0; var off = 0;
var checksum, xprivkey, privateKey, publicKey, size, fingerPrint; var checksum;
off += utils.copy(data.version, sequence, off); off += utils.copy(data.version, sequence, off);
off += utils.copy(data.depth, sequence, off); off += utils.copy(data.depth, sequence, off);
@ -682,13 +682,6 @@ HDPrivateKey.prototype._build = function _build(data) {
off += utils.copy(checksum, sequence, off); off += utils.copy(checksum, sequence, off);
assert(off === 82, off); assert(off === 82, off);
xprivkey = utils.toBase58(sequence);
publicKey = bcoin.ec.publicKeyCreate(data.privateKey, true);
size = constants.hd.parentFingerPrintSize;
fingerPrint = utils.ripesha(publicKey).slice(0, size);
this.version = data.version; this.version = data.version;
this.depth = data.depth; this.depth = data.depth;
this.parentFingerPrint = data.parentFingerPrint; this.parentFingerPrint = data.parentFingerPrint;
@ -697,16 +690,15 @@ HDPrivateKey.prototype._build = function _build(data) {
this.privateKey = data.privateKey; this.privateKey = data.privateKey;
this.checksum = null; this.checksum = null;
this.fingerPrint = fingerPrint; this.publicKey = bcoin.ec.publicKeyCreate(data.privateKey, true);
this.publicKey = publicKey; this.fingerPrint = null;
this.hdPrivateKey = this; this.hdPrivateKey = this;
this.xprivkey = xprivkey; this.xprivkey = utils.toBase58(sequence);
this.hdPublicKey = new HDPublicKey({ this.hdPublicKey = new HDPublicKey({
network: this.network, network: this.network,
data: { data: {
key: this.key,
version: network[this.network].prefixes.xpubkey, version: network[this.network].prefixes.xpubkey,
depth: this.depth, depth: this.depth,
parentFingerPrint: this.parentFingerPrint, parentFingerPrint: this.parentFingerPrint,
@ -755,6 +747,11 @@ HDPrivateKey.prototype.derive = function derive(index, hardened) {
.mod(bcoin.ecdsa.curve.n) .mod(bcoin.ecdsa.curve.n)
.toArray('be', 32)); .toArray('be', 32));
if (!this.fingerPrint) {
this.fingerPrint = utils.ripesha(this.publicKey)
.slice(0, constants.hd.parentFingerPrintSize);
}
child = new HDPrivateKey({ child = new HDPrivateKey({
network: this.network, network: this.network,
data: { data: {
@ -1035,7 +1032,7 @@ HDPublicKey.prototype._unbuild = function _unbuild(xkey) {
HDPublicKey.prototype._build = function _build(data) { HDPublicKey.prototype._build = function _build(data) {
var sequence = new Buffer(82); var sequence = new Buffer(82);
var off = 0; var off = 0;
var checksum, xpubkey, publicKey, size, fingerPrint; var checksum;
off += utils.copy(data.version, sequence, off); off += utils.copy(data.version, sequence, off);
off += utils.copy(data.depth, sequence, off); off += utils.copy(data.depth, sequence, off);
@ -1053,25 +1050,19 @@ HDPublicKey.prototype._build = function _build(data) {
else if (utils.toHex(checksum) !== utils.toHex(data.checksum)) else if (utils.toHex(checksum) !== utils.toHex(data.checksum))
throw new Error('checksum mismatch'); throw new Error('checksum mismatch');
xpubkey = utils.toBase58(sequence);
publicKey = data.publicKey;
size = constants.hd.parentFingerPrintSize;
fingerPrint = utils.ripesha(publicKey).slice(0, size);
this.version = data.version; this.version = data.version;
this.depth = data.depth; this.depth = data.depth;
this.parentFingerPrint = data.parentFingerPrint; this.parentFingerPrint = data.parentFingerPrint;
this.childIndex = data.childIndex; this.childIndex = data.childIndex;
this.chainCode = data.chainCode; this.chainCode = data.chainCode;
this.publicKey = publicKey; this.publicKey = data.publicKey;
this.checksum = null; this.checksum = null;
this.fingerPrint = fingerPrint;
this.privateKey = null; this.privateKey = null;
this.fingerPrint = null;
this.hdPublicKey = this; this.hdPublicKey = this;
this.xpubkey = xpubkey; this.xpubkey = utils.toBase58(sequence);
this.hdPrivateKey = null; this.hdPrivateKey = null;
this.xprivkey = null; this.xprivkey = null;
@ -1108,6 +1099,11 @@ HDPublicKey.prototype.derive = function derive(index, hardened) {
point = bcoin.ecdsa.curve.g.mul(leftPart).add(publicPoint); point = bcoin.ecdsa.curve.g.mul(leftPart).add(publicPoint);
publicKey = new Buffer(point.encode('array', true)); publicKey = new Buffer(point.encode('array', true));
if (!this.fingerPrint) {
this.fingerPrint = utils.ripesha(this.publicKey)
.slice(0, constants.hd.parentFingerPrintSize);
}
child = new HDPublicKey({ child = new HDPublicKey({
network: this.network, network: this.network,
data: { data: {