working on fixing the wierd test

This commit is contained in:
Manuel Araoz 2014-06-12 10:33:16 -03:00
parent a2b8bb0f51
commit a57191c66f
2 changed files with 89 additions and 74 deletions

8
failsearch.sh Executable file
View File

@ -0,0 +1,8 @@
#! /bin/bash
# run mocha until it fails
COUNTER=0
while [ $? -eq 0 ]; do
mocha
done

View File

@ -6,6 +6,7 @@ var Point = imports.Point || require('./Point');
var SecureRandom = imports.SecureRandom || require('./SecureRandom'); var SecureRandom = imports.SecureRandom || require('./SecureRandom');
var bignum = imports.bignum || require('bignum'); var bignum = imports.bignum || require('bignum');
var networks = require('../networks'); var networks = require('../networks');
var BufferPut = require('bufferput');
var secp256k1_n = new bignum('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141', 16); var secp256k1_n = new bignum('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141', 16);
var secp256k1_Gx = new bignum('79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798', 16); var secp256k1_Gx = new bignum('79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798', 16);
@ -19,8 +20,7 @@ var HierarchicalKey = function(bytes) {
if (typeof bytes == 'undefined' || bytes == 'mainnet' || bytes == 'livenet') { if (typeof bytes == 'undefined' || bytes == 'mainnet' || bytes == 'livenet') {
bytes = 'livenet'; bytes = 'livenet';
this.version = networks['livenet'].hkeyPrivateVersion; this.version = networks['livenet'].hkeyPrivateVersion;
} } else if (bytes == 'testnet') {
else if (bytes == 'testnet') {
this.version = networks['testnet'].hkeyPrivateVersion; this.version = networks['testnet'].hkeyPrivateVersion;
} }
if (bytes == 'livenet' || bytes == 'testnet') { if (bytes == 'livenet' || bytes == 'testnet') {
@ -142,20 +142,15 @@ HierarchicalKey.prototype.buildExtendedPublicKey = function() {
throw new Error('Unknown version'); throw new Error('Unknown version');
} }
this.extendedPublicKey = Buffer.concat([ var r = new BufferPut();
new Buffer([v >> 24]), r = r.word32be(v);
new Buffer([(v >> 16) & 0xff]), r = r.word8(this.depth);
new Buffer([(v >> 8) & 0xff]), r = r.put(this.parentFingerprint);
new Buffer([v & 0xff]), r = r.word32be(this.childIndex);
new Buffer([this.depth]), r = r.put(this.chainCode);
this.parentFingerprint, r = r.put(this.eckey.public);
new Buffer([this.childIndex >>> 24]),
new Buffer([(this.childIndex >>> 16) & 0xff]), this.extendedPublicKey = r.buffer();
new Buffer([(this.childIndex >>> 8) & 0xff]),
new Buffer([this.childIndex & 0xff]),
this.chainCode,
this.eckey.public
]);
console.log('a'); console.log('a');
} }
@ -178,21 +173,16 @@ HierarchicalKey.prototype.buildExtendedPrivateKey = function() {
var v = this.version; var v = this.version;
this.extendedPrivateKey = Buffer.concat([ var r = new BufferPut();
new Buffer([v >> 24]), r = r.word32be(v);
new Buffer([(v >> 16) & 0xff]), r = r.word8(this.depth);
new Buffer([(v >> 8) & 0xff]), r = r.put(this.parentFingerprint);
new Buffer([v & 0xff]), r = r.word32be(this.childIndex);
new Buffer([this.depth]), r = r.put(this.chainCode);
this.parentFingerprint, r = r.word8(0);
new Buffer([this.childIndex >>> 24]), r = r.put(this.eckey.private);
new Buffer([(this.childIndex >>> 16) & 0xff]),
new Buffer([(this.childIndex >>> 8) & 0xff]), this.extendedPrivateKey = r.buffer();
new Buffer([this.childIndex & 0xff]),
this.chainCode,
new Buffer([0]),
this.eckey.private
]);
} }
HierarchicalKey.prototype.extendedPrivateKeyString = function(format) { HierarchicalKey.prototype.extendedPrivateKeyString = function(format) {
@ -266,18 +256,24 @@ HierarchicalKey.prototype.deriveChild = function(i) {
} }
var hash = coinUtil.sha512hmac(data, this.chainCode); var hash = coinUtil.sha512hmac(data, this.chainCode);
var il = bignum.fromBuffer(hash.slice(0, 32), {size: 32}); var il = bignum.fromBuffer(hash.slice(0, 32), {
size: 32
});
var ir = hash.slice(32, 64); var ir = hash.slice(32, 64);
// ki = IL + kpar (mod n). // ki = IL + kpar (mod n).
var priv = bignum.fromBuffer(this.eckey.private, {size: 32}); var priv = bignum.fromBuffer(this.eckey.private, {
size: 32
});
var k = il.add(priv).mod(secp256k1_n); var k = il.add(priv).mod(secp256k1_n);
ret = new HierarchicalKey(null); ret = new HierarchicalKey(null);
ret.chainCode = ir; ret.chainCode = ir;
ret.eckey = new Key(); ret.eckey = new Key();
ret.eckey.private = k.toBuffer({size: 32}); ret.eckey.private = k.toBuffer({
size: 32
});
ret.eckey.regenerateSync(); ret.eckey.regenerateSync();
ret.hasPrivateKey = true; ret.hasPrivateKey = true;
@ -335,9 +331,20 @@ function uint(f, size) {
return n; return n;
} }
function u8(f) {return uint(f,1);} function u8(f) {
function u16(f) {return uint(f,2);} return uint(f, 1);
function u32(f) {return uint(f,4);} }
function u64(f) {return uint(f,8);}
function u16(f) {
return uint(f, 2);
}
function u32(f) {
return uint(f, 4);
}
function u64(f) {
return uint(f, 8);
}
module.exports = require('soop')(HierarchicalKey); module.exports = require('soop')(HierarchicalKey);