diff --git a/src/ripple/app/misc/NetworkOPs.cpp b/src/ripple/app/misc/NetworkOPs.cpp index b298a41db4..b4e493270e 100644 --- a/src/ripple/app/misc/NetworkOPs.cpp +++ b/src/ripple/app/misc/NetworkOPs.cpp @@ -1721,16 +1721,23 @@ void NetworkOPsImp::pubValidation (STValidation::ref val) { Json::Value jvObj (Json::objectValue); + auto const signerPublic = val->getSignerPublic(); + jvObj [jss::type] = "validationReceived"; jvObj [jss::validation_public_key] = toBase58( TokenType::NodePublic, - val->getSignerPublic()); + signerPublic); jvObj [jss::ledger_hash] = to_string (val->getLedgerHash ()); jvObj [jss::signature] = strHex (val->getSignature ()); jvObj [jss::full] = val->isFull(); jvObj [jss::flags] = val->getFlags(); jvObj [jss::signing_time] = *(*val)[~sfSigningTime]; + auto const masterKey = app_.validatorManifests().getMasterKey(signerPublic); + + if(masterKey != signerPublic) + jvObj [jss::master_key] = toBase58(TokenType::NodePublic, masterKey); + if (auto const seq = (*val)[~sfLedgerSequence]) jvObj [jss::ledger_index] = to_string (*seq); diff --git a/src/ripple/protocol/jss.h b/src/ripple/protocol/jss.h index 9c9400e13a..1d95293751 100644 --- a/src/ripple/protocol/jss.h +++ b/src/ripple/protocol/jss.h @@ -322,7 +322,7 @@ JSS ( marker ); // in/out: AccountTx, AccountOffers, // AccountLines, AccountObjects, // LedgerData // in: BookOffers -JSS ( master_key ); // out: WalletPropose +JSS ( master_key ); // out: WalletPropose, NetworkOPs JSS ( master_seed ); // out: WalletPropose JSS ( master_seed_hex ); // out: WalletPropose JSS ( master_signature ); // out: pubManifest