ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +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
2012-07-17 03:10:55 -07:00
parent d83d8080fd 0f554c1c59
commit c210356c98
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
newcoin.vcxproj
View File

@@ -116,6 +116,7 @@
<ClCompile Include="src\LedgerMaster.cpp" />
<ClCompile Include="src\LedgerNode.cpp" />
<ClCompile Include="src\LedgerProposal.cpp" />
<ClCompile Include="src\LedgerTiming.cpp" />
<ClCompile Include="src\Log.cpp" />
<ClCompile Include="src\main.cpp" />
<ClCompile Include="src\NetworkOPs.cpp" />

3
newcoin.vcxproj.filters
View File

@@ -264,6 +264,9 @@
<ClCompile Include="websocketpp\src\sha1\sha1.cpp">
<Filter>Source Files\websocketpp</Filter>
</ClCompile>
<ClCompile Include="src\LedgerTiming.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="KnownNodeList.h">

8
src/Amount.cpp
View File

@@ -836,11 +836,17 @@ Json::Value STAmount::getJson(int) const
{
Json::Value elem(Json::objectValue);
elem["value"] = getText();
// This is a hack, many places don't specify a currency. STAmount is used just as a value.
if (!mIsNative)
{
elem["value"] = getText();
elem["currency"] = getCurrencyHuman();
}else
{
elem=getText();
}
return elem;
}

2
src/RPCServer.cpp
View File

@@ -1386,7 +1386,7 @@ Json::Value RPCServer::doSend(const Json::Value& params)
{
// Not enough native currency.
Log(lsINFO) << "doSend: Insufficent funds: src=" << saSrcAmount.getText() << " dst=" << saDstAmount.getText();
Log(lsINFO) << "doSend: Insufficient funds: src=" << saSrcAmount.getText() << " dst=" << saDstAmount.getText();
return RPCError(rpcINSUF_FUNDS);
}