Merge branch 'master' into autoclient

Conflicts:
	src/cpp/ripple/AutoSocket.h
This commit is contained in:
Arthur Britto
2013-02-01 19:01:10 -08:00
53 changed files with 1726 additions and 748 deletions

View File

@@ -296,6 +296,11 @@ Json::Value RPCHandler::transactionSign(Json::Value jvRequest, bool bSubmit)
return jvResult;
}
if (jvRequest.isMember("debug_signing")) {
jvResult["tx_unsigned"] = strHex(stpTrans->getSerializer().peekData());
jvResult["tx_signing_hash"] = stpTrans->getSigningHash().ToString();
}
// FIXME: For performance, transactions should not be signed in this code path.
stpTrans->sign(naAccountPrivate);