Add ledger account iterator for the unconfirmed ledger set.

nano/core_test/system.cpp

@@ -94,10 +94,10 @@ TEST (system, DISABLED_generate_send_new)
 	system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);
 	{
 		auto transaction (node1.store.tx_begin_read ());
-		auto iterator1 (node1.store.account.begin (transaction));
-		ASSERT_NE (node1.store.account.end (), iterator1);
+		auto iterator1 (node1.ledger.any.account_begin (transaction));
+		ASSERT_NE (node1.ledger.any.account_end (), iterator1);
 		++iterator1;
-		ASSERT_EQ (node1.store.account.end (), iterator1);
+		ASSERT_EQ (node1.ledger.any.account_end (), iterator1);
 	}
 	nano::keypair stake_preserver;
 	auto send_block (system.wallet (0)->send_action (nano::dev::genesis_key.pub, stake_preserver.pub, nano::dev::constants.genesis_amount / 3 * 2, true));

nano/nano_node/entry.cpp

@@ -429,7 +429,7 @@ int main (int argc, char * const * argv)
 			// Cache the account heads to make searching quicker against unchecked keys.
 			auto transaction (node->store.tx_begin_read ());
 			std::unordered_set<nano::block_hash> frontier_hashes;
-			for (auto i (node->store.account.begin (transaction)), n (node->store.account.end ()); i != n; ++i)
+			for (auto i (node->ledger.any.account_begin (transaction)), n (node->ledger.any.account_end ()); i != n; ++i)
 			{
 				frontier_hashes.insert (i->second.head);
 			}
@@ -1628,7 +1628,7 @@ int main (int argc, char * const * argv)
 			}
 			size_t const accounts_deque_overflow (32 * 1024);
 			auto transaction (node->store.tx_begin_read ());
