anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

change BIP32 structure to match our new BIP

Browse source
This commit is contained in:
Manuel Araoz 2014-05-28 16:10:05 -03:00
commit b8e20c1ee7
3 changed files with 51 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

12
js/models/core/WalletFactory.js
View file

@ -53,14 +53,6 @@ WalletFactory.prototype.fromObj = function(obj) {
console.log('## Decrypting'); //TODO
var w = Wallet.fromObj(obj, this.storage, this.network, this.blockchain);
w.verbose = this.verbose;
// JIC: Add our key
try {
w.publicKeyRing.addCopayer(
w.privateKey.getExtendedPublicKeyString()
);
} catch (e) {
// No really an error, just to be sure.
}
this.log('### WALLET OPENED:', w.id);
return w;
};
@ -107,7 +99,9 @@ WalletFactory.prototype.create = function(opts) {
requiredCopayers: requiredCopayers,
totalCopayers: totalCopayers,
});
opts.publicKeyRing.addCopayer(opts.privateKey.getExtendedPublicKeyString(), opts.nickname);
opts.publicKeyRing.addCopayer(
opts.privateKey.deriveBIP45Branch().extendedPublicKeyString(),
opts.nickname);
this.log('\t### PublicKeyRing Initialized');
opts.txProposals = opts.txProposals || new TxProposals({