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

Add wallet locked check to RPC wallet_representative_set (#1627)

Browse source 
* Add wallet locked check to PRC wallet_representative_set

Required after https://github.com/nanocurrency/nano-node/pull/1531 if existing accounts are updated

* Move update_existing_accounts get
This commit is contained in:
Sergey Kroshnin 2019-01-26 18:46:07 +03:00 • committed by Zach Hyatt
commit e4d61e6bbe
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
nano/node/rpc.cpp
View file

@ -3543,17 +3543,26 @@ void nano::rpc_handler::wallet_representative_set ()
nano::account representative;
if (!representative.decode_account (representative_text))
{
bool update_existing_accounts (request.get<bool> ("update_existing_accounts", false));
{
auto transaction (node.wallets.tx_begin_write ());
wallet->store.representative_set (transaction, representative);
if (wallet->store.valid_password (transaction) || !update_existing_accounts)
{
wallet->store.representative_set (transaction, representative);
response_l.put ("set", "1");
}
else
{
ec = nano::error_common::wallet_locked;
}
}
// Change representative for all wallet accounts
if (request.get<bool> ("update_existing_accounts", false))
if (!ec && update_existing_accounts)
{
std::vector<nano::account> accounts;
{
auto transaction (node.wallets.tx_begin_read ());
auto block_transaction (node.store.tx_begin_write ());
auto block_transaction (node.store.tx_begin_read ());
for (auto i (wallet->store.begin (transaction)), n (wallet->store.end ()); i != n; ++i)
{
nano::account account (i->first);
@ -3574,7 +3583,6 @@ void nano::rpc_handler::wallet_representative_set ()
wallet->change_async (account, representative, [](std::shared_ptr<nano::block>) {}, 0, false);
}
}
response_l.put ("set", "1");
}
else
{