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

Return last account restored in RPC wallet_change_seed (#1718)

Browse source 
https://github.com/nanocurrency/nano-node/issues/1717
Also returns restored count
This commit is contained in:
Sergey Kroshnin 2019-02-23 00:20:56 +03:00 • committed by GitHub
commit c926f0a6e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
nano/core_test/rpc.cpp
View file

@ -709,11 +709,14 @@ TEST (rpc, wallet_create)
TEST (rpc, wallet_create_seed)
{
nano::system system (24000, 1);
nano::keypair seed;
nano::raw_key prv;
nano::deterministic_key (seed.pub, 0, prv.data);
auto pub (nano::pub_key (prv.data));
nano::rpc rpc (system.io_ctx, *system.nodes[0], nano::rpc_config (true));
rpc.start ();
boost::property_tree::ptree request;
request.put ("action", "wallet_create");
nano::keypair seed;
request.put ("seed", seed.pub.to_string ());
test_response response (request, rpc, system.io_ctx);
while (response.status == 0)
@ -732,10 +735,12 @@ TEST (rpc, wallet_create_seed)
existing->second->store.seed (seed0, transaction);
ASSERT_EQ (seed.pub, seed0.data);
}
auto account_text (response.json.get<std::string> ("account"));
auto account_text (response.json.get<std::string> ("last_restored_account"));
nano::uint256_union account;
ASSERT_FALSE (account.decode_account (account_text));
ASSERT_TRUE (existing->second->exists (account));
ASSERT_EQ (pub, account);
ASSERT_EQ ("1", response.json.get<std::string> ("restored_count"));
}
TEST (rpc, wallet_export)
@ -2424,6 +2429,9 @@ TEST (rpc, wallet_change_seed)
system0.wallet (0)->store.seed (seed0, transaction);
ASSERT_NE (seed.pub, seed0.data);
}
nano::raw_key prv;
nano::deterministic_key (seed.pub, 0, prv.data);
auto pub (nano::pub_key (prv.data));
nano::rpc rpc (system0.io_ctx, *system0.nodes[0], nano::rpc_config (true));
rpc.start ();
boost::property_tree::ptree request;
@ -2443,6 +2451,12 @@ TEST (rpc, wallet_change_seed)
system0.wallet (0)->store.seed (seed0, transaction);
ASSERT_EQ (seed.pub, seed0.data);
}
auto account_text (response.json.get<std::string> ("last_restored_account"));
nano::uint256_union account;
ASSERT_FALSE (account.decode_account (account_text));
ASSERT_TRUE (system0.wallet (0)->exists (account));
ASSERT_EQ (pub, account);
ASSERT_EQ ("1", response.json.get<std::string> ("restored_count"));
}
TEST (rpc, wallet_frontiers)

11
nano/node/rpc.cpp
View file

@ -3473,8 +3473,12 @@ void nano::rpc_handler::wallet_change_seed ()
auto transaction (node.wallets.tx_begin_write ());
if (wallet->store.valid_password (transaction))
{
wallet->change_seed (transaction, seed, count);
nano::public_key account (wallet->change_seed (transaction, seed, count));
response_l.put ("success", "");
response_l.put ("last_restored_account", account.to_account ());
auto index (wallet->store.deterministic_index_get (transaction));
assert (index > 0);
response_l.put ("restored_count", std::to_string (index));
}
else
{
@ -3530,7 +3534,10 @@ void nano::rpc_handler::wallet_create ()
{
auto transaction (node.wallets.tx_begin_write ());
nano::public_key account (wallet->change_seed (transaction, seed));
response_l.put ("account", account.to_account ());
response_l.put ("last_restored_account", account.to_account ());
auto index (wallet->store.deterministic_index_get (transaction));
assert (index > 0);
response_l.put ("restored_count", std::to_string (index));
}
}
}