Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor RPC block_create changes #804

Merged
merged 5 commits into from
Apr 18, 2018
Merged

Minor RPC block_create changes #804

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eff7d71
Fetching account balance & previous for send blocks
SergiySW Apr 16, 2018
3a00a00
Account field is not required for state blocks
SergiySW Apr 16, 2018
0efa55b
If there is no link in request use source or destination
SergiySW Apr 16, 2018
4770e99
Double check current balance if previous block is specified
SergiySW Apr 16, 2018
29f442b
Link can be 0 for changing representative
SergiySW Apr 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 33 additions & 5 deletions rai/node/rpc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1125,7 +1125,6 @@ void rai::rpc_handler::block_create ()
prv.data.clear ();
rai::uint256_union previous (0);
rai::uint128_union balance (0);
rai::uint256_union link (0);
if (wallet != 0 && account != 0)
{
auto existing (node.wallets.items.find (wallet));
Expand Down Expand Up @@ -1184,6 +1183,7 @@ void rai::rpc_handler::block_create ()
error_response (response, "Bad balance number");
}
}
rai::uint256_union link (0);
boost::optional<std::string> link_text (request.get_optional<std::string> ("link"));
if (link_text.is_initialized ())
{
Expand All @@ -1197,20 +1197,48 @@ void rai::rpc_handler::block_create ()
}
}
}
else
{
// Retrieve link from source or destination
link = source.is_zero () ? destination : source;
}
if (prv.data != 0)
{
rai::uint256_union pub;
ed25519_publickey (prv.data.bytes.data (), pub.bytes.data ());
// Fetching account balance & previous for send blocks (if aren't given directly)
if (!previous_text.is_initialized () && !balance_text.is_initialized ())
{
rai::transaction transaction (node.store.environment, nullptr, false);
previous = node.ledger.latest (transaction, pub);
balance = node.ledger.account_balance (transaction, pub);
}
// Double check current balance if previous block is specified
else if (previous_text.is_initialized () && balance_text.is_initialized () && type == "send")
{
rai::transaction transaction (node.store.environment, nullptr, false);
if (node.store.block_exists (transaction, previous) && node.store.block_balance (transaction, previous) != balance.number ())
{
error_response (response, "Balance mismatch for previous block");
}
}
// Check for incorrect account key
if (account_text.is_initialized ())
{
if (account != pub)
{
error_response (response, "Incorrect key for given account");
}
}
if (type == "state")
{
if (!account.is_zero () && previous_text.is_initialized () && !representative.is_zero () && !balance.is_zero () && link_text.is_initialized ())
if (previous_text.is_initialized () && !representative.is_zero () && !balance.is_zero () && (!link.is_zero () || link_text.is_initialized ()))
{
if (work == 0)
{
work = node.generate_work (previous.is_zero () ? pub : previous);
}

rai::state_block state (account, previous, representative, balance, link, prv, pub, work);
rai::state_block state (pub, previous, representative, balance, link, prv, pub, work);
boost::property_tree::ptree response_l;
response_l.put ("hash", state.hash ().to_string ());
std::string contents;
Expand All @@ -1220,7 +1248,7 @@ void rai::rpc_handler::block_create ()
}
else
{
error_response (response, "Account, previous, representative, balance, and link are required");
error_response (response, "Previous, representative, final balance and link (source or destination) are required");
}
}
else if (type == "open")
Expand Down