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

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

Browse Source 
Conflicts:
	src/Transaction.cpp
This commit is contained in:
JoelKatz
2012-10-01 15:22:37 -07:00
parent 79c35f2689 0b49c0dee9
commit 18d3773da4
4 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/RPCServer.cpp
View File

@@ -960,7 +960,6 @@ Json::Value RPCServer::doNicknameSet(const Json::Value& params)
std::string strOfferCurrency;
std::string strNickname = params[2u].asString();
boost::trim(strNickname);
std::vector<unsigned char> vucSignature;
if (strNickname.empty())
{
@@ -1012,8 +1011,7 @@ Json::Value RPCServer::doNicknameSet(const Json::Value& params)
0, // YYY No source tag
Ledger::getNicknameHash(strNickname),
bSetOffer,
saMinimumOffer,
vucSignature);
saMinimumOffer);
trans = mNetOps->submitTransaction(trans);
@@ -1783,14 +1781,14 @@ Json::Value RPCServer::doSend(const Json::Value& params)
// bool ret_b;
// ret_b = false;
if (!saSrcAmountMax.isNative() || !saDstAmount.isNative())
if (!saSrcAmountMax.isNative() || !saDstAmount.isNative())
{
STAmount::currencyFromString(srcCurrencyID, sSrcCurrency);
Pathfinder pf(naSrcAccountID, naDstAccountID, srcCurrencyID, saDstAmount);
// ret_b = pf.findPaths(5, 1, spsPaths);
pf.findPaths(5, 1, spsPaths);
}
trans = Transaction::sharedPayment(
naAccountPublic, naAccountPrivate,
naSrcAccountID,