From dca284a131589f4225972993a57b69db58e5b77b Mon Sep 17 00:00:00 2001 From: Daniel Cousens Date: Tue, 3 Jun 2014 16:14:15 +1000 Subject: [PATCH] HDWallet: rename derivePrivate to deriveHardened --- src/hdwallet.js | 2 +- src/wallet.js | 4 ++-- test/hdwallet.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/hdwallet.js b/src/hdwallet.js index a09eb9e..c836e73 100644 --- a/src/hdwallet.js +++ b/src/hdwallet.js @@ -273,7 +273,7 @@ HDWallet.prototype.derive = function(index) { return hd } -HDWallet.prototype.derivePrivate = function(index) { +HDWallet.prototype.deriveHardened = function(index) { // Only derives hardened private keys by default return this.derive(index + HDWallet.HIGHEST_BIT) } diff --git a/src/wallet.js b/src/wallet.js index 1255228..e34e311 100644 --- a/src/wallet.js +++ b/src/wallet.js @@ -31,9 +31,9 @@ function Wallet(seed, network) { seed = seed || new Buffer(rng(32)) masterkey = HDNode.fromSeedBuffer(seed, network) - // HD first-level child derivation method should be private + // HD first-level child derivation method should be hardened // See https://bitcointalk.org/index.php?topic=405179.msg4415254#msg4415254 - accountZero = masterkey.derivePrivate(0) + accountZero = masterkey.deriveHardened(0) externalAccount = accountZero.derive(0) internalAccount = accountZero.derive(1) diff --git a/test/hdwallet.js b/test/hdwallet.js index aa78c5d..f4ad018 100644 --- a/test/hdwallet.js +++ b/test/hdwallet.js @@ -227,7 +227,7 @@ describe('HDWallet', function() { f.children.forEach(function(c, i) { it(c.description + ' from ' + f.master.fingerprint, function() { if (c.hardened) { - hd = hd.derivePrivate(c.m) + hd = hd.deriveHardened(c.m) } else { hd = hd.derive(c.m) @@ -255,7 +255,7 @@ describe('HDWallet', function() { var parent = HDWallet.fromBase58(f.master.base58) assert.throws(function() { - parent.derivePrivate(c.m) + parent.deriveHardened(c.m) }, /Could not derive hardened child key/) }) })