ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow random seed with specified wallet_propose key_type (RIPD-1030)

Browse Source
This commit is contained in:
wilsonianb
2016-01-19 14:58:30 -08:00
committed by Nik Bougalis
parent 767d253593
commit b92a58d11e
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ripple/rpc/handlers/WalletPropose.cpp
View File

@@ -56,8 +56,16 @@ Json::Value walletPropose (Json::Value const& params)
if (keyType == KeyType::invalid) if (keyType == KeyType::invalid)
return rpcError(rpcINVALID_PARAMS); return rpcError(rpcINVALID_PARAMS);
if (params.isMember (jss::passphrase) || params.isMember (jss::seed) ||
params.isMember (jss::seed_hex))
{
seed = RPC::getSeedFromRPC (params); seed = RPC::getSeedFromRPC (params);
} }
else
{
seed = randomSeed ();
}
}
else if (params.isMember (jss::passphrase)) else if (params.isMember (jss::passphrase))
{ {
seed = parseGenericSeed ( seed = parseGenericSeed (

3
src/ripple/rpc/tests/KeyGeneration.test.cpp
View File

@@ -132,6 +132,9 @@ public:
Json::Value params; Json::Value params;
params[jss::key_type] = keyType; params[jss::key_type] = keyType;
expect (! contains_error (walletPropose (params)));
params[jss::passphrase] = common::passphrase; params[jss::passphrase] = common::passphrase;
testSecretWallet (params, strings); testSecretWallet (params, strings);