Merge branch 'integration'

Author: Yostra

.flake8

@@ -1,3 +1,4 @@
 [flake8]
 max-line-length = 120
 exclude = ./typings/**/*
+ignore = E203,W503

.github/workflows/pythonpackage.yml

@@ -7,6 +7,7 @@ jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       max-parallel: 4
       matrix:
         python-version: [3.7, 3.8]
@@ -18,31 +19,33 @@ jobs:
       uses: actions/[email protected]
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
+    - name: Install Mac dependencies
+      if: startsWith(matrix.os, 'mac')
+      run: |
+        brew update && brew install gmp boost openssl
+    - name: Install ubuntu dependencies
+      if: startsWith(matrix.os, 'ubuntu')
+      run: |
+        sudo apt-get install libboost-all-dev libssl-dev
+    - name: Run install script
+      env:
+        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
       run: |
-        brew update && brew install gmp boost || echo ""
         sh install.sh
-    - name: Test proof of space
-      run: |
-        cd lib/chiapos
-        mkdir -p build && cd build
-        cmake ../
-        cmake --build . -- -j 6
-        ./RunTests
-        cd ../../../
-    - name: Test vdf
-      run: |
-        . .venv/bin/activate
-        cd lib/chiavdf/fast_vdf
-        python python_bindings/test_verifier.py
-        cd ../../../
+    - name: Install time lord
+      run: |
+        . ./activate
+        sh install-timelord.sh
+    - name: Install developer requirements
+      run: |
+        venv/bin/python -m pip install -r requirements-dev.txt
     - name: Lint source with flake8
       run: |
-        ./.venv/bin/flake8 src
+        ./venv/bin/flake8 src
     - name: Lint source with mypy
       run: |
-        ./.venv/bin/mypy src tests
+        ./venv/bin/mypy src tests
     - name: Test blockchain code with pytest
       run: |
-        ./.venv/bin/py.test tests -s -v
+        ./venv/bin/py.test tests -s -v
 

.github/workflows/upload-pypi-source.yml

@@ -0,0 +1,48 @@
+name: Build
+
+on: [push, pull_request]
+
+jobs:
+  upload_source_dist:
+    name: Upload source distribution
+    runs-on: [macos-latest]
+
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        fetch-depth: 0
+        # we need fetch-depth 0 so setuptools_scm can resolve tags
+    - uses: actions/setup-python@v1
+      name: Install Python
+      with:
+        python-version: '3.7'
+
+    - name: Build source distribution
+      run: |
+        pip install pep517
+        python -m pep517.build --source --out-dir dist .
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v1
+      with:
+        name: dist
+        path: ./dist
+
+    - name: Install twine
+      run: pip install twine
+
+    - name: Publish distribution to Test PyPI
+      env:
+        TWINE_REPOSITORY_URL: https://test.pypi.org/legacy/
+        TWINE_USERNAME: __token__
+        TWINE_NON_INTERACTIVE: 1
+        TWINE_PASSWORD: ${{ secrets.test_pypi_password }}
+      run: twine upload --non-interactive --skip-existing --verbose 'dist/*'
+
+    - name: Publish distribution to PyPI
+      if: startsWith(github.event.ref, 'refs/tags')
+      env:
+        TWINE_USERNAME: __token__
+        TWINE_NON_INTERACTIVE: 1
+        TWINE_PASSWORD: ${{ secrets.pypi_password }}
+      run: twine upload --non-interactive --skip-existing --verbose 'dist/*'

.gitignore

@@ -52,6 +52,8 @@ pip-delete-this-directory.txt
 .python-version
 .eggs
 .venv
+venv
+activate
 
 # mypy
 .mypy_cache/
@@ -61,3 +63,9 @@ pip-delete-this-directory.txt
 
 # Packaging
 chia-blockchain.tar.gz
+
+# Electron wallet node modules
+src/wallet/electron/node_modules/
+
+# Node modules
+**/node_modules

CONTRIBUTING.md

@@ -12,7 +12,7 @@ If you want to learn more about this project, read the [wiki](https://github.com
 We would be pleased to accept code contributions to this project.
 As we are in the alpha stage, the main priority is getting a robust blockchain up and running, with as many of the mainnet features as possible.
 You can visit our [Trello project board](https://trello.com/b/ZuNx7sET) to get a sense of what is in the backlog.
-Generally things to the left are in progress or done. Some things go through "Coming up soon" but some will come directly out of other columns. 
+Generally things to the left are in progress or done. Some things go through "Coming up soon" but some will come directly out of other columns.
 Usually the things closer to the top of each column are the ones that will be worked on soonest.
 If you are interested in cryptography, math, or just like hacking in python, there are many interesting problems to work on.
 Contact any of the team members on keybase: https://keybase.io/team/chia_network.public, which we use as the main communication method and you can comment on any Trello card.
@@ -22,15 +22,15 @@ The first time the tests are run, BlockTools will create and persist many plots.
 proofs of space during testing. The next time tests are run, this won't be necessary.
 
 ```bash
-black src tests && flake8 src && mypy src tests
+black src tests && flake8 src --exclude src/wallet/electron/node_modules  && mypy src tests
 py.test tests -s -v
 ```
 Black is used as an automatic style formatter to make things easier, and flake8 helps ensure consistent style.
 Mypy is very useful for ensuring objects are of the correct type, so try to always add the type of the return value, and the type of local variables.
 
 ### Configure VS code
 1. Install Python extension
-2. Set the environment to ./.venv/bin/python
+2. Set the environment to ./venv/bin/python
 3. Install mypy plugin
 4. Preferences > Settings > Python > Linting > flake8 enabled
 5. Preferences > Settings > Python > Linting > mypy enabled

INSTALL.md

@@ -0,0 +1,115 @@
+## Installation
+
+To install the chia-blockchain node, follow the instructions according to your operating system.
+After installing, follow the remaining instructions in [README.md](README.md) to run the software.
+
+### MacOS
+Make sure [brew](https://brew.sh/) is available before starting the setup.
+```bash
+brew upgrade python
+brew install npm gmp
+
+git clone https://github.com/Chia-Network/chia-blockchain.git
+cd chia-blockchain
+
+sh install.sh
+. ./activate
+```
+
+### Debian/Ubuntu
+
+On Ubuntu 18.04, you need python 3.7. It's not available in the default
+repository, so you need to add an alternate source. You can skip this step
+if you install in Ubuntu 19.x or higher.
+
+```bash
+# for add-apt-repository
+sudo apt install software-properties-common -y
+sudo add-apt-repository ppa:deadsnakes/ppa -y
+```
+
+Install dependencies for Ubuntu 18.04 from above or Ubuntu 19.x or higher.
+```bash
+sudo apt-get update
+sudo apt-get install python3.7-venv python3.7-dev python3-pip git -y
+
+git clone https://github.com/Chia-Network/chia-blockchain.git
+cd chia-blockchain
+
+sh install.sh
+
+. ./activate
+```
+
+### Windows (WSL)
+#### Install WSL2 + Ubuntu 18.04 LTS
+
+From an Administrator PowerShell
+`dism.exe /online /enable-feature /featurename:Microsoft-Windows-Subsystem-Linux /all /norestart`
+and then
+`dism.exe /online /enable-feature /featurename:VirtualMachinePlatform /all /norestart`.
+This usually requires a reboot. Once that is complete, install Ubuntu 18.04 LTS from the Microsoft Store and run it. Then follow the steps below.
+```bash
+# add-apt-repository
+sudo add-apt-repository ppa:deadsnakes/ppa -y
+
+sudo apt-get -y update
+sudo apt-get -y upgrade
+
+sudo apt-get install python3.7-venv python3.7-dev python3-pip git -y
+
+git clone https://github.com/Chia-Network/chia-blockchain.git
+cd chia-blockchain
+
+sh install.sh
+. ./activate
+```
+You will need to download the Windows native Wallet and unzip into somewhere convenient in Windows.
+
+[main.js-win32-x64.zip](https://hosted.chia.net/beta-1.0-win64-wallet/main.js-win32-x64.zip)
+
+Instead of `chia-start-wallet-ui &` as explained in the [README.md](README.md) you run `chia-start-wallet-server &` in Ubuntu/WSL 2 to allow the Wallet to connect to the Full Node running in Ubuntu/WSL 2. Once you've enabled `chia-start-wallet-server &` you can run `chia.exe` from the unzipped `chia-win32-x64` directory.
+
+### Amazon Linux 2
+
+```bash
+sudo yum update
+sudo yum install python3 python3-devel git
+
+# Install npm and node
+curl -sL https://rpm.nodesource.com/setup_10.x | sudo bash -
+sudo yum install nodejs
+
+# uPnP and setproctitle require compiling
+sudo yum install gcc
+
+git clone https://github.com/Chia-Network/chia-blockchain.git
+cd chia-blockchain
+
+sh install.sh
+
+. ./activate
+```
+
+### CentOS 7.7 or newer
+
+```bash
+sudo yum update
+sudo yum install gcc openssl-devel bzip2-devel libffi libffi-devel
+sudo yum install libsqlite3x-devel
+
+# Install python 3.7
+wget https://www.python.org/ftp/python/3.7.7/Python-3.7.7.tgz
+tar -zxvf Python-3.7.7.tgz ; cd Python-3.7.7
+./configure --enable-optimizations; sudo make install; cd ..
+
+# Install npm and node
+curl -sL https://rpm.nodesource.com/setup_10.x | sudo bash -
+sudo yum install nodejs
+
+git clone https://github.com/Chia-Network/chia-blockchain.git
+cd chia-blockchain
+
+sh install.sh
+. ./activate
+```

LINUX_TIMELORD.md

@@ -0,0 +1,11 @@
+The Linux chiavdf wheels are currently missing an executable required to run a timelord.
+If you want to run a timelord on Linux, you must install the wheel from source (which may require
+some additional packages).
+
+```
+source ./activate
+pip install --force --no-binary chiavdf chiavdf==0.12.1
+```
+
+If the compile fails, it's likely due to a missing dependency. See [INSTALL.md](INSTALL.md) to determine
+how to install dependent packages for your system.