ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-24 21:15:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

More fixes for offline RPC sign.

Browse Source
This commit is contained in:
Arthur Britto
2013-06-08 21:32:16 -07:00
parent 12dd03ff65
commit 5e685aa55b
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/cpp/ripple/CallRPC.cpp
View File

@@ -558,13 +558,14 @@ Json::Value RPCParser::parseRipplePathFind(const Json::Value& jvParams)
// sign/submit any transaction to the network
//
// sign private_key json
// submit private_key json
// submit tx_blob
// sign <private_key> <json> offline
// submit <private_key> <json>
// submit <tx_blob>
Json::Value RPCParser::parseSignSubmit(const Json::Value& jvParams)
{
Json::Value txJSON;
Json::Reader reader;
bool bOffline = 3 == jvParams.size() && jvParams[2u].asString() == "offline";
if (1 == jvParams.size())
{
@@ -576,13 +577,16 @@ Json::Value RPCParser::parseSignSubmit(const Json::Value& jvParams)
return jvRequest;
}
// Submitting tx_json.
else if (reader.parse(jvParams[1u].asString(), txJSON))
else if ((2 == jvParams.size() || bOffline)
&& reader.parse(jvParams[1u].asString(), txJSON))
{
// Signing or submitting tx_json.
Json::Value jvRequest;
jvRequest["secret"] = jvParams[0u].asString();
jvRequest["tx_json"] = txJSON;
if (bOffline)
jvRequest["offline"] = true;
return jvRequest;
}
@@ -767,7 +771,7 @@ Json::Value RPCParser::parseCommand(std::string strMethod, Json::Value jvParams)
{ "proof_verify", &RPCParser::parseProofVerify, 2, 4 },
{ "random", &RPCParser::parseAsIs, 0, 0 },
{ "ripple_path_find", &RPCParser::parseRipplePathFind, 1, 2 },
{ "sign", &RPCParser::parseSignSubmit, 2, 2 },
{ "sign", &RPCParser::parseSignSubmit, 2, 3 },
{ "sms", &RPCParser::parseSMS, 1, 1 },
{ "submit", &RPCParser::parseSignSubmit, 1, 2 },
{ "server_info", &RPCParser::parseAsIs, 0, 0 },

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

@@ -78,7 +78,7 @@ Json::Value RPCHandler::transactionSign(Json::Value jvRequest, bool bSubmit, Sco
Json::Value jvResult;
RippleAddress naSeed;
RippleAddress raSrcAddressID;
bool bOffline = jvRequest.isMember("offline");
bool bOffline = jvRequest.isMember("offline") && jvRequest["offline"].asBool();
WriteLog (lsDEBUG, RPCHandler) << boost::str(boost::format("transactionSign: %s") % jvRequest);
@@ -231,6 +231,8 @@ Json::Value RPCHandler::transactionSign(Json::Value jvRequest, bool bSubmit, Sco
if (!txJSON.isMember("Flags")) txJSON["Flags"] = 0;
if (!bOffline)
{
Ledger::pointer lpCurrent = mNetOps->getCurrentSnapshot();
SLE::pointer sleAccountRoot = mNetOps->getSLEi(lpCurrent, Ledger::getAccountRootIndex(raSrcAddressID.getAccountID()));
@@ -239,6 +241,7 @@ Json::Value RPCHandler::transactionSign(Json::Value jvRequest, bool bSubmit, Sco
// XXX Ignore transactions for accounts not created.
return rpcError(rpcSRC_ACT_NOT_FOUND);
}
}
bool bHaveAuthKey = false;
RippleAddress naAuthorizedPublic;