From 4da897287b25cf7014d4fe0965ea2b7d3d0a4772 Mon Sep 17 00:00:00 2001
From: Chris Kleeschulte <chrisk@bitpay.com>
Date: Mon, 3 Aug 2015 18:41:15 -0400
Subject: [PATCH] Merge

---
 bin/build-bindings |  2 +-
 binding.gyp        | 13 ++++++++++++-
 lib/daemon.js      |  7 ++++---
 package.json       | 10 ++++++++++
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/bin/build-bindings b/bin/build-bindings
index e5bd406e..7b535542 100755
--- a/bin/build-bindings
+++ b/bin/build-bindings
@@ -9,6 +9,6 @@ if test x"$1" = x'debug'; then
   debug=--debug
 fi
 
-node-gyp ${debug} rebuild
+node-pre-gyp ${debug} rebuild --fallback-to-build
 
 
diff --git a/binding.gyp b/binding.gyp
index db85a5a3..d9f37e13 100755
--- a/binding.gyp
+++ b/binding.gyp
@@ -1,6 +1,6 @@
 {
   'targets': [{
-    'target_name': 'libbitcoind',
+    'target_name': "<(module_name)",
     'include_dirs' : [
       '<!(node -e "require(\'nan\')")',
       '<!(./platform/os.sh artifacts_dir)/include/libbitcoind/src',
@@ -44,5 +44,16 @@
         '<!(./platform/os.sh load_archive)'
       ]
     }
+  },
+  {
+    "target_name": "action_after_build",
+    "type": "none",
+    "dependencies": [ "<(module_name)" ],
+    "copies": [
+    {
+      "files": [ "<(PRODUCT_DIR)/<(module_name).node" ],
+      "destination": "<(module_path)"
+    }
+    ]
   }]
 }
diff --git a/lib/daemon.js b/lib/daemon.js
index 101cd605..b63380dd 100644
--- a/lib/daemon.js
+++ b/lib/daemon.js
@@ -1,9 +1,10 @@
 'use strict';
 
 var EventEmitter = require('events').EventEmitter;
-var bitcoind = require('bindings')('bitcoind.node');
-var chainlib = require('chainlib');
-var log = chainlib.log;
+var binary = require('node-pre-gyp');
+var path = require('path');
+var binding_path = binary.find(path.resolve(path.join(__dirname,'./package.json')));
+var bitcoindjs = require(binding_path);
 var util = require('util');
 var bitcore = require('bitcore');
 var $ = bitcore.util.preconditions;
diff --git a/package.json b/package.json
index 7eec2c68..18c2fa30 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
     "bitcoind"
   ],
   "dependencies": {
+    "node-pre-gyp": "0.5.x",
     "async": "1.3.0",
     "bindings": "^1.2.1",
     "bitcore": "^0.12.15",
@@ -50,6 +51,7 @@
     "socket.io": "^1.3.6"
   },
   "devDependencies": {
+    "aws-sdk": "~2.0.0-rc.15",
     "benchmark": "1.0.0",
     "bitcoin": "^2.3.2",
     "bitcoind-rpc": "^0.3.0",
@@ -58,5 +60,13 @@
     "proxyquire": "^1.3.1",
     "rimraf": "^2.4.2",
     "sinon": "^1.15.4"
+  },
+  "bundledDependencies": ["node-pre-gyp"],
+  "binary": {
+        "module_name" : "bitcoindjs",
+        "module_path" : "./build/{configuration}/{node_abi}-{platform}-{arch}/",
+        "remote_path" : "./{module_name}/v{version}/{configuration}/",
+        "package_name": "{module_name}-v{version}-{node_abi}-{platform}-{arch}.tar.gz",
+        "host"        : "https://kleetus-bitcoindjs.s3-us-east-1.amazonaws.com"
   }
 }