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

Change process overspend to negative_spend

Browse source
This commit is contained in:
Lee Bousfield 2018-02-03 11:51:34 -07:00 • committed by androm3da
commit 639d132c98
5 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rai/core_test/ledger.cpp
View file

@ -970,7 +970,7 @@ TEST (ledger, fail_send_bad_signature)
ASSERT_EQ (rai::process_result::bad_signature, result1.code);
}
TEST (ledger, fail_send_overspend)
TEST (ledger, fail_send_negative_spend)
{
bool init (false);
rai::block_store store (init, rai::unique_path ());
@ -984,7 +984,7 @@ TEST (ledger, fail_send_overspend)
ASSERT_EQ (rai::process_result::progress, ledger.process (transaction, block1).code);
rai::keypair key2;
rai::send_block block2 (block1.hash (), key2.pub, 2, rai::test_genesis_key.prv, rai::test_genesis_key.pub, 0);
ASSERT_EQ (rai::process_result::overspend, ledger.process (transaction, block2).code);
ASSERT_EQ (rai::process_result::negative_spend, ledger.process (transaction, block2).code);
}
TEST (ledger, fail_send_fork)

4
rai/node/node.cpp
View file

@ -1285,11 +1285,11 @@ rai::process_return rai::block_processor::process_receive_one (MDB_txn * transac
}
break;
}
case rai::process_result::overspend:
case rai::process_result::negative_spend:
{
if (node.config.logging.ledger_logging ())
{
BOOST_LOG (node.log) << boost::str (boost::format ("Overspend for: %1%") % block_a->hash ().to_string ());
BOOST_LOG (node.log) << boost::str (boost::format ("Negative spend for: %1%") % block_a->hash ().to_string ());
}
break;
}

3
rai/node/rpc.cpp
View file

@ -2412,8 +2412,9 @@ void rai::rpc_handler::process ()
error_response (response, "Bad signature");
break;
}
case rai::process_result::overspend:
case rai::process_result::negative_spend:
{
// TODO once we get RPC versioning, this should be changed to "negative spend"
error_response (response, "Overspend");
break;
}

2
rai/secure.cpp
View file

@ -2407,7 +2407,7 @@ void ledger_processor::send_block (rai::send_block const & block_a)
auto latest_error (ledger.store.account_get (transaction, account, info));
assert (!latest_error);
assert (info.head == block_a.hashables.previous);
result.code = info.balance.number () >= block_a.hashables.balance.number () ? rai::process_result::progress : rai::process_result::overspend; // Is this trying to spend more than they have (Malicious)
result.code = info.balance.number () >= block_a.hashables.balance.number () ? rai::process_result::progress : rai::process_result::negative_spend; // Is this trying to spend a negative amount (Malicious)
if (result.code == rai::process_result::progress)
{
auto amount (info.balance.number () - block_a.hashables.balance.number ());

2
rai/secure.hpp
View file

@ -312,7 +312,7 @@ enum class process_result
progress, // Hasn't been seen before, signed correctly
bad_signature, // Signature was bad, forged or transmission error
old, // Already seen and was valid
overspend, // Malicious attempt to overspend
negative_spend, // Malicious attempt to spend a negative amount
fork, // Malicious fork based on previous
unreceivable, // Source block doesn't exist or has already been received
gap_previous, // Block marked as previous is unknown