Merge branch '3M3RY-mainline_bitcoind'

diff --git a/HOWTO.md b/HOWTO.md
index 59dc5b0..5ac4397 100644 (file)
--- a/HOWTO.md
+++ b/HOWTO.md
@@ -173,7 +173,7 @@ The pruning server uses leveldb and keeps a smaller and
 faster database by pruning spent transactions. It's a lot quicker to get up
 and running and requires less maintenance and diskspace than abe.
 
-The section in the configuration file looks like this:
+The section in the electrum server configuration file (see step 10) looks like this:
 
      [leveldb]
      path = /path/to/your/database
@@ -182,23 +182,29 @@ The section in the configuration file looks like this:
 
 ### Step 8. Import blockchain into the database or download it
 
+It's recommended to fetch a pre-processed leveldb from the net
+
+You can fetch recent copies of electrum leveldb databases and further instructions 
+from the Electrum full archival server foundry at:
+http://foundry.electrum.org/ 
+
+Alternatively if you have the time and nerve you can import the blockchain yourself.
+
 As of April 2013 it takes between 6-24 hours to import 230k of blocks, depending
 on CPU speed, I/O speed and selected pruning limit.
 
-It's considerably faster to index in memory. You can use /dev/shm or indexing in RAM
+It's considerably faster to index in memory. You can use /dev/shm or
 or create a tmpfs which will also use swap if you run out of memory:
 
     $ sudo mount -t tmpfs -o rw,nodev,nosuid,noatime,size=6000M,mode=0777 none /tmpfs
 
+Figures from April 2013:
 At limit 100 the database comes to 2,6 GB with 230k blocks and takes roughly 6h to import in /dev/shm.
 At limit 1000 the database comes to 3,0 GB with 230k blocks and takes roughly 10h to import in /dev/shm.
 At limit 10000 the database comes to 3,5 GB with 230k blocks and takes roughly 24h to import in /dev/shm.
 
-Alternatively you can fetch a pre-processed leveldb from the net
-
-You can fetch recent copies of electrum leveldb databases and further instructions 
-from the Electrum full archival server foundry at:
-http://foundry.electrum.org/ 
+As of November 2013 expect at least double the time for indexing the blockchain. Databases have grown to
+roughly 4 GB, give or take a few hundred MB between pruning limits 100 and 10000. 
 
 
 ### Step 9. Create a self-signed SSL cert

diff --git a/README.leveldb b/README.leveldb
index 036f63c..78d86a3 100644 (file)
--- a/README.leveldb
+++ b/README.leveldb
@@ -12,9 +12,10 @@ Install version 0.8 or equivalent.
 Patch it with the patch distributed with Electrum.
 
 Note: Even though Electrum's database uses pruning, you cannot use it
-with a pruning bitcoind. A full bitcoin node is required in order to
-know for each address if it has been used. Pruning occurs only at the
-level of the Electrum database.
+with a ultra-pruning bitcoind (forthcoming in 0.9 or later).
+A full bitcoin node is required in order to know for each address 
+if it has been used. Pruning occurs only at the level of the Electrum database.
+txindex=1 however is *not* needed!
 
 __________________________________________________________