diff --git a/js/models/core/PrivateKey.js b/js/models/core/PrivateKey.js index 110dca65b..f1cee7f48 100644 --- a/js/models/core/PrivateKey.js +++ b/js/models/core/PrivateKey.js @@ -7,7 +7,7 @@ var HK = bitcore.HierarchicalKey; var WalletKey = bitcore.WalletKey; var networks = bitcore.networks; var util = bitcore.util; -var PublicKeyRing = require('./PublicKeyRing'); +var PublicKeyRing = require('./PublicKeyRing'); function PrivateKey(opts) { opts = opts || {}; @@ -62,6 +62,7 @@ PrivateKey.prototype._getHK = function(path) { }; PrivateKey.prototype.get = function(index,isChange) { + console.log(PublicKeyRing); var path = PublicKeyRing.FullBranch(index, isChange); var pk = this.privateKeyCache[path]; if (!pk) { diff --git a/js/models/core/PublicKeyRing.js b/js/models/core/PublicKeyRing.js index 76edc40e1..2dd7e62ba 100644 --- a/js/models/core/PublicKeyRing.js +++ b/js/models/core/PublicKeyRing.js @@ -5,6 +5,7 @@ var imports = require('soop').imports(); var bitcore = require('bitcore'); var HK = bitcore.HierarchicalKey; +var PrivateKey = require('./PrivateKey'); var Address = bitcore.Address; var Script = bitcore.Script; var coinUtil = bitcore.util; @@ -127,7 +128,8 @@ PublicKeyRing.prototype._checkKeys = function() { }; PublicKeyRing.prototype._newExtendedPublicKey = function () { - return new HK(this.network.name) + return new PrivateKey({networkName: this.network.name}) + .deriveBIP45Branch() .extendedPublicKeyString(); }; diff --git a/test/test.TxProposals.js b/test/test.TxProposals.js index 1d76b1bae..41ecc2002 100644 --- a/test/test.TxProposals.js +++ b/test/test.TxProposals.js @@ -42,7 +42,7 @@ var createPKR = function (bip32s) { for(var i=0; i<5; i++) { if (bip32s) { var b=bip32s[i]; - w.addCopayer(b?b.getExtendedPublicKeyString():null); + w.addCopayer(b?b.deriveBIP45Branch().extendedPublicKeyString():null); } else w.addCopayer(); @@ -72,7 +72,7 @@ describe('TxProposals model', function() { var priv = new PrivateKey(config); var priv2 = new PrivateKey(config); var priv3 = new PrivateKey(config); - var ts = Date.now(); + var ts = Date.now(); var isChange=0; var index=0; var pkr = createPKR([priv, priv2, priv3]); diff --git a/test/test.Wallet.js b/test/test.Wallet.js index 53a235fe9..fd1c2fe50 100644 --- a/test/test.Wallet.js +++ b/test/test.Wallet.js @@ -132,6 +132,7 @@ describe('Wallet model', function() { ); var t = w.txProposals; + console.log(t); var k = Object.keys(t.txps)[0]; var tx = t.txps[k].builder.build(); should.exist(tx);