From 40e8dfec06767f18f10f358feb2b5734f3a8acd6 Mon Sep 17 00:00:00 2001
From: "Ryan X. Charles" <ryan@bitpay.com>
Date: Fri, 29 Aug 2014 12:38:43 -0700
Subject: [PATCH] compressed by default with fromRandom

---
 lib/ecdsa.js         | 1 +
 lib/privkey.js       | 6 +++++-
 test/test.key.js     | 5 ++++-
 test/test.privkey.js | 3 ++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/ecdsa.js b/lib/ecdsa.js
index e2648aa66..e7b33cdb0 100644
--- a/lib/ecdsa.js
+++ b/lib/ecdsa.js
@@ -31,6 +31,7 @@ ECDSA.prototype.calci = function() {
     }
 
     if (Qprime.point.eq(this.key.pubkey.point)) {
+      this.sig.compressed = this.key.pubkey.compressed;
       return this;
     }
   }
diff --git a/lib/privkey.js b/lib/privkey.js
index b1dd12ca1..e102bf337 100644
--- a/lib/privkey.js
+++ b/lib/privkey.js
@@ -24,7 +24,11 @@ Privkey.prototype.fromRandom = function() {
     var bn = BN().fromBuffer(privbuf);
     var condition = bn.lt(Point.getN());
   } while (!condition);
-  this.bn = bn;
+  this.set({
+    bn: bn,
+    networkstr: 'mainnet',
+    compressed: true
+  });
   return this;
 };
 
diff --git a/test/test.key.js b/test/test.key.js
index e7495dd0d..488237f45 100644
--- a/test/test.key.js
+++ b/test/test.key.js
@@ -32,7 +32,7 @@ describe('Key', function() {
 
   describe("#fromRandom", function() {
     
-    it('should make a new priv and pub', function() {
+    it('should make a new priv and pub, should be compressed, mainnet', function() {
       var key = new Key();
       key.fromRandom();
       should.exist(key.privkey);
@@ -40,6 +40,9 @@ describe('Key', function() {
       key.privkey.bn.gt(bn(0)).should.equal(true);
       key.pubkey.point.getX().gt(bn(0)).should.equal(true);
       key.pubkey.point.getY().gt(bn(0)).should.equal(true);
+      key.privkey.compressed.should.equal(true);
+      key.privkey.networkstr.should.equal('mainnet');
+      key.pubkey.compressed.should.equal(true);
     });
 
   });
diff --git a/test/test.privkey.js b/test/test.privkey.js
index 6cc0afa5e..24f956834 100644
--- a/test/test.privkey.js
+++ b/test/test.privkey.js
@@ -42,10 +42,11 @@ describe('Privkey', function() {
 
   describe('#fromRandom', function() {
     
-    it('should set bn gt 0 and lt n', function() {
+    it('should set bn gt 0 and lt n, and should be compressed', function() {
       var privkey = Privkey().fromRandom();
       privkey.bn.gt(BN(0)).should.equal(true);
       privkey.bn.lt(Point.getN()).should.equal(true);
+      privkey.compressed.should.equal(true);
     });
 
   });