-			for (auto i (node->store.account.begin (transaction)), n (node->store.account.end ()); i != n; ++i)
+			for (auto i (node->ledger.any.account_begin (transaction)), n (node->ledger.any.account_end ()); i != n; ++i)
 			{
 				{
 					nano::unique_lock<nano::mutex> lock{ mutex };
@@ -1796,7 +1796,7 @@ int main (int argc, char * const * argv)
 				auto transaction (source_node->store.tx_begin_read ());
 				block_count = source_node->ledger.block_count ();
 				std::cout << boost::str (boost::format ("Performing bootstrap emulation, %1% blocks in ledger...") % block_count) << std::endl;
-				for (auto i (source_node->store.account.begin (transaction)), n (source_node->store.account.end ()); i != n; ++i)
+				for (auto i (source_node->ledger.any.account_begin (transaction)), n (source_node->ledger.any.account_end ()); i != n; ++i)
 				{
 					nano::account const & account (i->first);
 					nano::account_info const & info (i->second);

nano/node/bootstrap/bootstrap_frontier.cpp

@@ -238,7 +238,7 @@ void nano::frontier_req_client::next ()
 	{
 		std::size_t max_size (128);
 		auto transaction (node->store.tx_begin_read ());
-		for (auto i (node->store.account.begin (transaction, current.number () + 1)), n (node->store.account.end ()); i != n && accounts.size () != max_size; ++i)
+		for (auto i (node->ledger.any.account_upper_bound (transaction, current.number ())), n (node->ledger.any.account_end ()); i != n && accounts.size () != max_size; ++i)
 		{
 			nano::account_info const & info (i->second);
 			nano::account const & account (i->first);
@@ -380,7 +380,7 @@ void nano::frontier_req_server::next ()
 		auto transaction (node->store.tx_begin_read ());
 		if (!send_confirmed ())
 		{
-			for (auto i (node->store.account.begin (transaction, current.number () + 1)), n (node->store.account.end ()); i != n && accounts.size () != max_size; ++i)
+			for (auto i (node->ledger.any.account_upper_bound (transaction, current.number ())), n (node->ledger.any.account_end ()); i != n && accounts.size () != max_size; ++i)
 			{
 				nano::account_info const & info (i->second);
 				if (disable_age_filter || (now - info.modified) <= request->age)

nano/node/bootstrap/bootstrap_server.cpp

@@ -331,7 +331,7 @@ nano::asc_pull_ack nano::bootstrap_server::process (const store::transaction & t
 
 	nano::asc_pull_ack::frontiers_payload response_payload{};
 
-	for (auto it = store.account.begin (transaction, request.start), end = store.account.end (); it != end && response_payload.frontiers.size () < request.count; ++it)
+	for (auto it = ledger.any.account_lower_bound (transaction, request.start), end = ledger.any.account_end (); it != end && response_payload.frontiers.size () < request.count; ++it)
 	{
 		response_payload.frontiers.emplace_back (it->first, it->second.head);
 	}

nano/node/bootstrap_ascending/iterators.cpp

@@ -28,9 +28,8 @@ void nano::bootstrap_ascending::database_iterator::next (store::transaction & tx
 	{
 		case table_type::account:
 		{
-			auto i = current.number () + 1;
-			auto item = ledger.store.account.begin (tx, i);
-			if (item != ledger.store.account.end ())
+			auto item = ledger.any.account_upper_bound (tx, current.number ());
+			if (item != ledger.any.account_end ())
 			{
 				current = item->first;
 			}

nano/node/epoch_upgrader.cpp

@@ -116,7 +116,7 @@ void nano::epoch_upgrader::upgrade_impl (nano::raw_key const & prv_a, nano::epoc
 			{
 				auto transaction (store.tx_begin_read ());
 				// Collect accounts to upgrade
-				for (auto i (store.account.begin (transaction)), n (store.account.end ()); i != n && accounts_list.size () < count_limit; ++i)
+				for (auto i (ledger.any.account_begin (transaction)), n (ledger.any.account_end ()); i != n && accounts_list.size () < count_limit; ++i)
 				{
 					nano::account const & account (i->first);
 					nano::account_info const & info (i->second);

nano/node/json_handler.cpp

@@ -2243,7 +2243,7 @@ void nano::json_handler::delegators ()
 	{
 		auto transaction (node.store.tx_begin_read ());
 		boost::property_tree::ptree delegators;
-		for (auto i (node.store.account.begin (transaction, start_account.number () + 1)), n (node.store.account.end ()); i != n && delegators.size () < count; ++i)
+		for (auto i (node.ledger.any.account_upper_bound (transaction, start_account)), n (node.ledger.any.account_end ()); i != n && delegators.size () < count; ++i)
 		{
 			nano::account_info const & info (i->second);
 			if (info.representative == representative)
@@ -2269,7 +2269,7 @@ void nano::json_handler::delegators_count ()
 	{
 		uint64_t count (0);
 		auto transaction (node.store.tx_begin_read ());
-		for (auto i (node.store.account.begin (transaction)), n (node.store.account.end ()); i != n; ++i)
+		for (auto i (node.ledger.any.account_begin (transaction)), n (node.ledger.any.account_end ()); i != n; ++i)
 		{
 			nano::account_info const & info (i->second);
 			if (info.representative == account)
@@ -2380,7 +2380,7 @@ void nano::json_handler::frontiers ()
 	{
 		boost::property_tree::ptree frontiers;
 		auto transaction (node.store.tx_begin_read ());
-		for (auto i (node.store.account.begin (transaction, start)), n (node.store.account.end ()); i != n && frontiers.size () < count; ++i)
+		for (auto i (node.ledger.any.account_lower_bound (transaction, start)), n (node.ledger.any.account_end ()); i != n && frontiers.size () < count; ++i)
 		{
 			frontiers.put (i->first.to_account (), i->second.head.to_string ());
 		}
@@ -2781,7 +2781,7 @@ void nano::json_handler::ledger ()
 		auto transaction (node.store.tx_begin_read ());
 		if (!ec && !sorting) // Simple
 		{
-			for (auto i (node.store.account.begin (transaction, start)), n (node.store.account.end ()); i != n && accounts.size () < count; ++i)
+			for (auto i (node.ledger.any.account_lower_bound (transaction, start)), n (node.ledger.any.account_end ()); i != n && accounts.size () < count; ++i)
 			{
 				nano::account_info const & info (i->second);
 				if (info.modified >= modified_since && (receivable || info.balance.number () >= threshold.number ()))
@@ -2822,7 +2822,7 @@ void nano::json_handler::ledger ()
 		else if (!ec) // Sorting
 		{
 			std::vector<std::pair<nano::uint128_union, nano::account>> ledger_l;
-			for (auto i (node.store.account.begin (transaction, start)), n (node.store.account.end ()); i != n; ++i)
+			for (auto i (node.ledger.any.account_lower_bound (transaction, start)), n (node.ledger.any.account_end ()); i != n; ++i)
 			{
 				nano::account_info const & info (i->second);
 				nano::uint128_union balance (info.balance);

nano/qt/qt.cpp

@@ -1972,7 +1972,7 @@ void nano_qt::advanced_actions::refresh_ledger ()
 {
 	ledger_model->removeRows (0, ledger_model->rowCount ());
 	auto transaction (wallet.node.store.tx_begin_read ());
-	for (auto i (wallet.node.ledger.store.account.begin (transaction)), j (wallet.node.ledger.store.account.end ()); i != j; ++i)
+	for (auto i (wallet.node.ledger.any.account_begin (transaction)), j (wallet.node.ledger.any.account_end ()); i != j; ++i)
 	{
 		QList<QStandardItem *> items;
 		items.push_back (new QStandardItem (QString (i->first.to_account ().c_str ())));

nano/rpc_test/rpc.cpp

@@ -6128,7 +6128,7 @@ TEST (rpc, epoch_upgrade)
 	{
 		auto transaction (node->store.tx_begin_read ());
 		ASSERT_EQ (2, node->store.account.count (transaction));
-		for (auto i (node->store.account.begin (transaction)); i != node->store.account.end (); ++i)
+		for (auto i (node->ledger.any.account_begin (transaction)); i != node->ledger.any.account_end (); ++i)
 		{
 			nano::account_info info (i->second);
 			ASSERT_EQ (info.epoch (), nano::epoch::epoch_0);
@@ -6146,7 +6146,7 @@ TEST (rpc, epoch_upgrade)
 	{
 		auto transaction (node->store.tx_begin_read ());
 		ASSERT_EQ (4, node->store.account.count (transaction));
-		for (auto i (node->store.account.begin (transaction)); i != node->store.account.end (); ++i)
+		for (auto i (node->ledger.any.account_begin (transaction)); i != node->ledger.any.account_end (); ++i)
 		{
 			nano::account_info info (i->second);
 			ASSERT_EQ (info.epoch (), nano::epoch::epoch_1);
@@ -6209,7 +6209,7 @@ TEST (rpc, epoch_upgrade)
 	{
 		auto transaction (node->store.tx_begin_read ());
 		ASSERT_EQ (5, node->store.account.count (transaction));
-		for (auto i (node->store.account.begin (transaction)); i != node->store.account.end (); ++i)
+		for (auto i (node->ledger.any.account_begin (transaction)); i != node->ledger.any.account_end (); ++i)
 		{
 			nano::account_info info (i->second);
 			ASSERT_EQ (info.epoch (), nano::epoch::epoch_2);
@@ -6291,7 +6291,7 @@ TEST (rpc, epoch_upgrade_multithreaded)
 	{
 		auto transaction (node->store.tx_begin_read ());
 		ASSERT_EQ (2, node->store.account.count (transaction));
-		for (auto i (node->store.account.begin (transaction)); i != node->store.account.end (); ++i)
+		for (auto i (node->ledger.any.account_begin (transaction)); i != node->ledger.any.account_end (); ++i)
 		{
 			nano::account_info info (i->second);
 			ASSERT_EQ (info.epoch (), nano::epoch::epoch_0);
@@ -6310,7 +6310,7 @@ TEST (rpc, epoch_upgrade_multithreaded)
 	{
 		auto transaction (node->store.tx_begin_read ());
 		ASSERT_EQ (4, node->store.account.count (transaction));
-		for (auto i (node->store.account.begin (transaction)); i != node->store.account.end (); ++i)
+		for (auto i (node->ledger.any.account_begin (transaction)); i != node->ledger.any.account_end (); ++i)
 		{
 			nano::account_info info (i->second);
 			ASSERT_EQ (info.epoch (), nano::epoch::epoch_1);
@@ -6373,7 +6373,7 @@ TEST (rpc, epoch_upgrade_multithreaded)
 	{
 		auto transaction (node->store.tx_begin_read ());
 		ASSERT_EQ (5, node->store.account.count (transaction));
-		for (auto i (node->store.account.begin (transaction)); i != node->store.account.end (); ++i)
+		for (auto i (node->ledger.any.account_begin (transaction)); i != node->ledger.any.account_end (); ++i)
 		{
 			nano::account_info info (i->second);
 			ASSERT_EQ (info.epoch (), nano::epoch::epoch_2);

nano/secure/CMakeLists.txt

@@ -41,6 +41,9 @@ add_library(
   ${CMAKE_BINARY_DIR}/bootstrap_weights_beta.cpp
   account_info.hpp
   account_info.cpp
+  account_iterator.cpp
+  account_iterator.hpp
+  account_iterator_impl.hpp
   common.hpp
   common.cpp
   generate_cache_flags.hpp

nano/secure/account_iterator.cpp

@@ -0,0 +1,4 @@
+#include <nano/secure/account_iterator_impl.hpp>
+#include <nano/secure/ledger_set_any.hpp>
+
+template class nano::account_iterator<nano::ledger_set_any>;

nano/secure/account_iterator.hpp

@@ -0,0 +1,32 @@
+#pragma once
+#include <nano/lib/numbers.hpp>
+#include <nano/secure/account_info.hpp>
+
+#include <optional>
+#include <utility>
+
+namespace nano::store
+{
+class transaction;
+}
+
+namespace nano
+{
+// This class iterates account entries
+template <typename T>
+class account_iterator
+{
+public:
+	account_iterator ();
+	account_iterator (store::transaction const & transaction, T const & view, std::optional<std::pair<nano::account, nano::account_info>> const & item);
+	bool operator== (account_iterator const & other) const;
+	account_iterator & operator++ ();
+	std::pair<nano::account, nano::account_info> const & operator* () const;
+	std::pair<nano::account, nano::account_info> const * operator->() const;
+
+private:
+	store::transaction const * transaction;
+	T const * view{ nullptr };
+	std::optional<std::pair<nano::account, nano::account_info>> item;
+};
+}

nano/secure/account_iterator_impl.hpp

@@ -0,0 +1,49 @@
+#include <nano/secure/account_info.hpp>
+#include <nano/secure/account_iterator.hpp>
+
+template <typename T>
+nano::account_iterator<T>::account_iterator ()
+{
+}
+
+template <typename T>
+nano::account_iterator<T>::account_iterator (store::transaction const & transaction, T const & view, std::optional<std::pair<nano::account, nano::account_info>> const & item) :
+	transaction{ &transaction },
+	view{ &view },
+	item{ item }
+{
+}
+
+template <typename T>
+bool nano::account_iterator<T>::operator== (account_iterator const & other) const
+{
+	debug_assert (view == nullptr || other.view == nullptr || view == other.view);
+	return item == other.item;
+}
+
+template <typename T>
+auto nano::account_iterator<T>::operator++ () -> account_iterator<T> &
+{
+	auto next = item.value ().first.number () + 1;
+	if (next != 0)
+	{
+		*this = view->account_lower_bound (*transaction, next);
+	}
+	else
+	{
+		*this = account_iterator<T>{};
+	}
+	return *this;
+}
+
+template <typename T>
+std::pair<nano::account, nano::account_info> const & nano::account_iterator<T>::operator* () const
+{
+	return item.value ();
+}
+
+template <typename T>
+std::pair<nano::account, nano::account_info> const * nano::account_iterator<T>::operator->() const
+{
+	return &item.value ();
+}

nano/secure/ledger_set_any.cpp

@@ -20,6 +20,32 @@ std::optional<nano::account> nano::ledger_set_any::account (store::transaction c
 	return block_l->account ();
 }
 
+auto nano::ledger_set_any::account_begin (store::transaction const & transaction) const -> account_iterator
+{
+	return account_lower_bound (transaction, 0);
+}
+
+auto nano::ledger_set_any::account_end () const -> account_iterator
+{
+	return account_iterator{};
+}
+
+// Returns the next receivable entry equal or greater than 'key'
+auto nano::ledger_set_any::account_lower_bound (store::transaction const & transaction, nano::account const & account) const -> account_iterator
+{
+	auto disk = ledger.store.account.begin (transaction, account);
+	if (disk == ledger.store.account.end ())
+	{
+		return account_iterator{};
+	}
+	return account_iterator{ transaction, *this, *disk };
+}
+
+auto nano::ledger_set_any::account_upper_bound (store::transaction const & transaction, nano::account const & account) const -> account_iterator
+{
+	return account_lower_bound (transaction, account.number () + 1);
+}
+
 std::optional<nano::uint128_t> nano::ledger_set_any::amount (store::transaction const & transaction, nano::block_hash const & hash) const
 {
 	auto block_l = get (transaction, hash);

nano/secure/ledger_set_any.hpp

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <nano/secure/account_iterator.hpp>
 #include <nano/secure/receivable_iterator.hpp>
 
 #include <optional>
@@ -24,11 +25,18 @@ namespace nano
 class ledger_set_any
 {
 public:
+	using account_iterator = nano::account_iterator<ledger_set_any>;
 	using receivable_iterator = nano::receivable_iterator<ledger_set_any>;
 
 	ledger_set_any (nano::ledger const & ledger);
 
 	std::optional<nano::account> account (store::transaction const & transaction, nano::block_hash const & hash) const;
+	account_iterator account_begin (store::transaction const & transaction) const;
+	account_iterator account_end () const;
+	// Returns the next account entry equal or greater than 'account'
+	account_iterator account_lower_bound (store::transaction const & transaction, nano::account const & account) const;
+	// Returns the next account entry greater than 'account'
+	account_iterator account_upper_bound (store::transaction const & transaction, nano::account const & account) const;
 	std::optional<nano::uint128_t> amount (store::transaction const & transaction, nano::block_hash const & hash) const;
 	std::optional<nano::uint128_t> balance (store::transaction const & transaction, nano::account const & account) const;
 	std::optional<nano::uint128_t> balance (store::transaction const & transaction, nano::block_hash const & hash) const;

nano/slow_test/node.cpp

@@ -53,7 +53,7 @@ TEST (system, generate_mass_activity)
 	uint32_t count (20);
 	system.generate_mass_activity (count, *system.nodes[0]);
 	auto transaction (system.nodes[0]->store.tx_begin_read ());
-	for (auto i (system.nodes[0]->store.account.begin (transaction)), n (system.nodes[0]->store.account.end ()); i != n; ++i)
+	for (auto i (system.nodes[0]->ledger.any.account_begin (transaction)), n (system.nodes[0]->ledger.any.account_end ()); i != n; ++i)
 	{
 	}
 }
@@ -75,7 +75,7 @@ TEST (system, generate_mass_activity_long)
 	}
 	system.generate_mass_activity (count, *system.nodes[0]);
 	auto transaction (system.nodes[0]->store.tx_begin_read ());
-	for (auto i (system.nodes[0]->store.account.begin (transaction)), n (system.nodes[0]->store.account.end ()); i != n; ++i)
+	for (auto i (system.nodes[0]->ledger.any.account_begin (transaction)), n (system.nodes[0]->ledger.any.account_end ()); i != n; ++i)
 	{
 	}
 	system.stop ();
@@ -693,7 +693,7 @@ TEST (confirmation_height, many_accounts_single_confirmation)
 
 	// All frontiers (except last) should have 2 blocks and both should be confirmed
 	auto transaction = node->store.tx_begin_read ();
-	for (auto i (node->store.account.begin (transaction)), n (node->store.account.end ()); i != n; ++i)
+	for (auto i (node->ledger.any.account_begin (transaction)), n (node->ledger.any.account_end ()); i != n; ++i)
 	{
 		auto & account = i->first;
 		auto & account_info = i->second;
@@ -1754,7 +1754,7 @@ TEST (node, mass_epoch_upgrader)
 		{
 			auto transaction (node.store.tx_begin_read ());
 			size_t block_count_sum = 0;
-			for (auto i (node.store.account.begin (transaction)); i != node.store.account.end (); ++i)
+			for (auto i (node.ledger.any.account_begin (transaction)); i != node.ledger.any.account_end (); ++i)
 			{
 				nano::account_info info (i->second);
 				ASSERT_EQ (info.epoch (), nano::epoch::epoch_1);