ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-11-19 01:55:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master (0.90.1) into develop (1.0.0-b2):

Browse Source 
The merge also updates the RELEASENOTES.md with the release
notes for the 0.90.1 which were accidentally not included
in that release.
This commit is contained in:
Nikolaos D. Bougalis
2018-03-23 16:21:35 -07:00
parent 881cd4cfad 067dbf299c
commit 2b8893dfca
49 changed files with 437 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ripple/app/misc/NetworkOPs.cpp
View File

@@ -785,7 +785,7 @@ void NetworkOPsImp::processClusterTimer ()
{
protocol::TMClusterNode& n = *cluster.add_clusternodes();
n.set_publickey(toBase58 (
TokenType::TOKEN_NODE_PUBLIC,
TokenType::NodePublic,
node.identity()));
n.set_reporttime(
node.getReportTime().time_since_epoch().count());
@@ -1560,9 +1560,9 @@ void NetworkOPsImp::pubManifest (Manifest const& mo)
jvObj [jss::type] = "manifestReceived";
jvObj [jss::master_key] = toBase58(
TokenType::TOKEN_NODE_PUBLIC, mo.masterKey);
TokenType::NodePublic, mo.masterKey);
jvObj [jss::signing_key] = toBase58(
TokenType::TOKEN_NODE_PUBLIC, mo.signingKey);
TokenType::NodePublic, mo.signingKey);
jvObj [jss::seq] = Json::UInt (mo.sequence);
jvObj [jss::signature] = strHex (mo.getSignature ());
jvObj [jss::master_signature] = strHex (mo.getMasterSignature ());
@@ -1699,7 +1699,7 @@ void NetworkOPsImp::pubValidation (STValidation::ref val)
jvObj [jss::type] = "validationReceived";
jvObj [jss::validation_public_key] = toBase58(
TokenType::TOKEN_NODE_PUBLIC,
TokenType::NodePublic,
val->getSignerPublic());
jvObj [jss::ledger_hash] = to_string (val->getLedgerHash ());
jvObj [jss::signature] = strHex (val->getSignature ());
@@ -2126,7 +2126,7 @@ Json::Value NetworkOPsImp::getServerInfo (bool human, bool admin)
if (!app_.getValidationPublicKey().empty())
{
info[jss::pubkey_validator] = toBase58 (
TokenType::TOKEN_NODE_PUBLIC,
TokenType::NodePublic,
app_.validators().localPublicKey());
}
else
@@ -2136,7 +2136,7 @@ Json::Value NetworkOPsImp::getServerInfo (bool human, bool admin)
}
info[jss::pubkey_node] = toBase58 (
TokenType::TOKEN_NODE_PUBLIC,
TokenType::NodePublic,
app_.nodeIdentity().first);
info[jss::complete_ledgers] =
@@ -2824,7 +2824,7 @@ bool NetworkOPsImp::subServer (InfoSub::ref isrListener, Json::Value& jvResult,
jvResult[jss::load_factor] = feeTrack.getLoadFactor ();
jvResult [jss::hostid] = getHostId (admin);
jvResult[jss::pubkey_node] = toBase58 (
TokenType::TOKEN_NODE_PUBLIC,
TokenType::NodePublic,
app_.nodeIdentity().first);
ScopedLockType sl (mSubLock);