dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #4707 from clemahieu/rpc_unopened_seek

Browse source 
Revert "Rewrite json_handler::unopened in terms of receivable iterators"
This commit is contained in:
clemahieu 2024-08-20 12:55:45 +01:00 • committed by GitHub
commit 67c88aac4a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 85 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

56
nano/node/json_handler.cpp
View file

@ -4279,8 +4279,8 @@ void nano::json_handler::unchecked_keys ()
void nano::json_handler::unopened ()
{
auto count (count_optional_impl ());
auto threshold (threshold_optional_impl ());
auto count{ count_optional_impl () };
auto threshold{ threshold_optional_impl () };
nano::account start{ 1 }; // exclude burn account by default
boost::optional<std::string> account_text (request.get_optional<std::string> ("account"));
if (account_text.is_initialized ())
@ -4289,28 +4289,48 @@ void nano::json_handler::unopened ()
}
if (!ec)
{
auto transaction = node.ledger.tx_begin_read ();
auto & ledger = node.ledger;
auto transaction = node.store.tx_begin_read ();
auto iterator = node.store.pending.begin (transaction, nano::pending_key (start, 0));
auto end = node.store.pending.end ();
nano::account current_account = start;
nano::uint128_t current_account_sum{ 0 };
boost::property_tree::ptree accounts;
for (auto iterator = ledger.any.receivable_upper_bound (transaction, start, 0), end = ledger.any.receivable_end (); iterator != end && accounts.size () < count;)
while (iterator != end && accounts.size () < count)
{
auto const & [key, info] = *iterator;
nano::account account = key.account;
if (!node.store.account.exists (transaction, account))
nano::pending_key key{ iterator->first };
nano::account account{ key.account };
nano::pending_info info{ iterator->second };
if (node.store.account.exists (transaction, account))
{
nano::uint128_t current_account_sum{ 0 };
while (iterator != end)
if (account.number () == std::numeric_limits<nano::uint256_t>::max ())
{
auto const & [key, info] = *iterator;
current_account_sum += info.amount.number ();
++iterator;
}
if (current_account_sum >= threshold.number ())
{
accounts.put (account.to_account (), current_account_sum.convert_to<std::string> ());
break;
}
// Skip existing accounts
iterator = node.store.pending.begin (transaction, nano::pending_key (account.number () + 1, 0));
}
iterator = ledger.any.receivable_upper_bound (transaction, account);
else
{
if (account != current_account)
{
if (current_account_sum > 0)
{
if (current_account_sum >= threshold.number ())
{
accounts.put (current_account.to_account (), current_account_sum.convert_to<std::string> ());
}
current_account_sum = 0;
}
current_account = account;
}
current_account_sum += info.amount.number ();
++iterator;
}
}
// last one after iterator reaches end
if (accounts.size () < count && current_account_sum > 0 && current_account_sum >= threshold.number ())
{
accounts.put (current_account.to_account (), current_account_sum.convert_to<std::string> ());
}
response_l.add_child ("accounts", accounts);
}

47
nano/rpc_test/rpc.cpp
View file

@ -5554,6 +5554,28 @@ TEST (rpc, unopened)
ASSERT_EQ (1, accounts.size ());
ASSERT_EQ ("1", accounts.get<std::string> (account1.to_account ()));
}
{
// using count=1 and a known unopened account1 number should get a single result
boost::property_tree::ptree request;
request.put ("action", "unopened");
request.put ("count", "1");
request.put ("account", account1.to_account());
auto response (wait_response (system, rpc_ctx, request));
auto & accounts (response.get_child ("accounts"));
ASSERT_EQ (1, accounts.size ());
ASSERT_EQ ("1", accounts.get<std::string> (account1.to_account ()));
}
{
// using count=1 and a known unopened account2 number should get a single result
boost::property_tree::ptree request;
request.put ("action", "unopened");
request.put ("count", "1");
request.put ("account", account2.to_account());
auto response (wait_response (system, rpc_ctx, request));
auto & accounts (response.get_child ("accounts"));
ASSERT_EQ (1, accounts.size ());
ASSERT_EQ ("10", accounts.get<std::string> (account2.to_account ()));
}
{
// using threshold at 5 should get a single result
boost::property_tree::ptree request;
@ -5566,6 +5588,31 @@ TEST (rpc, unopened)
}
}
// Check that the "unopened" RPC can seek
// Request unopened for the genesis account while there in an unopened account with the max account number
TEST (rpc, unopened_seek)
{
nano::test::system system;
auto node = add_ipc_enabled_node (system);
system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);
nano::account last_account{ std::numeric_limits<nano::uint256_t>::max () };
auto genesis (node->latest (nano::dev::genesis_key.pub));
ASSERT_FALSE (genesis.is_zero ());
auto send (system.wallet (0)->send_action (nano::dev::genesis_key.pub, last_account, 1));
ASSERT_NE (nullptr, send);
auto const rpc_ctx = add_rpc (system, node);
{
boost::property_tree::ptree request;
request.put ("action", "unopened");
request.put ("count", "1");
request.put ("account", nano::dev::genesis_key.pub.to_account());
auto response (wait_response (system, rpc_ctx, request));
auto & accounts (response.get_child ("accounts"));
ASSERT_EQ (1, accounts.size ());
ASSERT_EQ ("1", accounts.get<std::string> (last_account.to_account ()));
}
}
TEST (rpc, unopened_burn)
{
nano::test::system system;