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-06-18 09:23:23 -07:00
parent 8f88030219 3e46abf9b8
commit 6c0135fbef
6 changed files with 11 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
SConstruct
View File

@@ -88,3 +88,4 @@ newcoind = env.Program('newcoind', NEWCOIN_OBJS)
tags = env.CTags('obj/tags', NEWCOIN_SRCS)
Default(newcoind, tags)

14
newcoin.vcxproj
View File

@@ -85,8 +85,6 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="cryptopp\cpu.cpp" />
<ClCompile Include="cryptopp\sha.cpp" />
<ClCompile Include="database\database.cpp" />
<ClCompile Include="database\sqlite3.c" />
<ClCompile Include="database\SqliteDatabase.cpp" />
@@ -158,17 +156,6 @@
<ClInclude Include="Account.h" />
<ClInclude Include="bitcoinUtil.h" />
<ClInclude Include="Conversion.h" />
<ClInclude Include="cryptopp\config.h" />
<ClInclude Include="cryptopp\cpu.h" />
<ClInclude Include="cryptopp\cryptlib.h" />
<ClInclude Include="cryptopp\iterhash.h" />
<ClInclude Include="cryptopp\misc.h" />
<ClInclude Include="cryptopp\pch.h" />
<ClInclude Include="cryptopp\secblock.h" />
<ClInclude Include="cryptopp\sha.h" />
<ClInclude Include="cryptopp\simple.h" />
<ClInclude Include="cryptopp\smartptr.h" />
<ClInclude Include="cryptopp\stdcpp.h" />
<ClInclude Include="database\database.h" />
<ClInclude Include="database\sqlite3.h" />
<ClInclude Include="database\sqlite3ext.h" />
@@ -264,6 +251,7 @@
</None>
<None Include="todo.txt" />
<None Include="unl.xml" />
<None Include="validators.txt" />
<None Include="wallet.xml" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

43
newcoin.vcxproj.filters
View File

@@ -25,9 +25,6 @@
<Filter Include="html">
<UniqueIdentifier>{77d2a621-b503-4ce4-aee8-ef0b337c4ee2}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\cryptopp">
<UniqueIdentifier>{c3412b4c-4150-48d7-a5f2-24bdb1a39c5b}</UniqueIdentifier>
</Filter>
<Filter Include="tests">
<UniqueIdentifier>{209ce0bd-b197-4cb2-ad50-f8f43bcd1e03}</UniqueIdentifier>
</Filter>
@@ -42,12 +39,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="cryptopp\cpu.cpp">
<Filter>Source Files\cryptopp</Filter>
</ClCompile>
<ClCompile Include="cryptopp\sha.cpp">
<Filter>Source Files\cryptopp</Filter>
</ClCompile>
<ClCompile Include="database\sqlite3.c">
<Filter>Header Files\util</Filter>
</ClCompile>
@@ -266,39 +257,6 @@
<ClInclude Include="TimingService.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="cryptopp\config.h">
<Filter>Source Files\cryptopp</Filter>
</ClInclude>
<ClInclude Include="cryptopp\cpu.h">
<Filter>Source Files\cryptopp</Filter>
</ClInclude>
<ClInclude Include="cryptopp\cryptlib.h">
<Filter>Source Files\cryptopp</Filter>
</ClInclude>
<ClInclude Include="cryptopp\iterhash.h">
<Filter>Source Files\cryptopp</Filter>
</ClInclude>
<ClInclude Include="cryptopp\misc.h">
<Filter>Source Files\cryptopp</Filter>
</ClInclude>
<ClInclude Include="cryptopp\pch.h">
<Filter>Source Files\cryptopp</Filter>
</ClInclude>
<ClInclude Include="cryptopp\secblock.h">
<Filter>Source Files\cryptopp</Filter>
</ClInclude>
<ClInclude Include="cryptopp\sha.h">
<Filter>Source Files\cryptopp</Filter>
</ClInclude>
<ClInclude Include="cryptopp\simple.h">
<Filter>Source Files\cryptopp</Filter>
</ClInclude>
<ClInclude Include="cryptopp\smartptr.h">
<Filter>Source Files\cryptopp</Filter>
</ClInclude>
<ClInclude Include="cryptopp\stdcpp.h">
<Filter>Source Files\cryptopp</Filter>
</ClInclude>
<ClInclude Include="script.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -527,6 +485,7 @@
</None>
<None Include="SConstruct" />
<None Include="newcoind.cfg" />
<None Include="validators.txt" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="src\newcoin.proto" />

2
src/Log.cpp
View File

@@ -27,7 +27,7 @@ Log::~Log()
boost::recursive_mutex::scoped_lock sl(sLock);
if (mSeverity >= sMinSeverity)
{
// TEMP std::cerr << logMsg << std::endl;
std::cerr << logMsg << std::endl;
}
}

4
src/RPCServer.cpp
View File

@@ -92,7 +92,9 @@ Json::Value RPCServer::RPCError(int iError)
void RPCServer::connected()
{
std::cout << "RPC request" << std::endl;
//BOOST_LOG_TRIVIAL(info) << "RPC request";
//std::cout << "RPC request" << std::endl;
mSocket.async_read_some(boost::asio::buffer(mReadBuffer),
boost::bind(&RPCServer::handle_read, shared_from_this(),

11
validators.txt
View File

@@ -6,7 +6,7 @@
#
# This file is UTF-8 with Dos, UNIX, or Mac style end of lines.
# Blank lines and lines starting with a '#' are ignored.
# All other lines should be domain names.
# All other lines should be hankos or domain names.
#
# [validators]:
# List of nodes to accept as validators speficied by public key or domain.
@@ -20,9 +20,6 @@
#
[validators]
redstem.com
alpha.redstem.com
bravo.redstem.com
charlie.redstem.com
delta.redstem.com
echo.redstem.com
n9LQC4xFSWXNv1SU1sKtjrW6TZpBZSwp1nRWej8saGs155x42YFZ first
n9LFzWuhKNvXStHAuemfRKFVECLApowncMAM5chSCL9R5ECHGN4V second
n9KXAZxiHkWuVGxDEE8boW7WmcycpZNmWei4vxVaywLZ391Nbuqx third