Merge pull request #1664 from theQRL/dev

Merging Hard fork code

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: qrledger/qrl-docker:xenial
+      - image: qrledger/qrl-docker-ci:xenial
     steps:
       - checkout
       - run: pip install -U setuptools
@@ -14,7 +14,7 @@ jobs:
 
   test_leaks_CLI:
     docker:
-      - image: qrledger/qrl-docker:xenial
+      - image: qrledger/qrl-docker-ci:xenial
     steps:
       - checkout
       - run: pip install -U setuptools
@@ -25,15 +25,15 @@ jobs:
 
   flake8:
     docker:
-      - image: qrledger/qrl-docker:xenial
+      - image: qrledger/qrl-docker-ci:xenial
     steps:
       - checkout
       - run: pip install -U setuptools
       - run: flake8
 
   test_leaks_other:
     docker:
-      - image: qrledger/qrl-docker:xenial
+      - image: qrledger/qrl-docker-ci:xenial
     steps:
       - checkout
       - run: pip install -U setuptools
@@ -44,7 +44,7 @@ jobs:
 
   build_trusty:
     docker:
-      - image: qrledger/qrl-docker:trusty
+      - image: qrledger/qrl-docker-ci:trusty
     steps:
       - checkout
       - run: pip install -U setuptools
@@ -55,7 +55,7 @@ jobs:
 
   build_bionic:
     docker:
-      - image: qrledger/qrl-docker:bionic
+      - image: qrledger/qrl-docker-ci:bionic
     steps:
       - checkout
       - run: pip install -U setuptools
@@ -65,7 +65,7 @@ jobs:
 
   integration_fast:
     docker:
-      - image: qrledger/qrl-docker:xenial
+      - image: qrledger/qrl-docker-ci:xenial
     environment:
       PYTHONPATH: /root/project:/root/project/tests_integration
       TESTINPLACE: 1
@@ -79,7 +79,7 @@ jobs:
 
   integration_smoke:
     docker:
-      - image: qrledger/qrl-docker:xenial
+      - image: qrledger/qrl-docker-ci:xenial
     environment:
       PYTHONPATH: /root/project:/root/project/tests_integration
       TESTINPLACE: 1
@@ -95,21 +95,29 @@ jobs:
 
   integration_fuzzing:
     docker:
-      - image: qrledger/qrl-docker:xenial
+      - image: qrledger/qrl-docker-ci:xenial
     environment:
       PYTHONPATH: /root/project:/root/project/tests_integration
       TESTINPLACE: 1
     steps:
       - checkout
+      - run: apt-get -y remove python3-dev python3-pip python3-venv --purge
+      - run: add-apt-repository ppa:deadsnakes/ppa -y
+      - run: apt-get update
+      - run: apt-get -y install python3.6 python3.6-dev python3-pip python3.6-venv
+      - run: update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.6 1
+      - run: python3 -m pip install
+      - run: python3 -m pip install -U pip setuptools
       - run: git submodule update --init --recursive --remote
-      - run: apt install -y python3-venv
-      - run: pip install -U -r tests_integration/requirements.txt
-      - run: pip install git+https://github.com/CurataEng/hypothesis-protobuf.git
+      - run: python3 -m pip install -U -r requirements.txt
+      - run: python3 -m pip install -U -r test-requirements.txt
+      - run: python3 -m pip install -U -r tests_integration/requirements.txt
+      - run: python3 -m pip install git+https://github.com/CurataEng/hypothesis-protobuf.git
       - run: pytest tests_integration/tests/python/fuzzing
 
   deploy-pypi:
     docker:
-      - image: qrledger/qrl-docker:xenial
+      - image: qrledger/qrl-docker-ci:xenial
     steps:
       - checkout
       - run: git submodule update --init --recursive

.codacy.yml

@@ -10,3 +10,7 @@ exclude_paths:
   - 'src/qrl/_version.py'
   - 'src/qrl/measure.py'
   - 'start_qrl.py'
+engines:
+  duplication:
+    exclude_paths:
+      - 'tests/**'

.gitignore

@@ -12,6 +12,7 @@ __pycache__/*
 .DS_Store
 .*.swp
 */.ipynb_checkpoints/*
+*_trial_temp
 
 # Project files
 .ropeproject

requirements.txt

@@ -1,11 +1,11 @@
 # Fixing sphinx version due to https://github.com/sphinx-doc/sphinx/issues/3976
 setuptools==39.0.1
-leveldb==0.20
+plyvel==1.2.0
 ntplib==0.3.3
-Twisted==19.2.1
+Twisted>=19.10.0
 colorlog==3.1.0
 simplejson==3.11.1
-PyYAML==5.1
+PyYAML==5.3
 grpcio-tools>=1.9.0,<=1.10.0
 grpcio>=1.9.0,<=1.10.0
 service_identity==17.0.0
@@ -15,7 +15,8 @@ six==1.11
 click==6.7
 pyqrllib>=0.99.3,<1.1.0
 pyqryptonight>=0.99.3,<1.1.0
-Flask==0.12.3
+pyqrandomx>=0.0.0,<1.0.0
+Flask>=1.0.0
 json-rpc==1.10.8
 cryptography==2.3
 mock==2.0.0

setup.cfg

@@ -26,12 +26,12 @@ package_dir =
 # install_requires = numpy; scipy
 install_requires =
     setuptools==39.0.1
-    leveldb==0.20
+    plyvel==1.2.0
     ntplib==0.3.3
-    Twisted==19.2.1
+    Twisted>=19.7.0
     colorlog==3.1.0
     simplejson==3.11.1
-    PyYAML==5.1
+    PyYAML==5.3
     grpcio-tools>=1.9.0,<=1.10.0
     grpcio>=1.9.0,<=1.10.0
     service_identity==17.0.0
@@ -41,7 +41,8 @@ install_requires =
     click==6.7
     pyqrllib>=0.99.3,<1.1.0
     pyqryptonight>=0.99.3,<1.1.0
-    Flask==0.12.3
+    pyqrandomx>=0.0.0,<1.0.0
+    Flask>=1.0.0
     json-rpc==1.10.8
     cryptography==2.3
     mock==2.0.0