Merge branch 'integration' of github.com:Chia-Network/chia-blockchain into integration

Author: mariano54

INSTALL.md

@@ -61,12 +61,14 @@ 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
 
-# You will need to download the Windows native Wallet
-# and start chia-websocket-server in WSL2 instead of chia-wallet-gui
-
 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
 

README.md

@@ -31,6 +31,12 @@ If you want to see std::out log output, modify the logging.std_out variable in .
 chia-start-node &
 chia-start-wallet-gui &
 ```
+If you're using Windows/WSL 2, you should instead run:
+```bash
+chia-start-node &
+chia-start-wallet-server &
+```
+And then run `chia.exe` from the unzipped `chia-win32-x64` directory in Windows (not Ubuntu/WSL 2.)
 
 ## Step 3b: Run a farmer + full node + wallet
 Instead of running only a full node (as in 4a), you can also run a farmer.
@@ -45,6 +51,13 @@ chia-create-plots -k 20 -n 10
 chia-start-farmer &
 chia-start-wallet-gui &
 ```
+If you're using Windows/WSL 2, you should instead run:
+```bash
+chia-create-plots -k 20 -n 10
+chia-start-farmer &
+chia-start-wallet-server &
+```
+And then run `chia.exe` from the unzipped `chia-win32-x64` directory in Windows (not Ubuntu/WSL 2.)
 
 
 ## Step 3c: Run a timelord + full node + wallet
@@ -65,6 +78,8 @@ When running the servers on Mac OS, allow the application to accept incoming con
 
 Ubuntu 18.04 LTS, 19.xx, Amazon Linux 2, and CentOS 7.7 or newer are the easiest linux install environments currently.
 
+Windows users (and others) can [download Virtualbox](https://www.virtualbox.org/wiki/Downloads) and install [Ubuntu Desktop 19.10](https://ubuntu.com/download/desktop) in a virtual machine. This will allow you to run all of the chia tools and use the Wallet GUI. There are lots of good howtos on the web including [this one on installing Ubuntu 19.10 Desktop](https://techsviewer.com/how-to-install-ubuntu-19-10-on-virtualbox/).
+
 UPnP is enabled by default, to open port 8444 for incoming connections. If this causes issues,
 you can disable it in the configuration. Some routers may require port forwarding, or enabling
 UPnP in the router configuration.

scripts/chia-start-wallet-server

@@ -0,0 +1,4 @@
+# Starts a websocket for GUI Wallet
+python -m src.wallet.websocket_server
+
+wait

setup.py

@@ -71,6 +71,7 @@
         "scripts/chia-start-sim",
         "scripts/chia-start-timelord",
         "scripts/chia-start-wallet-gui",
+        "scripts/chia-start-wallet-server",
         "scripts/chia-stop-all",
     ],
     entry_points={