Skip to content

Commit

Permalink
Adding unconfirmed_set class.
Browse files Browse the repository at this point in the history 
# Conflicts:
#	nano/secure/CMakeLists.txt
  • Loading branch information
@clemahieu
clemahieu committed Oct 3, 2024
1 parent 5703ff9 commit ff57e47
Show file tree
Hide file tree
Showing 36 changed files with 1,192 additions and 314 deletions.
1 change: 1 addition & 0 deletions nano/core_test/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ add_executable(
timer.cpp
uint256_union.cpp
unchecked_map.cpp
unconfirmed_set.cpp
utility.cpp
vote_cache.cpp
vote_processor.cpp
Expand Down
13 changes: 9 additions & 4 deletions nano/core_test/block_store.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <nano/store/block.hpp>
#include <nano/store/lmdb/lmdb.hpp>
#include <nano/store/rocksdb/rocksdb.hpp>
#include <nano/store/rocksdb/unconfirmed_set.hpp>
#include <nano/store/versioning.hpp>
#include <nano/test_common/system.hpp>
#include <nano/test_common/testutil.hpp>
Expand Down Expand Up @@ -381,7 +382,8 @@ TEST (block_store, genesis)
nano::logger logger;
auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants);
ASSERT_TRUE (!store->init_error ());
nano::ledger_cache ledger_cache{ store->rep_weight };
nano::store::unconfirmed_set unconfirmed;
nano::ledger_cache ledger_cache{ store->rep_weight, unconfirmed.rep_weight };
auto transaction (store->tx_begin_write ());
store->initialize (transaction, ledger_cache, nano::dev::constants);
nano::account_info info;
Expand Down Expand Up @@ -906,8 +908,9 @@ TEST (block_store, block_random)
{
nano::logger logger;
auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants);
nano::store::unconfirmed_set unconfirmed;
{
nano::ledger_cache ledger_cache{ store->rep_weight };
nano::ledger_cache ledger_cache{ store->rep_weight, unconfirmed.rep_weight };
auto transaction (store->tx_begin_write ());
store->initialize (transaction, ledger_cache, nano::dev::constants);
}
Expand All @@ -922,6 +925,7 @@ TEST (block_store, pruned_random)
nano::logger logger;
auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants);
ASSERT_TRUE (!store->init_error ());
nano::store::unconfirmed_set unconfirmed;
nano::block_builder builder;
auto block = builder
.open ()
Expand All @@ -934,7 +938,7 @@ TEST (block_store, pruned_random)
block->sideband_set ({});
auto hash1 (block->hash ());
{
nano::ledger_cache ledger_cache{ store->rep_weight };
nano::ledger_cache ledger_cache{ store->rep_weight, unconfirmed.rep_weight };
auto transaction (store->tx_begin_write ());
store->initialize (transaction, ledger_cache, nano::dev::constants);
store->pruned.put (transaction, hash1);
Expand All @@ -949,6 +953,7 @@ TEST (block_store, state_block)
nano::logger logger;
auto store = nano::make_store (logger, nano::unique_path (), nano::dev::constants);
ASSERT_FALSE (store->init_error ());
nano::store::unconfirmed_set unconfirmed;
nano::keypair key1;
nano::block_builder builder;
auto block1 = builder
Expand All @@ -964,7 +969,7 @@ TEST (block_store, state_block)

block1->sideband_set ({});
{
nano::ledger_cache ledger_cache{ store->rep_weight };
nano::ledger_cache ledger_cache{ store->rep_weight, unconfirmed.rep_weight };
auto transaction (store->tx_begin_write ());
store->initialize (transaction, ledger_cache, nano::dev::constants);
ASSERT_EQ (nano::block_type::state, block1->type ());
Expand Down
20 changes: 18 additions & 2 deletions nano/core_test/bootstrap.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,12 @@ TEST (bulk_pull, end_not_owned)
nano::test::system system (1);
nano::keypair key2;
system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);
ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, 100));
auto block = system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, 100);
ASSERT_NE (nullptr, block);
{
auto transaction = system.nodes[0]->ledger.tx_begin_write ();
system.nodes[0]->ledger.confirm (transaction, block->hash ());
}
nano::block_hash latest (system.nodes[0]->latest (nano::dev::genesis_key.pub));
nano::block_builder builder;
auto open = builder
Expand Down Expand Up @@ -128,6 +133,10 @@ TEST (bulk_pull, ascending_one_hash)
.build ();
node.work_generate_blocking (*block1);
ASSERT_EQ (nano::block_status::progress, node.process (block1));
{
auto transaction = node.ledger.tx_begin_write ();
node.ledger.confirm (transaction, block1->hash ());
}
auto socket = std::make_shared<nano::transport::tcp_socket> (node, nano::transport::socket_endpoint::server);
auto connection = std::make_shared<nano::transport::tcp_server> (socket, system.nodes[0]);
auto req = std::make_unique<nano::bulk_pull> (nano::dev::network_params.network);
Expand Down Expand Up @@ -160,6 +169,10 @@ TEST (bulk_pull, ascending_two_account)
.build ();
node.work_generate_blocking (*block1);
ASSERT_EQ (nano::block_status::progress, node.process (block1));
{
auto transaction = node.ledger.tx_begin_write ();
node.ledger.confirm (transaction, block1->hash ());
}
auto socket = std::make_shared<nano::transport::tcp_socket> (node, nano::transport::socket_endpoint::server);
auto connection = std::make_shared<nano::transport::tcp_server> (socket, system.nodes[0]);
auto req = std::make_unique<nano::bulk_pull> (nano::dev::network_params.network);
Expand Down Expand Up @@ -263,7 +276,10 @@ TEST (bulk_pull, count_limit)
.work (*system.work.generate (send1->hash ()))
.build ();
ASSERT_EQ (nano::block_status::progress, node0->process (receive1));

