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

Publish new manifest signature

Browse Source
This commit is contained in:
wilsonianb
2016-10-21 08:13:33 -07:00
committed by Brad Chase
parent b8cae2dfaf
commit bbf52056f9
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1564,11 +1564,14 @@ void NetworkOPsImp::pubManifest (Manifest const& mo)
{
Json::Value jvObj (Json::objectValue);
jvObj [jss::type] = "manifestReceived";
jvObj [jss::master_key] = toBase58(TokenType::TOKEN_NODE_PUBLIC, mo.masterKey);
jvObj [jss::signing_key] = toBase58(TokenType::TOKEN_NODE_PUBLIC, mo.signingKey);
jvObj [jss::seq] = Json::UInt (mo.sequence);
jvObj [jss::signature] = strHex (mo.getSignature ());
jvObj [jss::type] = "manifestReceived";
jvObj [jss::master_key] = toBase58(
TokenType::TOKEN_NODE_PUBLIC, mo.masterKey);
jvObj [jss::signing_key] = toBase58(
TokenType::TOKEN_NODE_PUBLIC, mo.signingKey);
jvObj [jss::seq] = Json::UInt (mo.sequence);
jvObj [jss::signature] = strHex (mo.getSignature ());
jvObj [jss::master_signature] = strHex (mo.getMasterSignature ());
for (auto i = mSubManifests.begin (); i != mSubManifests.end (); )
{
@@ -2043,7 +2046,7 @@ Json::Value NetworkOPsImp::getServerInfo (bool human, bool admin)
if (! validation_manifest.lines().empty())
{
std::string s;
s.reserve (188);
s.reserve (Manifest::textLength);
for (auto const& line : validation_manifest.lines())
s += beast::rfc2616::trim(line);
if (auto mo = make_Manifest (beast::detail::base64_decode(s)))

2
src/ripple/overlay/impl/Manifest.h
View File

@@ -85,6 +85,8 @@ namespace ripple {
struct Manifest
{
static std::size_t constexpr textLength = 288;
std::string serialized;
PublicKey masterKey;
PublicKey signingKey;

2
src/ripple/overlay/impl/OverlayImpl.cpp
View File

@@ -497,7 +497,7 @@ OverlayImpl::setupValidatorKeyManifests (BasicConfig const& config,
if (! validation_manifest.lines().empty())
{
std::string s;
s.reserve (188);
s.reserve (Manifest::textLength);
for (auto const& line : validation_manifest.lines())
s += beast::rfc2616::trim(line);
if (auto mo = make_Manifest (beast::detail::base64_decode(s)))

1
src/ripple/protocol/JsonFields.h
View File

@@ -264,6 +264,7 @@ JSS ( marker ); // in/out: AccountTx, AccountOffers,
JSS ( master_key ); // out: WalletPropose
JSS ( master_seed ); // out: WalletPropose
JSS ( master_seed_hex ); // out: WalletPropose
JSS ( master_signature ); // out: pubManifest
JSS ( max_ledger ); // in/out: LedgerCleaner
JSS ( max_queue_size ); // out: TxQ
JSS ( max_spend_drops ); // out: AccountInfo