Lazy bootstrap cleanup & basic improvements (#2292)

* Lazy bootstrap cleanup
* Increase lazy pulls flushing speed
* Lazy backlog cleanup check
* Block count cache fix

nano/lib/blocks.cpp

@@ -125,6 +125,11 @@ nano::qualified_root nano::block::qualified_root () const
 	return nano::qualified_root (previous (), root ());
 }
 
+nano::amount nano::block::balance () const
+{
+	return 0;
+}
+
 void nano::send_block::visit (nano::block_visitor & visitor_a) const
 {
 	visitor_a.send_block (*this);
@@ -378,6 +383,11 @@ nano::block_hash nano::send_block::root () const
 	return hashables.previous;
 }
 
+nano::amount nano::send_block::balance () const
+{
+	return hashables.balance;
+}
+
 nano::signature nano::send_block::block_signature () const
 {
 	return signature;
@@ -1187,6 +1197,11 @@ nano::account nano::state_block::representative () const
 	return hashables.representative;
 }
 
+nano::amount nano::state_block::balance () const
+{
+	return hashables.balance;
+}
+
 nano::signature nano::state_block::block_signature () const
 {
 	return signature;

nano/lib/blocks.hpp

@@ -76,6 +76,7 @@ class block
 	// Link field for state blocks, zero otherwise.
 	virtual nano::block_hash link () const;
 	virtual nano::account representative () const;
+	virtual nano::amount balance () const;
 	virtual void serialize (nano::stream &) const = 0;
 	virtual void serialize_json (std::string &, bool = false) const = 0;
 	virtual void serialize_json (boost::property_tree::ptree &) const = 0;
@@ -115,6 +116,7 @@ class send_block : public nano::block
 	void block_work_set (uint64_t) override;
 	nano::block_hash previous () const override;
 	nano::block_hash root () const override;
+	nano::amount balance () const override;
 	void serialize (nano::stream &) const override;
 	bool deserialize (nano::stream &);
 	void serialize_json (std::string &, bool = false) const override;
@@ -310,6 +312,7 @@ class state_block : public nano::block
 	nano::block_hash root () const override;
 	nano::block_hash link () const override;
 	nano::account representative () const override;
+	nano::amount balance () const override;
 	void serialize (nano::stream &) const override;
 	bool deserialize (nano::stream &);
 	void serialize_json (std::string &, bool = false) const override;

nano/node/blockprocessor.cpp

@@ -226,6 +226,7 @@ void nano::block_processor::verify_state_blocks (nano::unique_lock<std::mutex> &
 			else
 			{
 				blocks_filter.erase (filter_item (hashes[i], blocks_signatures[i]));
+				requeue_invalid (hashes[i]);
 			}
 			items.pop_front ();
 		}
@@ -477,6 +478,7 @@ nano::process_return nano::block_processor::process_one (nano::write_transaction
 			{
 				node.logger.try_log (boost::str (boost::format ("Bad signature for: %1%") % hash.to_string ()));
 			}
+			requeue_invalid (hash);
 			break;
 		}
 		case nano::process_result::negative_spend:
@@ -571,3 +573,12 @@ nano::block_hash nano::block_processor::filter_item (nano::block_hash const & ha
 	blake2b_final (&state, result.bytes.data (), sizeof (result.bytes));
 	return result;
 }
+
+void nano::block_processor::requeue_invalid (nano::block_hash const & hash_a)
+{
+	auto attempt (node.bootstrap_initiator.current_attempt ());
+	if (attempt != nullptr && attempt->mode == nano::bootstrap_mode::lazy)
+	{
+		attempt->lazy_requeue (hash_a);
+	}
+}

nano/node/blockprocessor.hpp

@@ -59,6 +59,7 @@ class block_processor final
 	void verify_state_blocks (nano::unique_lock<std::mutex> &, size_t = std::numeric_limits<size_t>::max ());
 	void process_batch (nano::unique_lock<std::mutex> &);
 	void process_live (nano::block_hash const &, std::shared_ptr<nano::block>, const bool = false);
+	void requeue_invalid (nano::block_hash const &);
 	bool stopped;
 	bool active;
 	bool awaiting_write{ false };