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

fix tests

Browse source
This commit is contained in:
Manuel Araoz 2014-05-29 17:18:55 -03:00
commit f13dea2376
6 changed files with 22 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

11
js/models/core/PrivateKey.js
View file

@ -3,11 +3,11 @@
var imports = require('soop').imports();
var bitcore = require('bitcore');
var HK = bitcore.HierarchicalKey;
var HK = bitcore.HierarchicalKey;
var WalletKey = bitcore.WalletKey;
var networks = bitcore.networks;
var util = bitcore.util;
var PublicKeyRing = require('./PublicKeyRing');
var Structure = require('./Structure');
function PrivateKey(opts) {
opts = opts || {};
@ -20,7 +20,7 @@ function PrivateKey(opts) {
PrivateKey.prototype.getId = function() {
if (!this.id) {
var path = PublicKeyRing.IdFullBranch();
var path = Structure.IdFullBranch;
var idhk = this.bip.derive(path);
this.id= idhk.eckey.public.toString('hex');
}
@ -29,7 +29,7 @@ PrivateKey.prototype.getId = function() {
PrivateKey.prototype.deriveBIP45Branch = function() {
if (!this.bip45Branch) {
this.bip45Branch = this.bip.derive(PublicKeyRing.BIP45_PUBLIC_PREFIX);
this.bip45Branch = this.bip.derive(Structure.BIP45_PUBLIC_PREFIX);
}
return this.bip45Branch;
}
@ -62,8 +62,7 @@ PrivateKey.prototype._getHK = function(path) {
};
PrivateKey.prototype.get = function(index,isChange) {
console.log(PublicKeyRing);
var path = PublicKeyRing.FullBranch(index, isChange);
var path = Structure.FullBranch(index, isChange);
var pk = this.privateKeyCache[path];
if (!pk) {
var derivedHK = this._getHK(path);

39
js/models/core/PublicKeyRing.js
View file

@ -6,6 +6,7 @@ var imports = require('soop').imports();
var bitcore = require('bitcore');
var HK = bitcore.HierarchicalKey;
var PrivateKey = require('./PrivateKey');
var Structure = require('./Structure');
var Address = bitcore.Address;
var Script = bitcore.Script;
var coinUtil = bitcore.util;
@ -37,40 +38,6 @@ function PublicKeyRing(opts) {
this.copayerIds = [];
}
/*
* Based on https://github.com/maraoz/bips/blob/master/bip-NNNN.mediawiki
* m / purpose' / cosigner_index / change / address_index
*/
var PURPOSE = 45;
var MAX_NON_HARDENED = 0x8000000 - 1;
var SHARED_INDEX = MAX_NON_HARDENED - 0;
var ID_INDEX = MAX_NON_HARDENED - 1;
var BIP45_PUBLIC_PREFIX = 'm/'+ PURPOSE+'\'';
PublicKeyRing.BIP45_PUBLIC_PREFIX = BIP45_PUBLIC_PREFIX;
PublicKeyRing.Branch = function(address_index, isChange, cosigner_index) {
var ret = 'm/'+
(typeof cosigner_index !== 'undefined'? cosigner_index: SHARED_INDEX)+'/'+
(isChange?1:0)+'/'+
address_index;
return ret;
};
PublicKeyRing.FullBranch = function(address_index, isChange, cosigner_index) {
var sub = PublicKeyRing.Branch(address_index, isChange, cosigner_index);
sub = sub.substring(2);
return BIP45_PUBLIC_PREFIX + '/' + sub;
};
PublicKeyRing.IdFullBranch = function() {
return PublicKeyRing.FullBranch(0, 0, ID_INDEX);
};
PublicKeyRing.fromObj = function (data) {
if (data instanceof PublicKeyRing) {
throw new Error('bad data format: Did you use .toObj()?');
@ -134,7 +101,7 @@ PublicKeyRing.prototype._newExtendedPublicKey = function () {
};
PublicKeyRing.prototype._updateBip = function (index) {
var hk = this.copayersHK[index].derive(PublicKeyRing.Branch(0, 0, ID_INDEX));
var hk = this.copayersHK[index].derive(Structure.IdBranch);
this.copayerIds[index]= hk.eckey.public.toString('hex');
};
@ -176,7 +143,7 @@ PublicKeyRing.prototype.addCopayer = function(newEpk, nickname) {
PublicKeyRing.prototype.getPubKeys = function(index, isChange) {
this._checkKeys();
var path = PublicKeyRing.Branch(index, isChange);
var path = Structure.Branch(index, isChange);
var pubKeys = this.publicKeysCache[path];
if (!pubKeys) {
pubKeys = [];

2
js/models/core/Wallet.js
View file

@ -628,7 +628,7 @@ Wallet.prototype.createTxSync = function(toAddress, amountSatStr, utxos, opts) {
var signRet;
if (priv) {
b.sign(priv.getAll(pkr.addressIndex, pkr.changeAddressIndex));
var signed = b.sign(priv.getAll(pkr.addressIndex, pkr.changeAddressIndex));
}
var myId = this.getMyCopayerId();
var now = Date.now();