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

README.md

@@ -10,10 +10,8 @@ sudo apt-get install build-essential cmake python3-dev --no-install-recommends
 git submodule update --init --recursive
 python3 -m venv .venv
 . .venv/bin/activate
-pip install wheel
-pip install .
-pip install lib/chiapos
-pip install lib/python-prompt-toolkit
+pip install -e .
+pip install -r requirements.txt
 
 cd lib/chiavdf/fast_vdf
 # Install libgmp, libboost, and libflint, and then run the following

lib/aiter

@@ -1 +1 @@
-Subproject commit 81163c4e1066c9e4320ef818a8f540a7bac97301
+Subproject commit 2da160c58f848e2d67d57912eef59a8e8a62eacf

lib/chiavdf/fast_vdf/vdf.h

@@ -114,7 +114,7 @@ public:
     }
 
     void reduce(form& inf) {
-#if 0
+#if 1
         // Old reduce from Sundersoft form
         inf.reduce();
 #else
@@ -433,7 +433,7 @@ struct Proof {
     std::vector<unsigned char> proof;
 };
 
-#define PULMARK 1
+#define PULMARK 0
 
 form GenerateProof(form &y, form &x_init, integer &D, uint64_t done_iterations, uint64_t num_iterations, uint64_t k, uint64_t l, WesolowskiCallback& weso, bool& stop_signal) {
     auto t1 = std::chrono::high_resolution_clock::now();

requirements.txt

@@ -7,8 +7,6 @@ bitstring==3.1.6
 blspy==0.1.11
 cbor2==4.1.2
 cffi==1.13.1
-chiablockchain==0.1.2
-chiapos==0.2.2
 cppimport==18.11.8
 cryptography==2.8
 decorator==4.4.0
@@ -28,7 +26,6 @@ parso==0.5.1
 pexpect==4.7.0
 pickleshare==0.7.5
 pluggy==0.13.0
-prompt-toolkit==3.0.0
 ptyprocess==0.6.0
 py==1.8.0
 pybind11==2.4.3
@@ -48,3 +45,5 @@ wcwidth==0.1.7
 zipp==0.6.0
 -e lib/chiapos
 -e lib/aiter
+-e lib/chiapos
+-e lib/python-prompt-toolkit

src/server/server.py

@@ -5,7 +5,6 @@ from typing import Tuple, AsyncGenerator, Callable, Optional, List, Any, Dict
 from aiter.server import start_server_aiter
 from aiter.map_aiter import map_aiter
 from aiter.join_aiters import join_aiters
-from aiter.parallel_map_aiter import parallel_map_aiter
 from aiter.iter_to_aiter import iter_to_aiter
 from aiter.aiter_forker import aiter_forker
 from aiter.push_aiter import push_aiter
@@ -124,16 +123,16 @@ class ChiaServer:
         handshake_finished_2 = forker.fork(is_active=True)
 
         # Reads messages one at a time from the TCP connection
-        messages_aiter = join_aiters(parallel_map_aiter(self.connection_to_message, handshake_finished_1, 100))
+        messages_aiter = join_aiters(map_aiter(self.connection_to_message, handshake_finished_1, 100))
 
         # Handles each message one at a time, and yields responses to send back or broadcast
-        responses_aiter = join_aiters(parallel_map_aiter(
+        responses_aiter = join_aiters(map_aiter(
             partial_func.partial_async_gen(self.handle_message, api),
             messages_aiter, 100))
 
         # Uses a forked aiter, and calls the on_connect function to send some initial messages
         # as soon as the connection is established
-        on_connect_outbound_aiter = join_aiters(parallel_map_aiter(self.connection_to_outbound,
+        on_connect_outbound_aiter = join_aiters(map_aiter(self.connection_to_outbound,
                                                                    handshake_finished_2, 100))
         # Also uses the instance variable _outbound_aiter, which clients can use to send messages
         # at any time, not just on_connect.
@@ -143,7 +142,7 @@ class ChiaServer:
                                                      outbound_aiter_mapped]))
 
         # For each outbound message, replicate for each peer that we need to send to
-        expanded_messages_aiter = join_aiters(parallel_map_aiter(
+        expanded_messages_aiter = join_aiters(map_aiter(
             self.expand_outbound_messages, responses_aiter, 100))
 
         # This will run forever. Sends each message through the TCP connection, using the