Merge pull request #2 from arcolife/master

update master with latest

Author: arcolife

README.md

@@ -4,6 +4,9 @@ Refer to:
 https://arxiv.org/abs/1805.01457
 https://eprint.iacr.org/2016/917.pdf
 
+## Run
+
+Refer to `trueconsensus/README.md` for further instructions
 
 ### Parameterized by following..
 

doc/DEV.md renamed to docs/DEV.md

@@ -0,0 +1,20 @@
+## Generic Infra
+
+- [ ] Separate Dapp architecture: `dapps/bank.py` is currently tightly coupled with node.py. 
+- [ ] no gRPC communiction between nodes yet
+- [ ] add network_latency check 
+
+## Fastchain
+
+- [ ] nodes call quits on any error
+- [ ] xyz.pem not found error on running client.py. Batch size not playing well in proto_message.message check
+- [ ] complete subprotocol.py
+- [ ] complete bft_committee.py
+- [ ] return blocks of transactions
+
+## Snailchain / Committee election
+
+- [ ] complete minerva/vrf.py function
+- [ ] complete snailchain/fpow.py dummy
+- [ ] integrate level db wrappers
+- [ ] integrate py-evm functionalities

docs/TODO.md

@@ -1,6 +1,7 @@
 bitcoin==1.1.42
 docopt==0.6.2
 ecdsa==0.13
+protobuf==3.5.2.post1
 pycrypto==2.6.1
 pykwalify==1.6.1
 PySocks==1.6.8

requirements.txt

@@ -4,50 +4,51 @@ This is a `Practical Byzantine Fault Tolerance` implementation of Miguel Castro
 
 ### Setup
 
-#### Install Google's Protobuf
-
-Download and install [google protobuf](https://github.com/google/protobuf/tree/master/python/google)
-
-```
-# brew install protobuf
-OR 
-# pip install protobuf
-```
-
 #### Configure paths and tunables
 
-Fill up the config files `pbft_logistics.cfg` and `pbft_tunables.yaml` or use defaults.
-
+Fill up the config files `conf/pbft_logistics.cfg` and `conf/pbft_tunables.yaml` or use defaults.
 
 #### Install dependencies
 
 __Recommended__: Use a python3 virtual environment
 
 ```
 virtualenv -p python3 venv
-virtualenv -p python3 venv
 source venv/bin/activate
 pip install -r requirements.txt
 ```
 
+##### Install Google's Protobuf
+
+Download and install [google protobuf](https://github.com/google/protobuf/tree/master/python/google)
+
+```
+# brew install protobuf
+OR 
+# pip install protobuf
+```
+
 #### Generate required content as a precusory
 
 Then proceed as follows:
 
 ```
-# generate requests_pb2.py from requests.proto file
-./proto.sh
+# change to folder trueconsensus
+cd trueconsensus/
+
+# generate proto/requests_pb2.py from proto/requests.proto file
+./utils/generate_proto.sh
 
 # generate asymm keypairs
-python make_keys.py
+python -m utils.make_keys
 
 # generate requests
-./generate_requests_dat.py 
+python -m utils.generate_requests_dat
 ```
 
 ### Run
 
-Server: `./server.py`
+Server: `./engine.py`
 
 Client: `./client.py`
 

trueconsensus/fastchain/pbft-py/README.md renamed to trueconsensus/README.md

@@ -11,8 +11,8 @@
 import socks
 # import time
 
-import request_pb2
-from config import client_address, \
+from proto import request_pb2
+from fastchain.config import client_address, \
     client_id, \
     RL, \
     client_logger, \

trueconsensus/fastchain/pbft-py/client.py renamed to trueconsensus/client.py

@@ -0,0 +1,28 @@
+# pbft core configurations
+# name: pbft base configuration
+testbed_config:
+  total: 5 # excluding base client
+  client_id: 5 # total-1 => 0-indexed
+  server_id_init: 4 # => 0 indexed
+  threading_enabled: true
+  requests:
+    max: 256
+    batch_size: 32
+general:
+  max_fail: 1
+  base_port: 49500
+  tor_socksport_range: 9050,9150
+# refer to  README.md#parameterized-by-following section for these configurables
+slowchain:
+  csize: 0
+bft_committee:
+  lambda: 1
+  timeout: 300 # seconds
+  tbft: 1
+  csize: 0
+  th: 10 # adjusted to ⌈csize/3⌉ later
+  actual_delta: 0
+  delta: 1 # ms to be adjusted from network ping test
+  # https://github.com/matthieu-lapeyre/network-benchmark/blob/master/network_test.py
+  chain: []
+  alpha: 0 # initial adversary hash power

trueconsensus/fastchain/pbft-py/pbft_logistics.cfg renamed to trueconsensus/conf/pbft_logistics.cfg

@@ -1,5 +1,5 @@
-import proto_message as message
-from config import config_general
+from proto import proto_message as message
+from fastchain.config import config_general
 
 
 class bank: