LBRYCommunity/bitcoinjs-lib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #536 from runn1ng/patch-1

Browse source 
Adding function to decide if HDNode is private
This commit is contained in:
Daniel Cousens 2016-02-06 13:26:30 +11:00
commit 75bd8331cd
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/hdnode.js
View file

@ -170,7 +170,7 @@ HDNode.prototype.toBase58 = function (__isPrivate) {
// Version
var network = this.keyPair.network
var version = this.keyPair.d ? network.bip32.private : network.bip32.public
var version = (!this.isNeutered()) ? network.bip32.private : network.bip32.public
var buffer = new Buffer(78)
// 4 bytes: version bytes
@ -190,7 +190,7 @@ HDNode.prototype.toBase58 = function (__isPrivate) {
this.chainCode.copy(buffer, 13)
// 33 bytes: the public key or private key data
if (this.keyPair.d) {
if (!this.isNeutered()) {
// 0x00 + k for private keys
buffer.writeUInt8(0, 45)
this.keyPair.d.toBuffer(32).copy(buffer, 46)
@ -211,7 +211,7 @@ HDNode.prototype.derive = function (index) {
// Hardened child
if (isHardened) {
if (!this.keyPair.d) throw new TypeError('Could not derive hardened child key')
if (this.isNeutered()) throw new TypeError('Could not derive hardened child key')
// data = 0x00 || ser256(kpar) || ser32(index)
data[0] = 0x00
@ -239,7 +239,7 @@ HDNode.prototype.derive = function (index) {
// Private parent key -> private child key
var derivedKeyPair
if (this.keyPair.d) {
if (!this.isNeutered()) {
// ki = parse256(IL) + kpar (mod n)
var ki = pIL.add(this.keyPair.d).mod(curve.n)
@ -281,6 +281,12 @@ HDNode.prototype.deriveHardened = function (index) {
return this.derive(index + HDNode.HIGHEST_BIT)
}
// Private === not neutered
// Public === neutered
HDNode.prototype.isNeutered = function () {
return !(this.keyPair.d)
}
HDNode.prototype.toString = HDNode.prototype.toBase58
module.exports = HDNode

6
test/hdnode.js
View file

@ -192,6 +192,7 @@ describe('HDNode', function () {
assert.strictEqual(hd.toBase58(), f.master.base58)
assert.strictEqual(hd.keyPair.network, network)
assert.strictEqual(hd.isNeutered(), true)
})
})
@ -202,6 +203,7 @@ describe('HDNode', function () {
assert.strictEqual(hd.toBase58(), f.master.base58Priv)
assert.strictEqual(hd.keyPair.network, network)
assert.strictEqual(hd.isNeutered(), false)
})
})
@ -240,7 +242,7 @@ describe('HDNode', function () {
var f = fixtures.valid[0]
it('strips all private information', function () {
var hd = HDNode.fromBase58(f.master.base58, NETWORKS_LIST)
var hd = HDNode.fromBase58(f.master.base58Priv, NETWORKS_LIST)
var hdn = hd.neutered()
assert.strictEqual(hdn.keyPair.d, undefined)
@ -248,6 +250,8 @@ describe('HDNode', function () {
assert.strictEqual(hdn.chainCode, hd.chainCode)
assert.strictEqual(hdn.depth, hd.depth)
assert.strictEqual(hdn.index, hd.index)
assert.strictEqual(hdn.isNeutered(), true)
assert.strictEqual(hd.isNeutered(), false)
})
})