From d5d88287cd8cb774aa5ab536a4f8a7134049078c Mon Sep 17 00:00:00 2001
From: Braydon Fuller <braydon@bitpay.com>
Date: Tue, 2 Dec 2014 10:48:21 -0500
Subject: [PATCH 1/2] Networks: Consistency of network reference for 'livenet',
 and removed hardcoded value.

---
 lib/address.js    | 1 +
 lib/publickey.js  | 2 +-
 test/publickey.js | 2 +-
 test/uri.js       | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/address.js b/lib/address.js
index 6b177569e..4042283f0 100644
--- a/lib/address.js
+++ b/lib/address.js
@@ -233,6 +233,7 @@ Address._transformString = function(data, network, type){
  */
 Address.fromPublicKey = function(data, network){
   var info = Address._transformPublicKey(data);
+  network = network || networks.defaultNetwork.name;
   return new Address(info.hashBuffer, network, info.type);
 };
 
diff --git a/lib/publickey.js b/lib/publickey.js
index b777a8909..eb8fbf7d9 100644
--- a/lib/publickey.js
+++ b/lib/publickey.js
@@ -331,7 +331,7 @@ PublicKey.prototype.toDER = function(compressed) {
  * @returns {Address} An address generated from the public key
  */
 PublicKey.prototype.toAddress = function(network) {
-  return Address.fromPublicKey(this, network || 'livenet');
+  return Address.fromPublicKey(this, network);
 };
 
 /**
diff --git a/test/publickey.js b/test/publickey.js
index 299eef008..58a3d07ef 100644
--- a/test/publickey.js
+++ b/test/publickey.js
@@ -260,7 +260,7 @@ describe('PublicKey', function() {
 
     it('should output this known mainnet address correctly', function() {
       var pk = new PublicKey('03c87bd0e162f26969da8509cafcb7b8c8d202af30b928c582e263dd13ee9a9781');
-      var address = pk.toAddress('mainnet');
+      var address = pk.toAddress('livenet');
       address.toString().should.equal('1A6ut1tWnUq1SEQLMr4ttDh24wcbJ5o9TT');
     });
 
diff --git a/test/uri.js b/test/uri.js
index 1eaa3dab4..da0b9cd2c 100644
--- a/test/uri.js
+++ b/test/uri.js
@@ -62,7 +62,7 @@ describe('URI', function() {
 
     uri = new URI('bitcoin:1DP69gMMvSuYhbnxsi4EJEFufUAbDrEQfj');
     uri.address.should.be.instanceof(bitcore.Address);
-    uri.network.should.equal('mainnet');
+    uri.network.should.equal('livenet');
 
     uri = new URI('bitcoin:mkYY5NRvikVBY1EPtaq9fAFgquesdjqECw');
     uri.address.should.be.instanceof(bitcore.Address);
@@ -92,7 +92,7 @@ describe('URI', function() {
       address: '1DP69gMMvSuYhbnxsi4EJEFufUAbDrEQfj'
     });
     uri.address.should.be.instanceof(bitcore.Address);
-    uri.network.should.equal('mainnet');
+    uri.network.should.equal('livenet');
 
     uri = new URI({
       address: 'mkYY5NRvikVBY1EPtaq9fAFgquesdjqECw'

From 968f9936d8d4bd246bcf6feafe27c07364c72c8c Mon Sep 17 00:00:00 2001
From: Braydon Fuller <braydon@bitpay.com>
Date: Tue, 2 Dec 2014 10:55:25 -0500
Subject: [PATCH 2/2] Networks: Add mainnet alias

---
 lib/networks.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/networks.js b/lib/networks.js
index a37a5cfe2..fff435f93 100644
--- a/lib/networks.js
+++ b/lib/networks.js
@@ -68,6 +68,7 @@ function getNetwork(arg) {
 module.exports = {
   defaultNetwork: livenet,
   livenet: livenet,
+  mainnet: livenet,
   testnet: testnet,
   get: getNetwork
 };