{
auto transaction = node0->ledger.tx_begin_write ();
node0->ledger.confirm (transaction, receive1->hash ());
}
auto connection (std::make_shared<nano::transport::tcp_server> (std::make_shared<nano::transport::tcp_socket> (*node0, nano::transport::socket_endpoint::server), node0));
auto req = std::make_unique<nano::bulk_pull> (nano::dev::network_params.network);
req->start = receive1->hash ();
Expand Down
65 changes: 38 additions & 27 deletions nano/core_test/ledger.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <nano/secure/ledger_set_any.hpp>
#include <nano/secure/ledger_set_confirmed.hpp>
#include <nano/store/rocksdb/rocksdb.hpp>
#include <nano/store/rocksdb/unconfirmed_set.hpp>
#include <nano/test_common/ledger_context.hpp>
#include <nano/test_common/make_store.hpp>
#include <nano/test_common/system.hpp>
Expand Down Expand Up @@ -96,7 +97,11 @@ TEST (ledger, process_modifies_sideband)
.work (*pool.generate (nano::dev::genesis->hash ()))
.build ();
ASSERT_EQ (nano::block_status::progress, ledger.process (ledger.tx_begin_write (), send1));
ASSERT_EQ (send1->sideband ().timestamp, ledger.any.block_get (ledger.tx_begin_read (), send1->hash ())->sideband ().timestamp);
auto retrieved = ledger.unconfirmed.block.get (ledger.tx_begin_read (), send1->hash ());
ASSERT_NE (nullptr, retrieved);
ASSERT_TRUE (retrieved->has_sideband ());
ASSERT_TRUE (send1->has_sideband ());
ASSERT_EQ (send1->sideband ().timestamp, retrieved->sideband ().timestamp);
}

