ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-27 06:25:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jedmccaleb/NewCoin

Browse Source
This commit is contained in:
JoelKatz
2013-01-01 16:11:53 -08:00
parent 1e24721a98 f09543fe8a
commit 6fce36b107
6 changed files with 48 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/cpp/ripple/Config.cpp
View File

@@ -274,7 +274,6 @@ void Config::load()
sectionSingleB(secConfig, SECTION_WEBSOCKET_SSL_CERT, WEBSOCKET_SSL_CERT);
sectionSingleB(secConfig, SECTION_WEBSOCKET_SSL_CHAIN, WEBSOCKET_SSL_CHAIN);
sectionSingleB(secConfig, SECTION_WEBSOCKET_SSL_KEY, WEBSOCKET_SSL_KEY);
if (sectionSingleB(secConfig, SECTION_VALIDATION_SEED, strTemp))
{

11
src/cpp/ripple/RPCHandler.cpp
View File

@@ -1006,7 +1006,9 @@ Json::Value RPCHandler::doSubmit(Json::Value jvRequest)
}
if (!txJSON.isMember("Fee")
&& ("OfferCreate" == txJSON["TransactionType"].asString()
&& (
"AccountSet" == txJSON["TransactionType"].asString()
|| "OfferCreate" == txJSON["TransactionType"].asString()
|| "OfferCancel" == txJSON["TransactionType"].asString()
|| "TrustSet" == txJSON["TransactionType"].asString()))
{
@@ -1353,8 +1355,10 @@ Json::Value RPCHandler::doAccountTransactions(Json::Value jvRequest)
}
// {
// secret: <string>
// secret: <string> // optional
// }
//
// This command requires admin access because it makes no sense to ask an untrusted server for this.
Json::Value RPCHandler::doValidationCreate(Json::Value jvRequest) {
RippleAddress raSeed;
Json::Value obj(Json::objectValue);
@@ -1518,6 +1522,7 @@ Json::Value RPCHandler::doWalletPropose(Json::Value jvRequest)
Json::Value obj(Json::objectValue);
obj["master_seed"] = naSeed.humanSeed();
obj["master_seed_hex"] = naSeed.getSeed().ToString();
//obj["master_key"] = naSeed.humanSeed1751();
obj["account_id"] = naAccount.humanAccountID();
@@ -2455,7 +2460,7 @@ Json::Value RPCHandler::doCommand(Json::Value& jvRequest, int iRole)
{ "unl_reset", &RPCHandler::doUnlReset, true, optNone },
{ "unl_score", &RPCHandler::doUnlScore, true, optNone },
{ "validation_create", &RPCHandler::doValidationCreate, false, optNone },
{ "validation_create", &RPCHandler::doValidationCreate, true, optNone },
{ "validation_seed", &RPCHandler::doValidationSeed, false, optNone },
{ "wallet_accounts", &RPCHandler::doWalletAccounts, false, optCurrent },