BTCPrivate
/
bitcore
mirror of https://github.com/BTCPrivate/bitcore.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix hd string path parsing.

This commit is contained in:
Yemel Jardi 2015-01-28 18:13:38 -03:00
parent 970bf12df8
commit 3bd361e27a
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/hdprivatekey.js
View File

@ -106,8 +106,13 @@ HDPrivateKey._getDerivationIndexes = function(path) {
} }
var indexes = steps.slice(1).map(function(step) { var indexes = steps.slice(1).map(function(step) {
var index = parseInt(step); var index = step ? +step : NaN;
index += step != index.toString() ? HDPrivateKey.Hardened : 0;
var isHardened = isNaN(index) && step[step.length-1] == "'";
if (isHardened) {
index = (+(step.slice(0, -1))) + HDPrivateKey.Hardened;
}
return index; return index;
}); });

12
test/hdprivatekey.js
View File

@ -234,6 +234,9 @@ describe('HDPrivate key interface', function() {
valid = HDPrivateKey.isValidPath('m/'); valid = HDPrivateKey.isValidPath('m/');
valid.should.equal(false); valid.should.equal(false);
valid = HDPrivateKey.isValidPath('m/12asd');
valid.should.equal(false);
valid = HDPrivateKey.isValidPath(HDPrivateKey.MaxHardened); valid = HDPrivateKey.isValidPath(HDPrivateKey.MaxHardened);
valid.should.equal(false); valid.should.equal(false);
}); });
@ -259,6 +262,15 @@ describe('HDPrivate key interface', function() {
indexes = HDPrivateKey._getDerivationIndexes("bad path"); indexes = HDPrivateKey._getDerivationIndexes("bad path");
expect(indexes).to.be.null; expect(indexes).to.be.null;
indexes = HDPrivateKey._getDerivationIndexes("K");
expect(indexes).to.be.null;
indexes = HDPrivateKey._getDerivationIndexes("m/");
expect(indexes).to.be.null;
indexes = HDPrivateKey._getDerivationIndexes("m/123asd");
expect(indexes).to.be.null;
}); });
}); });