Merge branch 'master' of github.com:spesmilo/electrum-server

[electrum-server.git] / HOWTO.md

diff --git a/HOWTO.md b/HOWTO.md
index 5ac4397..51f30c7 100644 (file)
--- a/HOWTO.md
+++ b/HOWTO.md
@@ -97,17 +97,18 @@ our ~/bin directory:
     $ chmod +x ~/src/electrum/server/server.py
     $ ln -s ~/src/electrum/server/server.py ~/bin/electrum-server
 
-### Step 3. Download Bitcoind stable & patch it
+### Step 3. Download bitcoind
 
-In order for the latest versions of Electrum to work properly we currently recommend bitcoind 0.8.5 stable.  
-0.8.5 can be downloaded from github or sourceforge and it needs to be patched with an electrum specific patch.
-bitcoin@master i.e. git head may not currently work with electrum-server even if the patch applies cleanly.
+Older versions of Electrum used to require a patched version of bitcoind. 
+This is not the case anymore since bitcoind supports the 'txindex' option.
+We currently recommend bitcoind 0.8.5 stable.
+
+If your package manager does not supply a recent bitcoind and prefer to compile
+here are some pointers for Ubuntu:
 
     $ cd ~/src && wget http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.8.5/bitcoin-0.8.5-linux.tar.gz
     $ tar xfz bitcoin-0.8.5-linux.tar.gz
-    $ cd bitcoin-0.8.5-linux/src
-    $ patch -p1 < ~/src/electrum/server/patch/patch
-    $ cd src
+    $ cd bitcoin-0.8.5-linux/src/src
     $ sudo apt-get install make g++ python-leveldb libboost-all-dev libssl-dev libdb++-dev 
     $ make USE_UPNP= -f makefile.unix
     $ strip ~/src/bitcoin-0.8.5-linux/src/src/bitcoind
@@ -127,8 +128,15 @@ Write this in `bitcoin.conf`:
     rpcuser=<rpc-username>
     rpcpassword=<rpc-password>
     daemon=1
+    txindex=1
+
+
+If you have an existing installation of bitcoind and have not previously
+set txindex=1 you need to reindex the blockchain by running
+
+    $ bitcoind -reindex
 
-Restart `bitcoind`:
+If you have a fresh copy of bitcoind start `bitcoind`:
 
     $ bitcoind