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

revert 4b825bf

Browse source
This commit is contained in:
Daniel Cousens 2015-09-09 12:25:50 +10:00
parent 0f8bce50f6
commit 322ade58e4
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/hdnode.js
View file

@ -11,9 +11,6 @@ var ECPair = require('./ecpair')
var ecurve = require('ecurve') var ecurve = require('ecurve')
var curve = ecurve.getCurveByName('secp256k1') var curve = ecurve.getCurveByName('secp256k1')
var MASTER_SECRET = new Buffer('Bitcoin seed')
var HIGHEST_BIT = 0x80000000
function HDNode (keyPair, chainCode) { function HDNode (keyPair, chainCode) {
typeforce(types.tuple('ECPair', types.Buffer256bit), arguments) typeforce(types.tuple('ECPair', types.Buffer256bit), arguments)
@ -26,13 +23,17 @@ function HDNode (keyPair, chainCode) {
this.parentFingerprint = 0x00000000 this.parentFingerprint = 0x00000000
} }
HDNode.HIGHEST_BIT = 0x80000000
HDNode.LENGTH = 78
HDNode.MASTER_SECRET = new Buffer('Bitcoin seed')
HDNode.fromSeedBuffer = function (seed, network) { HDNode.fromSeedBuffer = function (seed, network) {
typeforce(types.tuple(types.Buffer, types.maybe(types.Network)), arguments) typeforce(types.tuple(types.Buffer, types.maybe(types.Network)), arguments)
if (seed.length < 16) throw new TypeError('Seed should be at least 128 bits') if (seed.length < 16) throw new TypeError('Seed should be at least 128 bits')
if (seed.length > 64) throw new TypeError('Seed should be at most 512 bits') if (seed.length > 64) throw new TypeError('Seed should be at most 512 bits')
var I = createHmac('sha512', MASTER_SECRET).update(seed).digest() var I = createHmac('sha512', HDNode.MASTER_SECRET).update(seed).digest()
var IL = I.slice(0, 32) var IL = I.slice(0, 32)
var IR = I.slice(32) var IR = I.slice(32)
@ -189,7 +190,7 @@ HDNode.prototype.toBase58 = function (__isPrivate) {
// https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki#child-key-derivation-ckd-functions // https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki#child-key-derivation-ckd-functions
HDNode.prototype.derive = function (index) { HDNode.prototype.derive = function (index) {
var isHardened = index >= HIGHEST_BIT var isHardened = index >= HDNode.HIGHEST_BIT
var data = new Buffer(37) var data = new Buffer(37)
// Hardened child // Hardened child
@ -261,7 +262,7 @@ HDNode.prototype.derive = function (index) {
HDNode.prototype.deriveHardened = function (index) { HDNode.prototype.deriveHardened = function (index) {
// Only derives hardened private keys by default // Only derives hardened private keys by default
return this.derive(index + HIGHEST_BIT) return this.derive(index + HDNode.HIGHEST_BIT)
} }
HDNode.prototype.toString = HDNode.prototype.toBase58 HDNode.prototype.toString = HDNode.prototype.toBase58

2
test/hdnode.js
View file

@ -193,7 +193,7 @@ describe('HDNode', function () {
assert.strictEqual(hd.depth, depth || 0) assert.strictEqual(hd.depth, depth || 0)
if (v.hardened) { if (v.hardened) {
assert.strictEqual(hd.index, v.m + 0x80000000) assert.strictEqual(hd.index, v.m + HDNode.HIGHEST_BIT)
} else { } else {
assert.strictEqual(hd.index, v.m) assert.strictEqual(hd.index, v.m)
} }

2
test/integration/crypto.js
View file

@ -67,7 +67,7 @@ describe('bitcoinjs-lib (crypto)', function () {
serQP.copy(data, 0) serQP.copy(data, 0)
// search index space until we find it // search index space until we find it
for (var i = 0; i < 0x80000000; ++i) { for (var i = 0; i < bitcoin.HDNode.HIGHEST_BIT; ++i) {
data.writeUInt32BE(i, 33) data.writeUInt32BE(i, 33)
// calculate I // calculate I