Merge pull request #1 from arcolife/devel

update master with latest

Author: arcolife

doc/DEV.md

@@ -0,0 +1,42 @@
+### Errors
+
+Collection of sommon common errors while coding, for troubleshooting:
+
+
+#### byte-like objects or str required
+
+1. `TypeError: a bytes-like object is required, not 'str'`
+
+```
+TypeError: a bytes-like object is required, not 'str'
+DEBUG:pbft_complete_run.log:--> Trying client ('127.0.0.1..
+```
+
+Your log file write mode was `wb` instead of `w`.
+
+
+2. `TypeError: key: expected bytes or bytearray, but got 'SigningKey'`
+
+```
+ File "/home/arcolife/workspace/projects/Truechain/forked/py-trueconsensus/trueconsensus/fastchain/pbft-py/node.py", line 878, in parse_request
+    req = message.check(key,req)
+  File "/home/arcolife/workspace/projects/Truechain/forked/py-trueconsensus/trueconsensus/fastchain/pbft-py/proto_message.py", line 40, in check
+    s = (sig.verify(key, sig_recv, digest_recv) and digest == digest_recv)
+  File "/home/arcolife/workspace/projects/Truechain/forked/py-trueconsensus/trueconsensus/fastchain/pbft-py/sig.py", line 25, in verify
+    h = hmac.new(key, bytes, hashlib.sha256)
+  File "/home/arcolife/workspace/projects/Truechain/forked/py-trueconsensus/trueconsensus/fastchain/pbft-py/venv/lib64/python3.6/hmac.py", line 144, in new
+    return HMAC(key, msg, digestmod)
+  File "/home/arcolife/workspace/projects/Truechain/forked/py-trueconsensus/trueconsensus/fastchain/pbft-py/venv/lib64/python3.6/hmac.py", line 42, in __init__
+    raise TypeError("key: expected bytes or bytearray, but got %r" % type(key).__name__)
+TypeError: key: expected bytes or bytearray, but got 'SigningKey'
+DEBUG:pbft_complete_run.log:--> Trying client ('127.0.0.1', 49504) from server ID: 3 
+```
+
+Make the following changes:
+
+```
+key = bytes(key.to_string())
+h = hmac.new(key, message, hashlib.sha256)
+```
+
+3. 

requirements.txt

@@ -0,0 +1,9 @@
+bitcoin==1.1.42
+docopt==0.6.2
+ecdsa==0.13
+pycrypto==2.6.1
+pykwalify==1.6.1
+PySocks==1.6.8
+python-dateutil==2.7.3
+PyYAML==3.12
+six==1.11.0

trueconsensus/__init__.py

@@ -1,36 +1,3 @@
-#!/usr/bin/env python
-#
-# Copyright (c) 2018 TrueChain Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""
-Relative package import structure 
-"""
-
-import os
-
-try:
-    # If a VERSION file exists, use it!
-    version_file = os.path.join(os.path.dirname(__file__), 'VERSION')
-    with open(version_file) as fh:
-        __version__ = fh.read().strip()
-except NameError:
-    __version__ = 'unknown (running code interactively?)'
-except IOError, ex:
-    __version__ = "unknown (%s)" % ex
-
-
 ###########################################################
 # PACKAGES
 ###########################################################
@@ -42,4 +9,5 @@
 # they override the same names inadvertently imported
 # from a subpackage)
 
-import snailchain, fastchain
+import trueconsensus.snailchain, \
+    trueconsensus.fastchain

trueconsensus/engine.py

@@ -13,3 +13,20 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+from snailchain import SnailChain
+from fastchain.bft import NodeBFT, \
+    ViewChangeInit, \
+    LedgerLog, \
+    BFTcommittee, \
+    SubProtoDailyBFT, \
+    Mempools
+
+
+class DailyOffChainConsensus(object):
+    def __init__(self):
+        self.chain = []
+        self._lambda = None
+
+    def preproess(self):
+        pass

trueconsensus/fastchain/__init__.py

@@ -0,0 +1,7 @@
+'''
+Package import structure
+'''
+
+from fastchain.bft import *
+from fastchain.node import *
+

trueconsensus/fastchain/bft.py

@@ -21,9 +21,11 @@
 import random
 from db.backends.level import LevelDB
 
-from logging import ledger
+# from logging import ledger
 
+from fastchain.node import Node
 from collections import OrderedDict, \
+    defaultdict, \
     namedtuple
 
 
@@ -48,7 +50,7 @@ def generate_txns(R, l):
 #     return uuid.uuid4().hex
 
 
-class Node(object):
+class NodeBFT(Node):
     '''
     @types:
     committee member
@@ -81,9 +83,9 @@ def __init__(self):
         pass
 
 
-def LedgerLog(object):
-    pass
-
+class LedgerLog(object):
+    def __init__(self):
+        pass
 
 class BFTcommittee(object):
     '''

trueconsensus/fastchain/ecdsa_sig.py

@@ -0,0 +1,23 @@
+import os
+# This Replica ID
+ID = 0
+
+# Number of replicas
+N = 4
+
+# Number of failures we can tolerate
+MAX_FAIL = 1
+
+# REPLICA LIST
+# IP, port
+RL = []
+RL.append(("127.0.0.1", 8001))
+RL.append(("127.0.0.1", 8002))
+RL.append(("127.0.0.1", 8003))
+RL.append(("127.0.0.1", 8004))
+
+client = (("127.0.0.1", 8101))
+
+# KEY DIRECTORY
+KD = os.getcwd() + "/keys"
+print KD

trueconsensus/fastchain/local_config.py

@@ -0,0 +1,15 @@
+*.pyc
+*log.txt
+*.out
+venv/
+__pycache__
+
+google/
+
+keys/
+
+*_commits.txt
+tx*.txt
+bank*.txt
+log/
+*.dat