Merge branch 'master' into system-monitor

.gitignore

@@ -19,4 +19,4 @@ docs/
 .teos
 .teos_cli
 *.orig
-/monitor/monitor.conf
+/monitor/monitor.conf

cli/README.md

@@ -16,7 +16,7 @@ Refer to [INSTALL.md](INSTALL.md)
 #### Global options
 
 - `--apiconnect`:	API server where to send the requests. Defaults to 'localhost' (modifiable in conf file).
-- `-apiport` :	API port where to send the requests. Defaults to '9814' (modifiable in conf file).
+- `--apiport` :	API port where to send the requests. Defaults to '9814' (modifiable in conf file).
 - `-h --help`: 	shows a list of commands or help for a specific command.
 
 #### Commands
@@ -176,16 +176,18 @@ python teos_cli.py register
 
 By default, `teos_cli` will connect to your local instance (running on localhost). There are also a couple of live instances running, one for mainet and one for testnet:
 
-- testnet endpoint = `teos.pisa.watch`
-- mainnet endpoint = `teosmainnet.pisa.watch`
+- testnet endpoint = `teos-testnet.pisa.watch:443`
+- mainnet endpoint = `teos.pisa.watch:443` or `theeyeofsatoshi.pisa.watch:443`
 
 ### Connecting to the mainnet instance
-Add `--apiconnect https://teosmainnet.pisa.watch` to your calls, for example:
+Add `--apiconnect  --apiport 443` to your calls, for example:
 
 ```
-python teos_cli.py --apiconnect https://teosmainnet.pisa.watch add_appointment -f dummy_appointment_data.json 
+python teos_cli.py --apiconnect=https://teos.pisa.watch add_appointment --apiport=443 -f dummy_appointment_data.json 
 ```
 
 You can also change the config file to avoid specifying the server every time:
-
-`TEOS_SERVER = "https://teosmainnet.pisa.watch"`
+```
+api_connect = https://teos.pisa.watch
+api_port = 443
+```

cli/teos_cli.py

@@ -484,7 +484,7 @@ def main(command, args, command_line_conf):
             if opt in ["-h", "--help"]:
                 sys.exit(show_usage())
 
-        command = args.pop(0)
+        command = args.pop(0) if args else None
         if command in commands:
             main(command, args, command_line_conf)
         elif not command:

common/README.md

@@ -0,0 +1,4 @@
+# teos-common
+
+This is a common library for The Eye of Satoshi. It contains classes and methods that are shared by both the tower and
+the clients.

common/requirements.txt

@@ -0,0 +1,4 @@
+cryptography==2.8
+coincurve
+pyzbase32
+plyvel

teos/teosd.py

@@ -43,7 +43,7 @@ def main(command_line_conf):
     signal(SIGQUIT, handle_signals)
 
     # Loads config and sets up the data folder and log file
-    data_dir = command_line_conf.get("DATA_DIR") if "DATA_DIR" in command_line_conf else DATA_DIR
+    data_dir = command_line_conf.pop("DATA_DIR") if "DATA_DIR" in command_line_conf else DATA_DIR
     config_loader = ConfigLoader(data_dir, CONF_FILE_NAME, DEFAULT_CONF, command_line_conf)
     config = config_loader.build_config()
     setup_data_folder(data_dir)
@@ -173,7 +173,7 @@ def main(command_line_conf):
             argv[1:],
             "h",
             [
-                "apiconnect=",
+                "apibind=",
                 "apiport=",
                 "btcnetwork=",
                 "btcrpcuser=",
@@ -188,7 +188,10 @@ def main(command_line_conf):
             if opt in ["--apibind"]:
                 command_line_conf["API_BIND"] = arg
             if opt in ["--apiport"]:
-                command_line_conf["API_PORT"] = arg
+                try:
+                    command_line_conf["API_PORT"] = int(arg)
+                except ValueError:
+                    exit("apiport must be an integer")
             if opt in ["--btcnetwork"]:
                 command_line_conf["BTC_NETWORK"] = arg
             if opt in ["--btcrpcuser"]: