Beta 1.4 release - Merge pull request #201 from Chia-Network/beta-1.4

Beta 1.4

Author: hoffmang9

.github/workflows/pythonpackage.yml

@@ -1,4 +1,4 @@
-name: Python package
+name: Build Ubuntu and MacOS
 
 
 on: [push]
@@ -28,8 +28,8 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install python3.7-venv python3.7-distutils git -y
-      #sudo apt-get install libboost-all-dev libssl-dev
-
+        sudo apt-get install nodejs-dev node-gyp libssl1.0-dev
+      # Brutal work around for Github ci
 
     - name: Run install script
       env:

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

@@ -1,4 +1,4 @@
-name: Build
+name: Upload source distribution to PyPI
 
 on: [push, pull_request]
 

.github/workflows/windows-installer.yml

@@ -3,12 +3,59 @@ name: Build Windows Installer
 on: [push, pull_request]
 
 jobs:
-  upload_source_dist:
-    name: Upload source distribution
+  build:
+    name: Build Windows .msi
     runs-on: [windows-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 3.7
+      with:
+        python-version: '3.7'
+
+    - name: curl miniupnpc and setproctitle
+      working-directory: ${{ github.workspace }}\electron-wix\blockchain
+      run: |
+        curl -OL --show-error --fail https://download.chia.net/simple/miniupnpc/miniupnpc-2.1-cp37-cp37m-win_amd64.whl
+        curl -OL --show-error --fail https://download.chia.net/simple/setproctitle/setproctitle-1.1.10-cp37-cp37m-win_amd64.whl
+
+    - name: Collect and Create wheels for chia-blockchain
+      run: |
+        python -m pip install --upgrade pip
+        pip install pep517 wheel
+        pip wheel --use-pep517 --only-binary cbor2 --extra-index-url https://download.chia.net/simple/ -f ${{ github.workspace }} --wheel-dir=${{ github.workspace }}\electron-wix\blockchain ${{ github.workspace }}\.
+
+    - name: Install electron-packager
+      run: |
+        npm install electron-packager -g
+
+    - name: npm install
+      working-directory: ${{ github.workspace }}\electron-ui
+      run: |
+        npm install --runtime=electron --target=1.7.6
+
+    - name: curl Visual C++ 2019 redistributable # Windows has curl natively
+      working-directory: ${{ github.workspace }}\electron-wix\prerequisites\
+      run: curl -OL --show-error --fail https://aka.ms/vs/16/release/vc_redist.x64.exe
+
+    - name: curl Python 3.7.6 Installer
+      working-directory: ${{ github.workspace }}\electron-wix\prerequisites\
+      run: curl -OL --show-error --fail https://www.python.org/ftp/python/3.7.6/python-3.7.6-amd64.exe
+
+    - name: Build Windows installer with Wix
+      env:
+        version: 0.1.10 # TODO Need to create this from setuptools_scm for Windows
+      working-directory: ${{ github.workspace }}\electron-wix
+      run: |
+        .\rebuild-all.ps1
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v1
+      with:
+        name: Windows-Installers
+        path: ${{ github.workspace }}\electron-wix\final

.gitignore

@@ -64,8 +64,14 @@ activate
 # Packaging
 chia-blockchain.tar.gz
 
+# Timelord utilities
+vdf_bench
+
 # Electron wallet node modules
 src/wallet/electron/node_modules/
 
 # Node modules
 **/node_modules
+
+# Offer Files
+*.offer

CONTRIBUTING.md

@@ -4,7 +4,7 @@ We are happy that you are taking a look at the code for Chia, a proof of space a
 
 A lot of fascinating new cryptography and blockchain concepts are used and implemented here.
 This repo includes the code for the Chia full node, farmer, and timelord (in src), which are all written in python.
-It also includes a verifiable delay function implementation under lib/chiavdf (in c/c++), and a proof of space implementation under lib/chiapos.
+It also includes a verifiable delay function implementation that it imports from the [chiavdf repo](https://github.com/Chia-Network/chiavdf) (in c/c++), and a proof of space implementation that it imports from the [chiapos repo](https://github.com/Chia-Network/chiapos). BLS signatures are imported from the [bls-signatures repo](https://github.com/Chia-Network/bls-signatures) as blspy. There is an additional dependency on the [chiabip158 repo](https://github.com/Chia-Network/chiabip158). For major platforms, binary and source wheels are shipped to PyPI from each dependent repo and then chia-blockchain can pip install those from PyPI or they can be prepackaged as is done for the Windows installer. On unsupported ploatforms, pip will fall back to the source distributions to be compiled locally.
 
 If you want to learn more about this project, read the [wiki](https://github.com/Chia-Network/chia-blockchain/wiki), or check out the [green paper](https://www.chia.net/assets/ChiaGreenPaper.pdf).
 

INSTALL.md

@@ -1,137 +1,5 @@
-## Installation
+# 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.
+Install instructions have been moved to the [INSTALL](https://github.com/Chia-Network/chia-blockchain/wiki/INSTALL) section of the repository [Wiki](https://github.com/Chia-Network/chia-blockchain/wiki)
 
-### MacOS
-Currently Catalina (10.15.x) is required.
-Make sure [brew](https://brew.sh/) is available before starting the setup.
-```bash
-git clone https://github.com/Chia-Network/chia-blockchain.git
-cd chia-blockchain
-
-sh install.sh
-. ./activate
-```
-
-### Debian/Ubuntu
-
-Install dependencies for Ubuntu 18.04, Ubuntu 19.x or newer.
-```bash
-sudo apt-get update
-sudo apt-get install python3.7-venv python3.7-distutils git -y
-
-# Either checkout the source and install
-git clone https://github.com/Chia-Network/chia-blockchain.git
-cd chia-blockchain
-
-sh install.sh
-
-. ./activate
-
-# Or install chia-blockchain as a binary package
-python3.7 -m venv venv
-ln -s venv/bin/activate
-. ./activate
-pip install --upgrade pip
-pip install -i https://hosted.chia.net/simple/ miniupnpc==2.0.2 setproctitle==1.1.10 cbor2==5.0.1
-
-pip install chia-blockchain==1.0.beta3
-```
-
-### Windows (WSL)
-#### Install WSL2 + Ubuntu 18.04 LTS
-
-From an Administrator PowerShell
-```
-dism.exe /online /enable-feature /featurename:Microsoft-Windows-Subsystem-Linux /all /norestart
-dism.exe /online /enable-feature /featurename:VirtualMachinePlatform /all
-```
-You will be prompted to reboot. Once that is complete, install Ubuntu 18.04 LTS from the Microsoft Store and run it and complete its initial install steps. You now have linux bash shell that can run linux native software on Windows.
-
-Then follow the steps below which are the same as the usual Ubuntu instructions above.
-```bash
-sudo apt-get update
-sudo apt-get install python3.7-venv python3.7-distutils git -y
-
-# Either checkout the source and install
-git clone https://github.com/Chia-Network/chia-blockchain.git
-cd chia-blockchain
-
-sh install.sh
-
-. ./activate
-
-# Or install chia-blockchain as a binary package
-python3.7 -m venv venv
-ln -s venv/bin/activate
-. ./activate
-pip install --upgrade pip
-pip install -i https://hosted.chia.net/simple/ miniupnpc==2.0.2 setproctitle==1.1.10 cbor2==5.0.1
-
-pip install chia-blockchain==1.0.beta3
-```
-You will need to download the Windows native Wallet and unzip into somewhere convenient in Windows. You may have to choose "More Info" and "Run Anyway" to be able to run the currently unsigned installer. This will place a Chia icon in your Start menu and on your Desktop that starts the Wallet UI.
-
-[Download: Chia-Wallet-Install-0.1.3](https://hosted.chia.net/beta-1.3-win64-wallet/Chia-Wallet-Install-0.1.3.msi)
-
-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" from the Start menu or your Desktop.
-
-### Amazon Linux 2
-
-```bash
-sudo yum update -y
-sudo yum install python3 git -y
-
-git clone https://github.com/Chia-Network/chia-blockchain.git
-cd chia-blockchain
-
-sh install.sh
-
-. ./activate
-
-# Or install chia-blockchain as a binary package
-curl -sL https://rpm.nodesource.com/setup_10.x | sudo bash -
-sudo yum install -y nodejs
-
-python3.7 -m venv venv
-ln -s venv/bin/activate
-. ./activate
-pip install --upgrade pip
-pip install -i https://hosted.chia.net/simple/ miniupnpc==2.0.2 setproctitle==1.1.10 cbor2==5.0.1
-
-pip install chia-blockchain==1.0.beta3
-```
-
-### CentOS/RHEL 7.7 or newer
-
-```bash
-sudo yum update -y
-
-# Compiling python 3.7 is generally required on CentOS 7.7 and newer
-sudo yum install gcc openssl-devel bzip2-devel libffi libffi-devel -y
-sudo yum install libsqlite3x-devel -y
-
-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 ..
-
-# Download and install the source version
-git clone https://github.com/Chia-Network/chia-blockchain.git
-cd chia-blockchain
-
-sh install.sh
-. ./activate
-
-# Or install from binary wheels
-curl -sL https://rpm.nodesource.com/setup_10.x | sudo bash -
-sudo yum install -y nodejs
-
-python3.7 -m venv venv
-ln -s venv/bin/activate
-. ./activate
-pip install --upgrade pip
-pip install -i https://hosted.chia.net/simple/ miniupnpc==2.0.2 setproctitle==1.1.10 cbor2==5.0.1
-
-pip install chia-blockchain==1.0.beta3
-```
+After installing, follow the remaining instructions in the [Quick Start Guide](https://github.com/Chia-Network/chia-blockchain/wiki/Quick-Start-Guide) to run the software.