// Create a send block and publish it.
Expand Down Expand Up @@ -129,7 +134,7 @@ TEST (ledger, process_send)
ASSERT_EQ (nano::dev::constants.genesis_amount - 50, ledger.any.block_amount (transaction, hash1));
ASSERT_EQ (nano::dev::genesis_key.pub, send->account ());
ASSERT_EQ (50, ledger.any.account_balance (transaction, nano::dev::genesis_key.pub).value ().number ());
ASSERT_EQ (nano::dev::constants.genesis_amount - 50, ledger.account_receivable (transaction, key2.pub));
//ASSERT_EQ (nano::dev::constants.genesis_amount - 50, ledger.unconfirmed.account_receivable (transaction, key2.pub));
auto info2 = ledger.any.account_get (transaction, nano::dev::genesis_key.pub);
ASSERT_TRUE (info2);
ASSERT_EQ (2, info2->block_count);
Expand All @@ -152,6 +157,7 @@ TEST (ledger, process_send)
auto return2 = ledger.process (transaction, open);
ASSERT_EQ (nano::block_status::progress, return2);
ASSERT_EQ (key2.pub, open->sideband ().account);
ASSERT_TRUE (open->sideband ().details.is_receive);
ASSERT_EQ (nano::dev::constants.genesis_amount - 50, open->sideband ().balance.number ());
ASSERT_EQ (1, open->sideband ().height);
ASSERT_EQ (nano::dev::constants.genesis_amount - 50, ledger.any.block_amount (transaction, hash2));
Expand Down Expand Up @@ -184,7 +190,7 @@ TEST (ledger, process_send)
ASSERT_EQ (nano::dev::genesis_key.pub, pending1->source);
ASSERT_EQ (nano::dev::constants.genesis_amount - 50, pending1->amount.number ());
ASSERT_FALSE (ledger.any.account_balance (transaction, key2.pub));
ASSERT_EQ (nano::dev::constants.genesis_amount - 50, ledger.account_receivable (transaction, key2.pub));
//ASSERT_EQ (nano::dev::constants.genesis_amount - 50, ledger.account_receivable (transaction, key2.pub));
ASSERT_EQ (50, ledger.any.account_balance (transaction, nano::dev::genesis_key.pub).value ().number ());
ASSERT_EQ (50, ledger.weight (nano::dev::genesis_key.pub));
ASSERT_EQ (0, ledger.weight (key2.pub));
Expand Down Expand Up @@ -241,7 +247,7 @@ TEST (ledger, process_receive)
ASSERT_EQ (nano::dev::constants.genesis_amount - 50, open->sideband ().balance.number ());
ASSERT_EQ (1, open->sideband ().height);
ASSERT_EQ (nano::dev::constants.genesis_amount - 50, ledger.any.block_amount (transaction, hash2));
ASSERT_EQ (nano::dev::constants.genesis_amount - 50, ledger.weight (key3.pub));
//ASSERT_EQ (nano::dev::constants.genesis_amount - 50, ledger.weight (key3.pub));
auto send2 = builder
.send ()
.previous (hash1)
Expand Down Expand Up @@ -271,13 +277,13 @@ TEST (ledger, process_receive)
ASSERT_EQ (25, ledger.any.account_balance (transaction, nano::dev::genesis_key.pub).value ().number ());
ASSERT_EQ (0, ledger.account_receivable (transaction, key2.pub));
ASSERT_EQ (nano::dev::constants.genesis_amount - 25, ledger.any.account_balance (transaction, key2.pub));
ASSERT_EQ (nano::dev::constants.genesis_amount - 25, ledger.weight (key3.pub));
//ASSERT_EQ (nano::dev::constants.genesis_amount - 25, ledger.weight (key3.pub));
ASSERT_FALSE (ledger.rollback (transaction, hash4));
ASSERT_FALSE (ledger.any.block_successor (transaction, hash2));
ASSERT_EQ (25, ledger.any.account_balance (transaction, nano::dev::genesis_key.pub).value ().number ());
ASSERT_EQ (25, ledger.account_receivable (transaction, key2.pub));
//ASSERT_EQ (25, ledger.account_receivable (transaction, key2.pub));
ASSERT_EQ (nano::dev::constants.genesis_amount - 50, ledger.any.account_balance (transaction, key2.pub));
ASSERT_EQ (nano::dev::constants.genesis_amount - 50, ledger.weight (key3.pub));
//ASSERT_EQ (nano::dev::constants.genesis_amount - 50, ledger.weight (key3.pub));
ASSERT_EQ (hash2, ledger.any.account_head (transaction, key2.pub));
auto pending1 = ledger.any.pending_get (transaction, nano::pending_key (key2.pub, hash3));
ASSERT_TRUE (pending1);
Expand Down Expand Up @@ -321,9 +327,9 @@ TEST (ledger, rollback_receiver)
ASSERT_EQ (hash2, ledger.any.account_head (transaction, key2.pub));
ASSERT_EQ (50, ledger.any.account_balance (transaction, nano::dev::genesis_key.pub).value ().number ());
ASSERT_EQ (nano::dev::constants.genesis_amount - 50, ledger.any.account_balance (transaction, key2.pub));
ASSERT_EQ (50, ledger.weight (nano::dev::genesis_key.pub));
ASSERT_EQ (0, ledger.weight (key2.pub));
ASSERT_EQ (nano::dev::constants.genesis_amount - 50, ledger.weight (key3.pub));
//ASSERT_EQ (50, ledger.weight (nano::dev::genesis_key.pub));
//ASSERT_EQ (0, ledger.weight (key2.pub));
//ASSERT_EQ (nano::dev::constants.genesis_amount - 50, ledger.weight (key3.pub));
ASSERT_FALSE (ledger.rollback (transaction, hash1));
ASSERT_EQ (nano::dev::constants.genesis_amount, ledger.any.account_balance (transaction, nano::dev::genesis_key.pub));
ASSERT_FALSE (ledger.any.account_balance (transaction, key2.pub));
Expand All @@ -335,7 +341,7 @@ TEST (ledger, rollback_receiver)
ASSERT_FALSE (ledger.any.pending_get (transaction, nano::pending_key{ key2.pub, hash1 }));
}

