From 207163704b5e6b434e224e2268679db598d37313 Mon Sep 17 00:00:00 2001 From: Wei Lu Date: Thu, 13 Mar 2014 19:12:52 +0800 Subject: [PATCH] return private key rather than HD wallet node --- src/wallet.js | 4 ++-- test/wallet.js | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/wallet.js b/src/wallet.js index a7fccfc..212d8a8 100644 --- a/src/wallet.js +++ b/src/wallet.js @@ -182,11 +182,11 @@ var Wallet = function (seed, options) { this.getMasterKey = function() { return masterkey } this.getPrivateKey = function(index) { - return this.externalAccount.derive(index) + return this.externalAccount.derive(index).priv } this.getInternalPrivateKey = function(index) { - return this.internalAccount.derive(index) + return this.internalAccount.derive(index).priv } this.getPrivateKeyForAddress = function(address) { diff --git a/test/wallet.js b/test/wallet.js index 3b1a2ca..fe18b31 100644 --- a/test/wallet.js +++ b/test/wallet.js @@ -79,8 +79,8 @@ describe('Wallet', function() { it('returns the private key at the given index of external account', function(){ var wallet = new Wallet(seed, {network: 'testnet'}) - assertPrivateKeyEqual(wallet.getPrivateKey(0), wallet.externalAccount.derive(0)) - assertPrivateKeyEqual(wallet.getPrivateKey(1), wallet.externalAccount.derive(1)) + assertPrivateKeyEqual(wallet.getPrivateKey(0), wallet.externalAccount.derive(0).priv) + assertPrivateKeyEqual(wallet.getPrivateKey(1), wallet.externalAccount.derive(1).priv) }) }) @@ -88,8 +88,8 @@ describe('Wallet', function() { it('returns the private key at the given index of internal account', function(){ var wallet = new Wallet(seed, {network: 'testnet'}) - assertPrivateKeyEqual(wallet.getInternalPrivateKey(0), wallet.internalAccount.derive(0)) - assertPrivateKeyEqual(wallet.getInternalPrivateKey(1), wallet.internalAccount.derive(1)) + assertPrivateKeyEqual(wallet.getInternalPrivateKey(0), wallet.internalAccount.derive(0).priv) + assertPrivateKeyEqual(wallet.getInternalPrivateKey(1), wallet.internalAccount.derive(1).priv) }) }) @@ -101,9 +101,9 @@ describe('Wallet', function() { wallet.generateAddress() assertPrivateKeyEqual(wallet.getPrivateKeyForAddress("n2fiWrHqD6GM5GiEqkbWAc6aaZQp3ba93X"), - wallet.externalAccount.derive(1)) + wallet.externalAccount.derive(1).priv) assertPrivateKeyEqual(wallet.getPrivateKeyForAddress("mnXiDR4MKsFxcKJEZjx4353oXvo55iuptn"), - wallet.internalAccount.derive(0)) + wallet.internalAccount.derive(0).priv) }) it('raises an error when address is not found', function(){