ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-27 22:45:52 +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-11-21 13:45:29 -08:00
parent c36d967de8 20f0ca6689
commit 6ce7d880e5
5 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
newcoin.vcxproj
View File

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

3
newcoin.vcxproj.filters
View File

@@ -342,6 +342,9 @@
<ClCompile Include="src\cpp\ripple\TrustSetTransactor.cpp"> <ClCompile Include="src\cpp\ripple\TrustSetTransactor.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\cpp\ripple\LoadMonitor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="util\pugiconfig.hpp"> <ClInclude Include="util\pugiconfig.hpp">

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

@@ -21,7 +21,7 @@
#define CONFIG_FILE_NAME SYSTEM_NAME "d.cfg" // rippled.cfg #define CONFIG_FILE_NAME SYSTEM_NAME "d.cfg" // rippled.cfg
#define DEFAULT_VALIDATORS_SITE "redstem.com" #define DEFAULT_VALIDATORS_SITE ""
#define VALIDATORS_FILE_NAME "validators.txt" #define VALIDATORS_FILE_NAME "validators.txt"
const int SYSTEM_PEER_PORT = 6561; const int SYSTEM_PEER_PORT = 6561;

19
src/cpp/ripple/UniqueNodeList.cpp
View File

@@ -1547,14 +1547,17 @@ void UniqueNodeList::validatorsResponse(const boost::system::error_code& err, st
void UniqueNodeList::nodeNetwork() void UniqueNodeList::nodeNetwork()
{ {
HttpsClient::httpsGet( if(!theConfig.VALIDATORS_SITE.empty())
theApp->getIOService(), {
theConfig.VALIDATORS_SITE, HttpsClient::httpsGet(
443, theApp->getIOService(),
VALIDATORS_FILE_PATH, theConfig.VALIDATORS_SITE,
VALIDATORS_FILE_BYTES_MAX, 443,
boost::posix_time::seconds(VALIDATORS_FETCH_SECONDS), VALIDATORS_FILE_PATH,
boost::bind(&UniqueNodeList::validatorsResponse, this, _1, _2)); VALIDATORS_FILE_BYTES_MAX,
boost::posix_time::seconds(VALIDATORS_FETCH_SECONDS),
boost::bind(&UniqueNodeList::validatorsResponse, this, _1, _2));
}
} }
void UniqueNodeList::nodeBootstrap() void UniqueNodeList::nodeBootstrap()

3
test/config-example.js
View File

@@ -14,12 +14,13 @@ exports.servers = {
// A local test server. // A local test server.
"alpha" : { "alpha" : {
'trusted' : true, 'trusted' : true,
'no_server' : true,
// "peer_ip" : "0.0.0.0", // "peer_ip" : "0.0.0.0",
// "peer_port" : 51235, // "peer_port" : 51235,
'rpc_ip' : "0.0.0.0", 'rpc_ip' : "0.0.0.0",
'rpc_port' : 5005, 'rpc_port' : 5005,
'websocket_ip' : "127.0.0.1", 'websocket_ip' : "127.0.0.1",
'websocket_port' : 6005, 'websocket_port' : 5006,
// 'validation_seed' : "shhDFVsmS2GSu5vUyZSPXYfj1r79h", // 'validation_seed' : "shhDFVsmS2GSu5vUyZSPXYfj1r79h",
// 'validators' : "n9L8LZZCwsdXzKUN9zoVxs4YznYXZ9hEhsQZY7aVpxtFaSceiyDZ beta" // 'validators' : "n9L8LZZCwsdXzKUN9zoVxs4YznYXZ9hEhsQZY7aVpxtFaSceiyDZ beta"
} }