zcash-hackworks
/
bitcore-lib-zcash
mirror of https://github.com/zcash-hackworks/bitcore-lib-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgraded bn.js to fix public key calculation problem, restored crypto/point.js, and added additional tests.

This commit is contained in:
Braydon Fuller 2015-01-04 09:19:08 -05:00
parent bc4e62ecd4
commit d2a2be7a93
4 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/crypto/point.js
View File

@ -2,8 +2,9 @@
var BN = require('./bn'); var BN = require('./bn');
var bufferUtil = require('../util/buffer'); var bufferUtil = require('../util/buffer');
var EC = require('elliptic').ec; var ec = require('elliptic').curves.secp256k1;
var ec = new EC('secp256k1'); var ecPoint = ec.curve.point.bind(ec.curve);
var ecPointFromX = ec.curve.pointFromX.bind(ec.curve);
/** /**
* *
@ -18,7 +19,7 @@ var ec = new EC('secp256k1');
* @constructor * @constructor
*/ */
var Point = function Point(x, y, isRed) { var Point = function Point(x, y, isRed) {
var point = ec.curve.point(x, y, isRed); var point = ecPoint(x, y, isRed);
point.validate(); point.validate();
return point; return point;
}; };
@ -35,7 +36,7 @@ Point.prototype = Object.getPrototypeOf(ec.curve.point());
* @returns {Point} An instance of Point * @returns {Point} An instance of Point
*/ */
Point.fromX = function fromX(odd, x){ Point.fromX = function fromX(odd, x){
var point = ec.curve.pointFromX(odd, x); var point = ecPointFromX(odd, x);
point.validate(); point.validate();
return point; return point;
}; };
@ -48,7 +49,7 @@ Point.fromX = function fromX(odd, x){
* @returns {Point} An instance of the base point. * @returns {Point} An instance of the base point.
*/ */
Point.getG = function getG() { Point.getG = function getG() {
return ec.curve.g; return Point(ec.curve.g.getX(), ec.curve.g.getY());
}; };
/** /**
@ -105,7 +106,7 @@ Point.prototype.validate = function validate() {
throw new Error('Invalid x,y value for curve, cannot equal 0.'); throw new Error('Invalid x,y value for curve, cannot equal 0.');
} }
var p2 = ec.curve.pointFromX(this.getY().isOdd(), this.getX()); var p2 = ecPointFromX(this.getY().isOdd(), this.getX());
if (p2.y.cmp(this.y) !== 0) { if (p2.y.cmp(this.y) !== 0) {
throw new Error('Invalid y value for curve.'); throw new Error('Invalid y value for curve.');

12
npm-shrinkwrap.json generated
View File

@ -13,9 +13,9 @@
"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-0.4.1.tgz" "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-0.4.1.tgz"
}, },
"bn.js": { "bn.js": {
"version": "0.16.0", "version": "0.16.1",
"from": "bn.js@0.16.0", "from": "bn.js@0.16.1",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-0.16.0.tgz" "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-0.16.1.tgz"
}, },
"browser-request": { "browser-request": {
"version": "0.3.3", "version": "0.3.3",
@ -43,9 +43,9 @@
"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-0.16.0.tgz", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-0.16.0.tgz",
"dependencies": { "dependencies": {
"bn.js": { "bn.js": {
"version": "0.16.0", "version": "0.16.1",
"from": "bn.js@0.16.0", "from": "bn.js@0.16.1",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-0.16.0.tgz" "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-0.16.1.tgz"
}, },
"brorand": { "brorand": {
"version": "1.0.1", "version": "1.0.1",

2
package.json
View File

@ -74,7 +74,7 @@
}, },
"dependencies": { "dependencies": {
"asn1.js": "=0.4.1", "asn1.js": "=0.4.1",
"bn.js": "=0.16.0", "bn.js": "=0.16.1",
"browser-request": "^0.3.3", "browser-request": "^0.3.3",
"bs58": "=2.0.0", "bs58": "=2.0.0",
"bufferput": "^0.1.2", "bufferput": "^0.1.2",

37
test/publickey.js
View File

@ -53,16 +53,33 @@ describe('PublicKey', function() {
pk.toString().should.equal(pubhex); pk.toString().should.equal(pubhex);
}); });
it('from a known private key', function() { it('problematic secp256k1 public keys', function() {
var privwif = 'KzsjKq2FVqVuQv2ueHVFuB65A9uEZ6S1L6F8NuokCrE3V3kE3Ack';
var pubhex = '03d6106302d2698d6a41e9c9a114269e7be7c6a0081317de444bb2980bf9265a01'; var knownKeys = [
var pubxhex = 'd6106302d2698d6a41e9c9a114269e7be7c6a0081317de444bb2980bf9265a01'; {
var pubyhex = 'e05fb262e64b108991a29979809fcef9d3e70cafceb3248c922c17d83d66bc9d'; wif: 'KzsjKq2FVqVuQv2ueHVFuB65A9uEZ6S1L6F8NuokCrE3V3kE3Ack',
var privkey = new PrivateKey(privwif); priv: '6d1229a6b24c2e775c062870ad26bc261051e0198c67203167273c7c62538846',
var pubkey = privkey.toPublicKey(); pub: '03d6106302d2698d6a41e9c9a114269e7be7c6a0081317de444bb2980bf9265a01',
pubkey.point.x.toString('hex').should.equal(pubxhex); pubx: 'd6106302d2698d6a41e9c9a114269e7be7c6a0081317de444bb2980bf9265a01',
pubkey.point.y.toString('hex').should.equal(pubyhex); puby: 'e05fb262e64b108991a29979809fcef9d3e70cafceb3248c922c17d83d66bc9d'
pubkey.toString().should.equal(pubhex); },
{
wif: 'L5MgSwNB2R76xBGorofRSTuQFd1bm3hQMFVf3u2CneFom8u1Yt7G',
priv: 'f2cc9d2b008927db94b89e04e2f6e70c180e547b3e5e564b06b8215d1c264b53',
pub: '03e275faa35bd1e88f5df6e8f9f6edb93bdf1d65f4915efc79fd7a726ec0c21700',
pubx: 'e275faa35bd1e88f5df6e8f9f6edb93bdf1d65f4915efc79fd7a726ec0c21700',
puby: '367216cb35b086e6686d69dddd822a8f4d52eb82ac5d9de18fdcd9bf44fa7df7'
}
];
for(var i = 0; i < knownKeys.length; i++) {
var privkey = new PrivateKey(knownKeys[i].wif);
var pubkey = privkey.toPublicKey();
pubkey.toString().should.equal(knownKeys[i].pub);
pubkey.point.x.toString('hex').should.equal(knownKeys[i].pubx);
pubkey.point.y.toString('hex').should.equal(knownKeys[i].puby);
}
}); });
it('from a compressed public key', function() { it('from a compressed public key', function() {