ECPubKey/ECKey: separate to two files

src/eckey.js

@@ -4,15 +4,12 @@ var ecdsa = require('./ecdsa')
 var networks = require('./networks')
 var secureRandom = require('secure-random')
 
-var Address = require('./address')
-var crypto = require('./crypto')
+var BigInteger = require('bigi')
+var ECPubKey = require('./ecpubkey')
 
 var sec = require('./sec')
 var ecparams = sec('secp256k1')
 
-var BigInteger = require('bigi')
-var ECPointFp = require('./ec').ECPointFp
-
 function ECKey(D, compressed) {
   assert(D.compareTo(BigInteger.ZERO) > 0, 'Private key must be greater than 0')
   assert(D.compareTo(ecparams.getN()) < 0, 'Private key must be less than the curve order')
@@ -31,6 +28,7 @@ ECKey.fromBuffer = function(buffer, compressed) {
   var D = BigInteger.fromBuffer(buffer)
   return new ECKey(D, compressed)
 }
+
 ECKey.fromHex = function(hex, compressed) {
   return ECKey.fromBuffer(new Buffer(hex, 'hex'), compressed)
 }
@@ -67,6 +65,7 @@ ECKey.prototype.sign = function(hash) {
 ECKey.prototype.toBuffer = function() {
   return this.D.toBuffer(32)
 }
+
 ECKey.prototype.toHex = function() {
   return this.toBuffer().toString('hex')
 }
@@ -82,53 +81,4 @@ ECKey.prototype.toWIF = function(version) {
   return base58check.encode(buffer, version)
 }
 
-//////////////////////////////////////////////////////
-
-function ECPubKey(Q, compressed) {
-  assert(Q instanceof ECPointFp, 'Q must be an ECPointFP')
-
-  if (compressed == undefined) compressed = true
-  assert.strictEqual(typeof compressed, 'boolean', 'Invalid compression flag')
-
-  this.compressed = compressed
-  this.Q = Q
-}
-
-// Static constructors
-ECPubKey.fromBuffer = function(buffer) {
-  var type = buffer.readUInt8(0)
-  assert(type >= 0x02 || type <= 0x04, 'Invalid public key')
-
-  var compressed = (type !== 0x04)
-  assert.strictEqual(buffer.length, compressed ? 33 : 65, 'Invalid public key')
-
-  var Q = ECPointFp.decodeFrom(ecparams.getCurve(), buffer)
-  return new ECPubKey(Q, compressed)
-}
-ECPubKey.fromHex = function(hex) {
-  return ECPubKey.fromBuffer(new Buffer(hex, 'hex'))
-}
-
-// Operations
-ECPubKey.prototype.verify = function(hash, sig) {
-  return ecdsa.verify(hash, sig, this.Q)
-}
-
-ECPubKey.prototype.getAddress = function(version) {
-  version = version || networks.bitcoin.pubKeyHash
-
-  return new Address(crypto.hash160(this.toBuffer()), version)
-}
-
-// Export functions
-ECPubKey.prototype.toBuffer = function() {
-  return new Buffer(this.Q.getEncoded(this.compressed))
-}
-ECPubKey.prototype.toHex = function() {
-  return this.toBuffer().toString('hex')
-}
-
-module.exports = {
-  ECKey: ECKey,
-  ECPubKey: ECPubKey
-}
+module.exports = ECKey

src/ecpubkey.js

@@ -0,0 +1,58 @@
+var assert = require('assert')
+var crypto = require('./crypto')
+var ecdsa = require('./ecdsa')
+var networks = require('./networks')
+
+var Address = require('./address')
+var ECPointFp = require('./ec').ECPointFp
+
+var sec = require('./sec')
+var ecparams = sec('secp256k1')
+
+function ECPubKey(Q, compressed) {
+  assert(Q instanceof ECPointFp, 'Q must be an ECPointFP')
+
+  if (compressed == undefined) compressed = true
+  assert.strictEqual(typeof compressed, 'boolean', 'Invalid compression flag')
+
+  this.compressed = compressed
+  this.Q = Q
+}
+
+// Static constructors
+ECPubKey.fromBuffer = function(buffer) {
+  var type = buffer.readUInt8(0)
+  assert(type >= 0x02 || type <= 0x04, 'Invalid public key')
+
+  var compressed = (type !== 0x04)
+  assert.strictEqual(buffer.length, compressed ? 33 : 65, 'Invalid public key')
+
+  var Q = ECPointFp.decodeFrom(ecparams.getCurve(), buffer)
+  return new ECPubKey(Q, compressed)
+}
+
+ECPubKey.fromHex = function(hex) {
+  return ECPubKey.fromBuffer(new Buffer(hex, 'hex'))
+}
+
+// Operations
+ECPubKey.prototype.getAddress = function(version) {
+  version = version || networks.bitcoin.pubKeyHash
+
+  return new Address(crypto.hash160(this.toBuffer()), version)
+}
+
+ECPubKey.prototype.verify = function(hash, sig) {
+  return ecdsa.verify(hash, sig, this.Q)
+}
+
+// Export functions
+ECPubKey.prototype.toBuffer = function() {
+  return new Buffer(this.Q.getEncoded(this.compressed))
+}
+
+ECPubKey.prototype.toHex = function() {
+  return this.toBuffer().toString('hex')
+}
+
+module.exports = ECPubKey

src/hdwallet.js

@@ -5,8 +5,8 @@ var convert = require('./convert')
 var Address = require('./address')
 var BigInteger = require('bigi')
 var crypto = require('./crypto')
-var ECKey = require('./eckey').ECKey
-var ECPubKey = require('./eckey').ECPubKey
+var ECKey = require('./eckey')
+var ECPubKey = require('./ecpubkey')
 var networks = require('./networks')
 
 var sec = require('./sec')

src/index.js

@@ -11,9 +11,9 @@ module.exports = {
   crypto: require('./crypto'),
   ec: ec,
   ecdsa: require('./ecdsa'),
-  ECKey: Key.ECKey,
+  ECKey: require('./eckey'),
   ECPointFp: ec.ECPointFp,
-  ECPubKey: Key.ECPubKey,
+  ECPubKey: require('./ecpubkey'),
   Message: require('./message'),
   Opcode: require('./opcode'),
   HDWallet: require('./hdwallet'),

src/message.js

@@ -3,7 +3,7 @@ var Address = require('./address')
 var bufferutils = require('./bufferutils')
 var crypto = require('./crypto')
 var ecdsa = require('./ecdsa')
-var ECPubKey = require('./eckey').ECPubKey
+var ECPubKey = require('./ecpubkey')
 
 // FIXME: incompatible with other networks (Litecoin etc)
 var MAGIC_PREFIX = new Buffer('\x18Bitcoin Signed Message:\n')

src/transaction.js

@@ -7,7 +7,7 @@ var bufferutils = require('./bufferutils')
 var Script = require('./script')
 var convert = require('./convert')
 var crypto = require('./crypto')
-var ECKey = require('./eckey').ECKey
+var ECKey = require('./eckey')
 var ecdsa = require('./ecdsa')
 
 function Transaction(doc) {