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

Sign with no locks.

Browse Source
This commit is contained in:
JoelKatz
2013-06-05 14:58:18 -07:00
parent d3e7fb5ba0
commit e02a49f045
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,8 +72,10 @@ RPCHandler::RPCHandler(NetworkOPs* netOps) : mNetOps(netOps), mRole(FORBID)
RPCHandler::RPCHandler(NetworkOPs* netOps, InfoSub::pointer infoSub) : mNetOps(netOps), mInfoSub(infoSub), mRole(FORBID) RPCHandler::RPCHandler(NetworkOPs* netOps, InfoSub::pointer infoSub) : mNetOps(netOps), mInfoSub(infoSub), mRole(FORBID)
{ ; } { ; }
Json::Value RPCHandler::transactionSign(Json::Value jvRequest, bool bSubmit) Json::Value RPCHandler::transactionSign(Json::Value jvRequest, bool bSubmit, ScopedLock& mlh)
{ {
mlh.unlock();
Json::Value jvResult; Json::Value jvResult;
RippleAddress naSeed; RippleAddress naSeed;
RippleAddress raSrcAddressID; RippleAddress raSrcAddressID;
@@ -108,7 +110,7 @@ Json::Value RPCHandler::transactionSign(Json::Value jvRequest, bool bSubmit)
return rpcError(rpcINVALID_PARAMS); return rpcError(rpcINVALID_PARAMS);
} }
AccountState::pointer asSrc = mNetOps->getAccountState(mNetOps->getCurrentLedger(), raSrcAddressID); AccountState::pointer asSrc = mNetOps->getAccountState(mNetOps->getCurrentSnapshot(), raSrcAddressID);
if (!asSrc) if (!asSrc)
{ {
WriteLog (lsDEBUG, RPCHandler) << boost::str(boost::format("transactionSign: Failed to find source account in current ledger: %s") WriteLog (lsDEBUG, RPCHandler) << boost::str(boost::format("transactionSign: Failed to find source account in current ledger: %s")
@@ -176,7 +178,6 @@ Json::Value RPCHandler::transactionSign(Json::Value jvRequest, bool bSubmit)
Ledger::pointer lSnapshot = mNetOps->getCurrentSnapshot(); Ledger::pointer lSnapshot = mNetOps->getCurrentSnapshot();
{ {
ScopedUnlock su(theApp->getMasterLock());
bool bValid; bool bValid;
RLCache::pointer cache = boost::make_shared<RLCache>(lSnapshot); RLCache::pointer cache = boost::make_shared<RLCache>(lSnapshot);
Pathfinder pf(cache, raSrcAddressID, dstAccountID, Pathfinder pf(cache, raSrcAddressID, dstAccountID,
@@ -214,7 +215,7 @@ Json::Value RPCHandler::transactionSign(Json::Value jvRequest, bool bSubmit)
if (!txJSON.isMember("Sequence")) txJSON["Sequence"] = asSrc->getSeq(); if (!txJSON.isMember("Sequence")) txJSON["Sequence"] = asSrc->getSeq();
if (!txJSON.isMember("Flags")) txJSON["Flags"] = 0; if (!txJSON.isMember("Flags")) txJSON["Flags"] = 0;
Ledger::pointer lpCurrent = mNetOps->getCurrentLedger(); Ledger::pointer lpCurrent = mNetOps->getCurrentSnapshot();
SLE::pointer sleAccountRoot = mNetOps->getSLEi(lpCurrent, Ledger::getAccountRootIndex(raSrcAddressID.getAccountID())); SLE::pointer sleAccountRoot = mNetOps->getSLEi(lpCurrent, Ledger::getAccountRootIndex(raSrcAddressID.getAccountID()));
if (!sleAccountRoot) if (!sleAccountRoot)
@@ -1570,7 +1571,7 @@ Json::Value RPCHandler::doRipplePathFind(Json::Value jvRequest, int& cost, Scope
Json::Value RPCHandler::doSign(Json::Value jvRequest, int& cost, ScopedLock& MasterLockHolder) Json::Value RPCHandler::doSign(Json::Value jvRequest, int& cost, ScopedLock& MasterLockHolder)
{ {
cost = rpcCOST_EXPENSIVE; cost = rpcCOST_EXPENSIVE;
return transactionSign(jvRequest, false); return transactionSign(jvRequest, false, MasterLockHolder);
} }
// { // {
@@ -1581,7 +1582,7 @@ Json::Value RPCHandler::doSubmit(Json::Value jvRequest, int& cost, ScopedLock& M
{ {
if (!jvRequest.isMember("tx_blob")) if (!jvRequest.isMember("tx_blob"))
{ {
return transactionSign(jvRequest, true); return transactionSign(jvRequest, true, MasterLockHolder);
} }
Json::Value jvResult; Json::Value jvResult;

2
src/cpp/ripple/RPCHandler.h
View File

@@ -32,7 +32,7 @@ class RPCHandler
// Utilities // Utilities
void addSubmitPath(Json::Value& txJSON); void addSubmitPath(Json::Value& txJSON);
boost::unordered_set<RippleAddress> parseAccountIds(const Json::Value& jvArray); boost::unordered_set<RippleAddress> parseAccountIds(const Json::Value& jvArray);
Json::Value transactionSign(Json::Value jvRequest, bool bSubmit); Json::Value transactionSign(Json::Value jvRequest, bool bSubmit, ScopedLock& mlh);
Json::Value lookupLedger(Json::Value jvRequest, Ledger::pointer& lpLedger); Json::Value lookupLedger(Json::Value jvRequest, Ledger::pointer& lpLedger);