Merge branch 'master' of https://github.com/blinktrade/bitex

README.md

@@ -9,16 +9,6 @@ BlinkTrade - Open Source Exchange Platform
 
 #Get Started
 
-```
-$ easy_install pyzmq
-$ easy_install tornado
-$ easy_install crypto
-$ easy_install sqlalchemy
-$ easy_install requests
-```
-
-or:
-
 ```
 $ pip install -r requirements.txt
 ```
@@ -49,10 +39,16 @@ $ ./apps/mailer/main.py
 Matching engine and the core of the BitEx platform
 
 # Applications - Ws Gateway
-HTTP and WebSocket gateways
+The HTTP/WebSocket gateway is based on Tornado.  It relays HTTP or websocket API
+requests to the trade engine in order to place orders or fetching market data.
 
 # Applications - Mailer
-Mailing application
+The mailing application... sends mail. To that end, 
+it uses Mailchimp's transaction email solution, Mandrill.
+
+E-mail templates are stored under the templates/ dir,
+and which template to use (and the data to fill it out)
+are supplied by listening on the zeromq socket.
 
 # Translating
 

apps/trade/models.py

@@ -2854,4 +2854,5 @@ def generate_deposit(self,session, user, value, client_order_id, instructions=No
 
 
 def db_bootstrap(session):
-  pass
+    """Database boostrapping now done by config/bootstrap/"""
+    pass

config/bootstrap/demo.ini

@@ -4,11 +4,13 @@ sqlalchemy_connection_string=~/.blinktrade/demo/db/bitex.demo.sqlite
 
 
 [currencies]
-BTC=[ "BTC" , "฿"       , "Bitcoin"  ,  true,  10000, "{:,.8f}", "฿ #,##0.00000000;(฿ #,##0.00000000)"  , "{:,.8f}", "฿ #,##0.00000000;(฿ #,##0.0000000)"          ]
-USD=[ "USD" , "$"       , "Dollar"   ,  false, 100  , "{:,.2f}", "¤ #,##0.00;(¤ #,##0.00)"              , "{:,.2f}", "¤ #,##0.00;(¤ #,##0.00)"              ]
+#   [ code  , sign , description , is_crypto, pip  , format_python, format_js                             , human_format_python, human_format_js ]
+BTC=[ "BTC" , "฿"  , "Bitcoin"   ,  true    , 10000, "{:,.8f}"    , "฿ #,##0.00000000;(฿ #,##0.00000000)" , "{:,.8f}"          , "฿ #,##0.00000000;(฿ #,##0.0000000)" ]
+USD=[ "USD" , "$"  , "Dollar"    ,  false   , 100  , "{:,.2f}"    , "¤ #,##0.00;(¤ #,##0.00)"             , "{:,.2f}"          , "¤ #,##0.00;(¤ #,##0.00)" ]
 
 [instruments]
-BTCUSD=["BTCUSD", "USD", "BTC / USD"]
+#      [symbol  , currency, description]
+BTCUSD=["BTCUSD", "USD"   , "BTC / USD"]
 
 
 [user_exchange]