From 6b3470198f19487a92599fc5165486d0817606ef Mon Sep 17 00:00:00 2001
From: Braydon Fuller <braydon@bitpay.com>
Date: Wed, 29 Apr 2015 23:17:35 -0400
Subject: [PATCH] Adjustments for initial setup.

---
 config/default.yml    |  4 +++-
 config/livenet.yml    | 14 +++++++-------
 config/testnet.yml    | 14 +++++++-------
 index.js              |  4 ++--
 lib/services/block.js |  5 +----
 package.json          |  4 ++--
 6 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/config/default.yml b/config/default.yml
index d0285e53..d7bdb37d 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -8,6 +8,8 @@ BitcoreNode:
   RPC:
     user: user
     pass: password
-    protocol: http
+    protocol: http # http, https
+    #rejectUnauthorized: false
+    #disableAgent: true
     host: 127.0.0.1
     port: 8332
diff --git a/config/livenet.yml b/config/livenet.yml
index 564f1073..d0285e53 100644
--- a/config/livenet.yml
+++ b/config/livenet.yml
@@ -4,10 +4,10 @@ BitcoreNode:
   NetworkMonitor:
     host: localhost
     port: 8333
-Reporter: none # none, simple, matrix
-RPC:
-  user: user
-  pass: password
-  protocol: http
-  host: 127.0.0.1
-  port: 8332
+  Reporter: none # none, simple, matrix
+  RPC:
+    user: user
+    pass: password
+    protocol: http
+    host: 127.0.0.1
+    port: 8332
diff --git a/config/testnet.yml b/config/testnet.yml
index 29a08192..e711c0dc 100644
--- a/config/testnet.yml
+++ b/config/testnet.yml
@@ -4,10 +4,10 @@ BitcoreNode:
   NetworkMonitor:
     host: localhost
     port: 18333
-Reporter: none # none, simple, matrix
-RPC:
-  user: user
-  pass: password
-  protocol: http
-  host: 127.0.0.1
-  port: 18332
+  Reporter: none # none, simple, matrix
+  RPC:
+    user: user
+    pass: password
+    protocol: http
+    host: 127.0.0.1
+    port: 18332
diff --git a/index.js b/index.js
index 974a31c0..ae5f102d 100644
--- a/index.js
+++ b/index.js
@@ -10,7 +10,7 @@ BitcoreNode.errors = require('./lib/errors');
 
 if (require.main === module) {
   var config = require('config');
-  var network = config.get('BitcoreHTTP.BitcoreNode').network;
+  var network = config.get('BitcoreNode').network;
   console.log('Starting bitcore-node', network, 'network');
   bitcore.Networks.defaultNetwork = bitcore.Networks.get(network);
 
@@ -28,7 +28,7 @@ if (require.main === module) {
     process.exit();
   });
 
-  var reporterName = config.get('Reporter');
+  var reporterName = config.get('BitcoreNode.Reporter');
   var reporter = reporters[reporterName];
   if (!reporter) {
     throw new Error('Unrecognized network reporter: ' + reporterName +
diff --git a/lib/services/block.js b/lib/services/block.js
index 7993ec67..d499e6c1 100644
--- a/lib/services/block.js
+++ b/lib/services/block.js
@@ -232,10 +232,7 @@ BlockService.prototype._getLatestHash = function() {
   var self = this;
   return Promise.try(function() {
     return self.database.getAsync(Index.tip);
-  }).catch(function(error) {
-    if (error.toString() !== 'NotFoundError: Key not found in database [tip]') {
-      throw error;
-    }
+  }).catch(LevelUp.errors.NotFoundError, function() {
     return null;
   });
 };
diff --git a/package.json b/package.json
index 1dbd1b47..cd14a3c0 100644
--- a/package.json
+++ b/package.json
@@ -47,8 +47,8 @@
     "express": "4.11.1",
     "glob": "*",
     "js-yaml": "^3.2.7",
-    "leveldown": "~0.10.0",
-    "levelup": "^0.19.0",
+    "leveldown": "git://github.com/Level/leveldown#657b5c",
+    "levelup": "git://github.com/Level/levelup#202ee1",
     "memdown": "^1.0.0",
     "moment": "~2.5.0",
     "morgan": "^1.5.1",