readme. drop gyp defines.

README.md

@@ -38,9 +38,7 @@ bitcoind as a shared object. This may not be ideal yet.
 ``` bash
 # ensure clean up
 $ make clean
-$ find ~/bitcoin -type f -name '*.o' \
+$ git clean -xdf
-  -or -name '*.so' -or -name '*.lo' \
-  -or -name '*.la' -print0 | xargs -0 rm -fv
 
 # create configure file
 $ ./autogen.sh
@@ -48,6 +46,7 @@ $ ./autogen.sh
 # configure as a library with -fPIC on all object files
 # use --with-incompatible-bdb if necessary
 # use --prefix=/usr if necessary
+# osx users may have to specify a boost path
 $ ./configure --enable-daemonlib
 
 # build libbitcoind.so
@@ -79,23 +78,18 @@ $ BITCOIN_DIR=~/bitcoin BOOST_INCLUDE=/usr/include/boost PYTHON=/usr/bin/python2
 You can run bitcoind.js to start downloading the blockchain by doing:
 
 ``` bash
-$ node example/ &
+$ node example --on-block &
-bitcoind: log pipe opened: 12
 bitcoind: status="start_node(): bitcoind opened."
+...
+[should see full javascript blocks here]
 ```
 
 However, if you look at the bitcoind log files:
 
 ``` bash
 $ tail -f ~/.bitcoin/debug.log
-connect() to [2001:470:c1f2:3::201]:8333 failed: 101
-connect() to [2001:470:6c:778::2]:8333 failed: 101
-connect() to [2001:470:c1f2:3::201]:8333 failed: 101
 ```
 
-Right now, the `connect(3)` call is failing due to some conflict with node or
-libuv I'm guessing. This is being investigated.
-
 ^C (SIGINT) will call `StartShutdown()` in bitcoind on the node thread pool.
 
 ##### Example Usage

binding.gyp

@@ -28,16 +28,6 @@
     'sources': [
       './src/bitcoindjs.cc',
     ],
-    'defines': [
-      # boost sleep:
-      '<!(test $(grep "#define BOOST_VERSION " <(BOOST_INCLUDE)/version.hpp'\
-      ' | awk "{ print \$3 }") -ge 105200'\
-      ' && echo HAVE_WORKING_BOOST_SLEEP_FOR'\
-      ' || echo HAVE_WORKING_BOOST_SLEEP)',
-
-      # wallet:
-      'ENABLE_WALLET',
-    ],
     'cflags_cc': [
       '-fexceptions',
       '-frtti',

src/bitcoindjs.cc

@@ -15,9 +15,7 @@
  */
 
 #if V090
-#if defined(HAVE_CONFIG_H)
+#include "config/bitcoin-config.h"
-#include "bitcoin-config.h"
-#endif
 
 #include "core.h"
 #include "addrman.h"
@@ -82,9 +80,7 @@
 #endif
 
 #if !V090
-#if defined(HAVE_CONFIG_H)
+#include "config/bitcoin-config.h"
-#include "bitcoin-config.h"
-#endif
 
 #include "addrman.h"
 #include "alert.h"
@@ -106,7 +102,7 @@
 #include "core.h"
 #include "core_io.h"
 #include "crypter.h"
-// #include "db.h"
+#include "db.h"
 #include "hash.h"
 #include "init.h"
 #include "key.h"
@@ -147,16 +143,16 @@
 #include "utilmoneystr.h"
 #include "utiltime.h"
 #include "version.h"
-// #include "wallet.h"
+#include "wallet.h"
 #include "wallet_ismine.h"
-// #include "walletdb.h"
+#include "walletdb.h"
 #include "compat/sanity.h"
 
-#ifdef ENABLE_WALLET
+// #ifdef ENABLE_WALLET
-#include "db.h"
+// #include "db.h"
-#include "wallet.h"
+// #include "wallet.h"
-#include "walletdb.h"
+// #include "walletdb.h"
-#endif
+// #endif
 
 #include "json/json_spirit.h"
 #include "json/json_spirit_error_position.h"