Merge pull request #1 from colindean/master

[electrum-server.git] / README

diff --git a/README b/README
index c3b5b53..bdb7a5d 100644 (file)
--- a/README
+++ b/README
@@ -7,9 +7,10 @@ Language: Python
 Features: 
 
 * The server uses a patched version of the Bitcoin daemon that can
-forward transactions, and bitcoin-abe * The server code is open
-source. Anyone can run a server, removing single points of failure
-concerns.
+forward transactions, and bitcoin-abe 
+
+* The server code is open source. Anyone can run a server, removing
+single points of failure concerns.
 
 * The server knows which set of Bitcoin addresses belong to the same
 wallet, which might raise concerns about anonymity. However, it should
@@ -18,19 +19,21 @@ be possible to write clients capable of using several servers.
 
 INSTALL
 
-1. patch and recompile the bitcoin daemon - bitcoinrpc.diff
+1. patch and recompile the bitcoin daemon: see bitcoinrpc.cpp.diff and main.cpp.diff
 
 2. install bitcoin-abe : https://github.com/jtobey/bitcoin-abe
 
-3. download bitcoin-python: https://github.com/toomanysecrets0/bitcoin-python
-   patch it with bitcoinrpc_connection.py.diff
+3. install jsonrpclib: code.google.com/p/jsonrpclib/
 
 4. launch the server:  nohup python -u server.py > /var/log/electrum.log &
 
-5. if you have a webserver, you can use electrum.php to forward http requests to the server
-
 
 Note: 
 You do not want to run bitcoin-abe and the server simultaneously, because they will both try to update the database. 
 If you want bitcoin-abe to be available on your website, run it with the --no-update option
 
+
+Upgrading Abe:
+if you upgrade abe, you might need to update the database. 
+in the abe directory, type:
+ python -m Abe.abe --config=abe.conf --upgrade