mirror of
https://github.com/XRPLF/rippled.git
synced 2026-08-23 15:20:54 +00:00
Make wallet_propose seed generation consistent:
Allow 'seed' or 'seed_hex' if 'key_type' is not specified. Use legacy passphrase seed generation if 'key_type' is specified.
This commit is contained in:
@@ -30,9 +30,6 @@ namespace RPC {
|
||||
boost::optional<Seed>
|
||||
getSeedFromRPC (Json::Value const& params)
|
||||
{
|
||||
// This function is only called when `key_type` is present.
|
||||
assert (params.isMember (jss::key_type));
|
||||
|
||||
bool const hasPassphrase = params.isMember (jss::passphrase);
|
||||
bool const hasSeed = params.isMember (jss::seed);
|
||||
bool const hasHexSeed = params.isMember (jss::seed_hex);
|
||||
@@ -48,7 +45,7 @@ getSeedFromRPC (Json::Value const& params)
|
||||
return parseBase58<Seed> (params[jss::seed].asString());
|
||||
|
||||
if (hasPassphrase)
|
||||
return generateSeed (params[jss::passphrase].asString());
|
||||
return parseGenericSeed (params[jss::passphrase].asString());
|
||||
|
||||
if (hasHexSeed)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user