Removes circular dependancy of ECKey
This commit is contained in:
parent
bfc5924522
commit
10dea421d5
3 changed files with 7 additions and 8 deletions
|
@ -272,10 +272,7 @@ var ECDSA = {
|
||||||
throw new Error("Pubkey recovery unsuccessful");
|
throw new Error("Pubkey recovery unsuccessful");
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO (shtylman) this is stupid because this file and eckey
|
return Q
|
||||||
// have circular dependencies
|
|
||||||
var ECPubKey = require('./eckey').ECPubKey;
|
|
||||||
return ECPubKey(Q);
|
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -293,7 +290,7 @@ var ECDSA = {
|
||||||
for (var i = 0; i < 4; i++) {
|
for (var i = 0; i < 4; i++) {
|
||||||
var pubKey = ECDSA.recoverPubKey(r, s, hash, i)
|
var pubKey = ECDSA.recoverPubKey(r, s, hash, i)
|
||||||
|
|
||||||
if (pubKey.pub.equals(origPubKey.pub)) {
|
if (pubKey.equals(origPubKey)) {
|
||||||
return i
|
return i
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
var Address = require('./address')
|
var Address = require('./address')
|
||||||
var convert = require('./convert')
|
var convert = require('./convert')
|
||||||
var ecdsa = require('./ecdsa')
|
var ecdsa = require('./ecdsa')
|
||||||
|
var ECPubKey = require('./eckey').ECPubKey
|
||||||
var SHA256 = require('crypto-js/sha256')
|
var SHA256 = require('crypto-js/sha256')
|
||||||
|
|
||||||
var Message = {}
|
var Message = {}
|
||||||
|
@ -32,7 +33,7 @@ Message.signMessage = function (key, message) {
|
||||||
var sig = key.sign(hash)
|
var sig = key.sign(hash)
|
||||||
var obj = ecdsa.parseSig(sig)
|
var obj = ecdsa.parseSig(sig)
|
||||||
|
|
||||||
var i = ecdsa.calcPubKeyRecoveryParam(key.getPub(), obj.r, obj.s, hash)
|
var i = ecdsa.calcPubKeyRecoveryParam(key.getPub().pub, obj.r, obj.s, hash)
|
||||||
|
|
||||||
i += 27
|
i += 27
|
||||||
if (key.compressed) {
|
if (key.compressed) {
|
||||||
|
@ -57,7 +58,7 @@ Message.verifyMessage = function (address, sig, message) {
|
||||||
var hash = Message.getHash(message)
|
var hash = Message.getHash(message)
|
||||||
|
|
||||||
var isCompressed = !!(sig.i & 4)
|
var isCompressed = !!(sig.i & 4)
|
||||||
var pubKey = ecdsa.recoverPubKey(sig.r, sig.s, hash, sig.i)
|
var pubKey = new ECPubKey(ecdsa.recoverPubKey(sig.r, sig.s, hash, sig.i))
|
||||||
pubKey.compressed = isCompressed
|
pubKey.compressed = isCompressed
|
||||||
|
|
||||||
// Compare address to expected address
|
// Compare address to expected address
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
var assert = require('assert')
|
var assert = require('assert')
|
||||||
var convert = require('../').convert
|
var convert = require('../').convert
|
||||||
var ecdsa = require('../').ecdsa
|
var ecdsa = require('../').ecdsa
|
||||||
|
var ECPubKey = require('../').ECPubKey
|
||||||
var Message = require('../').Message
|
var Message = require('../').Message
|
||||||
|
|
||||||
describe('ecdsa', function() {
|
describe('ecdsa', function() {
|
||||||
|
@ -12,7 +13,7 @@ describe('ecdsa', function() {
|
||||||
|
|
||||||
var hash = Message.getHash('1111')
|
var hash = Message.getHash('1111')
|
||||||
var obj = ecdsa.parseSigCompact(signature)
|
var obj = ecdsa.parseSigCompact(signature)
|
||||||
var pubKey = ecdsa.recoverPubKey(obj.r, obj.s, hash, obj.i)
|
var pubKey = new ECPubKey(ecdsa.recoverPubKey(obj.r, obj.s, hash, obj.i))
|
||||||
|
|
||||||
assert.equal(pubKey.toHex(true), '02e8fcf4d749b35879bc1f3b14b49e67ab7301da3558c5a9b74a54f1e6339c334c')
|
assert.equal(pubKey.toHex(true), '02e8fcf4d749b35879bc1f3b14b49e67ab7301da3558c5a9b74a54f1e6339c334c')
|
||||||
})
|
})
|
||||||
|
|
Loading…
Add table
Reference in a new issue