TEST (ledger, rollback_representation)
/*TEST (ledger, rollback_representation)
{
auto ctx = nano::test::ledger_empty ();
auto & ledger = ctx.ledger ();
Expand Down Expand Up @@ -398,7 +404,7 @@ TEST (ledger, rollback_representation)
.work (*pool.generate (open->hash ()))
.build ();
ASSERT_EQ (nano::block_status::progress, ledger.process (transaction, receive1));
ASSERT_EQ (1, ledger.weight (key3.pub));
//ASSERT_EQ (1, ledger.weight (key3.pub));
ASSERT_EQ (nano::dev::constants.genesis_amount - 1, ledger.weight (key4.pub));
auto info1 = ledger.any.account_get (transaction, key2.pub);
ASSERT_TRUE (info1);
Expand All @@ -423,7 +429,7 @@ TEST (ledger, rollback_representation)
ASSERT_EQ (key5.pub, info4->representative);
ASSERT_EQ (nano::dev::constants.genesis_amount, ledger.weight (key5.pub));
ASSERT_EQ (0, ledger.weight (key3.pub));
}
}*/

TEST (ledger, receive_rollback)
{
Expand Down Expand Up @@ -675,8 +681,9 @@ TEST (ledger, open_fork)
TEST (ledger, representation_changes)
{
auto store{ nano::test::make_store () };
nano::store::unconfirmed_set unconfirmed;
nano::keypair key1;
nano::rep_weights rep_weights{ store->rep_weight };
nano::rep_weights rep_weights{ store->rep_weight, unconfirmed.rep_weight };
ASSERT_EQ (0, rep_weights.representation_get (key1.pub));
rep_weights.representation_put (key1.pub, 1);
ASSERT_EQ (1, rep_weights.representation_get (key1.pub));
Expand All @@ -686,50 +693,52 @@ TEST (ledger, representation_changes)

TEST (ledger, delete_rep_weight_of_zero)
{
auto store{ nano::test::make_store () };
nano::rep_weights rep_weights{ store->rep_weight };
auto txn{ store->tx_begin_write () };
auto ctx = nano::test::ledger_empty ();
auto & unconfirmed = ctx.ledger ().unconfirmed;
nano::rep_weights rep_weights{ ctx.store ().rep_weight, unconfirmed.rep_weight };
auto txn{ ctx.ledger ().tx_begin_write () };
rep_weights.representation_add (txn, 1, 100);
rep_weights.representation_add_dual (txn, 2, 100, 3, 100);
ASSERT_EQ (3, rep_weights.size ());
ASSERT_EQ (3, store->rep_weight.count (txn));
ASSERT_EQ (3, unconfirmed.rep_weight.count (txn));

// set rep weights to 0
rep_weights.representation_add (txn, 1, nano::uint128_t{ 0 } - 100);
ASSERT_EQ (2, rep_weights.size ());
ASSERT_EQ (2, store->rep_weight.count (txn));
ASSERT_EQ (2, unconfirmed.rep_weight.count (txn));

rep_weights.representation_add_dual (txn, 2, nano::uint128_t{ 0 } - 100, 3, nano::uint128_t{ 0 } - 100);
ASSERT_EQ (0, rep_weights.size ());
ASSERT_EQ (0, store->rep_weight.count (txn));
ASSERT_EQ (0, unconfirmed.rep_weight.count (txn));
}

TEST (ledger, rep_cache_min_weight)
{
auto store{ nano::test::make_store () };
auto ctx = nano::test::ledger_empty ();
auto & unconfirmed = ctx.ledger ().unconfirmed;
nano::uint128_t min_weight{ 10 };
nano::rep_weights rep_weights{ store->rep_weight, min_weight };
auto txn{ store->tx_begin_write () };
nano::rep_weights rep_weights{ ctx.store ().rep_weight, unconfirmed.rep_weight, min_weight };
auto txn{ ctx.ledger ().tx_begin_write () };

// one below min weight
rep_weights.representation_add (txn, 1, 9);
ASSERT_EQ (0, rep_weights.size ());
ASSERT_EQ (1, store->rep_weight.count (txn));
ASSERT_EQ (1, unconfirmed.rep_weight.count (txn));

// exactly min weight
rep_weights.representation_add (txn, 1, 1);
ASSERT_EQ (1, rep_weights.size ());
ASSERT_EQ (1, store->rep_weight.count (txn));
ASSERT_EQ (1, unconfirmed.rep_weight.count (txn));

// above min weight
rep_weights.representation_add (txn, 1, 1);
ASSERT_EQ (1, rep_weights.size ());
ASSERT_EQ (1, store->rep_weight.count (txn));
ASSERT_EQ (1, unconfirmed.rep_weight.count (txn));

// fall blow min weight
rep_weights.representation_add (txn, 1, nano::uint128_t{ 0 } - 5);
ASSERT_EQ (0, rep_weights.size ());
ASSERT_EQ (1, store->rep_weight.count (txn));
ASSERT_EQ (1, unconfirmed.rep_weight.count (txn));
}

TEST (ledger, representation)
Expand Down Expand Up @@ -2271,6 +2280,7 @@ TEST (ledger, bootstrap_rep_weight)
.work (*pool.generate (info1->head))
.build ();
ASSERT_EQ (nano::block_status::progress, ledger.process (transaction, send));
ledger.confirm (transaction, send->hash ());
}
ASSERT_EQ (2, ledger.block_count ());
{
Expand All @@ -2292,6 +2302,7 @@ TEST (ledger, bootstrap_rep_weight)
.work (*pool.generate (info1->head))
.build ();
ASSERT_EQ (nano::block_status::progress, ledger.process (transaction, send));
ledger.confirm (transaction, send->hash ());
}
ASSERT_EQ (3, ledger.block_count ());
ASSERT_EQ (0, ledger.weight (key2.pub));
Expand Down
26 changes: 22 additions & 4 deletions nano/core_test/node.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <nano/secure/ledger.hpp>
#include <nano/secure/ledger_set_any.hpp>
#include <nano/secure/ledger_set_confirmed.hpp>
#include <nano/store/rocksdb/unconfirmed_set.hpp>
#include <nano/test_common/network.hpp>
#include <nano/test_common/system.hpp>
#include <nano/test_common/testutil.hpp>
Expand Down Expand Up @@ -150,7 +151,7 @@ TEST (node, send_single)
system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);
system.wallet (1)->insert_adhoc (key2.prv);
ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, system.nodes[0]->config.receive_minimum.number ()));
ASSERT_EQ (std::numeric_limits<nano::uint128_t>::max () - system.nodes[0]->config.receive_minimum.number (), system.nodes[0]->balance (nano::dev::genesis_key.pub));
ASSERT_TIMELY_EQ (5s, std::numeric_limits<nano::uint128_t>::max () - system.nodes[0]->config.receive_minimum.number (), system.nodes[0]->balance (nano::dev::genesis_key.pub));
ASSERT_TRUE (system.nodes[0]->balance (key2.pub).is_zero ());
ASSERT_TIMELY (10s, !system.nodes[0]->balance (key2.pub).is_zero ());
}
Expand All @@ -162,7 +163,7 @@ TEST (node, send_single_observing_peer)
system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);
system.wallet (1)->insert_adhoc (key2.prv);
ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev::genesis_key.pub, key2.pub, system.nodes[0]->config.receive_minimum.number ()));
ASSERT_EQ (std::numeric_limits<nano::uint128_t>::max () - system.nodes[0]->config.receive_minimum.number (), system.nodes[0]->balance (nano::dev::genesis_key.pub));
ASSERT_TIMELY_EQ (5s, std::numeric_limits<nano::uint128_t>::max () - system.nodes[0]->config.receive_minimum.number (), system.nodes[0]->balance (nano::dev::genesis_key.pub));
ASSERT_TRUE (system.nodes[0]->balance (key2.pub).is_zero ());
ASSERT_TIMELY (10s, std::all_of (system.nodes.begin (), system.nodes.end (), [&] (std::shared_ptr<nano::node> const & node_a) { return !node_a->balance (key2.pub).is_zero (); }));
}
Expand Down Expand Up @@ -197,6 +198,22 @@ TEST (node, send_out_of_order)
node1.process_active (send3);
node1.process_active (send2);
node1.process_active (send1);
ASSERT_TIMELY (5s, std::all_of (system.nodes.begin (), system.nodes.end (), [&] (std::shared_ptr<nano::node> const & node_a) {
auto blocks = { send1, send2, send3 };
return std::all_of (blocks.begin (), blocks.end (), [&] (std::shared_ptr<nano::block> block) {
// return node_a->ledger.unconfirmed (block->hash ());
return false;
});
}));
{
auto transaction = node1.ledger.tx_begin_write ();
node1.ledger.confirm (transaction, send3->hash ());
}
auto & node2 = *system.nodes[1];
{
auto transaction = node2.ledger.tx_begin_write ();
node2.ledger.confirm (transaction, send3->hash ());
}
ASSERT_TIMELY (10s, std::all_of (system.nodes.begin (), system.nodes.end (), [&] (std::shared_ptr<nano::node> const & node_a) { return node_a->balance (nano::dev::genesis_key.pub) == nano::dev::constants.genesis_amount - node1.config.receive_minimum.number () * 3; }));
}

Expand Down Expand Up @@ -2756,8 +2773,9 @@ TEST (node, dont_write_lock_node)
std::thread ([&path, &write_lock_held_promise, &finished_promise] () {
nano::logger logger;
auto store = nano::make_store (logger, path, nano::dev::constants, false, true);
nano::store::unconfirmed_set unconfirmed;
{
nano::ledger_cache ledger_cache{ store->rep_weight };
nano::ledger_cache ledger_cache{ store->rep_weight, unconfirmed.rep_weight };
auto transaction (store->tx_begin_write ());
store->initialize (transaction, ledger_cache, nano::dev::constants);
}
Expand Down Expand Up @@ -3807,4 +3825,4 @@ TEST (node, local_block_broadcast)
node1.network.merge_peer (node2.network.endpoint ());
ASSERT_TIMELY (5s, node1.network.find_node_id (node2.get_node_id ()));
ASSERT_TIMELY (10s, node2.block (send1->hash ()));
}
}
Loading

0 comments on commit ff57e47

Please sign in to comment.