From e80f9cf0deb3a572e68fef1a38810c2cfee3d6b6 Mon Sep 17 00:00:00 2001 From: intelliot Date: Thu, 13 Jul 2023 17:28:56 +0000 Subject: [PATCH] deploy: cb09e61d2f765435dbc4624d5ac3b214197f5622 --- AccountObjects__test_8cpp_source.html | 2 +- Application_8cpp_source.html | 2 +- ConnectAttempt_8cpp_source.html | 10 +- Consensus_8h_source.html | 2629 +++++++++-------- Consensus__test_8cpp_source.html | 2 +- DatabaseShardImp_8cpp_source.html | 2 +- DatabaseShard__test_8cpp_source.html | 6 +- ETLSource_8cpp_source.html | 2 +- ETLSource_8h_source.html | 2 +- HTTPClient_8cpp_source.html | 4 +- HTTPClient_8h_source.html | 136 +- Handshake_8cpp_source.html | 774 ++--- Handshake_8h_source.html | 20 +- InnerObjectFormats__test_8cpp_source.html | 2 +- JSONRPCClient_8cpp_source.html | 2 +- JSONRPC__test_8cpp_source.html | 2 +- LedgerData__test_8cpp_source.html | 2 +- LedgerLoad__test_8cpp_source.html | 2 +- LedgerMaster_8cpp_source.html | 4 +- LedgerMaster_8h_source.html | 2 +- LedgerReplay__test_8cpp_source.html | 4 +- NetworkOPs_8cpp_source.html | 2 +- Node_8cpp_source.html | 2 +- Node_8h_source.html | 4 +- OverlayImpl_8cpp_source.html | 4 +- Path__test_8cpp_source.html | 2 +- PeerImp_8cpp_source.html | 18 +- PerfLog__test_8cpp_source.html | 2 +- PostgresDatabase_8cpp_source.html | 6 +- RCLConsensus_8h_source.html | 2 +- RPCCall_8cpp_source.html | 2 +- RPCCall__test_8cpp_source.html | 2 +- RPCHelpers_8cpp_source.html | 2 +- RangeSet_8h_source.html | 227 +- RangeSet__test_8cpp_source.html | 8 +- Regression__test_8cpp_source.html | 2 +- SQLiteDatabase_8cpp_source.html | 4 +- SQLiteDatabase_8h_source.html | 4 +- STObject__test_8cpp_source.html | 2 +- ServerHandler_8cpp_source.html | 12 +- ServerStatus__test_8cpp_source.html | 2 +- ShardInfo_8h_source.html | 4 +- TER_8cpp_source.html | 2 +- TransactionMaster_8cpp_source.html | 4 +- TransactionMaster_8h_source.html | 4 +- Transaction_8cpp_source.html | 4 +- Transaction_8h_source.html | 4 +- TrustedPublisherServer_8h_source.html | 4 +- Tx_8cpp_source.html | 4 +- ValidatorList_8cpp_source.html | 2 +- ValidatorSite_8cpp_source.html | 2 +- WSClient_8cpp_source.html | 2 +- WSInfoSub_8h_source.html | 2 +- app_2misc_2impl_2Manifest_8cpp_source.html | 2 +- classJson_1_1Reader.html | 60 +- classripple_1_1Consensus.html | 124 +- ...sripple_1_1Consensus_1_1MonitoredMode.html | 10 +- classripple_1_1HTTPClient.html | 4 +- classripple_1_1HTTPClientImp.html | 2 +- compression__test_8cpp_source.html | 4 +- handshake__test_8cpp_source.html | 4 +- json__reader_8cpp_source.html | 1904 ++++++------ json__reader_8h_source.html | 54 +- json__value__test_8cpp_source.html | 2 +- namespaceJson.html | 4 +- namespaceripple.html | 38 +- nodestore_2impl_2Shard_8cpp_source.html | 4 +- nodestore_2impl_2Shard_8h_source.html | 2 +- reduce__relay__test_8cpp_source.html | 4 +- short__read__test_8cpp_source.html | 2 +- test_2csf_2Peer_8h_source.html | 2 +- tx__reduce__relay__test_8cpp_source.html | 2 +- 72 files changed, 3100 insertions(+), 3086 deletions(-) diff --git a/AccountObjects__test_8cpp_source.html b/AccountObjects__test_8cpp_source.html index 1883499e0e..4164f92cf5 100644 --- a/AccountObjects__test_8cpp_source.html +++ b/AccountObjects__test_8cpp_source.html @@ -934,7 +934,7 @@ $(function() {
ripple::test::jtx::Env::now
NetClock::time_point now()
Returns the current network time.
Definition: Env.h:264
std::vector::begin
T begin(T... args)
ripple::test::jtx::Env::fund
void fund(bool setDefaultRipple, STAmount const &amount, Account const &account)
Definition: Env.cpp:228
-
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:76
+
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:74
ripple::test::AccountObjects_test::run
void run() override
Definition: AccountObjects_test.cpp:803
ripple::sfBalance
const SF_AMOUNT sfBalance
ripple::to_string
std::string to_string(Manifest const &m)
Format the specified manifest to a string for debugging purposes.
Definition: app/misc/impl/Manifest.cpp:41
diff --git a/Application_8cpp_source.html b/Application_8cpp_source.html index a1547cd2a1..a96ffcb91e 100644 --- a/Application_8cpp_source.html +++ b/Application_8cpp_source.html @@ -2566,7 +2566,7 @@ $(function() {
ripple::ApplicationImp::getInboundTransactions
InboundTransactions & getInboundTransactions() override
Definition: Application.cpp:649
ripple::makeWalletDB
std::unique_ptr< DatabaseCon > makeWalletDB(DatabaseCon::Setup const &setup)
makeWalletDB Opens the wallet database and returns it.
Definition: Wallet.cpp:26
ripple::PostgresDatabase
Definition: PostgresDatabase.h:27
-
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:76
+
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:74
condition_variable
ripple::Resource::Consumer
An endpoint that consumes resources.
Definition: Consumer.h:34
ripple::Resource::Charge
A consumption charge.
Definition: Charge.h:30
diff --git a/ConnectAttempt_8cpp_source.html b/ConnectAttempt_8cpp_source.html index e0bc2c1a56..207c86bc90 100644 --- a/ConnectAttempt_8cpp_source.html +++ b/ConnectAttempt_8cpp_source.html @@ -491,7 +491,7 @@ $(function() {
ripple::ConnectAttempt::journal_
const beast::Journal journal_
Definition: ConnectAttempt.h:51
ripple::toBase58
std::string toBase58(AccountID const &v)
Convert AccountID to base58 checked string.
Definition: AccountID.cpp:104
ripple::parseProtocolVersions
std::vector< ProtocolVersion > parseProtocolVersions(boost::beast::string_view const &value)
Parse a set of protocol versions.
Definition: ProtocolVersion.cpp:78
-
ripple::makeSharedValue
std::optional< uint256 > makeSharedValue(stream_type &ssl, beast::Journal journal)
Computes a shared value based on the SSL connection state.
Definition: Handshake.cpp:145
+
ripple::makeSharedValue
std::optional< uint256 > makeSharedValue(stream_type &ssl, beast::Journal journal)
Computes a shared value based on the SSL connection state.
Definition: Handshake.cpp:147
ripple::Cluster::member
std::optional< std::string > member(PublicKey const &node) const
Determines whether a node belongs in the cluster.
Definition: Cluster.cpp:39
boost
Definition: IPAddress.h:103
ripple::ConnectAttempt::processResponse
void processResponse()
Definition: ConnectAttempt.cpp:289
@@ -536,7 +536,7 @@ $(function() {
ripple::PeerFinder::Manager::config
virtual Config config()=0
Returns the configuration for the manager.
std
STL namespace.
ripple::ConnectAttempt::stream_ptr_
std::unique_ptr< stream_type > stream_ptr_
Definition: ConnectAttempt.h:56
-
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:76
+
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:74
ripple::Resource::Consumer
An endpoint that consumes resources.
Definition: Consumer.h:34
ripple::ConnectAttempt::run
void run()
Definition: ConnectAttempt.cpp:78
ripple::ConnectAttempt::timer_
boost::asio::basic_waitable_timer< std::chrono::steady_clock > timer_
Definition: ConnectAttempt.h:55
@@ -551,10 +551,10 @@ $(function() {
ripple::ConnectAttempt::req_
request_type req_
Definition: ConnectAttempt.h:62
ripple::ConnectAttempt::close
void close()
Definition: ConnectAttempt.cpp:91
ripple::Config::TX_REDUCE_RELAY_ENABLE
bool TX_REDUCE_RELAY_ENABLE
Definition: Config.h:264
-
ripple::verifyHandshake
PublicKey verifyHandshake(boost::beast::http::fields const &headers, ripple::uint256 const &sharedValue, std::optional< std::uint32_t > networkID, beast::IP::Address public_ip, beast::IP::Address remote, Application &app)
Validate header fields necessary for upgrading the link to the peer protocol.
Definition: Handshake.cpp:226
+
ripple::verifyHandshake
PublicKey verifyHandshake(boost::beast::http::fields const &headers, ripple::uint256 const &sharedValue, std::optional< std::uint32_t > networkID, beast::IP::Address public_ip, beast::IP::Address remote, Application &app)
Validate header fields necessary for upgrading the link to the peer protocol.
Definition: Handshake.cpp:228
ripple::OverlayImpl
Definition: OverlayImpl.h:58
ripple::ConnectAttempt::ConnectAttempt
ConnectAttempt(Application &app, boost::asio::io_service &io_service, endpoint_type const &remote_endpoint, Resource::Consumer usage, shared_context const &context, std::uint32_t id, std::shared_ptr< PeerFinder::Slot > const &slot, beast::Journal journal, OverlayImpl &overlay)
Definition: ConnectAttempt.cpp:28
-
ripple::makeRequest
auto makeRequest(bool crawlPublic, bool comprEnabled, bool ledgerReplayEnabled, bool txReduceRelayEnabled, bool vpReduceRelayEnabled) -> request_type
Make outbound http request.
Definition: Handshake.cpp:365
+
ripple::makeRequest
auto makeRequest(bool crawlPublic, bool comprEnabled, bool ledgerReplayEnabled, bool txReduceRelayEnabled, bool vpReduceRelayEnabled) -> request_type
Make outbound http request.
Definition: Handshake.cpp:367
ripple::ConnectAttempt::~ConnectAttempt
~ConnectAttempt()
Definition: ConnectAttempt.cpp:57
ripple::ConnectAttempt::parse_endpoint
static boost::asio::ip::tcp::endpoint parse_endpoint(std::string const &s, boost::system::error_code &ec)
Definition: ConnectAttempt.h:112
ripple::OverlayImpl::isPeerUpgrade
static bool isPeerUpgrade(http_request_type const &request)
Definition: OverlayImpl.cpp:326
@@ -564,7 +564,7 @@ $(function() {
ripple::ConnectAttempt::onTimer
void onTimer(error_code ec)
Definition: ConnectAttempt.cpp:140
ripple::ConnectAttempt::onWrite
void onWrite(error_code ec)
Definition: ConnectAttempt.cpp:230
Json::Value
Represents a JSON value.
Definition: json_value.h:145
-
ripple::buildHandshake
void buildHandshake(boost::beast::http::fields &h, ripple::uint256 const &sharedValue, std::optional< std::uint32_t > networkID, beast::IP::Address public_ip, beast::IP::Address remote_ip, Application &app)
Insert fields headers necessary for upgrading the link to the peer protocol.
Definition: Handshake.cpp:177
+
ripple::buildHandshake
void buildHandshake(boost::beast::http::fields &h, ripple::uint256 const &sharedValue, std::optional< std::uint32_t > networkID, beast::IP::Address public_ip, beast::IP::Address remote_ip, Application &app)
Insert fields headers necessary for upgrading the link to the peer protocol.
Definition: Handshake.cpp:179
Generated by   diff --git a/Consensus_8h_source.html b/Consensus_8h_source.html index 45b54b1b7d..3c2485ec9a 100644 --- a/Consensus_8h_source.html +++ b/Consensus_8h_source.html @@ -101,1430 +101,1435 @@ $(function() {
30 #include <ripple/consensus/LedgerTiming.h>
31 #include <ripple/json/json_writer.h>
32 #include <boost/logic/tribool.hpp>
-
33 #include <optional>
-
34 #include <sstream>
-
35 
-
36 namespace ripple {
-
37 
-
56 bool
-
57 shouldCloseLedger(
-
58  bool anyTransactions,
-
59  std::size_t prevProposers,
-
60  std::size_t proposersClosed,
-
61  std::size_t proposersValidated,
-
62  std::chrono::milliseconds prevRoundTime,
-
63  std::chrono::milliseconds timeSincePrevClose,
-
64  std::chrono::milliseconds openTime,
-
65  std::chrono::milliseconds idleInterval,
-
66  ConsensusParms const& parms,
-
67  beast::Journal j);
-
68 
-
83 ConsensusState
-
84 checkConsensus(
-
85  std::size_t prevProposers,
-
86  std::size_t currentProposers,
-
87  std::size_t currentAgree,
-
88  std::size_t currentFinished,
-
89  std::chrono::milliseconds previousAgreeTime,
-
90  std::chrono::milliseconds currentAgreeTime,
-
91  ConsensusParms const& parms,
-
92  bool proposing,
-
93  beast::Journal j);
-
94 
-
283 template <class Adaptor>
-
284 class Consensus
-
285 {
-
286  using Ledger_t = typename Adaptor::Ledger_t;
-
287  using TxSet_t = typename Adaptor::TxSet_t;
-
288  using NodeID_t = typename Adaptor::NodeID_t;
-
289  using Tx_t = typename TxSet_t::Tx;
-
290  using PeerPosition_t = typename Adaptor::PeerPosition_t;
-
291  using Proposal_t = ConsensusProposal<
-
292  NodeID_t,
-
293  typename Ledger_t::ID,
-
294  typename TxSet_t::ID>;
-
295 
-
296  using Result = ConsensusResult<Adaptor>;
-
297 
-
298  // Helper class to ensure adaptor is notified whenever the ConsensusMode
-
299  // changes
-
300  class MonitoredMode
-
301  {
-
302  ConsensusMode mode_;
-
303 
-
304  public:
-
305  MonitoredMode(ConsensusMode m) : mode_{m}
-
306  {
-
307  }
-
308  ConsensusMode
-
309  get() const
-
310  {
-
311  return mode_;
-
312  }
-
313 
-
314  void
-
315  set(ConsensusMode mode, Adaptor& a)
-
316  {
-
317  a.onModeChange(mode_, mode);
-
318  mode_ = mode;
-
319  }
-
320  };
-
321 
-
322 public:
-
324  using clock_type = beast::abstract_clock<std::chrono::steady_clock>;
-
325 
-
326  Consensus(Consensus&&) noexcept = default;
-
327 
-
334  Consensus(clock_type const& clock, Adaptor& adaptor, beast::Journal j);
-
335 
-
349  void
-
350  startRound(
-
351  NetClock::time_point const& now,
-
352  typename Ledger_t::ID const& prevLedgerID,
-
353  Ledger_t prevLedger,
-
354  hash_set<NodeID_t> const& nowUntrusted,
-
355  bool proposing);
-
356 
-
363  bool
-
364  peerProposal(
-
365  NetClock::time_point const& now,
-
366  PeerPosition_t const& newProposal);
-
367 
-
372  void
-
373  timerEntry(NetClock::time_point const& now);
-
374 
-
380  void
-
381  gotTxSet(NetClock::time_point const& now, TxSet_t const& txSet);
-
382 
-
399  void
-
400  simulate(
-
401  NetClock::time_point const& now,
-
402  std::optional<std::chrono::milliseconds> consensusDelay);
-
403 
-
411  typename Ledger_t::ID
-
412  prevLedgerID() const
-
413  {
-
414  return prevLedgerID_;
-
415  }
-
416 
-
417  ConsensusPhase
-
418  phase() const
-
419  {
-
420  return phase_;
-
421  }
-
422 
-
430  Json::Value
-
431  getJson(bool full) const;
-
432 
-
433 private:
-
434  void
-
435  startRoundInternal(
-
436  NetClock::time_point const& now,
-
437  typename Ledger_t::ID const& prevLedgerID,
-
438  Ledger_t const& prevLedger,
-
439  ConsensusMode mode);
-
440 
-
441  // Change our view of the previous ledger
-
442  void
-
443  handleWrongLedger(typename Ledger_t::ID const& lgrId);
-
444 
-
450  void
-
451  checkLedger();
-
452 
-
456  void
-
457  playbackProposals();
-
458 
-
461  bool
-
462  peerProposalInternal(
-
463  NetClock::time_point const& now,
-
464  PeerPosition_t const& newProposal);
-
465 
-
472  void
-
473  phaseOpen();
-
474 
-
483  void
-
484  phaseEstablish();
-
485 
-
508  bool
-
509  shouldPause() const;
-
510 
-
511  // Close the open ledger and establish initial position.
-
512  void
-
513  closeLedger();
-
514 
-
515  // Adjust our positions to try to agree with other validators.
-
516  void
-
517  updateOurPositions();
-
518 
-
519  bool
-
520  haveConsensus();
+
33 
+
34 #include <chrono>
+
35 #include <deque>
+
36 #include <optional>
+
37 #include <sstream>
+
38 
+
39 namespace ripple {
+
40 
+
59 bool
+
60 shouldCloseLedger(
+
61  bool anyTransactions,
+
62  std::size_t prevProposers,
+
63  std::size_t proposersClosed,
+
64  std::size_t proposersValidated,
+
65  std::chrono::milliseconds prevRoundTime,
+
66  std::chrono::milliseconds timeSincePrevClose,
+
67  std::chrono::milliseconds openTime,
+
68  std::chrono::milliseconds idleInterval,
+
69  ConsensusParms const& parms,
+
70  beast::Journal j);
+
71 
+
86 ConsensusState
+
87 checkConsensus(
+
88  std::size_t prevProposers,
+
89  std::size_t currentProposers,
+
90  std::size_t currentAgree,
+
91  std::size_t currentFinished,
+
92  std::chrono::milliseconds previousAgreeTime,
+
93  std::chrono::milliseconds currentAgreeTime,
+
94  ConsensusParms const& parms,
+
95  bool proposing,
+
96  beast::Journal j);
+
97 
+
286 template <class Adaptor>
+
287 class Consensus
+
288 {
+
289  using Ledger_t = typename Adaptor::Ledger_t;
+
290  using TxSet_t = typename Adaptor::TxSet_t;
+
291  using NodeID_t = typename Adaptor::NodeID_t;
+
292  using Tx_t = typename TxSet_t::Tx;
+
293  using PeerPosition_t = typename Adaptor::PeerPosition_t;
+
294  using Proposal_t = ConsensusProposal<
+
295  NodeID_t,
+
296  typename Ledger_t::ID,
+
297  typename TxSet_t::ID>;
+
298 
+
299  using Result = ConsensusResult<Adaptor>;
+
300 
+
301  // Helper class to ensure adaptor is notified whenever the ConsensusMode
+
302  // changes
+
303  class MonitoredMode
+
304  {
+
305  ConsensusMode mode_;
+
306 
+
307  public:
+
308  MonitoredMode(ConsensusMode m) : mode_{m}
+
309  {
+
310  }
+
311  ConsensusMode
+
312  get() const
+
313  {
+
314  return mode_;
+
315  }
+
316 
+
317  void
+
318  set(ConsensusMode mode, Adaptor& a)
+
319  {
+
320  a.onModeChange(mode_, mode);
+
321  mode_ = mode;
+
322  }
+
323  };
+
324 
+
325 public:
+
327  using clock_type = beast::abstract_clock<std::chrono::steady_clock>;
+
328 
+
329  Consensus(Consensus&&) noexcept = default;
+
330 
+
337  Consensus(clock_type const& clock, Adaptor& adaptor, beast::Journal j);
+
338 
+
352  void
+
353  startRound(
+
354  NetClock::time_point const& now,
+
355  typename Ledger_t::ID const& prevLedgerID,
+
356  Ledger_t prevLedger,
+
357  hash_set<NodeID_t> const& nowUntrusted,
+
358  bool proposing);
+
359 
+
366  bool
+
367  peerProposal(
+
368  NetClock::time_point const& now,
+
369  PeerPosition_t const& newProposal);
+
370 
+
375  void
+
376  timerEntry(NetClock::time_point const& now);
+
377 
+
383  void
+
384  gotTxSet(NetClock::time_point const& now, TxSet_t const& txSet);
+
385 
+
402  void
+
403  simulate(
+
404  NetClock::time_point const& now,
+
405  std::optional<std::chrono::milliseconds> consensusDelay);
+
406 
+
414  typename Ledger_t::ID
+
415  prevLedgerID() const
+
416  {
+
417  return prevLedgerID_;
+
418  }
+
419 
+
420  ConsensusPhase
+
421  phase() const
+
422  {
+
423  return phase_;
+
424  }
+
425 
+
433  Json::Value
+
434  getJson(bool full) const;
+
435 
+
436 private:
+
437  void
+
438  startRoundInternal(
+
439  NetClock::time_point const& now,
+
440  typename Ledger_t::ID const& prevLedgerID,
+
441  Ledger_t const& prevLedger,
+
442  ConsensusMode mode);
+
443 
+
444  // Change our view of the previous ledger
+
445  void
+
446  handleWrongLedger(typename Ledger_t::ID const& lgrId);
+
447 
+
453  void
+
454  checkLedger();
+
455 
+
459  void
+
460  playbackProposals();
+
461 
+
464  bool
+
465  peerProposalInternal(
+
466  NetClock::time_point const& now,
+
467  PeerPosition_t const& newProposal);
+
468 
+
475  void
+
476  phaseOpen();
+
477 
+
486  void
+
487  phaseEstablish();
+
488 
+
511  bool
+
512  shouldPause() const;
+
513 
+
514  // Close the open ledger and establish initial position.
+
515  void
+
516  closeLedger();
+
517 
+
518  // Adjust our positions to try to agree with other validators.
+
519  void
+
520  updateOurPositions();
521 
-
522  // Create disputes between our position and the provided one.
-
523  void
-
524  createDisputes(TxSet_t const& o);
-
525 
-
526  // Update our disputes given that this node has adopted a new position.
-
527  // Will call createDisputes as needed.
-
528  void
-
529  updateDisputes(NodeID_t const& node, TxSet_t const& other);
-
530 
-
531  // Revoke our outstanding proposal, if any, and cease proposing
-
532  // until this round ends.
-
533  void
-
534  leaveConsensus();
-
535 
-
536  // The rounded or effective close time estimate from a proposer
-
537  NetClock::time_point
-
538  asCloseTime(NetClock::time_point raw) const;
-
539 
-
540 private:
-
541  Adaptor& adaptor_;
+
522  bool
+
523  haveConsensus();
+
524 
+
525  // Create disputes between our position and the provided one.
+
526  void
+
527  createDisputes(TxSet_t const& o);
+
528 
+
529  // Update our disputes given that this node has adopted a new position.
+
530  // Will call createDisputes as needed.
+
531  void
+
532  updateDisputes(NodeID_t const& node, TxSet_t const& other);
+
533 
+
534  // Revoke our outstanding proposal, if any, and cease proposing
+
535  // until this round ends.
+
536  void
+
537  leaveConsensus();
+
538 
+
539  // The rounded or effective close time estimate from a proposer
+
540  NetClock::time_point
+
541  asCloseTime(NetClock::time_point raw) const;
542 
-
543  ConsensusPhase phase_{ConsensusPhase::accepted};
-
544  MonitoredMode mode_{ConsensusMode::observing};
-
545  bool firstRound_ = true;
-
546  bool haveCloseTimeConsensus_ = false;
-
547 
-
548  clock_type const& clock_;
-
549 
-
550  // How long the consensus convergence has taken, expressed as
-
551  // a percentage of the time that we expected it to take.
-
552  int convergePercent_{0};
-
553 
-
554  // How long has this round been open
-
555  ConsensusTimer openTime_;
+
543 private:
+
544  Adaptor& adaptor_;
+
545 
+
546  ConsensusPhase phase_{ConsensusPhase::accepted};
+
547  MonitoredMode mode_{ConsensusMode::observing};
+
548  bool firstRound_ = true;
+
549  bool haveCloseTimeConsensus_ = false;
+
550 
+
551  clock_type const& clock_;
+
552 
+
553  // How long the consensus convergence has taken, expressed as
+
554  // a percentage of the time that we expected it to take.
+
555  int convergePercent_{0};
556 
-
557  NetClock::duration closeResolution_ = ledgerDefaultTimeResolution;
-
558 
-
559  // Time it took for the last consensus round to converge
-
560  std::chrono::milliseconds prevRoundTime_;
+
557  // How long has this round been open
+
558  ConsensusTimer openTime_;
+
559 
+
560  NetClock::duration closeResolution_ = ledgerDefaultTimeResolution;
561 
-
562  //-------------------------------------------------------------------------
-
563  // Network time measurements of consensus progress
+
562  // Time it took for the last consensus round to converge
+
563  std::chrono::milliseconds prevRoundTime_;
564 
-
565  // The current network adjusted time. This is the network time the
-
566  // ledger would close if it closed now
-
567  NetClock::time_point now_;
-
568  NetClock::time_point prevCloseTime_;
-
569 
-
570  //-------------------------------------------------------------------------
-
571  // Non-peer (self) consensus data
+
565  //-------------------------------------------------------------------------
+
566  // Network time measurements of consensus progress
+
567 
+
568  // The current network adjusted time. This is the network time the
+
569  // ledger would close if it closed now
+
570  NetClock::time_point now_;
+
571  NetClock::time_point prevCloseTime_;
572 
-
573  // Last validated ledger ID provided to consensus
-
574  typename Ledger_t::ID prevLedgerID_;
-
575  // Last validated ledger seen by consensus
-
576  Ledger_t previousLedger_;
-
577 
-
578  // Transaction Sets, indexed by hash of transaction tree
-
579  hash_map<typename TxSet_t::ID, const TxSet_t> acquired_;
+
573  //-------------------------------------------------------------------------
+
574  // Non-peer (self) consensus data
+
575 
+
576  // Last validated ledger ID provided to consensus
+
577  typename Ledger_t::ID prevLedgerID_;
+
578  // Last validated ledger seen by consensus
+
579  Ledger_t previousLedger_;
580 
-
581  std::optional<Result> result_;
-
582  ConsensusCloseTimes rawCloseTimes_;
+
581  // Transaction Sets, indexed by hash of transaction tree
+
582  hash_map<typename TxSet_t::ID, const TxSet_t> acquired_;
583 
-
584  //-------------------------------------------------------------------------
-
585  // Peer related consensus data
+
584  std::optional<Result> result_;
+
585  ConsensusCloseTimes rawCloseTimes_;
586 
-
587  // Peer proposed positions for the current round
-
588  hash_map<NodeID_t, PeerPosition_t> currPeerPositions_;
+
587  //-------------------------------------------------------------------------
+
588  // Peer related consensus data
589 
-
590  // Recently received peer positions, available when transitioning between
-
591  // ledgers or rounds
-
592  hash_map<NodeID_t, std::deque<PeerPosition_t>> recentPeerPositions_;
-
593 
-
594  // The number of proposers who participated in the last consensus round
-
595  std::size_t prevProposers_ = 0;
+
590  // Peer proposed positions for the current round
+
591  hash_map<NodeID_t, PeerPosition_t> currPeerPositions_;
+
592 
+
593  // Recently received peer positions, available when transitioning between
+
594  // ledgers or rounds
+
595  hash_map<NodeID_t, std::deque<PeerPosition_t>> recentPeerPositions_;
596 
-
597  // nodes that have bowed out of this consensus process
-
598  hash_set<NodeID_t> deadNodes_;
+
597  // The number of proposers who participated in the last consensus round
+
598  std::size_t prevProposers_ = 0;
599 
-
600  // Journal for debugging
-
601  beast::Journal const j_;
-
602 };
-
603 
-
604 template <class Adaptor>
-
605 Consensus<Adaptor>::Consensus(
-
606  clock_type const& clock,
-
607  Adaptor& adaptor,
-
608  beast::Journal journal)
-
609  : adaptor_(adaptor), clock_(clock), j_{journal}
-
610 {
-
611  JLOG(j_.debug()) << "Creating consensus object";
-
612 }
-
613 
-
614 template <class Adaptor>
-
615 void
-
616 Consensus<Adaptor>::startRound(
-
617  NetClock::time_point const& now,
-
618  typename Ledger_t::ID const& prevLedgerID,
-
619  Ledger_t prevLedger,
-
620  hash_set<NodeID_t> const& nowUntrusted,
-
621  bool proposing)
-
622 {
-
623  if (firstRound_)
-
624  {
-
625  // take our initial view of closeTime_ from the seed ledger
-
626  prevRoundTime_ = adaptor_.parms().ledgerIDLE_INTERVAL;
-
627  prevCloseTime_ = prevLedger.closeTime();
-
628  firstRound_ = false;
-
629  }
-
630  else
-
631  {
-
632  prevCloseTime_ = rawCloseTimes_.self;
-
633  }
-
634 
-
635  for (NodeID_t const& n : nowUntrusted)
-
636  recentPeerPositions_.erase(n);
+
600  // nodes that have bowed out of this consensus process
+
601  hash_set<NodeID_t> deadNodes_;
+
602 
+
603  // Journal for debugging
+
604  beast::Journal const j_;
+
605 };
+
606 
+
607 template <class Adaptor>
+
608 Consensus<Adaptor>::Consensus(
+
609  clock_type const& clock,
+
610  Adaptor& adaptor,
+
611  beast::Journal journal)
+
612  : adaptor_(adaptor), clock_(clock), j_{journal}
+
613 {
+
614  JLOG(j_.debug()) << "Creating consensus object";
+
615 }
+
616 
+
617 template <class Adaptor>
+
618 void
+
619 Consensus<Adaptor>::startRound(
+
620  NetClock::time_point const& now,
+
621  typename Ledger_t::ID const& prevLedgerID,
+
622  Ledger_t prevLedger,
+
623  hash_set<NodeID_t> const& nowUntrusted,
+
624  bool proposing)
+
625 {
+
626  if (firstRound_)
+
627  {
+
628  // take our initial view of closeTime_ from the seed ledger
+
629  prevRoundTime_ = adaptor_.parms().ledgerIDLE_INTERVAL;
+
630  prevCloseTime_ = prevLedger.closeTime();
+
631  firstRound_ = false;
+
632  }
+
633  else
+
634  {
+
635  prevCloseTime_ = rawCloseTimes_.self;
+
636  }
637 
-
638  ConsensusMode startMode =
-
639  proposing ? ConsensusMode::proposing : ConsensusMode::observing;
+
638  for (NodeID_t const& n : nowUntrusted)
+
639  recentPeerPositions_.erase(n);
640 
-
641  // We were handed the wrong ledger
-
642  if (prevLedger.id() != prevLedgerID)
-
643  {
-
644  // try to acquire the correct one
-
645  if (auto newLedger = adaptor_.acquireLedger(prevLedgerID))
-
646  {
-
647  prevLedger = *newLedger;
-
648  }
-
649  else // Unable to acquire the correct ledger
-
650  {
-
651  startMode = ConsensusMode::wrongLedger;
-
652  JLOG(j_.info())
-
653  << "Entering consensus with: " << previousLedger_.id();
-
654  JLOG(j_.info()) << "Correct LCL is: " << prevLedgerID;
-
655  }
-
656  }
-
657 
-
658  startRoundInternal(now, prevLedgerID, prevLedger, startMode);
-
659 }
-
660 template <class Adaptor>
-
661 void
-
662 Consensus<Adaptor>::startRoundInternal(
-
663  NetClock::time_point const& now,
-
664  typename Ledger_t::ID const& prevLedgerID,
-
665  Ledger_t const& prevLedger,
-
666  ConsensusMode mode)
-
667 {
-
668  phase_ = ConsensusPhase::open;
-
669  JLOG(j_.debug()) << "transitioned to ConsensusPhase::open";
-
670  mode_.set(mode, adaptor_);
-
671  now_ = now;
-
672  prevLedgerID_ = prevLedgerID;
-
673  previousLedger_ = prevLedger;
-
674  result_.reset();
-
675  convergePercent_ = 0;
-
676  haveCloseTimeConsensus_ = false;
-
677  openTime_.reset(clock_.now());
-
678  currPeerPositions_.clear();
-
679  acquired_.clear();
-
680  rawCloseTimes_.peers.clear();
-
681  rawCloseTimes_.self = {};
-
682  deadNodes_.clear();
-
683 
-
684  closeResolution_ = getNextLedgerTimeResolution(
-
685  previousLedger_.closeTimeResolution(),
-
686  previousLedger_.closeAgree(),
-
687  previousLedger_.seq() + typename Ledger_t::Seq{1});
-
688 
-
689  playbackProposals();
-
690  if (currPeerPositions_.size() > (prevProposers_ / 2))
-
691  {
-
692  // We may be falling behind, don't wait for the timer
-
693  // consider closing the ledger immediately
-
694  timerEntry(now_);
-
695  }
-
696 }
-
697 
-
698 template <class Adaptor>
-
699 bool
-
700 Consensus<Adaptor>::peerProposal(
-
701  NetClock::time_point const& now,
-
702  PeerPosition_t const& newPeerPos)
-
703 {
-
704  auto const& peerID = newPeerPos.proposal().nodeID();
-
705 
-
706  // Always need to store recent positions
-
707  {
-
708  auto& props = recentPeerPositions_[peerID];
-
709 
-
710  if (props.size() >= 10)
-
711  props.pop_front();
+
641  ConsensusMode startMode =
+
642  proposing ? ConsensusMode::proposing : ConsensusMode::observing;
+
643 
+
644  // We were handed the wrong ledger
+
645  if (prevLedger.id() != prevLedgerID)
+
646  {
+
647  // try to acquire the correct one
+
648  if (auto newLedger = adaptor_.acquireLedger(prevLedgerID))
+
649  {
+
650  prevLedger = *newLedger;
+
651  }
+
652  else // Unable to acquire the correct ledger
+
653  {
+
654  startMode = ConsensusMode::wrongLedger;
+
655  JLOG(j_.info())
+
656  << "Entering consensus with: " << previousLedger_.id();
+
657  JLOG(j_.info()) << "Correct LCL is: " << prevLedgerID;
+
658  }
+
659  }
+
660 
+
661  startRoundInternal(now, prevLedgerID, prevLedger, startMode);
+
662 }
+
663 template <class Adaptor>
+
664 void
+
665 Consensus<Adaptor>::startRoundInternal(
+
666  NetClock::time_point const& now,
+
667  typename Ledger_t::ID const& prevLedgerID,
+
668  Ledger_t const& prevLedger,
+
669  ConsensusMode mode)
+
670 {
+
671  phase_ = ConsensusPhase::open;
+
672  JLOG(j_.debug()) << "transitioned to ConsensusPhase::open";
+
673  mode_.set(mode, adaptor_);
+
674  now_ = now;
+
675  prevLedgerID_ = prevLedgerID;
+
676  previousLedger_ = prevLedger;
+
677  result_.reset();
+
678  convergePercent_ = 0;
+
679  haveCloseTimeConsensus_ = false;
+
680  openTime_.reset(clock_.now());
+
681  currPeerPositions_.clear();
+
682  acquired_.clear();
+
683  rawCloseTimes_.peers.clear();
+
684  rawCloseTimes_.self = {};
+
685  deadNodes_.clear();
+
686 
+
687  closeResolution_ = getNextLedgerTimeResolution(
+
688  previousLedger_.closeTimeResolution(),
+
689  previousLedger_.closeAgree(),
+
690  previousLedger_.seq() + typename Ledger_t::Seq{1});
+
691 
+
692  playbackProposals();
+
693  if (currPeerPositions_.size() > (prevProposers_ / 2))
+
694  {
+
695  // We may be falling behind, don't wait for the timer
+
696  // consider closing the ledger immediately
+
697  timerEntry(now_);
+
698  }
+
699 }
+
700 
+
701 template <class Adaptor>
+
702 bool
+
703 Consensus<Adaptor>::peerProposal(
+
704  NetClock::time_point const& now,
+
705  PeerPosition_t const& newPeerPos)
+
706 {
+
707  auto const& peerID = newPeerPos.proposal().nodeID();
+
708 
+
709  // Always need to store recent positions
+
710  {
+
711  auto& props = recentPeerPositions_[peerID];
712 
-
713  props.push_back(newPeerPos);
-
714  }
-
715  return peerProposalInternal(now, newPeerPos);
-
716 }
-
717 
-
718 template <class Adaptor>
-
719 bool
-
720 Consensus<Adaptor>::peerProposalInternal(
-
721  NetClock::time_point const& now,
-
722  PeerPosition_t const& newPeerPos)
-
723 {
-
724  // Nothing to do for now if we are currently working on a ledger
-
725  if (phase_ == ConsensusPhase::accepted)
-
726  return false;
-
727 
-
728  now_ = now;
-
729 
-
730  auto const& newPeerProp = newPeerPos.proposal();
-
731 
-
732  if (newPeerProp.prevLedger() != prevLedgerID_)
-
733  {
-
734  JLOG(j_.debug()) << "Got proposal for " << newPeerProp.prevLedger()
-
735  << " but we are on " << prevLedgerID_;
-
736  return false;
-
737  }
-
738 
-
739  auto const& peerID = newPeerProp.nodeID();
-
740 
-
741  if (deadNodes_.find(peerID) != deadNodes_.end())
-
742  {
-
743  JLOG(j_.info()) << "Position from dead node: " << peerID;
-
744  return false;
-
745  }
-
746 
-
747  {
-
748  // update current position
-
749  auto peerPosIt = currPeerPositions_.find(peerID);
-
750 
-
751  if (peerPosIt != currPeerPositions_.end())
-
752  {
-
753  if (newPeerProp.proposeSeq() <=
-
754  peerPosIt->second.proposal().proposeSeq())
-
755  {
-
756  return false;
-
757  }
-
758  }
-
759 
-
760  if (newPeerProp.isBowOut())
-
761  {
-
762  JLOG(j_.info()) << "Peer " << peerID << " bows out";
-
763  if (result_)
-
764  {
-
765  for (auto& it : result_->disputes)
-
766  it.second.unVote(peerID);
-
767  }
-
768  if (peerPosIt != currPeerPositions_.end())
-
769  currPeerPositions_.erase(peerID);
-
770  deadNodes_.insert(peerID);
-
771 
-
772  return true;
-
773  }
+
713  if (props.size() >= 10)
+
714  props.pop_front();
+
715 
+
716  props.push_back(newPeerPos);
+
717  }
+
718  return peerProposalInternal(now, newPeerPos);
+
719 }
+
720 
+
721 template <class Adaptor>
+
722 bool
+
723 Consensus<Adaptor>::peerProposalInternal(
+
724  NetClock::time_point const& now,
+
725  PeerPosition_t const& newPeerPos)
+
726 {
+
727  // Nothing to do for now if we are currently working on a ledger
+
728  if (phase_ == ConsensusPhase::accepted)
+
729  return false;
+
730 
+
731  now_ = now;
+
732 
+
733  auto const& newPeerProp = newPeerPos.proposal();
+
734 
+
735  if (newPeerProp.prevLedger() != prevLedgerID_)
+
736  {
+
737  JLOG(j_.debug()) << "Got proposal for " << newPeerProp.prevLedger()
+
738  << " but we are on " << prevLedgerID_;
+
739  return false;
+
740  }
+
741 
+
742  auto const& peerID = newPeerProp.nodeID();
+
743 
+
744  if (deadNodes_.find(peerID) != deadNodes_.end())
+
745  {
+
746  JLOG(j_.info()) << "Position from dead node: " << peerID;
+
747  return false;
+
748  }
+
749 
+
750  {
+
751  // update current position
+
752  auto peerPosIt = currPeerPositions_.find(peerID);
+
753 
+
754  if (peerPosIt != currPeerPositions_.end())
+
755  {
+
756  if (newPeerProp.proposeSeq() <=
+
757  peerPosIt->second.proposal().proposeSeq())
+
758  {
+
759  return false;
+
760  }
+
761  }
+
762 
+
763  if (newPeerProp.isBowOut())
+
764  {
+
765  JLOG(j_.info()) << "Peer " << peerID << " bows out";
+
766  if (result_)
+
767  {
+
768  for (auto& it : result_->disputes)
+
769  it.second.unVote(peerID);
+
770  }
+
771  if (peerPosIt != currPeerPositions_.end())
+
772  currPeerPositions_.erase(peerID);
+
773  deadNodes_.insert(peerID);
774 
-
775  if (peerPosIt != currPeerPositions_.end())
-
776  peerPosIt->second = newPeerPos;
-
777  else
-
778  currPeerPositions_.emplace(peerID, newPeerPos);
-
779  }
-
780 
-
781  if (newPeerProp.isInitial())
-
782  {
-
783  // Record the close time estimate
-
784  JLOG(j_.trace()) << "Peer reports close time as "
-
785  << newPeerProp.closeTime().time_since_epoch().count();
-
786  ++rawCloseTimes_.peers[newPeerProp.closeTime()];
-
787  }
-
788 
-
789  JLOG(j_.trace()) << "Processing peer proposal " << newPeerProp.proposeSeq()
-
790  << "/" << newPeerProp.position();
+
775  return true;
+
776  }
+
777 
+
778  if (peerPosIt != currPeerPositions_.end())
+
779  peerPosIt->second = newPeerPos;
+
780  else
+
781  currPeerPositions_.emplace(peerID, newPeerPos);
+
782  }
+
783 
+
784  if (newPeerProp.isInitial())
+
785  {
+
786  // Record the close time estimate
+
787  JLOG(j_.trace()) << "Peer reports close time as "
+
788  << newPeerProp.closeTime().time_since_epoch().count();
+
789  ++rawCloseTimes_.peers[newPeerProp.closeTime()];
+
790  }
791 
-
792  {
-
793  auto const ait = acquired_.find(newPeerProp.position());
-
794  if (ait == acquired_.end())
-
795  {
-
796  // acquireTxSet will return the set if it is available, or
-
797  // spawn a request for it and return nullopt/nullptr. It will call
-
798  // gotTxSet once it arrives
-
799  if (auto set = adaptor_.acquireTxSet(newPeerProp.position()))
-
800  gotTxSet(now_, *set);
-
801  else
-
802  JLOG(j_.debug()) << "Don't have tx set for peer";
-
803  }
-
804  else if (result_)
-
805  {
-
806  updateDisputes(newPeerProp.nodeID(), ait->second);
-
807  }
-
808  }
-
809 
-
810  return true;
-
811 }
+
792  JLOG(j_.trace()) << "Processing peer proposal " << newPeerProp.proposeSeq()
+
793  << "/" << newPeerProp.position();
+
794 
+
795  {
+
796  auto const ait = acquired_.find(newPeerProp.position());
+
797  if (ait == acquired_.end())
+
798  {
+
799  // acquireTxSet will return the set if it is available, or
+
800  // spawn a request for it and return nullopt/nullptr. It will call
+
801  // gotTxSet once it arrives
+
802  if (auto set = adaptor_.acquireTxSet(newPeerProp.position()))
+
803  gotTxSet(now_, *set);
+
804  else
+
805  JLOG(j_.debug()) << "Don't have tx set for peer";
+
806  }
+
807  else if (result_)
+
808  {
+
809  updateDisputes(newPeerProp.nodeID(), ait->second);
+
810  }
+
811  }
812 
-
813 template <class Adaptor>
-
814 void
-
815 Consensus<Adaptor>::timerEntry(NetClock::time_point const& now)
-
816 {
-
817  // Nothing to do if we are currently working on a ledger
-
818  if (phase_ == ConsensusPhase::accepted)
-
819  return;
-
820 
-
821  now_ = now;
-
822 
-
823  // Check we are on the proper ledger (this may change phase_)
-
824  checkLedger();
+
813  return true;
+
814 }
+
815 
+
816 template <class Adaptor>
+
817 void
+
818 Consensus<Adaptor>::timerEntry(NetClock::time_point const& now)
+
819 {
+
820  // Nothing to do if we are currently working on a ledger
+
821  if (phase_ == ConsensusPhase::accepted)
+
822  return;
+
823 
+
824  now_ = now;
825 
-
826  if (phase_ == ConsensusPhase::open)
-
827  {
-
828  phaseOpen();
-
829  }
-
830  else if (phase_ == ConsensusPhase::establish)
-
831  {
-
832  phaseEstablish();
-
833  }
-
834 }
-
835 
-
836 template <class Adaptor>
-
837 void
-
838 Consensus<Adaptor>::gotTxSet(
-
839  NetClock::time_point const& now,
-
840  TxSet_t const& txSet)
-
841 {
-
842  // Nothing to do if we've finished work on a ledger
-
843  if (phase_ == ConsensusPhase::accepted)
-
844  return;
-
845 
-
846  now_ = now;
-
847 
-
848  auto id = txSet.id();
-
849 
-
850  // If we've already processed this transaction set since requesting
-
851  // it from the network, there is nothing to do now
-
852  if (!acquired_.emplace(id, txSet).second)
-
853  return;
-
854 
-
855  if (!result_)
-
856  {
-
857  JLOG(j_.debug()) << "Not creating disputes: no position yet.";
-
858  }
-
859  else
-
860  {
-
861  // Our position is added to acquired_ as soon as we create it,
-
862  // so this txSet must differ
-
863  assert(id != result_->position.position());
-
864  bool any = false;
-
865  for (auto const& [nodeId, peerPos] : currPeerPositions_)
-
866  {
-
867  if (peerPos.proposal().position() == id)
-
868  {
-
869  updateDisputes(nodeId, txSet);
-
870  any = true;
-
871  }
-
872  }
-
873 
-
874  if (!any)
-
875  {
-
876  JLOG(j_.warn())
-
877  << "By the time we got " << id << " no peers were proposing it";
-
878  }
-
879  }
-
880 }
-
881 
-
882 template <class Adaptor>
-
883 void
-
884 Consensus<Adaptor>::simulate(
-
885  NetClock::time_point const& now,
-
886  std::optional<std::chrono::milliseconds> consensusDelay)
-
887 {
-
888  using namespace std::chrono_literals;
-
889  JLOG(j_.info()) << "Simulating consensus";
-
890  now_ = now;
-
891  closeLedger();
-
892  result_->roundTime.tick(consensusDelay.value_or(100ms));
-
893  result_->proposers = prevProposers_ = currPeerPositions_.size();
-
894  prevRoundTime_ = result_->roundTime.read();
-
895  phase_ = ConsensusPhase::accepted;
-
896  adaptor_.onForceAccept(
-
897  *result_,
-
898  previousLedger_,
-
899  closeResolution_,
-
900  rawCloseTimes_,
-
901  mode_.get(),
-
902  getJson(true));
-
903  JLOG(j_.info()) << "Simulation complete";
-
904 }
-
905 
-
906 template <class Adaptor>
-
907 Json::Value
-
908 Consensus<Adaptor>::getJson(bool full) const
-
909 {
-
910  using std::to_string;
-
911  using Int = Json::Value::Int;
-
912 
-
913  Json::Value ret(Json::objectValue);
-
914 
-
915  ret["proposing"] = (mode_.get() == ConsensusMode::proposing);
-
916  ret["proposers"] = static_cast<int>(currPeerPositions_.size());
+
826  // Check we are on the proper ledger (this may change phase_)
+
827  checkLedger();
+
828 
+
829  if (phase_ == ConsensusPhase::open)
+
830  {
+
831  phaseOpen();
+
832  }
+
833  else if (phase_ == ConsensusPhase::establish)
+
834  {
+
835  phaseEstablish();
+
836  }
+
837 }
+
838 
+
839 template <class Adaptor>
+
840 void
+
841 Consensus<Adaptor>::gotTxSet(
+
842  NetClock::time_point const& now,
+
843  TxSet_t const& txSet)
+
844 {
+
845  // Nothing to do if we've finished work on a ledger
+
846  if (phase_ == ConsensusPhase::accepted)
+
847  return;
+
848 
+
849  now_ = now;
+
850 
+
851  auto id = txSet.id();
+
852 
+
853  // If we've already processed this transaction set since requesting
+
854  // it from the network, there is nothing to do now
+
855  if (!acquired_.emplace(id, txSet).second)
+
856  return;
+
857 
+
858  if (!result_)
+
859  {
+
860  JLOG(j_.debug()) << "Not creating disputes: no position yet.";
+
861  }
+
862  else
+
863  {
+
864  // Our position is added to acquired_ as soon as we create it,
+
865  // so this txSet must differ
+
866  assert(id != result_->position.position());
+
867  bool any = false;
+
868  for (auto const& [nodeId, peerPos] : currPeerPositions_)
+
869  {
+
870  if (peerPos.proposal().position() == id)
+
871  {
+
872  updateDisputes(nodeId, txSet);
+
873  any = true;
+
874  }
+
875  }
+
876 
+
877  if (!any)
+
878  {
+
879  JLOG(j_.warn())
+
880  << "By the time we got " << id << " no peers were proposing it";
+
881  }
+
882  }
+
883 }
+
884 
+
885 template <class Adaptor>
+
886 void
+
887 Consensus<Adaptor>::simulate(
+
888  NetClock::time_point const& now,
+
889  std::optional<std::chrono::milliseconds> consensusDelay)
+
890 {
+
891  using namespace std::chrono_literals;
+
892  JLOG(j_.info()) << "Simulating consensus";
+
893  now_ = now;
+
894  closeLedger();
+
895  result_->roundTime.tick(consensusDelay.value_or(100ms));
+
896  result_->proposers = prevProposers_ = currPeerPositions_.size();
+
897  prevRoundTime_ = result_->roundTime.read();
+
898  phase_ = ConsensusPhase::accepted;
+
899  adaptor_.onForceAccept(
+
900  *result_,
+
901  previousLedger_,
+
902  closeResolution_,
+
903  rawCloseTimes_,
+
904  mode_.get(),
+
905  getJson(true));
+
906  JLOG(j_.info()) << "Simulation complete";
+
907 }
+
908 
+
909 template <class Adaptor>
+
910 Json::Value
+
911 Consensus<Adaptor>::getJson(bool full) const
+
912 {
+
913  using std::to_string;
+
914  using Int = Json::Value::Int;
+
915 
+
916  Json::Value ret(Json::objectValue);
917 
-
918  if (mode_.get() != ConsensusMode::wrongLedger)
-
919  {
-
920  ret["synched"] = true;
-
921  ret["ledger_seq"] =
-
922  static_cast<std::uint32_t>(previousLedger_.seq()) + 1;
-
923  ret["close_granularity"] = static_cast<Int>(closeResolution_.count());
-
924  }
-
925  else
-
926  ret["synched"] = false;
-
927 
-
928  ret["phase"] = to_string(phase_);
-
929 
-
930  if (result_ && !result_->disputes.empty() && !full)
-
931  ret["disputes"] = static_cast<Int>(result_->disputes.size());
+
918  ret["proposing"] = (mode_.get() == ConsensusMode::proposing);
+
919  ret["proposers"] = static_cast<int>(currPeerPositions_.size());
+
920 
+
921  if (mode_.get() != ConsensusMode::wrongLedger)
+
922  {
+
923  ret["synched"] = true;
+
924  ret["ledger_seq"] =
+
925  static_cast<std::uint32_t>(previousLedger_.seq()) + 1;
+
926  ret["close_granularity"] = static_cast<Int>(closeResolution_.count());
+
927  }
+
928  else
+
929  ret["synched"] = false;
+
930 
+
931  ret["phase"] = to_string(phase_);
932 
-
933  if (result_)
-
934  ret["our_position"] = result_->position.getJson();
+
933  if (result_ && !result_->disputes.empty() && !full)
+
934  ret["disputes"] = static_cast<Int>(result_->disputes.size());
935 
-
936  if (full)
-
937  {
-
938  if (result_)
-
939  ret["current_ms"] =
-
940  static_cast<Int>(result_->roundTime.read().count());
-
941  ret["converge_percent"] = convergePercent_;
-
942  ret["close_resolution"] = static_cast<Int>(closeResolution_.count());
-
943  ret["have_time_consensus"] = haveCloseTimeConsensus_;
-
944  ret["previous_proposers"] = static_cast<Int>(prevProposers_);
-
945  ret["previous_mseconds"] = static_cast<Int>(prevRoundTime_.count());
-
946 
-
947  if (!currPeerPositions_.empty())
-
948  {
-
949  Json::Value ppj(Json::objectValue);
-
950 
-
951  for (auto const& [nodeId, peerPos] : currPeerPositions_)
-
952  {
-
953  ppj[to_string(nodeId)] = peerPos.getJson();
-
954  }
-
955  ret["peer_positions"] = std::move(ppj);
-
956  }
-
957 
-
958  if (!acquired_.empty())
-
959  {
-
960  Json::Value acq(Json::arrayValue);
-
961  for (auto const& at : acquired_)
-
962  {
-
963  acq.append(to_string(at.first));
-
964  }
-
965  ret["acquired"] = std::move(acq);
-
966  }
-
967 
-
968  if (result_ && !result_->disputes.empty())
-
969  {
-
970  Json::Value dsj(Json::objectValue);
-
971  for (auto const& [txId, dispute] : result_->disputes)
-
972  {
-
973  dsj[to_string(txId)] = dispute.getJson();
-
974  }
-
975  ret["disputes"] = std::move(dsj);
-
976  }
-
977 
-
978  if (!rawCloseTimes_.peers.empty())
-
979  {
-
980  Json::Value ctj(Json::objectValue);
-
981  for (auto const& ct : rawCloseTimes_.peers)
-
982  {
-
983  ctj[std::to_string(ct.first.time_since_epoch().count())] =
-
984  ct.second;
-
985  }
-
986  ret["close_times"] = std::move(ctj);
-
987  }
-
988 
-
989  if (!deadNodes_.empty())
-
990  {
-
991  Json::Value dnj(Json::arrayValue);
-
992  for (auto const& dn : deadNodes_)
-
993  {
-
994  dnj.append(to_string(dn));
-
995  }
-
996  ret["dead_nodes"] = std::move(dnj);
-
997  }
-
998  }
-
999 
-
1000  return ret;
-
1001 }
+
936  if (result_)
+
937  ret["our_position"] = result_->position.getJson();
+
938 
+
939  if (full)
+
940  {
+
941  if (result_)
+
942  ret["current_ms"] =
+
943  static_cast<Int>(result_->roundTime.read().count());
+
944  ret["converge_percent"] = convergePercent_;
+
945  ret["close_resolution"] = static_cast<Int>(closeResolution_.count());
+
946  ret["have_time_consensus"] = haveCloseTimeConsensus_;
+
947  ret["previous_proposers"] = static_cast<Int>(prevProposers_);
+
948  ret["previous_mseconds"] = static_cast<Int>(prevRoundTime_.count());
+
949 
+
950  if (!currPeerPositions_.empty())
+
951  {
+
952  Json::Value ppj(Json::objectValue);
+
953 
+
954  for (auto const& [nodeId, peerPos] : currPeerPositions_)
+
955  {
+
956  ppj[to_string(nodeId)] = peerPos.getJson();
+
957  }
+
958  ret["peer_positions"] = std::move(ppj);
+
959  }
+
960 
+
961  if (!acquired_.empty())
+
962  {
+
963  Json::Value acq(Json::arrayValue);
+
964  for (auto const& at : acquired_)
+
965  {
+
966  acq.append(to_string(at.first));
+
967  }
+
968  ret["acquired"] = std::move(acq);
+
969  }
+
970 
+
971  if (result_ && !result_->disputes.empty())
+
972  {
+
973  Json::Value dsj(Json::objectValue);
+
974  for (auto const& [txId, dispute] : result_->disputes)
+
975  {
+
976  dsj[to_string(txId)] = dispute.getJson();
+
977  }
+
978  ret["disputes"] = std::move(dsj);
+
979  }
+
980 
+
981  if (!rawCloseTimes_.peers.empty())
+
982  {
+
983  Json::Value ctj(Json::objectValue);
+
984  for (auto const& ct : rawCloseTimes_.peers)
+
985  {
+
986  ctj[std::to_string(ct.first.time_since_epoch().count())] =
+
987  ct.second;
+
988  }
+
989  ret["close_times"] = std::move(ctj);
+
990  }
+
991 
+
992  if (!deadNodes_.empty())
+
993  {
+
994  Json::Value dnj(Json::arrayValue);
+
995  for (auto const& dn : deadNodes_)
+
996  {
+
997  dnj.append(to_string(dn));
+
998  }
+
999  ret["dead_nodes"] = std::move(dnj);
+
1000  }
+
1001  }
1002 
-
1003 // Handle a change in the prior ledger during a consensus round
-
1004 template <class Adaptor>
-
1005 void
-
1006 Consensus<Adaptor>::handleWrongLedger(typename Ledger_t::ID const& lgrId)
-
1007 {
-
1008  assert(lgrId != prevLedgerID_ || previousLedger_.id() != lgrId);
-
1009 
-
1010  // Stop proposing because we are out of sync
-
1011  leaveConsensus();
+
1003  return ret;
+
1004 }
+
1005 
+
1006 // Handle a change in the prior ledger during a consensus round
+
1007 template <class Adaptor>
+
1008 void
+
1009 Consensus<Adaptor>::handleWrongLedger(typename Ledger_t::ID const& lgrId)
+
1010 {
+
1011  assert(lgrId != prevLedgerID_ || previousLedger_.id() != lgrId);
1012 
-
1013  // First time switching to this ledger
-
1014  if (prevLedgerID_ != lgrId)
-
1015  {
-
1016  prevLedgerID_ = lgrId;
-
1017 
-
1018  // Clear out state
-
1019  if (result_)
-
1020  {
-
1021  result_->disputes.clear();
-
1022  result_->compares.clear();
-
1023  }
-
1024 
-
1025  currPeerPositions_.clear();
-
1026  rawCloseTimes_.peers.clear();
-
1027  deadNodes_.clear();
-
1028 
-
1029  // Get back in sync, this will also recreate disputes
-
1030  playbackProposals();
-
1031  }
-
1032 
-
1033  if (previousLedger_.id() == prevLedgerID_)
-
1034  return;
+
1013  // Stop proposing because we are out of sync
+
1014  leaveConsensus();
+
1015 
+
1016  // First time switching to this ledger
+
1017  if (prevLedgerID_ != lgrId)
+
1018  {
+
1019  prevLedgerID_ = lgrId;
+
1020 
+
1021  // Clear out state
+
1022  if (result_)
+
1023  {
+
1024  result_->disputes.clear();
+
1025  result_->compares.clear();
+
1026  }
+
1027 
+
1028  currPeerPositions_.clear();
+
1029  rawCloseTimes_.peers.clear();
+
1030  deadNodes_.clear();
+
1031 
+
1032  // Get back in sync, this will also recreate disputes
+
1033  playbackProposals();
+
1034  }
1035 
-
1036  // we need to switch the ledger we're working from
-
1037  if (auto newLedger = adaptor_.acquireLedger(prevLedgerID_))
-
1038  {
-
1039  JLOG(j_.info()) << "Have the consensus ledger " << prevLedgerID_;
-
1040  startRoundInternal(
-
1041  now_, lgrId, *newLedger, ConsensusMode::switchedLedger);
-
1042  }
-
1043  else
-
1044  {
-
1045  mode_.set(ConsensusMode::wrongLedger, adaptor_);
-
1046  }
-
1047 }
-
1048 
-
1049 template <class Adaptor>
-
1050 void
-
1051 Consensus<Adaptor>::checkLedger()
-
1052 {
-
1053  auto netLgr =
-
1054  adaptor_.getPrevLedger(prevLedgerID_, previousLedger_, mode_.get());
-
1055 
-
1056  if (netLgr != prevLedgerID_)
-
1057  {
-
1058  JLOG(j_.warn()) << "View of consensus changed during "
-
1059  << to_string(phase_) << " status=" << to_string(phase_)
-
1060  << ", "
-
1061  << " mode=" << to_string(mode_.get());
-
1062  JLOG(j_.warn()) << prevLedgerID_ << " to " << netLgr;
-
1063  JLOG(j_.warn()) << Json::Compact{previousLedger_.getJson()};
-
1064  JLOG(j_.debug()) << "State on consensus change "
-
1065  << Json::Compact{getJson(true)};
-
1066  handleWrongLedger(netLgr);
-
1067  }
-
1068  else if (previousLedger_.id() != prevLedgerID_)
+
1036  if (previousLedger_.id() == prevLedgerID_)
+
1037  return;
+
1038 
+
1039  // we need to switch the ledger we're working from
+
1040  if (auto newLedger = adaptor_.acquireLedger(prevLedgerID_))
+
1041  {
+
1042  JLOG(j_.info()) << "Have the consensus ledger " << prevLedgerID_;
+
1043  startRoundInternal(
+
1044  now_, lgrId, *newLedger, ConsensusMode::switchedLedger);
+
1045  }
+
1046  else
+
1047  {
+
1048  mode_.set(ConsensusMode::wrongLedger, adaptor_);
+
1049  }
+
1050 }
+
1051 
+
1052 template <class Adaptor>
+
1053 void
+
1054 Consensus<Adaptor>::checkLedger()
+
1055 {
+
1056  auto netLgr =
+
1057  adaptor_.getPrevLedger(prevLedgerID_, previousLedger_, mode_.get());
+
1058 
+
1059  if (netLgr != prevLedgerID_)
+
1060  {
+
1061  JLOG(j_.warn()) << "View of consensus changed during "
+
1062  << to_string(phase_) << " status=" << to_string(phase_)
+
1063  << ", "
+
1064  << " mode=" << to_string(mode_.get());
+
1065  JLOG(j_.warn()) << prevLedgerID_ << " to " << netLgr;
+
1066  JLOG(j_.warn()) << Json::Compact{previousLedger_.getJson()};
+
1067  JLOG(j_.debug()) << "State on consensus change "
+
1068  << Json::Compact{getJson(true)};
1069  handleWrongLedger(netLgr);
-
1070 }
-
1071 
-
1072 template <class Adaptor>
-
1073 void
-
1074 Consensus<Adaptor>::playbackProposals()
-
1075 {
-
1076  for (auto const& it : recentPeerPositions_)
-
1077  {
-
1078  for (auto const& pos : it.second)
-
1079  {
-
1080  if (pos.proposal().prevLedger() == prevLedgerID_)
-
1081  {
-
1082  if (peerProposalInternal(now_, pos))
-
1083  adaptor_.share(pos);
-
1084  }
-
1085  }
-
1086  }
-
1087 }
-
1088 
-
1089 template <class Adaptor>
-
1090 void
-
1091 Consensus<Adaptor>::phaseOpen()
-
1092 {
-
1093  using namespace std::chrono;
-
1094 
-
1095  // it is shortly before ledger close time
-
1096  bool anyTransactions = adaptor_.hasOpenTransactions();
-
1097  auto proposersClosed = currPeerPositions_.size();
-
1098  auto proposersValidated = adaptor_.proposersValidated(prevLedgerID_);
-
1099 
-
1100  openTime_.tick(clock_.now());
-
1101 
-
1102  // This computes how long since last ledger's close time
-
1103  milliseconds sinceClose;
-
1104  {
-
1105  bool previousCloseCorrect =
-
1106  (mode_.get() != ConsensusMode::wrongLedger) &&
-
1107  previousLedger_.closeAgree() &&
-
1108  (previousLedger_.closeTime() !=
-
1109  (previousLedger_.parentCloseTime() + 1s));
-
1110 
-
1111  auto lastCloseTime = previousCloseCorrect
-
1112  ? previousLedger_.closeTime() // use consensus timing
-
1113  : prevCloseTime_; // use the time we saw internally
-
1114 
-
1115  if (now_ >= lastCloseTime)
-
1116  sinceClose = duration_cast<milliseconds>(now_ - lastCloseTime);
-
1117  else
-
1118  sinceClose = -duration_cast<milliseconds>(lastCloseTime - now_);
-
1119  }
-
1120 
-
1121  auto const idleInterval = std::max<milliseconds>(
-
1122  adaptor_.parms().ledgerIDLE_INTERVAL,
-
1123  2 * previousLedger_.closeTimeResolution());
-
1124 
-
1125  // Decide if we should close the ledger
-
1126  if (shouldCloseLedger(
-
1127  anyTransactions,
-
1128  prevProposers_,
-
1129  proposersClosed,
-
1130  proposersValidated,
-
1131  prevRoundTime_,
-
1132  sinceClose,
-
1133  openTime_.read(),
-
1134  idleInterval,
-
1135  adaptor_.parms(),
-
1136  j_))
-
1137  {
-
1138  closeLedger();
-
1139  }
-
1140 }
-
1141 
-
1142 template <class Adaptor>
-
1143 bool
-
1144 Consensus<Adaptor>::shouldPause() const
-
1145 {
-
1146  auto const& parms = adaptor_.parms();
-
1147  std::uint32_t const ahead(
-
1148  previousLedger_.seq() -
-
1149  std::min(adaptor_.getValidLedgerIndex(), previousLedger_.seq()));
-
1150  auto [quorum, trustedKeys] = adaptor_.getQuorumKeys();
-
1151  std::size_t const totalValidators = trustedKeys.size();
-
1152  std::size_t laggards =
-
1153  adaptor_.laggards(previousLedger_.seq(), trustedKeys);
-
1154  std::size_t const offline = trustedKeys.size();
-
1155 
-
1156  std::stringstream vars;
-
1157  vars << " (working seq: " << previousLedger_.seq() << ", "
-
1158  << "validated seq: " << adaptor_.getValidLedgerIndex() << ", "
-
1159  << "am validator: " << adaptor_.validator() << ", "
-
1160  << "have validated: " << adaptor_.haveValidated() << ", "
-
1161  << "roundTime: " << result_->roundTime.read().count() << ", "
-
1162  << "max consensus time: " << parms.ledgerMAX_CONSENSUS.count() << ", "
-
1163  << "validators: " << totalValidators << ", "
-
1164  << "laggards: " << laggards << ", "
-
1165  << "offline: " << offline << ", "
-
1166  << "quorum: " << quorum << ")";
-
1167 
-
1168  if (!ahead || !laggards || !totalValidators || !adaptor_.validator() ||
-
1169  !adaptor_.haveValidated() ||
-
1170  result_->roundTime.read() > parms.ledgerMAX_CONSENSUS)
-
1171  {
-
1172  j_.debug() << "not pausing (early)" << vars.str();
-
1173  return false;
-
1174  }
-
1175 
-
1176  bool willPause = false;
-
1177 
-
1191  constexpr static std::size_t maxPausePhase = 4;
-
1192 
-
1212  std::size_t const phase = (ahead - 1) % (maxPausePhase + 1);
-
1213 
-
1214  // validators that remain after the laggards() function are considered
-
1215  // offline, and should be considered as laggards for purposes of
-
1216  // evaluating whether the threshold for non-laggards has been reached.
-
1217  switch (phase)
-
1218  {
-
1219  case 0:
-
1220  // Laggards and offline shouldn't preclude consensus.
-
1221  if (laggards + offline > totalValidators - quorum)
-
1222  willPause = true;
-
1223  break;
-
1224  case maxPausePhase:
-
1225  // No tolerance.
-
1226  willPause = true;
-
1227  break;
-
1228  default:
-
1229  // Ensure that sufficient validators are known to be not lagging.
-
1230  // Their sufficiently most recent validation sequence was equal to
-
1231  // or greater than our own.
-
1232  //
-
1233  // The threshold is the amount required for quorum plus
-
1234  // the proportion of the remainder based on number of intermediate
-
1235  // phases between 0 and max.
-
1236  float const nonLaggards = totalValidators - (laggards + offline);
-
1237  float const quorumRatio =
-
1238  static_cast<float>(quorum) / totalValidators;
-
1239  float const allowedDissent = 1.0f - quorumRatio;
-
1240  float const phaseFactor = static_cast<float>(phase) / maxPausePhase;
-
1241 
-
1242  if (nonLaggards / totalValidators <
-
1243  quorumRatio + (allowedDissent * phaseFactor))
-
1244  {
-
1245  willPause = true;
-
1246  }
-
1247  }
-
1248 
-
1249  if (willPause)
-
1250  j_.warn() << "pausing" << vars.str();
-
1251  else
-
1252  j_.debug() << "not pausing" << vars.str();
-
1253  return willPause;
-
1254 }
-
1255 
-
1256 template <class Adaptor>
-
1257 void
-
1258 Consensus<Adaptor>::phaseEstablish()
-
1259 {
-
1260  // can only establish consensus if we already took a stance
-
1261  assert(result_);
-
1262 
-
1263  using namespace std::chrono;
-
1264  ConsensusParms const& parms = adaptor_.parms();
+
1070  }
+
1071  else if (previousLedger_.id() != prevLedgerID_)
+
1072  handleWrongLedger(netLgr);
+
1073 }
+
1074 
+
1075 template <class Adaptor>
+
1076 void
+
1077 Consensus<Adaptor>::playbackProposals()
+
1078 {
+
1079  for (auto const& it : recentPeerPositions_)
+
1080  {
+
1081  for (auto const& pos : it.second)
+
1082  {
+
1083  if (pos.proposal().prevLedger() == prevLedgerID_)
+
1084  {
+
1085  if (peerProposalInternal(now_, pos))
+
1086  adaptor_.share(pos);
+
1087  }
+
1088  }
+
1089  }
+
1090 }
+
1091 
+
1092 template <class Adaptor>
+
1093 void
+
1094 Consensus<Adaptor>::phaseOpen()
+
1095 {
+
1096  using namespace std::chrono;
+
1097 
+
1098  // it is shortly before ledger close time
+
1099  bool anyTransactions = adaptor_.hasOpenTransactions();
+
1100  auto proposersClosed = currPeerPositions_.size();
+
1101  auto proposersValidated = adaptor_.proposersValidated(prevLedgerID_);
+
1102 
+
1103  openTime_.tick(clock_.now());
+
1104 
+
1105  // This computes how long since last ledger's close time
+
1106  milliseconds sinceClose;
+
1107  {
+
1108  bool previousCloseCorrect =
+
1109  (mode_.get() != ConsensusMode::wrongLedger) &&
+
1110  previousLedger_.closeAgree() &&
+
1111  (previousLedger_.closeTime() !=
+
1112  (previousLedger_.parentCloseTime() + 1s));
+
1113 
+
1114  auto lastCloseTime = previousCloseCorrect
+
1115  ? previousLedger_.closeTime() // use consensus timing
+
1116  : prevCloseTime_; // use the time we saw internally
+
1117 
+
1118  if (now_ >= lastCloseTime)
+
1119  sinceClose = duration_cast<milliseconds>(now_ - lastCloseTime);
+
1120  else
+
1121  sinceClose = -duration_cast<milliseconds>(lastCloseTime - now_);
+
1122  }
+
1123 
+
1124  auto const idleInterval = std::max<milliseconds>(
+
1125  adaptor_.parms().ledgerIDLE_INTERVAL,
+
1126  2 * previousLedger_.closeTimeResolution());
+
1127 
+
1128  // Decide if we should close the ledger
+
1129  if (shouldCloseLedger(
+
1130  anyTransactions,
+
1131  prevProposers_,
+
1132  proposersClosed,
+
1133  proposersValidated,
+
1134  prevRoundTime_,
+
1135  sinceClose,
+
1136  openTime_.read(),
+
1137  idleInterval,
+
1138  adaptor_.parms(),
+
1139  j_))
+
1140  {
+
1141  closeLedger();
+
1142  }
+
1143 }
+
1144 
+
1145 template <class Adaptor>
+
1146 bool
+
1147 Consensus<Adaptor>::shouldPause() const
+
1148 {
+
1149  auto const& parms = adaptor_.parms();
+
1150  std::uint32_t const ahead(
+
1151  previousLedger_.seq() -
+
1152  std::min(adaptor_.getValidLedgerIndex(), previousLedger_.seq()));
+
1153  auto [quorum, trustedKeys] = adaptor_.getQuorumKeys();
+
1154  std::size_t const totalValidators = trustedKeys.size();
+
1155  std::size_t laggards =
+
1156  adaptor_.laggards(previousLedger_.seq(), trustedKeys);
+
1157  std::size_t const offline = trustedKeys.size();
+
1158 
+
1159  std::stringstream vars;
+
1160  vars << " (working seq: " << previousLedger_.seq() << ", "
+
1161  << "validated seq: " << adaptor_.getValidLedgerIndex() << ", "
+
1162  << "am validator: " << adaptor_.validator() << ", "
+
1163  << "have validated: " << adaptor_.haveValidated() << ", "
+
1164  << "roundTime: " << result_->roundTime.read().count() << ", "
+
1165  << "max consensus time: " << parms.ledgerMAX_CONSENSUS.count() << ", "
+
1166  << "validators: " << totalValidators << ", "
+
1167  << "laggards: " << laggards << ", "
+
1168  << "offline: " << offline << ", "
+
1169  << "quorum: " << quorum << ")";
+
1170 
+
1171  if (!ahead || !laggards || !totalValidators || !adaptor_.validator() ||
+
1172  !adaptor_.haveValidated() ||
+
1173  result_->roundTime.read() > parms.ledgerMAX_CONSENSUS)
+
1174  {
+
1175  j_.debug() << "not pausing (early)" << vars.str();
+
1176  return false;
+
1177  }
+
1178 
+
1179  bool willPause = false;
+
1180 
+
1194  constexpr static std::size_t maxPausePhase = 4;
+
1195 
+
1215  std::size_t const phase = (ahead - 1) % (maxPausePhase + 1);
+
1216 
+
1217  // validators that remain after the laggards() function are considered
+
1218  // offline, and should be considered as laggards for purposes of
+
1219  // evaluating whether the threshold for non-laggards has been reached.
+
1220  switch (phase)
+
1221  {
+
1222  case 0:
+
1223  // Laggards and offline shouldn't preclude consensus.
+
1224  if (laggards + offline > totalValidators - quorum)
+
1225  willPause = true;
+
1226  break;
+
1227  case maxPausePhase:
+
1228  // No tolerance.
+
1229  willPause = true;
+
1230  break;
+
1231  default:
+
1232  // Ensure that sufficient validators are known to be not lagging.
+
1233  // Their sufficiently most recent validation sequence was equal to
+
1234  // or greater than our own.
+
1235  //
+
1236  // The threshold is the amount required for quorum plus
+
1237  // the proportion of the remainder based on number of intermediate
+
1238  // phases between 0 and max.
+
1239  float const nonLaggards = totalValidators - (laggards + offline);
+
1240  float const quorumRatio =
+
1241  static_cast<float>(quorum) / totalValidators;
+
1242  float const allowedDissent = 1.0f - quorumRatio;
+
1243  float const phaseFactor = static_cast<float>(phase) / maxPausePhase;
+
1244 
+
1245  if (nonLaggards / totalValidators <
+
1246  quorumRatio + (allowedDissent * phaseFactor))
+
1247  {
+
1248  willPause = true;
+
1249  }
+
1250  }
+
1251 
+
1252  if (willPause)
+
1253  j_.warn() << "pausing" << vars.str();
+
1254  else
+
1255  j_.debug() << "not pausing" << vars.str();
+
1256  return willPause;
+
1257 }
+
1258 
+
1259 template <class Adaptor>
+
1260 void
+
1261 Consensus<Adaptor>::phaseEstablish()
+
1262 {
+
1263  // can only establish consensus if we already took a stance
+
1264  assert(result_);
1265 
-
1266  result_->roundTime.tick(clock_.now());
-
1267  result_->proposers = currPeerPositions_.size();
+
1266  using namespace std::chrono;
+
1267  ConsensusParms const& parms = adaptor_.parms();
1268 
-
1269  convergePercent_ = result_->roundTime.read() * 100 /
-
1270  std::max<milliseconds>(prevRoundTime_, parms.avMIN_CONSENSUS_TIME);
+
1269  result_->roundTime.tick(clock_.now());
+
1270  result_->proposers = currPeerPositions_.size();
1271 
-
1272  // Give everyone a chance to take an initial position
-
1273  if (result_->roundTime.read() < parms.ledgerMIN_CONSENSUS)
-
1274  return;
-
1275 
-
1276  updateOurPositions();
-
1277 
-
1278  // Nothing to do if too many laggards or we don't have consensus.
-
1279  if (shouldPause() || !haveConsensus())
-
1280  return;
-
1281 
-
1282  if (!haveCloseTimeConsensus_)
-
1283  {
-
1284  JLOG(j_.info()) << "We have TX consensus but not CT consensus";
-
1285  return;
-
1286  }
-
1287 
-
1288  JLOG(j_.info()) << "Converge cutoff (" << currPeerPositions_.size()
-
1289  << " participants)";
-
1290  adaptor_.updateOperatingMode(currPeerPositions_.size());
-
1291  prevProposers_ = currPeerPositions_.size();
-
1292  prevRoundTime_ = result_->roundTime.read();
-
1293  phase_ = ConsensusPhase::accepted;
-
1294  JLOG(j_.debug()) << "transitioned to ConsensusPhase::accepted";
-
1295  adaptor_.onAccept(
-
1296  *result_,
-
1297  previousLedger_,
-
1298  closeResolution_,
-
1299  rawCloseTimes_,
-
1300  mode_.get(),
-
1301  getJson(true));
-
1302 }
-
1303 
-
1304 template <class Adaptor>
-
1305 void
-
1306 Consensus<Adaptor>::closeLedger()
-
1307 {
-
1308  // We should not be closing if we already have a position
-
1309  assert(!result_);
-
1310 
-
1311  phase_ = ConsensusPhase::establish;
-
1312  JLOG(j_.debug()) << "transitioned to ConsensusPhase::establish";
-
1313  rawCloseTimes_.self = now_;
-
1314 
-
1315  result_.emplace(adaptor_.onClose(previousLedger_, now_, mode_.get()));
-
1316  result_->roundTime.reset(clock_.now());
-
1317  // Share the newly created transaction set if we haven't already
-
1318  // received it from a peer
-
1319  if (acquired_.emplace(result_->txns.id(), result_->txns).second)
-
1320  adaptor_.share(result_->txns);
-
1321 
-
1322  if (mode_.get() == ConsensusMode::proposing)
-
1323  adaptor_.propose(result_->position);
+
1272  convergePercent_ = result_->roundTime.read() * 100 /
+
1273  std::max<milliseconds>(prevRoundTime_, parms.avMIN_CONSENSUS_TIME);
+
1274 
+
1275  // Give everyone a chance to take an initial position
+
1276  if (result_->roundTime.read() < parms.ledgerMIN_CONSENSUS)
+
1277  return;
+
1278 
+
1279  updateOurPositions();
+
1280 
+
1281  // Nothing to do if too many laggards or we don't have consensus.
+
1282  if (shouldPause() || !haveConsensus())
+
1283  return;
+
1284 
+
1285  if (!haveCloseTimeConsensus_)
+
1286  {
+
1287  JLOG(j_.info()) << "We have TX consensus but not CT consensus";
+
1288  return;
+
1289  }
+
1290 
+
1291  JLOG(j_.info()) << "Converge cutoff (" << currPeerPositions_.size()
+
1292  << " participants)";
+
1293  adaptor_.updateOperatingMode(currPeerPositions_.size());
+
1294  prevProposers_ = currPeerPositions_.size();
+
1295  prevRoundTime_ = result_->roundTime.read();
+
1296  phase_ = ConsensusPhase::accepted;
+
1297  JLOG(j_.debug()) << "transitioned to ConsensusPhase::accepted";
+
1298  adaptor_.onAccept(
+
1299  *result_,
+
1300  previousLedger_,
+
1301  closeResolution_,
+
1302  rawCloseTimes_,
+
1303  mode_.get(),
+
1304  getJson(true));
+
1305 }
+
1306 
+
1307 template <class Adaptor>
+
1308 void
+
1309 Consensus<Adaptor>::closeLedger()
+
1310 {
+
1311  // We should not be closing if we already have a position
+
1312  assert(!result_);
+
1313 
+
1314  phase_ = ConsensusPhase::establish;
+
1315  JLOG(j_.debug()) << "transitioned to ConsensusPhase::establish";
+
1316  rawCloseTimes_.self = now_;
+
1317 
+
1318  result_.emplace(adaptor_.onClose(previousLedger_, now_, mode_.get()));
+
1319  result_->roundTime.reset(clock_.now());
+
1320  // Share the newly created transaction set if we haven't already
+
1321  // received it from a peer
+
1322  if (acquired_.emplace(result_->txns.id(), result_->txns).second)
+
1323  adaptor_.share(result_->txns);
1324 
-
1325  // Create disputes with any peer positions we have transactions for
-
1326  for (auto const& pit : currPeerPositions_)
-
1327  {
-
1328  auto const& pos = pit.second.proposal().position();
-
1329  auto const it = acquired_.find(pos);
-
1330  if (it != acquired_.end())
-
1331  {
-
1332  createDisputes(it->second);
-
1333  }
-
1334  }
-
1335 }
-
1336 
-
1349 inline int
-
1350 participantsNeeded(int participants, int percent)
-
1351 {
-
1352  int result = ((participants * percent) + (percent / 2)) / 100;
-
1353 
-
1354  return (result == 0) ? 1 : result;
-
1355 }
+
1325  if (mode_.get() == ConsensusMode::proposing)
+
1326  adaptor_.propose(result_->position);
+
1327 
+
1328  // Create disputes with any peer positions we have transactions for
+
1329  for (auto const& pit : currPeerPositions_)
+
1330  {
+
1331  auto const& pos = pit.second.proposal().position();
+
1332  auto const it = acquired_.find(pos);
+
1333  if (it != acquired_.end())
+
1334  {
+
1335  createDisputes(it->second);
+
1336  }
+
1337  }
+
1338 }
+
1339 
+
1352 inline int
+
1353 participantsNeeded(int participants, int percent)
+
1354 {
+
1355  int result = ((participants * percent) + (percent / 2)) / 100;
1356 
-
1357 template <class Adaptor>
-
1358 void
-
1359 Consensus<Adaptor>::updateOurPositions()
-
1360 {
-
1361  // We must have a position if we are updating it
-
1362  assert(result_);
-
1363  ConsensusParms const& parms = adaptor_.parms();
-
1364 
-
1365  // Compute a cutoff time
-
1366  auto const peerCutoff = now_ - parms.proposeFRESHNESS;
-
1367  auto const ourCutoff = now_ - parms.proposeINTERVAL;
-
1368 
-
1369  // Verify freshness of peer positions and compute close times
-
1370  std::map<NetClock::time_point, int> closeTimeVotes;
-
1371  {
-
1372  auto it = currPeerPositions_.begin();
-
1373  while (it != currPeerPositions_.end())
-
1374  {
-
1375  Proposal_t const& peerProp = it->second.proposal();
-
1376  if (peerProp.isStale(peerCutoff))
-
1377  {
-
1378  // peer's proposal is stale, so remove it
-
1379  NodeID_t const& peerID = peerProp.nodeID();
-
1380  JLOG(j_.warn()) << "Removing stale proposal from " << peerID;
-
1381  for (auto& dt : result_->disputes)
-
1382  dt.second.unVote(peerID);
-
1383  it = currPeerPositions_.erase(it);
-
1384  }
-
1385  else
-
1386  {
-
1387  // proposal is still fresh
-
1388  ++closeTimeVotes[asCloseTime(peerProp.closeTime())];
-
1389  ++it;
-
1390  }
-
1391  }
-
1392  }
-
1393 
-
1394  // This will stay unseated unless there are any changes
-
1395  std::optional<TxSet_t> ourNewSet;
+
1357  return (result == 0) ? 1 : result;
+
1358 }
+
1359 
+
1360 template <class Adaptor>
+
1361 void
+
1362 Consensus<Adaptor>::updateOurPositions()
+
1363 {
+
1364  // We must have a position if we are updating it
+
1365  assert(result_);
+
1366  ConsensusParms const& parms = adaptor_.parms();
+
1367 
+
1368  // Compute a cutoff time
+
1369  auto const peerCutoff = now_ - parms.proposeFRESHNESS;
+
1370  auto const ourCutoff = now_ - parms.proposeINTERVAL;
+
1371 
+
1372  // Verify freshness of peer positions and compute close times
+
1373  std::map<NetClock::time_point, int> closeTimeVotes;
+
1374  {
+
1375  auto it = currPeerPositions_.begin();
+
1376  while (it != currPeerPositions_.end())
+
1377  {
+
1378  Proposal_t const& peerProp = it->second.proposal();
+
1379  if (peerProp.isStale(peerCutoff))
+
1380  {
+
1381  // peer's proposal is stale, so remove it
+
1382  NodeID_t const& peerID = peerProp.nodeID();
+
1383  JLOG(j_.warn()) << "Removing stale proposal from " << peerID;
+
1384  for (auto& dt : result_->disputes)
+
1385  dt.second.unVote(peerID);
+
1386  it = currPeerPositions_.erase(it);
+
1387  }
+
1388  else
+
1389  {
+
1390  // proposal is still fresh
+
1391  ++closeTimeVotes[asCloseTime(peerProp.closeTime())];
+
1392  ++it;
+
1393  }
+
1394  }
+
1395  }
1396 
-
1397  // Update votes on disputed transactions
-
1398  {
-
1399  std::optional<typename TxSet_t::MutableTxSet> mutableSet;
-
1400  for (auto& [txId, dispute] : result_->disputes)
-
1401  {
-
1402  // Because the threshold for inclusion increases,
-
1403  // time can change our position on a dispute
-
1404  if (dispute.updateVote(
-
1405  convergePercent_,
-
1406  mode_.get() == ConsensusMode::proposing,
-
1407  parms))
-
1408  {
-
1409  if (!mutableSet)
-
1410  mutableSet.emplace(result_->txns);
-
1411 
-
1412  if (dispute.getOurVote())
-
1413  {
-
1414  // now a yes
-
1415  mutableSet->insert(dispute.tx());
-
1416  }
-
1417  else
-
1418  {
-
1419  // now a no
-
1420  mutableSet->erase(txId);
-
1421  }
-
1422  }
-
1423  }
-
1424 
-
1425  if (mutableSet)
-
1426  ourNewSet.emplace(std::move(*mutableSet));
-
1427  }
-
1428 
-
1429  NetClock::time_point consensusCloseTime = {};
-
1430  haveCloseTimeConsensus_ = false;
+
1397  // This will stay unseated unless there are any changes
+
1398  std::optional<TxSet_t> ourNewSet;
+
1399 
+
1400  // Update votes on disputed transactions
+
1401  {
+
1402  std::optional<typename TxSet_t::MutableTxSet> mutableSet;
+
1403  for (auto& [txId, dispute] : result_->disputes)
+
1404  {
+
1405  // Because the threshold for inclusion increases,
+
1406  // time can change our position on a dispute
+
1407  if (dispute.updateVote(
+
1408  convergePercent_,
+
1409  mode_.get() == ConsensusMode::proposing,
+
1410  parms))
+
1411  {
+
1412  if (!mutableSet)
+
1413  mutableSet.emplace(result_->txns);
+
1414 
+
1415  if (dispute.getOurVote())
+
1416  {
+
1417  // now a yes
+
1418  mutableSet->insert(dispute.tx());
+
1419  }
+
1420  else
+
1421  {
+
1422  // now a no
+
1423  mutableSet->erase(txId);
+
1424  }
+
1425  }
+
1426  }
+
1427 
+
1428  if (mutableSet)
+
1429  ourNewSet.emplace(std::move(*mutableSet));
+
1430  }
1431 
-
1432  if (currPeerPositions_.empty())
-
1433  {
-
1434  // no other times
-
1435  haveCloseTimeConsensus_ = true;
-
1436  consensusCloseTime = asCloseTime(result_->position.closeTime());
-
1437  }
-
1438  else
-
1439  {
-
1440  int neededWeight;
-
1441 
-
1442  if (convergePercent_ < parms.avMID_CONSENSUS_TIME)
-
1443  neededWeight = parms.avINIT_CONSENSUS_PCT;
-
1444  else if (convergePercent_ < parms.avLATE_CONSENSUS_TIME)
-
1445  neededWeight = parms.avMID_CONSENSUS_PCT;
-
1446  else if (convergePercent_ < parms.avSTUCK_CONSENSUS_TIME)
-
1447  neededWeight = parms.avLATE_CONSENSUS_PCT;
-
1448  else
-
1449  neededWeight = parms.avSTUCK_CONSENSUS_PCT;
-
1450 
-
1451  int participants = currPeerPositions_.size();
-
1452  if (mode_.get() == ConsensusMode::proposing)
-
1453  {
-
1454  ++closeTimeVotes[asCloseTime(result_->position.closeTime())];
-
1455  ++participants;
-
1456  }
-
1457 
-
1458  // Threshold for non-zero vote
-
1459  int threshVote = participantsNeeded(participants, neededWeight);
+
1432  NetClock::time_point consensusCloseTime = {};
+
1433  haveCloseTimeConsensus_ = false;
+
1434 
+
1435  if (currPeerPositions_.empty())
+
1436  {
+
1437  // no other times
+
1438  haveCloseTimeConsensus_ = true;
+
1439  consensusCloseTime = asCloseTime(result_->position.closeTime());
+
1440  }
+
1441  else
+
1442  {
+
1443  int neededWeight;
+
1444 
+
1445  if (convergePercent_ < parms.avMID_CONSENSUS_TIME)
+
1446  neededWeight = parms.avINIT_CONSENSUS_PCT;
+
1447  else if (convergePercent_ < parms.avLATE_CONSENSUS_TIME)
+
1448  neededWeight = parms.avMID_CONSENSUS_PCT;
+
1449  else if (convergePercent_ < parms.avSTUCK_CONSENSUS_TIME)
+
1450  neededWeight = parms.avLATE_CONSENSUS_PCT;
+
1451  else
+
1452  neededWeight = parms.avSTUCK_CONSENSUS_PCT;
+
1453 
+
1454  int participants = currPeerPositions_.size();
+
1455  if (mode_.get() == ConsensusMode::proposing)
+
1456  {
+
1457  ++closeTimeVotes[asCloseTime(result_->position.closeTime())];
+
1458  ++participants;
+
1459  }
1460 
-
1461  // Threshold to declare consensus
-
1462  int const threshConsensus =
-
1463  participantsNeeded(participants, parms.avCT_CONSENSUS_PCT);
-
1464 
-
1465  JLOG(j_.info()) << "Proposers:" << currPeerPositions_.size()
-
1466  << " nw:" << neededWeight << " thrV:" << threshVote
-
1467  << " thrC:" << threshConsensus;
-
1468 
-
1469  for (auto const& [t, v] : closeTimeVotes)
-
1470  {
-
1471  JLOG(j_.debug())
-
1472  << "CCTime: seq "
-
1473  << static_cast<std::uint32_t>(previousLedger_.seq()) + 1 << ": "
-
1474  << t.time_since_epoch().count() << " has " << v << ", "
-
1475  << threshVote << " required";
-
1476 
-
1477  if (v >= threshVote)
-
1478  {
-
1479  // A close time has enough votes for us to try to agree
-
1480  consensusCloseTime = t;
-
1481  threshVote = v;
-
1482 
-
1483  if (threshVote >= threshConsensus)
-
1484  haveCloseTimeConsensus_ = true;
-
1485  }
-
1486  }
-
1487 
-
1488  if (!haveCloseTimeConsensus_)
-
1489  {
-
1490  JLOG(j_.debug())
-
1491  << "No CT consensus:"
-
1492  << " Proposers:" << currPeerPositions_.size()
-
1493  << " Mode:" << to_string(mode_.get())
-
1494  << " Thresh:" << threshConsensus
-
1495  << " Pos:" << consensusCloseTime.time_since_epoch().count();
-
1496  }
-
1497  }
-
1498 
-
1499  if (!ourNewSet &&
-
1500  ((consensusCloseTime != asCloseTime(result_->position.closeTime())) ||
-
1501  result_->position.isStale(ourCutoff)))
-
1502  {
-
1503  // close time changed or our position is stale
-
1504  ourNewSet.emplace(result_->txns);
-
1505  }
-
1506 
-
1507  if (ourNewSet)
-
1508  {
-
1509  auto newID = ourNewSet->id();
-
1510 
-
1511  result_->txns = std::move(*ourNewSet);
-
1512 
-
1513  JLOG(j_.info()) << "Position change: CTime "
-
1514  << consensusCloseTime.time_since_epoch().count()
-
1515  << ", tx " << newID;
-
1516 
-
1517  result_->position.changePosition(newID, consensusCloseTime, now_);
-
1518 
-
1519  // Share our new transaction set and update disputes
-
1520  // if we haven't already received it
-
1521  if (acquired_.emplace(newID, result_->txns).second)
-
1522  {
-
1523  if (!result_->position.isBowOut())
-
1524  adaptor_.share(result_->txns);
-
1525 
-
1526  for (auto const& [nodeId, peerPos] : currPeerPositions_)
-
1527  {
-
1528  Proposal_t const& p = peerPos.proposal();
-
1529  if (p.position() == newID)
-
1530  updateDisputes(nodeId, result_->txns);
-
1531  }
-
1532  }
-
1533 
-
1534  // Share our new position if we are still participating this round
-
1535  if (!result_->position.isBowOut() &&
-
1536  (mode_.get() == ConsensusMode::proposing))
-
1537  adaptor_.propose(result_->position);
-
1538  }
-
1539 }
-
1540 
-
1541 template <class Adaptor>
-
1542 bool
-
1543 Consensus<Adaptor>::haveConsensus()
-
1544 {
-
1545  // Must have a stance if we are checking for consensus
-
1546  assert(result_);
-
1547 
-
1548  // CHECKME: should possibly count unacquired TX sets as disagreeing
-
1549  int agree = 0, disagree = 0;
+
1461  // Threshold for non-zero vote
+
1462  int threshVote = participantsNeeded(participants, neededWeight);
+
1463 
+
1464  // Threshold to declare consensus
+
1465  int const threshConsensus =
+
1466  participantsNeeded(participants, parms.avCT_CONSENSUS_PCT);
+
1467 
+
1468  JLOG(j_.info()) << "Proposers:" << currPeerPositions_.size()
+
1469  << " nw:" << neededWeight << " thrV:" << threshVote
+
1470  << " thrC:" << threshConsensus;
+
1471 
+
1472  for (auto const& [t, v] : closeTimeVotes)
+
1473  {
+
1474  JLOG(j_.debug())
+
1475  << "CCTime: seq "
+
1476  << static_cast<std::uint32_t>(previousLedger_.seq()) + 1 << ": "
+
1477  << t.time_since_epoch().count() << " has " << v << ", "
+
1478  << threshVote << " required";
+
1479 
+
1480  if (v >= threshVote)
+
1481  {
+
1482  // A close time has enough votes for us to try to agree
+
1483  consensusCloseTime = t;
+
1484  threshVote = v;
+
1485 
+
1486  if (threshVote >= threshConsensus)
+
1487  haveCloseTimeConsensus_ = true;
+
1488  }
+
1489  }
+
1490 
+
1491  if (!haveCloseTimeConsensus_)
+
1492  {
+
1493  JLOG(j_.debug())
+
1494  << "No CT consensus:"
+
1495  << " Proposers:" << currPeerPositions_.size()
+
1496  << " Mode:" << to_string(mode_.get())
+
1497  << " Thresh:" << threshConsensus
+
1498  << " Pos:" << consensusCloseTime.time_since_epoch().count();
+
1499  }
+
1500  }
+
1501 
+
1502  if (!ourNewSet &&
+
1503  ((consensusCloseTime != asCloseTime(result_->position.closeTime())) ||
+
1504  result_->position.isStale(ourCutoff)))
+
1505  {
+
1506  // close time changed or our position is stale
+
1507  ourNewSet.emplace(result_->txns);
+
1508  }
+
1509 
+
1510  if (ourNewSet)
+
1511  {
+
1512  auto newID = ourNewSet->id();
+
1513 
+
1514  result_->txns = std::move(*ourNewSet);
+
1515 
+
1516  JLOG(j_.info()) << "Position change: CTime "
+
1517  << consensusCloseTime.time_since_epoch().count()
+
1518  << ", tx " << newID;
+
1519 
+
1520  result_->position.changePosition(newID, consensusCloseTime, now_);
+
1521 
+
1522  // Share our new transaction set and update disputes
+
1523  // if we haven't already received it
+
1524  if (acquired_.emplace(newID, result_->txns).second)
+
1525  {
+
1526  if (!result_->position.isBowOut())
+
1527  adaptor_.share(result_->txns);
+
1528 
+
1529  for (auto const& [nodeId, peerPos] : currPeerPositions_)
+
1530  {
+
1531  Proposal_t const& p = peerPos.proposal();
+
1532  if (p.position() == newID)
+
1533  updateDisputes(nodeId, result_->txns);
+
1534  }
+
1535  }
+
1536 
+
1537  // Share our new position if we are still participating this round
+
1538  if (!result_->position.isBowOut() &&
+
1539  (mode_.get() == ConsensusMode::proposing))
+
1540  adaptor_.propose(result_->position);
+
1541  }
+
1542 }
+
1543 
+
1544 template <class Adaptor>
+
1545 bool
+
1546 Consensus<Adaptor>::haveConsensus()
+
1547 {
+
1548  // Must have a stance if we are checking for consensus
+
1549  assert(result_);
1550 
-
1551  auto ourPosition = result_->position.position();
-
1552 
-
1553  // Count number of agreements/disagreements with our position
-
1554  for (auto const& [nodeId, peerPos] : currPeerPositions_)
-
1555  {
-
1556  Proposal_t const& peerProp = peerPos.proposal();
-
1557  if (peerProp.position() == ourPosition)
-
1558  {
-
1559  ++agree;
-
1560  }
-
1561  else
-
1562  {
-
1563  JLOG(j_.debug()) << nodeId << " has " << peerProp.position();
-
1564  ++disagree;
-
1565  }
-
1566  }
-
1567  auto currentFinished =
-
1568  adaptor_.proposersFinished(previousLedger_, prevLedgerID_);
-
1569 
-
1570  JLOG(j_.debug()) << "Checking for TX consensus: agree=" << agree
-
1571  << ", disagree=" << disagree;
+
1551  // CHECKME: should possibly count unacquired TX sets as disagreeing
+
1552  int agree = 0, disagree = 0;
+
1553 
+
1554  auto ourPosition = result_->position.position();
+
1555 
+
1556  // Count number of agreements/disagreements with our position
+
1557  for (auto const& [nodeId, peerPos] : currPeerPositions_)
+
1558  {
+
1559  Proposal_t const& peerProp = peerPos.proposal();
+
1560  if (peerProp.position() == ourPosition)
+
1561  {
+
1562  ++agree;
+
1563  }
+
1564  else
+
1565  {
+
1566  JLOG(j_.debug()) << nodeId << " has " << peerProp.position();
+
1567  ++disagree;
+
1568  }
+
1569  }
+
1570  auto currentFinished =
+
1571  adaptor_.proposersFinished(previousLedger_, prevLedgerID_);
1572 
-
1573  // Determine if we actually have consensus or not
-
1574  result_->state = checkConsensus(
-
1575  prevProposers_,
-
1576  agree + disagree,
-
1577  agree,
-
1578  currentFinished,
-
1579  prevRoundTime_,
-
1580  result_->roundTime.read(),
-
1581  adaptor_.parms(),
-
1582  mode_.get() == ConsensusMode::proposing,
-
1583  j_);
-
1584 
-
1585  if (result_->state == ConsensusState::No)
-
1586  return false;
+
1573  JLOG(j_.debug()) << "Checking for TX consensus: agree=" << agree
+
1574  << ", disagree=" << disagree;
+
1575 
+
1576  // Determine if we actually have consensus or not
+
1577  result_->state = checkConsensus(
+
1578  prevProposers_,
+
1579  agree + disagree,
+
1580  agree,
+
1581  currentFinished,
+
1582  prevRoundTime_,
+
1583  result_->roundTime.read(),
+
1584  adaptor_.parms(),
+
1585  mode_.get() == ConsensusMode::proposing,
+
1586  j_);
1587 
-
1588  // There is consensus, but we need to track if the network moved on
-
1589  // without us.
-
1590  if (result_->state == ConsensusState::MovedOn)
-
1591  {
-
1592  JLOG(j_.error()) << "Unable to reach consensus";
-
1593  JLOG(j_.error()) << Json::Compact{getJson(true)};
-
1594  }
-
1595 
-
1596  return true;
-
1597 }
+
1588  if (result_->state == ConsensusState::No)
+
1589  return false;
+
1590 
+
1591  // There is consensus, but we need to track if the network moved on
+
1592  // without us.
+
1593  if (result_->state == ConsensusState::MovedOn)
+
1594  {
+
1595  JLOG(j_.error()) << "Unable to reach consensus";
+
1596  JLOG(j_.error()) << Json::Compact{getJson(true)};
+
1597  }
1598 
-
1599 template <class Adaptor>
-
1600 void
-
1601 Consensus<Adaptor>::leaveConsensus()
-
1602 {
-
1603  if (mode_.get() == ConsensusMode::proposing)
-
1604  {
-
1605  if (result_ && !result_->position.isBowOut())
-
1606  {
-
1607  result_->position.bowOut(now_);
-
1608  adaptor_.propose(result_->position);
-
1609  }
-
1610 
-
1611  mode_.set(ConsensusMode::observing, adaptor_);
-
1612  JLOG(j_.info()) << "Bowing out of consensus";
-
1613  }
-
1614 }
-
1615 
-
1616 template <class Adaptor>
-
1617 void
-
1618 Consensus<Adaptor>::createDisputes(TxSet_t const& o)
-
1619 {
-
1620  // Cannot create disputes without our stance
-
1621  assert(result_);
-
1622 
-
1623  // Only create disputes if this is a new set
-
1624  if (!result_->compares.emplace(o.id()).second)
-
1625  return;
-
1626 
-
1627  // Nothing to dispute if we agree
-
1628  if (result_->txns.id() == o.id())
-
1629  return;
-
1630 
-
1631  JLOG(j_.debug()) << "createDisputes " << result_->txns.id() << " to "
-
1632  << o.id();
+
1599  return true;
+
1600 }
+
1601 
+
1602 template <class Adaptor>
+
1603 void
+
1604 Consensus<Adaptor>::leaveConsensus()
+
1605 {
+
1606  if (mode_.get() == ConsensusMode::proposing)
+
1607  {
+
1608  if (result_ && !result_->position.isBowOut())
+
1609  {
+
1610  result_->position.bowOut(now_);
+
1611  adaptor_.propose(result_->position);
+
1612  }
+
1613 
+
1614  mode_.set(ConsensusMode::observing, adaptor_);
+
1615  JLOG(j_.info()) << "Bowing out of consensus";
+
1616  }
+
1617 }
+
1618 
+
1619 template <class Adaptor>
+
1620 void
+
1621 Consensus<Adaptor>::createDisputes(TxSet_t const& o)
+
1622 {
+
1623  // Cannot create disputes without our stance
+
1624  assert(result_);
+
1625 
+
1626  // Only create disputes if this is a new set
+
1627  if (!result_->compares.emplace(o.id()).second)
+
1628  return;
+
1629 
+
1630  // Nothing to dispute if we agree
+
1631  if (result_->txns.id() == o.id())
+
1632  return;
1633 
-
1634  auto differences = result_->txns.compare(o);
-
1635 
-
1636  int dc = 0;
-
1637 
-
1638  for (auto const& [txId, inThisSet] : differences)
-
1639  {
-
1640  ++dc;
-
1641  // create disputed transactions (from the ledger that has them)
-
1642  assert(
-
1643  (inThisSet && result_->txns.find(txId) && !o.find(txId)) ||
-
1644  (!inThisSet && !result_->txns.find(txId) && o.find(txId)));
-
1645 
-
1646  Tx_t tx = inThisSet ? result_->txns.find(txId) : o.find(txId);
-
1647  auto txID = tx.id();
+
1634  JLOG(j_.debug()) << "createDisputes " << result_->txns.id() << " to "
+
1635  << o.id();
+
1636 
+
1637  auto differences = result_->txns.compare(o);
+
1638 
+
1639  int dc = 0;
+
1640 
+
1641  for (auto const& [txId, inThisSet] : differences)
+
1642  {
+
1643  ++dc;
+
1644  // create disputed transactions (from the ledger that has them)
+
1645  assert(
+
1646  (inThisSet && result_->txns.find(txId) && !o.find(txId)) ||
+
1647  (!inThisSet && !result_->txns.find(txId) && o.find(txId)));
1648 
-
1649  if (result_->disputes.find(txID) != result_->disputes.end())
-
1650  continue;
+
1649  Tx_t tx = inThisSet ? result_->txns.find(txId) : o.find(txId);
+
1650  auto txID = tx.id();
1651 
-
1652  JLOG(j_.debug()) << "Transaction " << txID << " is disputed";
-
1653 
-
1654  typename Result::Dispute_t dtx{
-
1655  tx,
-
1656  result_->txns.exists(txID),
-
1657  std::max(prevProposers_, currPeerPositions_.size()),
-
1658  j_};
-
1659 
-
1660  // Update all of the available peer's votes on the disputed transaction
-
1661  for (auto const& [nodeId, peerPos] : currPeerPositions_)
-
1662  {
-
1663  Proposal_t const& peerProp = peerPos.proposal();
-
1664  auto const cit = acquired_.find(peerProp.position());
-
1665  if (cit != acquired_.end())
-
1666  dtx.setVote(nodeId, cit->second.exists(txID));
-
1667  }
-
1668  adaptor_.share(dtx.tx());
-
1669 
-
1670  result_->disputes.emplace(txID, std::move(dtx));
-
1671  }
-
1672  JLOG(j_.debug()) << dc << " differences found";
-
1673 }
-
1674 
-
1675 template <class Adaptor>
-
1676 void
-
1677 Consensus<Adaptor>::updateDisputes(NodeID_t const& node, TxSet_t const& other)
-
1678 {
-
1679  // Cannot updateDisputes without our stance
-
1680  assert(result_);
-
1681 
-
1682  // Ensure we have created disputes against this set if we haven't seen
-
1683  // it before
-
1684  if (result_->compares.find(other.id()) == result_->compares.end())
-
1685  createDisputes(other);
-
1686 
-
1687  for (auto& it : result_->disputes)
-
1688  {
-
1689  auto& d = it.second;
-
1690  d.setVote(node, other.exists(d.tx().id()));
-
1691  }
-
1692 }
-
1693 
-
1694 template <class Adaptor>
-
1695 NetClock::time_point
-
1696 Consensus<Adaptor>::asCloseTime(NetClock::time_point raw) const
-
1697 {
-
1698  return roundCloseTime(raw, closeResolution_);
-
1699 }
-
1700 
-
1701 } // namespace ripple
-
1702 
-
1703 #endif
+
1652  if (result_->disputes.find(txID) != result_->disputes.end())
+
1653  continue;
+
1654 
+
1655  JLOG(j_.debug()) << "Transaction " << txID << " is disputed";
+
1656 
+
1657  typename Result::Dispute_t dtx{
+
1658  tx,
+
1659  result_->txns.exists(txID),
+
1660  std::max(prevProposers_, currPeerPositions_.size()),
+
1661  j_};
+
1662 
+
1663  // Update all of the available peer's votes on the disputed transaction
+
1664  for (auto const& [nodeId, peerPos] : currPeerPositions_)
+
1665  {
+
1666  Proposal_t const& peerProp = peerPos.proposal();
+
1667  auto const cit = acquired_.find(peerProp.position());
+
1668  if (cit != acquired_.end())
+
1669  dtx.setVote(nodeId, cit->second.exists(txID));
+
1670  }
+
1671  adaptor_.share(dtx.tx());
+
1672 
+
1673  result_->disputes.emplace(txID, std::move(dtx));
+
1674  }
+
1675  JLOG(j_.debug()) << dc << " differences found";
+
1676 }
+
1677 
+
1678 template <class Adaptor>
+
1679 void
+
1680 Consensus<Adaptor>::updateDisputes(NodeID_t const& node, TxSet_t const& other)
+
1681 {
+
1682  // Cannot updateDisputes without our stance
+
1683  assert(result_);
+
1684 
+
1685  // Ensure we have created disputes against this set if we haven't seen
+
1686  // it before
+
1687  if (result_->compares.find(other.id()) == result_->compares.end())
+
1688  createDisputes(other);
+
1689 
+
1690  for (auto& it : result_->disputes)
+
1691  {
+
1692  auto& d = it.second;
+
1693  d.setVote(node, other.exists(d.tx().id()));
+
1694  }
+
1695 }
+
1696 
+
1697 template <class Adaptor>
+
1698 NetClock::time_point
+
1699 Consensus<Adaptor>::asCloseTime(NetClock::time_point raw) const
+
1700 {
+
1701  return roundCloseTime(raw, closeResolution_);
+
1702 }
+
1703 
+
1704 } // namespace ripple
+
1705 
+
1706 #endif
ripple::ConsensusParms::avCT_CONSENSUS_PCT
std::size_t avCT_CONSENSUS_PCT
Percentage of nodes required to reach agreement on ledger close time.
Definition: ConsensusParms.h:137
Json::Value::Int
Json::Int Int
Definition: json_value.h:154
-
ripple::Consensus::deadNodes_
hash_set< NodeID_t > deadNodes_
Definition: Consensus.h:598
+
ripple::Consensus::deadNodes_
hash_set< NodeID_t > deadNodes_
Definition: Consensus.h:601
ripple::checkConsensus
ConsensusState checkConsensus(std::size_t prevProposers, std::size_t currentProposers, std::size_t currentAgree, std::size_t currentFinished, std::chrono::milliseconds previousAgreeTime, std::chrono::milliseconds currentAgreeTime, ConsensusParms const &parms, bool proposing, beast::Journal j)
Determine whether the network reached consensus and whether we joined.
Definition: Consensus.cpp:108
-
ripple::Consensus::checkLedger
void checkLedger()
Check if our previous ledger matches the network's.
Definition: Consensus.h:1051
+
ripple::Consensus::checkLedger
void checkLedger()
Check if our previous ledger matches the network's.
Definition: Consensus.h:1054
ripple::ConsensusState
ConsensusState
Whether we have or don't have a consensus.
Definition: ConsensusTypes.h:186
-
ripple::Consensus::playbackProposals
void playbackProposals()
If we radically changed our consensus context for some reason, we need to replay recent proposals so ...
Definition: Consensus.h:1074
-
ripple::Consensus::shouldPause
bool shouldPause() const
Evaluate whether pausing increases likelihood of validation.
Definition: Consensus.h:1144
+
ripple::Consensus::playbackProposals
void playbackProposals()
If we radically changed our consensus context for some reason, we need to replay recent proposals so ...
Definition: Consensus.h:1077
+
ripple::Consensus::shouldPause
bool shouldPause() const
Evaluate whether pausing increases likelihood of validation.
Definition: Consensus.h:1147
ripple::ConsensusProposal::isStale
bool isStale(NetClock::time_point cutoff) const
Get whether this position is stale relative to the provided cutoff.
Definition: ConsensusProposal.h:157
ripple::ConsensusMode::proposing
@ proposing
We are normal participant in consensus and propose our position.
-
ripple::Consensus::result_
std::optional< Result > result_
Definition: Consensus.h:581
+
ripple::Consensus::result_
std::optional< Result > result_
Definition: Consensus.h:584
ripple::ConsensusTimer
Measures the duration of phases of consensus.
Definition: ConsensusTypes.h:134
-
ripple::Consensus::asCloseTime
NetClock::time_point asCloseTime(NetClock::time_point raw) const
Definition: Consensus.h:1696
+
ripple::Consensus::asCloseTime
NetClock::time_point asCloseTime(NetClock::time_point raw) const
Definition: Consensus.h:1699
beast::Journal::trace
Stream trace() const
Severity stream access functions.
Definition: Journal.h:309
ripple::shouldCloseLedger
bool shouldCloseLedger(bool anyTransactions, std::size_t prevProposers, std::size_t proposersClosed, std::size_t proposersValidated, std::chrono::milliseconds prevRoundTime, std::chrono::milliseconds timeSincePrevClose, std::chrono::milliseconds openTime, std::chrono::milliseconds idleInterval, ConsensusParms const &parms, beast::Journal j)
Determines whether the current ledger should close at this time.
Definition: Consensus.cpp:26
-
ripple::Consensus::createDisputes
void createDisputes(TxSet_t const &o)
Definition: Consensus.h:1618
-
ripple::Consensus::handleWrongLedger
void handleWrongLedger(typename Ledger_t::ID const &lgrId)
Definition: Consensus.h:1006
+
ripple::Consensus::createDisputes
void createDisputes(TxSet_t const &o)
Definition: Consensus.h:1621
+
ripple::Consensus::handleWrongLedger
void handleWrongLedger(typename Ledger_t::ID const &lgrId)
Definition: Consensus.h:1009
ripple::ConsensusParms::avMID_CONSENSUS_TIME
std::size_t avMID_CONSENSUS_TIME
Percentage of previous round duration before we advance.
Definition: ConsensusParms.h:119
-
ripple::Consensus::closeResolution_
NetClock::duration closeResolution_
Definition: Consensus.h:557
+
ripple::Consensus::closeResolution_
NetClock::duration closeResolution_
Definition: Consensus.h:560
- +
Json::arrayValue
@ arrayValue
array value (ordered list)
Definition: json_value.h:42
ripple::ConsensusParms::avLATE_CONSENSUS_PCT
std::size_t avLATE_CONSENSUS_PCT
Percentage of nodes that most vote yes after advancing.
Definition: ConsensusParms.h:128
-
ripple::Consensus::MonitoredMode::set
void set(ConsensusMode mode, Adaptor &a)
Definition: Consensus.h:315
-
ripple::Consensus::MonitoredMode::MonitoredMode
MonitoredMode(ConsensusMode m)
Definition: Consensus.h:305
+
ripple::Consensus::MonitoredMode::set
void set(ConsensusMode mode, Adaptor &a)
Definition: Consensus.h:318
+
ripple::Consensus::MonitoredMode::MonitoredMode
MonitoredMode(ConsensusMode m)
Definition: Consensus.h:308
Json::Compact
Decorator for streaming out compact json.
Definition: json_writer.h:316
-
ripple::Consensus::getJson
Json::Value getJson(bool full) const
Get the Json state of the consensus process.
Definition: Consensus.h:908
+
ripple::Consensus::getJson
Json::Value getJson(bool full) const
Get the Json state of the consensus process.
Definition: Consensus.h:911
ripple::ConsensusParms::avSTUCK_CONSENSUS_PCT
std::size_t avSTUCK_CONSENSUS_PCT
Percentage of nodes that must vote yes after we are stuck.
Definition: ConsensusParms.h:134
-
ripple::Consensus
Generic implementation of consensus algorithm.
Definition: Consensus.h:284
-
ripple::Consensus::recentPeerPositions_
hash_map< NodeID_t, std::deque< PeerPosition_t > > recentPeerPositions_
Definition: Consensus.h:592
+
ripple::Consensus
Generic implementation of consensus algorithm.
Definition: Consensus.h:287
+
ripple::Consensus::recentPeerPositions_
hash_map< NodeID_t, std::deque< PeerPosition_t > > recentPeerPositions_
Definition: Consensus.h:595
std::optional::value_or
T value_or(T... args)
std::optional::emplace
T emplace(T... args)
beast::Journal::warn
Stream warn() const
Definition: Journal.h:327
-
ripple::Consensus::leaveConsensus
void leaveConsensus()
Definition: Consensus.h:1601
-
ripple::Consensus::phase
ConsensusPhase phase() const
Definition: Consensus.h:418
-
ripple::Consensus::j_
const beast::Journal j_
Definition: Consensus.h:601
+
ripple::Consensus::leaveConsensus
void leaveConsensus()
Definition: Consensus.h:1604
+
ripple::Consensus::phase
ConsensusPhase phase() const
Definition: Consensus.h:421
+
ripple::Consensus::j_
const beast::Journal j_
Definition: Consensus.h:604
ripple::roundCloseTime
std::chrono::time_point< Clock, Duration > roundCloseTime(std::chrono::time_point< Clock, Duration > closeTime, std::chrono::duration< Rep, Period > closeResolution)
Calculates the close time for a ledger, given a close time resolution.
Definition: LedgerTiming.h:129
-
ripple::Consensus::currPeerPositions_
hash_map< NodeID_t, PeerPosition_t > currPeerPositions_
Definition: Consensus.h:588
+
ripple::Consensus::currPeerPositions_
hash_map< NodeID_t, PeerPosition_t > currPeerPositions_
Definition: Consensus.h:591
ripple::ConsensusParms::proposeINTERVAL
std::chrono::seconds proposeINTERVAL
How often we force generating a new proposal to keep ours fresh.
Definition: ConsensusParms.h:67
-
ripple::Consensus::prevProposers_
std::size_t prevProposers_
Definition: Consensus.h:595
-
ripple::Consensus::now_
NetClock::time_point now_
Definition: Consensus.h:567
+
ripple::Consensus::prevProposers_
std::size_t prevProposers_
Definition: Consensus.h:598
+
ripple::Consensus::now_
NetClock::time_point now_
Definition: Consensus.h:570
std::stringstream::read
T read(T... args)
ripple::ConsensusPhase::accepted
@ accepted
We have accepted a new last closed ledger and are waiting on a call to startRound to begin the next c...
-
ripple::Consensus::gotTxSet
void gotTxSet(NetClock::time_point const &now, TxSet_t const &txSet)
Process a transaction set acquired from the network.
Definition: Consensus.h:838
+
ripple::Consensus::gotTxSet
void gotTxSet(NetClock::time_point const &now, TxSet_t const &txSet)
Process a transaction set acquired from the network.
Definition: Consensus.h:841
ripple::ConsensusResult
Encapsulates the result of consensus.
Definition: ConsensusTypes.h:201
-
ripple::Consensus::acquired_
hash_map< typename TxSet_t::ID, const TxSet_t > acquired_
Definition: Consensus.h:579
-
ripple::Consensus::prevRoundTime_
std::chrono::milliseconds prevRoundTime_
Definition: Consensus.h:560
-
ripple::Consensus::clock_
clock_type const & clock_
Definition: Consensus.h:548
+
ripple::Consensus::acquired_
hash_map< typename TxSet_t::ID, const TxSet_t > acquired_
Definition: Consensus.h:582
+
ripple::Consensus::prevRoundTime_
std::chrono::milliseconds prevRoundTime_
Definition: Consensus.h:563
+
ripple::Consensus::clock_
clock_type const & clock_
Definition: Consensus.h:551
ripple::ConsensusMode::observing
@ observing
We are observing peer positions, but not proposing our position.
-
ripple::Consensus::adaptor_
Adaptor & adaptor_
Definition: Consensus.h:541
-
ripple::Consensus::phaseOpen
void phaseOpen()
Handle pre-close phase.
Definition: Consensus.h:1091
+
ripple::Consensus::adaptor_
Adaptor & adaptor_
Definition: Consensus.h:544
+
ripple::Consensus::phaseOpen
void phaseOpen()
Handle pre-close phase.
Definition: Consensus.h:1094
std::chrono::time_point::time_since_epoch
T time_since_epoch(T... args)
Json::Value::append
Value & append(const Value &value)
Append value to array at the end.
Definition: json_value.cpp:882
Json::objectValue
@ objectValue
object value (collection of name/value pairs).
Definition: json_value.h:43
-
ripple::Consensus::timerEntry
void timerEntry(NetClock::time_point const &now)
Call periodically to drive consensus forward.
Definition: Consensus.h:815
- -
ripple::Consensus::phase_
ConsensusPhase phase_
Definition: Consensus.h:543
-
ripple::Consensus::startRoundInternal
void startRoundInternal(NetClock::time_point const &now, typename Ledger_t::ID const &prevLedgerID, Ledger_t const &prevLedger, ConsensusMode mode)
Definition: Consensus.h:662
+
ripple::Consensus::timerEntry
void timerEntry(NetClock::time_point const &now)
Call periodically to drive consensus forward.
Definition: Consensus.h:818
+ + +
ripple::Consensus::phase_
ConsensusPhase phase_
Definition: Consensus.h:546
+
ripple::Consensus::startRoundInternal
void startRoundInternal(NetClock::time_point const &now, typename Ledger_t::ID const &prevLedgerID, Ledger_t const &prevLedger, ConsensusMode mode)
Definition: Consensus.h:665
ripple::Consensus::Consensus
Consensus(Consensus &&) noexcept=default
std::to_string
T to_string(T... args)
ripple::ConsensusParms::proposeFRESHNESS
std::chrono::seconds proposeFRESHNESS
How long we consider a proposal fresh.
Definition: ConsensusParms.h:64
-
ripple::Consensus::prevLedgerID
Ledger_t::ID prevLedgerID() const
Get the previous ledger ID.
Definition: Consensus.h:412
+
ripple::Consensus::prevLedgerID
Ledger_t::ID prevLedgerID() const
Get the previous ledger ID.
Definition: Consensus.h:415
ripple::set
bool set(T &target, std::string const &name, Section const &section)
Set a value from a configuration Section If the named value is not found or doesn't parse as a T,...
Definition: BasicConfig.h:313
ripple::ConsensusPhase
ConsensusPhase
Phases of consensus for a single ledger round.
Definition: ConsensusTypes.h:103
beast::Journal::error
Stream error() const
Definition: Journal.h:333
beast::Journal::info
Stream info() const
Definition: Journal.h:321
-
ripple::Consensus::updateDisputes
void updateDisputes(NodeID_t const &node, TxSet_t const &other)
Definition: Consensus.h:1677
-
ripple::Consensus< ripple::test::csf::Peer >::NodeID_t
typename ripple::test::csf::Peer ::NodeID_t NodeID_t
Definition: Consensus.h:288
-
ripple::Consensus::haveCloseTimeConsensus_
bool haveCloseTimeConsensus_
Definition: Consensus.h:546
+
ripple::Consensus::updateDisputes
void updateDisputes(NodeID_t const &node, TxSet_t const &other)
Definition: Consensus.h:1680
+
ripple::Consensus< ripple::test::csf::Peer >::NodeID_t
typename ripple::test::csf::Peer ::NodeID_t NodeID_t
Definition: Consensus.h:291
+
ripple::Consensus::haveCloseTimeConsensus_
bool haveCloseTimeConsensus_
Definition: Consensus.h:549
+
ripple::ConsensusParms::avINIT_CONSENSUS_PCT
std::size_t avINIT_CONSENSUS_PCT
Percentage of nodes on our UNL that must vote yes.
Definition: ConsensusParms.h:116
beast::Journal
A generic endpoint for log messages.
Definition: Journal.h:58
- +
std::map
STL class.
-
ripple::Consensus::mode_
MonitoredMode mode_
Definition: Consensus.h:544
-
ripple::Consensus< ripple::test::csf::Peer >::Ledger_t
typename ripple::test::csf::Peer ::Ledger_t Ledger_t
Definition: Consensus.h:286
+
ripple::Consensus::mode_
MonitoredMode mode_
Definition: Consensus.h:547
+
ripple::Consensus< ripple::test::csf::Peer >::Ledger_t
typename ripple::test::csf::Peer ::Ledger_t Ledger_t
Definition: Consensus.h:289
ripple::ConsensusParms::avMID_CONSENSUS_PCT
std::size_t avMID_CONSENSUS_PCT
Percentage of nodes that most vote yes after advancing.
Definition: ConsensusParms.h:122
-
ripple::Consensus< ripple::test::csf::Peer >::PeerPosition_t
typename ripple::test::csf::Peer ::PeerPosition_t PeerPosition_t
Definition: Consensus.h:290
+
ripple::Consensus< ripple::test::csf::Peer >::PeerPosition_t
typename ripple::test::csf::Peer ::PeerPosition_t PeerPosition_t
Definition: Consensus.h:293
beast::abstract_clock< std::chrono::steady_clock >
-
ripple::Consensus::phaseEstablish
void phaseEstablish()
Handle establish phase.
Definition: Consensus.h:1258
+
ripple::Consensus::phaseEstablish
void phaseEstablish()
Handle establish phase.
Definition: Consensus.h:1261
std::min
T min(T... args)
ripple::getJson
Json::Value getJson(LedgerFill const &fill)
Return a new Json::Value representing the ledger with given options.
Definition: LedgerToJson.cpp:291
-
ripple::Consensus::MonitoredMode::get
ConsensusMode get() const
Definition: Consensus.h:309
+
ripple::Consensus::MonitoredMode::get
ConsensusMode get() const
Definition: Consensus.h:312
ripple::ConsensusProposal::nodeID
NodeID_t const & nodeID() const
Identifying which peer took this position.
Definition: ConsensusProposal.h:93
-
ripple::Consensus::prevCloseTime_
NetClock::time_point prevCloseTime_
Definition: Consensus.h:568
+
ripple::Consensus::prevCloseTime_
NetClock::time_point prevCloseTime_
Definition: Consensus.h:571
ripple::ConsensusProposal::closeTime
NetClock::time_point const & closeTime() const
The current position on the consensus close time.
Definition: ConsensusProposal.h:127
ripple
Use hash_* containers for keys that do not need a cryptographically secure hashing algorithm.
Definition: RCLCensorshipDetector.h:29
ripple::ConsensusParms::ledgerMIN_CONSENSUS
std::chrono::milliseconds ledgerMIN_CONSENSUS
The number of seconds we wait minimum to ensure participation.
Definition: ConsensusParms.h:80
ripple::ConsensusMode
ConsensusMode
Represents how a node currently participates in Consensus.
Definition: ConsensusTypes.h:55
-
ripple::Consensus::peerProposalInternal
bool peerProposalInternal(NetClock::time_point const &now, PeerPosition_t const &newProposal)
Handle a replayed or a new peer proposal.
Definition: Consensus.h:720
+
ripple::Consensus::peerProposalInternal
bool peerProposalInternal(NetClock::time_point const &now, PeerPosition_t const &newProposal)
Handle a replayed or a new peer proposal.
Definition: Consensus.h:723
ripple::ConsensusParms
Consensus algorithm parameters.
Definition: ConsensusParms.h:33
std::map::begin
T begin(T... args)
- +
std
STL namespace.
ripple::ConsensusParms::avSTUCK_CONSENSUS_TIME
std::size_t avSTUCK_CONSENSUS_TIME
Percentage of previous round duration before we are stuck.
Definition: ConsensusParms.h:131
-
ripple::Consensus::prevLedgerID_
Ledger_t::ID prevLedgerID_
Definition: Consensus.h:574
-
ripple::Consensus::openTime_
ConsensusTimer openTime_
Definition: Consensus.h:555
-
ripple::Consensus::peerProposal
bool peerProposal(NetClock::time_point const &now, PeerPosition_t const &newProposal)
A peer has proposed a new position, adjust our tracking.
Definition: Consensus.h:700
+
ripple::Consensus::prevLedgerID_
Ledger_t::ID prevLedgerID_
Definition: Consensus.h:577
+
ripple::Consensus::openTime_
ConsensusTimer openTime_
Definition: Consensus.h:558
+
ripple::Consensus::peerProposal
bool peerProposal(NetClock::time_point const &now, PeerPosition_t const &newProposal)
A peer has proposed a new position, adjust our tracking.
Definition: Consensus.h:703
std::stringstream::str
T str(T... args)
ripple::DisputedTx
A transaction discovered to be in dispute during consensus.
Definition: DisputedTx.h:50
beast::Journal::debug
Stream debug() const
Definition: Journal.h:315
ripple::ConsensusParms::avLATE_CONSENSUS_TIME
std::size_t avLATE_CONSENSUS_TIME
Percentage of previous round duration before we advance.
Definition: ConsensusParms.h:125
-
ripple::Consensus< ripple::test::csf::Peer >::TxSet_t
typename ripple::test::csf::Peer ::TxSet_t TxSet_t
Definition: Consensus.h:287
-
ripple::Consensus::haveConsensus
bool haveConsensus()
Definition: Consensus.h:1543
+
ripple::Consensus< ripple::test::csf::Peer >::TxSet_t
typename ripple::test::csf::Peer ::TxSet_t TxSet_t
Definition: Consensus.h:290
+
ripple::Consensus::haveConsensus
bool haveConsensus()
Definition: Consensus.h:1546
std::max
T max(T... args)
ripple::getNextLedgerTimeResolution
std::chrono::duration< Rep, Period > getNextLedgerTimeResolution(std::chrono::duration< Rep, Period > previousResolution, bool previousAgree, Seq ledgerSeq)
Calculates the close time resolution for the specified ledger.
Definition: LedgerTiming.h:80
- +
ripple::ledgerDefaultTimeResolution
constexpr auto ledgerDefaultTimeResolution
Initial resolution of ledger close time.
Definition: LedgerTiming.h:44
ripple::NetClock
Clock for measuring the network time.
Definition: chrono.h:48
-
ripple::Consensus::updateOurPositions
void updateOurPositions()
Definition: Consensus.h:1359
-
ripple::Consensus::simulate
void simulate(NetClock::time_point const &now, std::optional< std::chrono::milliseconds > consensusDelay)
Simulate the consensus process without any network traffic.
Definition: Consensus.h:884
- +
ripple::Consensus::updateOurPositions
void updateOurPositions()
Definition: Consensus.h:1362
+
ripple::Consensus::simulate
void simulate(NetClock::time_point const &now, std::optional< std::chrono::milliseconds > consensusDelay)
Simulate the consensus process without any network traffic.
Definition: Consensus.h:887
+
ripple::ConsensusParms::avMIN_CONSENSUS_TIME
std::chrono::milliseconds avMIN_CONSENSUS_TIME
The minimum amount of time to consider the previous round to have taken.
Definition: ConsensusParms.h:107
ripple::ConsensusProposal::position
Position_t const & position() const
Get the proposed position.
Definition: ConsensusProposal.h:100
-
ripple::participantsNeeded
int participantsNeeded(int participants, int percent)
How many of the participants must agree to reach a given threshold?
Definition: Consensus.h:1350
-
ripple::Consensus::startRound
void startRound(NetClock::time_point const &now, typename Ledger_t::ID const &prevLedgerID, Ledger_t prevLedger, hash_set< NodeID_t > const &nowUntrusted, bool proposing)
Kick-off the next round of consensus.
Definition: Consensus.h:616
+
ripple::participantsNeeded
int participantsNeeded(int participants, int percent)
How many of the participants must agree to reach a given threshold?
Definition: Consensus.h:1353
+
ripple::Consensus::startRound
void startRound(NetClock::time_point const &now, typename Ledger_t::ID const &prevLedgerID, Ledger_t prevLedger, hash_set< NodeID_t > const &nowUntrusted, bool proposing)
Kick-off the next round of consensus.
Definition: Consensus.h:619
ripple::ConsensusCloseTimes
Stores the set of initial close times.
Definition: ConsensusTypes.h:174
Json::Value
Represents a JSON value.
Definition: json_value.h:145
-
ripple::Consensus::rawCloseTimes_
ConsensusCloseTimes rawCloseTimes_
Definition: Consensus.h:582
-
ripple::Consensus::previousLedger_
Ledger_t previousLedger_
Definition: Consensus.h:576
+
ripple::Consensus::rawCloseTimes_
ConsensusCloseTimes rawCloseTimes_
Definition: Consensus.h:585
+
ripple::Consensus::previousLedger_
Ledger_t previousLedger_
Definition: Consensus.h:579
diff --git a/Consensus__test_8cpp_source.html b/Consensus__test_8cpp_source.html index d477a71f46..52b5be022e 100644 --- a/Consensus__test_8cpp_source.html +++ b/Consensus__test_8cpp_source.html @@ -1155,7 +1155,7 @@ $(function() {
std::vector
STL class.
ripple::test::Consensus_test::Disruptor::on
void on(csf::PeerID who, csf::SimTime, csf::AcceptLedger const &e)
Definition: Consensus_test.cpp:816
ripple::test::Consensus_test::Disruptor::Disruptor
Disruptor(csf::PeerGroup &net, csf::PeerGroup &c, csf::PeerGroup &split, csf::SimDuration d)
Definition: Consensus_test.cpp:785
-
ripple::Consensus
Generic implementation of consensus algorithm.
Definition: Consensus.h:284
+
ripple::Consensus
Generic implementation of consensus algorithm.
Definition: Consensus.h:287
ripple::ConsensusState::Yes
@ Yes
We have consensus along with the network.
ripple::test::Consensus_test::Disruptor::delay
csf::SimDuration delay
Definition: Consensus_test.cpp:782
diff --git a/DatabaseShardImp_8cpp_source.html b/DatabaseShardImp_8cpp_source.html index ad933da262..0a5641bc65 100644 --- a/DatabaseShardImp_8cpp_source.html +++ b/DatabaseShardImp_8cpp_source.html @@ -2505,7 +2505,7 @@ $(function() {
std::vector::end
T end(T... args)
ripple::NodeStore::Database::fetchNodeObject
std::shared_ptr< NodeObject > fetchNodeObject(uint256 const &hash, std::uint32_t ledgerSeq=0, FetchType fetchType=FetchType::synchronous, bool duplicate=false)
Fetch a node object.
Definition: Database.cpp:252
-
ripple::RangeSet
boost::icl::interval_set< T, std::less, ClosedInterval< T > > RangeSet
A set of closed intervals over the domain T.
Definition: RangeSet.h:69
+
ripple::RangeSet
boost::icl::interval_set< T, std::less, ClosedInterval< T > > RangeSet
A set of closed intervals over the domain T.
Definition: RangeSet.h:70
ripple::NodeStore::Database::earliestLedgerSeq
std::uint32_t earliestLedgerSeq() const noexcept
Definition: Database.h:238
ripple::NodeStore::DatabaseShardImp::finalizeShard
void finalizeShard(std::shared_ptr< Shard > &shard, bool writeSQLite, std::optional< uint256 > const &expectedHash)
Definition: DatabaseShardImp.cpp:1467
std::max
T max(T... args)
diff --git a/DatabaseShard__test_8cpp_source.html b/DatabaseShard__test_8cpp_source.html index 5251570bfe..e1f304e9bb 100644 --- a/DatabaseShard__test_8cpp_source.html +++ b/DatabaseShard__test_8cpp_source.html @@ -2016,7 +2016,7 @@ $(function() {
ripple::NodeStore::DatabaseShard_test::checkLedger
void checkLedger(TestData &data, DatabaseShard &db, Ledger const &ledger)
Definition: DatabaseShard_test.cpp:470
ripple::NodeStore::uniformIntDistribution::rnd
resultType rnd(Generator &g, const resultType a, const resultType b) const
Definition: DatabaseShard_test.cpp:128
ripple::NodeStore::DatabaseShard_test::maxHistoricalShards
static constexpr std::uint32_t maxHistoricalShards
Definition: DatabaseShard_test.cpp:171
-
ripple::from_string
bool from_string(RangeSet< T > &rs, std::string const &s)
Convert the given styled string to a RangeSet.
Definition: RangeSet.h:123
+
ripple::from_string
bool from_string(RangeSet< T > &rs, std::string const &s)
Convert the given styled string to a RangeSet.
Definition: RangeSet.h:124
ripple::NodeStore::DatabaseShard_test::earliestSeq
static constexpr std::uint32_t earliestSeq
Definition: DatabaseShard_test.cpp:173
ripple::test::jtx::Env::app
Application & app()
Definition: Env.h:241
ripple::LedgerInfo::seq
LedgerIndex seq
Definition: ReadView.h:83
@@ -2081,7 +2081,7 @@ $(function() {
std::accumulate
T accumulate(T... args)
-
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:53
+
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:54
ripple::NodeStore::DatabaseShard::prepareShards
virtual bool prepareShards(std::vector< std::uint32_t > const &shardIndexes)=0
Prepare one or more shard indexes to be imported into the database.
std::transform
T transform(T... args)
@@ -2132,7 +2132,7 @@ $(function() {
std::array::end
T end(T... args)
ripple::NodeStore::Database::fetchNodeObject
std::shared_ptr< NodeObject > fetchNodeObject(uint256 const &hash, std::uint32_t ledgerSeq=0, FetchType fetchType=FetchType::synchronous, bool duplicate=false)
Fetch a node object.
Definition: Database.cpp:252
-
ripple::RangeSet
boost::icl::interval_set< T, std::less, ClosedInterval< T > > RangeSet
A set of closed intervals over the domain T.
Definition: RangeSet.h:69
+
ripple::RangeSet
boost::icl::interval_set< T, std::less, ClosedInterval< T > > RangeSet
A set of closed intervals over the domain T.
Definition: RangeSet.h:70
ripple::NodeStore::DatabaseShard_test::TestData::makeLedgerData
void makeLedgerData(test::jtx::Env &env_, std::uint32_t seq)
Definition: DatabaseShard_test.cpp:263
diff --git a/ETLSource_8cpp_source.html b/ETLSource_8cpp_source.html index 86f7c3bf6b..f181a42401 100644 --- a/ETLSource_8cpp_source.html +++ b/ETLSource_8cpp_source.html @@ -1136,7 +1136,7 @@ $(function() {
ripple::ETLLoadBalancer::etl_
ReportingETL & etl_
Definition: ETLSource.h:318
Json::Value::asUInt
UInt asUInt() const
Definition: json_value.cpp:545
Json::FastWriter
Outputs a Value in JSON format without formatting (not human friendly).
Definition: json_writer.h:52
-
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:76
+
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:74
ripple::rpcFAILED_TO_FORWARD
@ rpcFAILED_TO_FORWARD
Definition: ErrorCodes.h:140
ripple::AsyncCallData::next_
std::unique_ptr< org::xrpl::rpc::v1::GetLedgerDataResponse > next_
Definition: ETLSource.cpp:419
ripple::ETLSource::toString
std::string toString() const
Definition: ETLSource.h:222
diff --git a/ETLSource_8h_source.html b/ETLSource_8h_source.html index bc536e3497..ee4d6e87ef 100644 --- a/ETLSource_8h_source.html +++ b/ETLSource_8h_source.html @@ -469,7 +469,7 @@ $(function() {
beast::Journal
A generic endpoint for log messages.
Definition: Journal.h:58
ripple::ETLSource::app_
Application & app_
Definition: ETLSource.h:75
-
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:53
+
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:54
ripple::ETLLoadBalancer::sources_
std::vector< std::unique_ptr< ETLSource > > sources_
Definition: ETLSource.h:322
ripple::ETLSource::journal_
beast::Journal journal_
Definition: ETLSource.h:73
ripple::ETLSource::getP2pForwardingStub
std::unique_ptr< org::xrpl::rpc::v1::XRPLedgerAPIService::Stub > getP2pForwardingStub() const
Get grpc stub to forward requests to p2p node.
Definition: ETLSource.cpp:791
diff --git a/HTTPClient_8cpp_source.html b/HTTPClient_8cpp_source.html index 37b60e9510..25556e8bb1 100644 --- a/HTTPClient_8cpp_source.html +++ b/HTTPClient_8cpp_source.html @@ -711,7 +711,7 @@ $(function() {
ripple::HTTPClientImp::handleHeader
void handleHeader(const boost::system::error_code &ecResult, std::size_t bytes_transferred)
Definition: HTTPClient.cpp:364
AutoSocket::SSLSocket
ssl_socket & SSLSocket()
Definition: AutoSocket.h:71
ripple::HTTPClientImp::mTimeout
std::chrono::seconds mTimeout
Definition: HTTPClient.cpp:536
-
ripple::HTTPClient::maxClientHeaderBytes
static constexpr auto maxClientHeaderBytes
Definition: HTTPClient.h:38
+
ripple::HTTPClient::maxClientHeaderBytes
static constexpr auto maxClientHeaderBytes
Definition: HTTPClient.h:42
ripple::HTTPClientImp::j_
beast::Journal j_
Definition: HTTPClient.cpp:537
std::to_string
T to_string(T... args)
@@ -739,7 +739,7 @@ $(function() {
beast::Journal::debug
Stream debug() const
Definition: Journal.h:315
-
ripple::HTTPClient
Provides an asynchronous HTTP client implementation with optional SSL.
Definition: HTTPClient.h:33
+
ripple::HTTPClient
Provides an asynchronous HTTP client implementation with optional SSL.
Definition: HTTPClient.h:37
AutoSocket::async_shutdown
void async_shutdown(ShutdownHandler handler)
Definition: AutoSocket.h:147
ripple::HTTPClientImp::mQuery
std::shared_ptr< boost::asio::ip::tcp::resolver::query > mQuery
Definition: HTTPClient.cpp:514
diff --git a/HTTPClient_8h_source.html b/HTTPClient_8h_source.html index 1053098c6a..bfac181bc2 100644 --- a/HTTPClient_8h_source.html +++ b/HTTPClient_8h_source.html @@ -95,70 +95,75 @@ $(function() {
24 #include <ripple/core/Config.h>
25 #include <boost/asio/io_service.hpp>
26 #include <boost/asio/streambuf.hpp>
-
27 #include <chrono>
-
28 
-
29 namespace ripple {
-
30 
-
33 class HTTPClient
-
34 {
-
35 public:
-
36  explicit HTTPClient() = default;
-
37 
-
38  static constexpr auto maxClientHeaderBytes = kilobytes(32);
-
39 
-
40  static void
-
41  initializeSSLContext(Config const& config, beast::Journal j);
-
42 
-
43  static void
-
44  get(bool bSSL,
-
45  boost::asio::io_service& io_service,
-
46  std::deque<std::string> deqSites,
-
47  const unsigned short port,
-
48  std::string const& strPath,
-
49  std::size_t responseMax, // if no Content-Length header
-
50  std::chrono::seconds timeout,
-
51  std::function<bool(
-
52  const boost::system::error_code& ecResult,
-
53  int iStatus,
-
54  std::string const& strData)> complete,
-
55  beast::Journal& j);
-
56 
-
57  static void
-
58  get(bool bSSL,
-
59  boost::asio::io_service& io_service,
-
60  std::string strSite,
-
61  const unsigned short port,
-
62  std::string const& strPath,
-
63  std::size_t responseMax, // if no Content-Length header
-
64  std::chrono::seconds timeout,
-
65  std::function<bool(
-
66  const boost::system::error_code& ecResult,
-
67  int iStatus,
-
68  std::string const& strData)> complete,
-
69  beast::Journal& j);
-
70 
-
71  static void
-
72  request(
-
73  bool bSSL,
-
74  boost::asio::io_service& io_service,
-
75  std::string strSite,
-
76  const unsigned short port,
-
77  std::function<
-
78  void(boost::asio::streambuf& sb, std::string const& strHost)> build,
-
79  std::size_t responseMax, // if no Content-Length header
-
80  std::chrono::seconds timeout,
-
81  std::function<bool(
-
82  const boost::system::error_code& ecResult,
-
83  int iStatus,
-
84  std::string const& strData)> complete,
-
85  beast::Journal& j);
-
86 };
-
87 
-
88 } // namespace ripple
-
89 
-
90 #endif
+
27 
+
28 #include <chrono>
+
29 #include <deque>
+
30 #include <functional>
+
31 #include <string>
+
32 
+
33 namespace ripple {
+
34 
+
37 class HTTPClient
+
38 {
+
39 public:
+
40  explicit HTTPClient() = default;
+
41 
+
42  static constexpr auto maxClientHeaderBytes = kilobytes(32);
+
43 
+
44  static void
+
45  initializeSSLContext(Config const& config, beast::Journal j);
+
46 
+
47  static void
+
48  get(bool bSSL,
+
49  boost::asio::io_service& io_service,
+
50  std::deque<std::string> deqSites,
+
51  const unsigned short port,
+
52  std::string const& strPath,
+
53  std::size_t responseMax, // if no Content-Length header
+
54  std::chrono::seconds timeout,
+
55  std::function<bool(
+
56  const boost::system::error_code& ecResult,
+
57  int iStatus,
+
58  std::string const& strData)> complete,
+
59  beast::Journal& j);
+
60 
+
61  static void
+
62  get(bool bSSL,
+
63  boost::asio::io_service& io_service,
+
64  std::string strSite,
+
65  const unsigned short port,
+
66  std::string const& strPath,
+
67  std::size_t responseMax, // if no Content-Length header
+
68  std::chrono::seconds timeout,
+
69  std::function<bool(
+
70  const boost::system::error_code& ecResult,
+
71  int iStatus,
+
72  std::string const& strData)> complete,
+
73  beast::Journal& j);
+
74 
+
75  static void
+
76  request(
+
77  bool bSSL,
+
78  boost::asio::io_service& io_service,
+
79  std::string strSite,
+
80  const unsigned short port,
+
81  std::function<
+
82  void(boost::asio::streambuf& sb, std::string const& strHost)> build,
+
83  std::size_t responseMax, // if no Content-Length header
+
84  std::chrono::seconds timeout,
+
85  std::function<bool(
+
86  const boost::system::error_code& ecResult,
+
87  int iStatus,
+
88  std::string const& strData)> complete,
+
89  beast::Journal& j);
+
90 };
+
91 
+
92 } // namespace ripple
+
93 
+
94 #endif
std::string
STL class.
+
ripple::HTTPClient::get
static void get(bool bSSL, boost::asio::io_service &io_service, std::deque< std::string > deqSites, const unsigned short port, std::string const &strPath, std::size_t responseMax, std::chrono::seconds timeout, std::function< bool(const boost::system::error_code &ecResult, int iStatus, std::string const &strData)> complete, beast::Journal &j)
Definition: HTTPClient.cpp:543
ripple::HTTPClient::HTTPClient
HTTPClient()=default
@@ -166,14 +171,15 @@ $(function() { -
ripple::HTTPClient::maxClientHeaderBytes
static constexpr auto maxClientHeaderBytes
Definition: HTTPClient.h:38
- +
ripple::HTTPClient::maxClientHeaderBytes
static constexpr auto maxClientHeaderBytes
Definition: HTTPClient.h:42
+
beast::Journal
A generic endpoint for log messages.
Definition: Journal.h:58
ripple
Use hash_* containers for keys that do not need a cryptographically secure hashing algorithm.
Definition: RCLCensorshipDetector.h:29
ripple::HTTPClient::request
static void request(bool bSSL, boost::asio::io_service &io_service, std::string strSite, const unsigned short port, std::function< void(boost::asio::streambuf &sb, std::string const &strHost)> build, std::size_t responseMax, std::chrono::seconds timeout, std::function< bool(const boost::system::error_code &ecResult, int iStatus, std::string const &strData)> complete, beast::Journal &j)
Definition: HTTPClient.cpp:585
-
ripple::HTTPClient
Provides an asynchronous HTTP client implementation with optional SSL.
Definition: HTTPClient.h:33
+
ripple::HTTPClient
Provides an asynchronous HTTP client implementation with optional SSL.
Definition: HTTPClient.h:37
ripple::HTTPClient::initializeSSLContext
static void initializeSSLContext(Config const &config, beast::Journal j)
Definition: HTTPClient.cpp:38
+
Generated by   diff --git a/Handshake_8cpp_source.html b/Handshake_8cpp_source.html index fdfc71987c..e94fa4c185 100644 --- a/Handshake_8cpp_source.html +++ b/Handshake_8cpp_source.html @@ -96,391 +96,393 @@ $(function() {
25 #include <ripple/beast/rfc2616.h>
26 #include <ripple/overlay/impl/Handshake.h>
27 #include <ripple/protocol/digest.h>
-
28 #include <boost/regex.hpp>
-
29 #include <algorithm>
-
30 #include <chrono>
-
31 
-
32 // VFALCO Shouldn't we have to include the OpenSSL
-
33 // headers or something for SSL_get_finished?
-
34 
-
35 namespace ripple {
+
28 
+
29 #include <boost/regex.hpp>
+
30 
+
31 #include <algorithm>
+
32 #include <chrono>
+
33 
+
34 // VFALCO Shouldn't we have to include the OpenSSL
+
35 // headers or something for SSL_get_finished?
36 
-
37 std::optional<std::string>
-
38 getFeatureValue(
-
39  boost::beast::http::fields const& headers,
-
40  std::string const& feature)
-
41 {
-
42  auto const header = headers.find("X-Protocol-Ctl");
-
43  if (header == headers.end())
-
44  return {};
-
45  boost::smatch match;
-
46  boost::regex rx(feature + "=([^;\\s]+)");
-
47  auto const value = header->value().to_string();
-
48  if (boost::regex_search(value, match, rx))
-
49  return {match[1]};
-
50  return {};
-
51 }
-
52 
-
53 bool
-
54 isFeatureValue(
-
55  boost::beast::http::fields const& headers,
-
56  std::string const& feature,
-
57  std::string const& value)
-
58 {
-
59  if (auto const fvalue = getFeatureValue(headers, feature))
-
60  return beast::rfc2616::token_in_list(fvalue.value(), value);
-
61 
-
62  return false;
-
63 }
-
64 
-
65 bool
-
66 featureEnabled(
-
67  boost::beast::http::fields const& headers,
-
68  std::string const& feature)
-
69 {
-
70  return isFeatureValue(headers, feature, "1");
-
71 }
-
72 
-
73 std::string
-
74 makeFeaturesRequestHeader(
-
75  bool comprEnabled,
-
76  bool ledgerReplayEnabled,
-
77  bool txReduceRelayEnabled,
-
78  bool vpReduceRelayEnabled)
-
79 {
-
80  std::stringstream str;
-
81  if (comprEnabled)
-
82  str << FEATURE_COMPR << "=lz4" << DELIM_FEATURE;
-
83  if (ledgerReplayEnabled)
-
84  str << FEATURE_LEDGER_REPLAY << "=1" << DELIM_FEATURE;
-
85  if (txReduceRelayEnabled)
-
86  str << FEATURE_TXRR << "=1" << DELIM_FEATURE;
-
87  if (vpReduceRelayEnabled)
-
88  str << FEATURE_VPRR << "=1" << DELIM_FEATURE;
-
89  return str.str();
-
90 }
-
91 
-
92 std::string
-
93 makeFeaturesResponseHeader(
-
94  http_request_type const& headers,
-
95  bool comprEnabled,
-
96  bool ledgerReplayEnabled,
-
97  bool txReduceRelayEnabled,
-
98  bool vpReduceRelayEnabled)
-
99 {
-
100  std::stringstream str;
-
101  if (comprEnabled && isFeatureValue(headers, FEATURE_COMPR, "lz4"))
-
102  str << FEATURE_COMPR << "=lz4" << DELIM_FEATURE;
-
103  if (ledgerReplayEnabled && featureEnabled(headers, FEATURE_LEDGER_REPLAY))
-
104  str << FEATURE_LEDGER_REPLAY << "=1" << DELIM_FEATURE;
-
105  if (txReduceRelayEnabled && featureEnabled(headers, FEATURE_TXRR))
-
106  str << FEATURE_TXRR << "=1" << DELIM_FEATURE;
-
107  if (vpReduceRelayEnabled && featureEnabled(headers, FEATURE_VPRR))
-
108  str << FEATURE_VPRR << "=1" << DELIM_FEATURE;
-
109  return str.str();
-
110 }
-
111 
-
126 static std::optional<base_uint<512>>
-
127 hashLastMessage(SSL const* ssl, size_t (*get)(const SSL*, void*, size_t))
-
128 {
-
129  constexpr std::size_t sslMinimumFinishedLength = 12;
-
130 
-
131  unsigned char buf[1024];
-
132  size_t len = get(ssl, buf, sizeof(buf));
-
133 
-
134  if (len < sslMinimumFinishedLength)
-
135  return std::nullopt;
-
136 
-
137  sha512_hasher h;
+
37 namespace ripple {
+
38 
+
39 std::optional<std::string>
+
40 getFeatureValue(
+
41  boost::beast::http::fields const& headers,
+
42  std::string const& feature)
+
43 {
+
44  auto const header = headers.find("X-Protocol-Ctl");
+
45  if (header == headers.end())
+
46  return {};
+
47  boost::smatch match;
+
48  boost::regex rx(feature + "=([^;\\s]+)");
+
49  std::string const value = header->value();
+
50  if (boost::regex_search(value, match, rx))
+
51  return {match[1]};
+
52  return {};
+
53 }
+
54 
+
55 bool
+
56 isFeatureValue(
+
57  boost::beast::http::fields const& headers,
+
58  std::string const& feature,
+
59  std::string const& value)
+
60 {
+
61  if (auto const fvalue = getFeatureValue(headers, feature))
+
62  return beast::rfc2616::token_in_list(fvalue.value(), value);
+
63 
+
64  return false;
+
65 }
+
66 
+
67 bool
+
68 featureEnabled(
+
69  boost::beast::http::fields const& headers,
+
70  std::string const& feature)
+
71 {
+
72  return isFeatureValue(headers, feature, "1");
+
73 }
+
74 
+
75 std::string
+
76 makeFeaturesRequestHeader(
+
77  bool comprEnabled,
+
78  bool ledgerReplayEnabled,
+
79  bool txReduceRelayEnabled,
+
80  bool vpReduceRelayEnabled)
+
81 {
+
82  std::stringstream str;
+
83  if (comprEnabled)
+
84  str << FEATURE_COMPR << "=lz4" << DELIM_FEATURE;
+
85  if (ledgerReplayEnabled)
+
86  str << FEATURE_LEDGER_REPLAY << "=1" << DELIM_FEATURE;
+
87  if (txReduceRelayEnabled)
+
88  str << FEATURE_TXRR << "=1" << DELIM_FEATURE;
+
89  if (vpReduceRelayEnabled)
+
90  str << FEATURE_VPRR << "=1" << DELIM_FEATURE;
+
91  return str.str();
+
92 }
+
93 
+
94 std::string
+
95 makeFeaturesResponseHeader(
+
96  http_request_type const& headers,
+
97  bool comprEnabled,
+
98  bool ledgerReplayEnabled,
+
99  bool txReduceRelayEnabled,
+
100  bool vpReduceRelayEnabled)
+
101 {
+
102  std::stringstream str;
+
103  if (comprEnabled && isFeatureValue(headers, FEATURE_COMPR, "lz4"))
+
104  str << FEATURE_COMPR << "=lz4" << DELIM_FEATURE;
+
105  if (ledgerReplayEnabled && featureEnabled(headers, FEATURE_LEDGER_REPLAY))
+
106  str << FEATURE_LEDGER_REPLAY << "=1" << DELIM_FEATURE;
+
107  if (txReduceRelayEnabled && featureEnabled(headers, FEATURE_TXRR))
+
108  str << FEATURE_TXRR << "=1" << DELIM_FEATURE;
+
109  if (vpReduceRelayEnabled && featureEnabled(headers, FEATURE_VPRR))
+
110  str << FEATURE_VPRR << "=1" << DELIM_FEATURE;
+
111  return str.str();
+
112 }
+
113 
+
128 static std::optional<base_uint<512>>
+
129 hashLastMessage(SSL const* ssl, size_t (*get)(const SSL*, void*, size_t))
+
130 {
+
131  constexpr std::size_t sslMinimumFinishedLength = 12;
+
132 
+
133  unsigned char buf[1024];
+
134  size_t len = get(ssl, buf, sizeof(buf));
+
135 
+
136  if (len < sslMinimumFinishedLength)
+
137  return std::nullopt;
138 
-
139  base_uint<512> cookie;
-
140  SHA512(buf, len, cookie.data());
-
141  return cookie;
-
142 }
-
143 
-
144 std::optional<uint256>
-
145 makeSharedValue(stream_type& ssl, beast::Journal journal)
-
146 {
-
147  auto const cookie1 = hashLastMessage(ssl.native_handle(), SSL_get_finished);
-
148  if (!cookie1)
-
149  {
-
150  JLOG(journal.error()) << "Cookie generation: local setup not complete";
-
151  return std::nullopt;
-
152  }
-
153 
-
154  auto const cookie2 =
-
155  hashLastMessage(ssl.native_handle(), SSL_get_peer_finished);
-
156  if (!cookie2)
-
157  {
-
158  JLOG(journal.error()) << "Cookie generation: peer setup not complete";
-
159  return std::nullopt;
-
160  }
-
161 
-
162  auto const result = (*cookie1 ^ *cookie2);
+
139  sha512_hasher h;
+
140 
+
141  base_uint<512> cookie;
+
142  SHA512(buf, len, cookie.data());
+
143  return cookie;
+
144 }
+
145 
+
146 std::optional<uint256>
+
147 makeSharedValue(stream_type& ssl, beast::Journal journal)
+
148 {
+
149  auto const cookie1 = hashLastMessage(ssl.native_handle(), SSL_get_finished);
+
150  if (!cookie1)
+
151  {
+
152  JLOG(journal.error()) << "Cookie generation: local setup not complete";
+
153  return std::nullopt;
+
154  }
+
155 
+
156  auto const cookie2 =
+
157  hashLastMessage(ssl.native_handle(), SSL_get_peer_finished);
+
158  if (!cookie2)
+
159  {
+
160  JLOG(journal.error()) << "Cookie generation: peer setup not complete";
+
161  return std::nullopt;
+
162  }
163 
-
164  // Both messages hash to the same value and the cookie
-
165  // is 0. Don't allow this.
-
166  if (result == beast::zero)
-
167  {
-
168  JLOG(journal.error())
-
169  << "Cookie generation: identical finished messages";
-
170  return std::nullopt;
-
171  }
-
172 
-
173  return sha512Half(Slice(result.data(), result.size()));
-
174 }
-
175 
-
176 void
-
177 buildHandshake(
-
178  boost::beast::http::fields& h,
-
179  ripple::uint256 const& sharedValue,
-
180  std::optional<std::uint32_t> networkID,
-
181  beast::IP::Address public_ip,
-
182  beast::IP::Address remote_ip,
-
183  Application& app)
-
184 {
-
185  if (networkID)
-
186  {
-
187  // The network identifier, if configured, can be used to specify
-
188  // what network we intend to connect to and detect if the remote
-
189  // end connects to the same network.
-
190  h.insert("Network-ID", std::to_string(*networkID));
-
191  }
-
192 
-
193  h.insert(
-
194  "Network-Time",
-
195  std::to_string(app.timeKeeper().now().time_since_epoch().count()));
-
196 
-
197  h.insert(
-
198  "Public-Key",
-
199  toBase58(TokenType::NodePublic, app.nodeIdentity().first));
-
200 
-
201  {
-
202  auto const sig = signDigest(
-
203  app.nodeIdentity().first, app.nodeIdentity().second, sharedValue);
-
204  h.insert("Session-Signature", base64_encode(sig.data(), sig.size()));
-
205  }
-
206 
-
207  h.insert("Instance-Cookie", std::to_string(app.instanceID()));
+
164  auto const result = (*cookie1 ^ *cookie2);
+
165 
+
166  // Both messages hash to the same value and the cookie
+
167  // is 0. Don't allow this.
+
168  if (result == beast::zero)
+
169  {
+
170  JLOG(journal.error())
+
171  << "Cookie generation: identical finished messages";
+
172  return std::nullopt;
+
173  }
+
174 
+
175  return sha512Half(Slice(result.data(), result.size()));
+
176 }
+
177 
+
178 void
+
179 buildHandshake(
+
180  boost::beast::http::fields& h,
+
181  ripple::uint256 const& sharedValue,
+
182  std::optional<std::uint32_t> networkID,
+
183  beast::IP::Address public_ip,
+
184  beast::IP::Address remote_ip,
+
185  Application& app)
+
186 {
+
187  if (networkID)
+
188  {
+
189  // The network identifier, if configured, can be used to specify
+
190  // what network we intend to connect to and detect if the remote
+
191  // end connects to the same network.
+
192  h.insert("Network-ID", std::to_string(*networkID));
+
193  }
+
194 
+
195  h.insert(
+
196  "Network-Time",
+
197  std::to_string(app.timeKeeper().now().time_since_epoch().count()));
+
198 
+
199  h.insert(
+
200  "Public-Key",
+
201  toBase58(TokenType::NodePublic, app.nodeIdentity().first));
+
202 
+
203  {
+
204  auto const sig = signDigest(
+
205  app.nodeIdentity().first, app.nodeIdentity().second, sharedValue);
+
206  h.insert("Session-Signature", base64_encode(sig.data(), sig.size()));
+
207  }
208 
-
209  if (!app.config().SERVER_DOMAIN.empty())
-
210  h.insert("Server-Domain", app.config().SERVER_DOMAIN);
-
211 
-
212  if (beast::IP::is_public(remote_ip))
-
213  h.insert("Remote-IP", remote_ip.to_string());
-
214 
-
215  if (!public_ip.is_unspecified())
-
216  h.insert("Local-IP", public_ip.to_string());
-
217 
-
218  if (auto const cl = app.getLedgerMaster().getClosedLedger())
-
219  {
-
220  h.insert("Closed-Ledger", strHex(cl->info().hash));
-
221  h.insert("Previous-Ledger", strHex(cl->info().parentHash));
-
222  }
-
223 }
-
224 
-
225 PublicKey
-
226 verifyHandshake(
-
227  boost::beast::http::fields const& headers,
-
228  ripple::uint256 const& sharedValue,
-
229  std::optional<std::uint32_t> networkID,
-
230  beast::IP::Address public_ip,
-
231  beast::IP::Address remote,
-
232  Application& app)
-
233 {
-
234  if (auto const iter = headers.find("Server-Domain"); iter != headers.end())
-
235  {
-
236  if (!isProperlyFormedTomlDomain(iter->value().to_string()))
-
237  throw std::runtime_error("Invalid server domain");
-
238  }
-
239 
-
240  if (auto const iter = headers.find("Network-ID"); iter != headers.end())
-
241  {
-
242  std::uint32_t nid;
-
243 
-
244  if (!beast::lexicalCastChecked(nid, iter->value().to_string()))
-
245  throw std::runtime_error("Invalid peer network identifier");
-
246 
-
247  if (networkID && nid != *networkID)
-
248  throw std::runtime_error("Peer is on a different network");
-
249  }
-
250 
-
251  if (auto const iter = headers.find("Network-Time"); iter != headers.end())
-
252  {
-
253  auto const netTime =
-
254  [str = iter->value().to_string()]() -> TimeKeeper::time_point {
-
255  TimeKeeper::duration::rep val;
-
256 
-
257  if (beast::lexicalCastChecked(val, str))
-
258  return TimeKeeper::time_point{TimeKeeper::duration{val}};
-
259 
-
260  // It's not an error for the header field to not be present but if
-
261  // it is present and it contains junk data, that is an error.
-
262  throw std::runtime_error("Invalid peer clock timestamp");
-
263  }();
-
264 
-
265  using namespace std::chrono;
+
209  h.insert("Instance-Cookie", std::to_string(app.instanceID()));
+
210 
+
211  if (!app.config().SERVER_DOMAIN.empty())
+
212  h.insert("Server-Domain", app.config().SERVER_DOMAIN);
+
213 
+
214  if (beast::IP::is_public(remote_ip))
+
215  h.insert("Remote-IP", remote_ip.to_string());
+
216 
+
217  if (!public_ip.is_unspecified())
+
218  h.insert("Local-IP", public_ip.to_string());
+
219 
+
220  if (auto const cl = app.getLedgerMaster().getClosedLedger())
+
221  {
+
222  h.insert("Closed-Ledger", strHex(cl->info().hash));
+
223  h.insert("Previous-Ledger", strHex(cl->info().parentHash));
+
224  }
+
225 }
+
226 
+
227 PublicKey
+
228 verifyHandshake(
+
229  boost::beast::http::fields const& headers,
+
230  ripple::uint256 const& sharedValue,
+
231  std::optional<std::uint32_t> networkID,
+
232  beast::IP::Address public_ip,
+
233  beast::IP::Address remote,
+
234  Application& app)
+
235 {
+
236  if (auto const iter = headers.find("Server-Domain"); iter != headers.end())
+
237  {
+
238  if (!isProperlyFormedTomlDomain(iter->value()))
+
239  throw std::runtime_error("Invalid server domain");
+
240  }
+
241 
+
242  if (auto const iter = headers.find("Network-ID"); iter != headers.end())
+
243  {
+
244  std::uint32_t nid;
+
245 
+
246  if (!beast::lexicalCastChecked(nid, std::string(iter->value())))
+
247  throw std::runtime_error("Invalid peer network identifier");
+
248 
+
249  if (networkID && nid != *networkID)
+
250  throw std::runtime_error("Peer is on a different network");
+
251  }
+
252 
+
253  if (auto const iter = headers.find("Network-Time"); iter != headers.end())
+
254  {
+
255  auto const netTime =
+
256  [str = std::string(iter->value())]() -> TimeKeeper::time_point {
+
257  TimeKeeper::duration::rep val;
+
258 
+
259  if (beast::lexicalCastChecked(val, str))
+
260  return TimeKeeper::time_point{TimeKeeper::duration{val}};
+
261 
+
262  // It's not an error for the header field to not be present but if
+
263  // it is present and it contains junk data, that is an error.
+
264  throw std::runtime_error("Invalid peer clock timestamp");
+
265  }();
266 
-
267  auto const ourTime = app.timeKeeper().now();
-
268  auto const tolerance = 20s;
-
269 
-
270  // We can't blindly "return a-b;" because TimeKeeper::time_point
-
271  // uses an unsigned integer for representing durations, which is
-
272  // a problem when trying to subtract time points.
-
273  auto calculateOffset = [](TimeKeeper::time_point a,
-
274  TimeKeeper::time_point b) {
-
275  if (a > b)
-
276  return duration_cast<std::chrono::seconds>(a - b);
-
277  return -duration_cast<std::chrono::seconds>(b - a);
-
278  };
-
279 
-
280  auto const offset = calculateOffset(netTime, ourTime);
+
267  using namespace std::chrono;
+
268 
+
269  auto const ourTime = app.timeKeeper().now();
+
270  auto const tolerance = 20s;
+
271 
+
272  // We can't blindly "return a-b;" because TimeKeeper::time_point
+
273  // uses an unsigned integer for representing durations, which is
+
274  // a problem when trying to subtract time points.
+
275  auto calculateOffset = [](TimeKeeper::time_point a,
+
276  TimeKeeper::time_point b) {
+
277  if (a > b)
+
278  return duration_cast<std::chrono::seconds>(a - b);
+
279  return -duration_cast<std::chrono::seconds>(b - a);
+
280  };
281 
-
282  if (abs(offset) > tolerance)
-
283  throw std::runtime_error("Peer clock is too far off");
-
284  }
-
285 
-
286  PublicKey const publicKey = [&headers] {
-
287  if (auto const iter = headers.find("Public-Key"); iter != headers.end())
-
288  {
-
289  auto pk = parseBase58<PublicKey>(
-
290  TokenType::NodePublic, iter->value().to_string());
-
291 
-
292  if (pk)
-
293  {
-
294  if (publicKeyType(*pk) != KeyType::secp256k1)
-
295  throw std::runtime_error("Unsupported public key type");
-
296 
-
297  return *pk;
-
298  }
-
299  }
-
300 
-
301  throw std::runtime_error("Bad node public key");
-
302  }();
-
303 
-
304  // This check gets two birds with one stone:
-
305  //
-
306  // 1) it verifies that the node we are talking to has access to the
-
307  // private key corresponding to the public node identity it claims.
-
308  // 2) it verifies that our SSL session is end-to-end with that node
-
309  // and not through a proxy that establishes two separate sessions.
-
310  {
-
311  auto const iter = headers.find("Session-Signature");
-
312 
-
313  if (iter == headers.end())
-
314  throw std::runtime_error("No session signature specified");
-
315 
-
316  auto sig = base64_decode(iter->value().to_string());
+
282  auto const offset = calculateOffset(netTime, ourTime);
+
283 
+
284  if (abs(offset) > tolerance)
+
285  throw std::runtime_error("Peer clock is too far off");
+
286  }
+
287 
+
288  PublicKey const publicKey = [&headers] {
+
289  if (auto const iter = headers.find("Public-Key"); iter != headers.end())
+
290  {
+
291  auto pk =
+
292  parseBase58<PublicKey>(TokenType::NodePublic, iter->value());
+
293 
+
294  if (pk)
+
295  {
+
296  if (publicKeyType(*pk) != KeyType::secp256k1)
+
297  throw std::runtime_error("Unsupported public key type");
+
298 
+
299  return *pk;
+
300  }
+
301  }
+
302 
+
303  throw std::runtime_error("Bad node public key");
+
304  }();
+
305 
+
306  // This check gets two birds with one stone:
+
307  //
+
308  // 1) it verifies that the node we are talking to has access to the
+
309  // private key corresponding to the public node identity it claims.
+
310  // 2) it verifies that our SSL session is end-to-end with that node
+
311  // and not through a proxy that establishes two separate sessions.
+
312  {
+
313  auto const iter = headers.find("Session-Signature");
+
314 
+
315  if (iter == headers.end())
+
316  throw std::runtime_error("No session signature specified");
317 
-
318  if (!verifyDigest(publicKey, sharedValue, makeSlice(sig), false))
-
319  throw std::runtime_error("Failed to verify session");
-
320  }
-
321 
-
322  if (publicKey == app.nodeIdentity().first)
-
323  throw std::runtime_error("Self connection");
-
324 
-
325  if (auto const iter = headers.find("Local-IP"); iter != headers.end())
-
326  {
-
327  boost::system::error_code ec;
-
328  auto const local_ip = boost::asio::ip::address::from_string(
-
329  iter->value().to_string(), ec);
-
330 
-
331  if (ec)
-
332  throw std::runtime_error("Invalid Local-IP");
-
333 
-
334  if (beast::IP::is_public(remote) && remote != local_ip)
-
335  throw std::runtime_error(
-
336  "Incorrect Local-IP: " + remote.to_string() + " instead of " +
-
337  local_ip.to_string());
-
338  }
-
339 
-
340  if (auto const iter = headers.find("Remote-IP"); iter != headers.end())
-
341  {
-
342  boost::system::error_code ec;
-
343  auto const remote_ip = boost::asio::ip::address::from_string(
-
344  iter->value().to_string(), ec);
-
345 
-
346  if (ec)
-
347  throw std::runtime_error("Invalid Remote-IP");
-
348 
-
349  if (beast::IP::is_public(remote) &&
-
350  !beast::IP::is_unspecified(public_ip))
-
351  {
-
352  // We know our public IP and peer reports our connection came
-
353  // from some other IP.
-
354  if (remote_ip != public_ip)
-
355  throw std::runtime_error(
-
356  "Incorrect Remote-IP: " + public_ip.to_string() +
-
357  " instead of " + remote_ip.to_string());
-
358  }
-
359  }
-
360 
-
361  return publicKey;
-
362 }
-
363 
-
364 auto
-
365 makeRequest(
-
366  bool crawlPublic,
-
367  bool comprEnabled,
-
368  bool ledgerReplayEnabled,
-
369  bool txReduceRelayEnabled,
-
370  bool vpReduceRelayEnabled) -> request_type
-
371 {
-
372  request_type m;
-
373  m.method(boost::beast::http::verb::get);
-
374  m.target("/");
-
375  m.version(11);
-
376  m.insert("User-Agent", BuildInfo::getFullVersionString());
-
377  m.insert("Upgrade", supportedProtocolVersions());
-
378  m.insert("Connection", "Upgrade");
-
379  m.insert("Connect-As", "Peer");
-
380  m.insert("Crawl", crawlPublic ? "public" : "private");
-
381  m.insert(
-
382  "X-Protocol-Ctl",
-
383  makeFeaturesRequestHeader(
-
384  comprEnabled,
-
385  ledgerReplayEnabled,
-
386  txReduceRelayEnabled,
-
387  vpReduceRelayEnabled));
-
388  return m;
-
389 }
-
390 
-
391 http_response_type
-
392 makeResponse(
-
393  bool crawlPublic,
-
394  http_request_type const& req,
-
395  beast::IP::Address public_ip,
-
396  beast::IP::Address remote_ip,
-
397  uint256 const& sharedValue,
-
398  std::optional<std::uint32_t> networkID,
-
399  ProtocolVersion protocol,
-
400  Application& app)
-
401 {
-
402  http_response_type resp;
-
403  resp.result(boost::beast::http::status::switching_protocols);
-
404  resp.version(req.version());
-
405  resp.insert("Connection", "Upgrade");
-
406  resp.insert("Upgrade", to_string(protocol));
-
407  resp.insert("Connect-As", "Peer");
-
408  resp.insert("Server", BuildInfo::getFullVersionString());
-
409  resp.insert("Crawl", crawlPublic ? "public" : "private");
-
410  resp.insert(
-
411  "X-Protocol-Ctl",
-
412  makeFeaturesResponseHeader(
-
413  req,
-
414  app.config().COMPRESSION,
-
415  app.config().LEDGER_REPLAY,
-
416  app.config().TX_REDUCE_RELAY_ENABLE,
-
417  app.config().VP_REDUCE_RELAY_ENABLE));
-
418 
-
419  buildHandshake(resp, sharedValue, networkID, public_ip, remote_ip, app);
+
318  auto sig = base64_decode(iter->value());
+
319 
+
320  if (!verifyDigest(publicKey, sharedValue, makeSlice(sig), false))
+
321  throw std::runtime_error("Failed to verify session");
+
322  }
+
323 
+
324  if (publicKey == app.nodeIdentity().first)
+
325  throw std::runtime_error("Self connection");
+
326 
+
327  if (auto const iter = headers.find("Local-IP"); iter != headers.end())
+
328  {
+
329  boost::system::error_code ec;
+
330  auto const local_ip =
+
331  boost::asio::ip::address::from_string(iter->value(), ec);
+
332 
+
333  if (ec)
+
334  throw std::runtime_error("Invalid Local-IP");
+
335 
+
336  if (beast::IP::is_public(remote) && remote != local_ip)
+
337  throw std::runtime_error(
+
338  "Incorrect Local-IP: " + remote.to_string() + " instead of " +
+
339  local_ip.to_string());
+
340  }
+
341 
+
342  if (auto const iter = headers.find("Remote-IP"); iter != headers.end())
+
343  {
+
344  boost::system::error_code ec;
+
345  auto const remote_ip =
+
346  boost::asio::ip::address::from_string(iter->value(), ec);
+
347 
+
348  if (ec)
+
349  throw std::runtime_error("Invalid Remote-IP");
+
350 
+
351  if (beast::IP::is_public(remote) &&
+
352  !beast::IP::is_unspecified(public_ip))
+
353  {
+
354  // We know our public IP and peer reports our connection came
+
355  // from some other IP.
+
356  if (remote_ip != public_ip)
+
357  throw std::runtime_error(
+
358  "Incorrect Remote-IP: " + public_ip.to_string() +
+
359  " instead of " + remote_ip.to_string());
+
360  }
+
361  }
+
362 
+
363  return publicKey;
+
364 }
+
365 
+
366 auto
+
367 makeRequest(
+
368  bool crawlPublic,
+
369  bool comprEnabled,
+
370  bool ledgerReplayEnabled,
+
371  bool txReduceRelayEnabled,
+
372  bool vpReduceRelayEnabled) -> request_type
+
373 {
+
374  request_type m;
+
375  m.method(boost::beast::http::verb::get);
+
376  m.target("/");
+
377  m.version(11);
+
378  m.insert("User-Agent", BuildInfo::getFullVersionString());
+
379  m.insert("Upgrade", supportedProtocolVersions());
+
380  m.insert("Connection", "Upgrade");
+
381  m.insert("Connect-As", "Peer");
+
382  m.insert("Crawl", crawlPublic ? "public" : "private");
+
383  m.insert(
+
384  "X-Protocol-Ctl",
+
385  makeFeaturesRequestHeader(
+
386  comprEnabled,
+
387  ledgerReplayEnabled,
+
388  txReduceRelayEnabled,
+
389  vpReduceRelayEnabled));
+
390  return m;
+
391 }
+
392 
+
393 http_response_type
+
394 makeResponse(
+
395  bool crawlPublic,
+
396  http_request_type const& req,
+
397  beast::IP::Address public_ip,
+
398  beast::IP::Address remote_ip,
+
399  uint256 const& sharedValue,
+
400  std::optional<std::uint32_t> networkID,
+
401  ProtocolVersion protocol,
+
402  Application& app)
+
403 {
+
404  http_response_type resp;
+
405  resp.result(boost::beast::http::status::switching_protocols);
+
406  resp.version(req.version());
+
407  resp.insert("Connection", "Upgrade");
+
408  resp.insert("Upgrade", to_string(protocol));
+
409  resp.insert("Connect-As", "Peer");
+
410  resp.insert("Server", BuildInfo::getFullVersionString());
+
411  resp.insert("Crawl", crawlPublic ? "public" : "private");
+
412  resp.insert(
+
413  "X-Protocol-Ctl",
+
414  makeFeaturesResponseHeader(
+
415  req,
+
416  app.config().COMPRESSION,
+
417  app.config().LEDGER_REPLAY,
+
418  app.config().TX_REDUCE_RELAY_ENABLE,
+
419  app.config().VP_REDUCE_RELAY_ENABLE));
420 
-
421  return resp;
-
422 }
-
423 
-
424 } // namespace ripple
+
421  buildHandshake(resp, sharedValue, networkID, public_ip, remote_ip, app);
+
422 
+
423  return resp;
+
424 }
+
425 
+
426 } // namespace ripple
-
ripple::hashLastMessage
static std::optional< base_uint< 512 > > hashLastMessage(SSL const *ssl, size_t(*get)(const SSL *, void *, size_t))
Hashes the latest finished message from an SSL stream.
Definition: Handshake.cpp:127
+
ripple::hashLastMessage
static std::optional< base_uint< 512 > > hashLastMessage(SSL const *ssl, size_t(*get)(const SSL *, void *, size_t))
Hashes the latest finished message from an SSL stream.
Definition: Handshake.cpp:129
ripple::makeSlice
std::enable_if_t< std::is_same< T, char >::value||std::is_same< T, unsigned char >::value, Slice > makeSlice(std::array< T, N > const &a)
Definition: Slice.h:241
std::string
STL class.
@@ -490,19 +492,19 @@ $(function() {
ripple::Application::instanceID
virtual std::uint64_t instanceID() const =0
Returns a 64-bit instance identifier, generated at startup.
ripple::DELIM_FEATURE
static constexpr char DELIM_FEATURE[]
Definition: Handshake.h:149
-
ripple::makeFeaturesRequestHeader
std::string makeFeaturesRequestHeader(bool comprEnabled, bool ledgerReplayEnabled, bool txReduceRelayEnabled, bool vpReduceRelayEnabled)
Make request header X-Protocol-Ctl value with supported features.
Definition: Handshake.cpp:74
+
ripple::makeFeaturesRequestHeader
std::string makeFeaturesRequestHeader(bool comprEnabled, bool ledgerReplayEnabled, bool txReduceRelayEnabled, bool vpReduceRelayEnabled)
Make request header X-Protocol-Ctl value with supported features.
Definition: Handshake.cpp:76
ripple::base64_encode
std::string base64_encode(std::uint8_t const *data, std::size_t len)
Definition: base64.cpp:236
ripple::FEATURE_LEDGER_REPLAY
static constexpr char FEATURE_LEDGER_REPLAY[]
Definition: Handshake.h:148
ripple::toBase58
std::string toBase58(AccountID const &v)
Convert AccountID to base58 checked string.
Definition: AccountID.cpp:104
-
ripple::makeSharedValue
std::optional< uint256 > makeSharedValue(stream_type &ssl, beast::Journal journal)
Computes a shared value based on the SSL connection state.
Definition: Handshake.cpp:145
+
ripple::makeSharedValue
std::optional< uint256 > makeSharedValue(stream_type &ssl, beast::Journal journal)
Computes a shared value based on the SSL connection state.
Definition: Handshake.cpp:147
ripple::Application::timeKeeper
virtual TimeKeeper & timeKeeper()=0
ripple::FEATURE_VPRR
static constexpr char FEATURE_VPRR[]
Definition: Handshake.h:144
ripple::base_uint::data
pointer data()
Definition: base_uint.h:122
-
ripple::isFeatureValue
bool isFeatureValue(boost::beast::http::fields const &headers, std::string const &feature, std::string const &value)
Check if a feature's value is equal to the specified value.
Definition: Handshake.cpp:54
+
ripple::isFeatureValue
bool isFeatureValue(boost::beast::http::fields const &headers, std::string const &feature, std::string const &value)
Check if a feature's value is equal to the specified value.
Definition: Handshake.cpp:56
ripple::FEATURE_TXRR
static constexpr char FEATURE_TXRR[]
Definition: Handshake.h:146
-
ripple::featureEnabled
bool featureEnabled(boost::beast::http::fields const &headers, std::string const &feature)
Check if a feature is enabled.
Definition: Handshake.cpp:66
+
ripple::featureEnabled
bool featureEnabled(boost::beast::http::fields const &headers, std::string const &feature)
Check if a feature is enabled.
Definition: Handshake.cpp:68
ripple::publicKeyType
std::optional< KeyType > publicKeyType(Slice const &slice)
Returns the type of public key.
Definition: PublicKey.cpp:207
ripple::base_uint
Integers of any length that is a multiple of 32-bits.
Definition: base_uint.h:82
beast::IP::Address
boost::asio::ip::address Address
Definition: IPAddress.h:41
@@ -520,7 +522,7 @@ $(function() {
beast::Journal
A generic endpoint for log messages.
Definition: Journal.h:58
beast::IP::is_public
bool is_public(AddressV4 const &addr)
Returns true if the address is a public routable address.
Definition: IPAddressV4.cpp:41
-
ripple::getFeatureValue
std::optional< std::string > getFeatureValue(boost::beast::http::fields const &headers, std::string const &feature)
Get feature's header value.
Definition: Handshake.cpp:38
+
ripple::getFeatureValue
std::optional< std::string > getFeatureValue(boost::beast::http::fields const &headers, std::string const &feature)
Get feature's header value.
Definition: Handshake.cpp:40
ripple::stream_type
boost::beast::ssl_stream< socket_type > stream_type
Definition: Handshake.h:43
ripple::Config::VP_REDUCE_RELAY_ENABLE
bool VP_REDUCE_RELAY_ENABLE
Definition: Config.h:253
@@ -547,17 +549,17 @@ $(function() {
ripple::isProperlyFormedTomlDomain
bool isProperlyFormedTomlDomain(std::string const &domain)
Determines if the given string looks like a TOML-file hosting domain.
ripple::strHex
std::string strHex(FwdIt begin, FwdIt end)
Definition: strHex.h:30
ripple::Config::TX_REDUCE_RELAY_ENABLE
bool TX_REDUCE_RELAY_ENABLE
Definition: Config.h:264
-
ripple::verifyHandshake
PublicKey verifyHandshake(boost::beast::http::fields const &headers, ripple::uint256 const &sharedValue, std::optional< std::uint32_t > networkID, beast::IP::Address public_ip, beast::IP::Address remote, Application &app)
Validate header fields necessary for upgrading the link to the peer protocol.
Definition: Handshake.cpp:226
-
ripple::makeFeaturesResponseHeader
std::string makeFeaturesResponseHeader(http_request_type const &headers, bool comprEnabled, bool ledgerReplayEnabled, bool txReduceRelayEnabled, bool vpReduceRelayEnabled)
Make response header X-Protocol-Ctl value with supported features.
Definition: Handshake.cpp:93
-
ripple::makeRequest
auto makeRequest(bool crawlPublic, bool comprEnabled, bool ledgerReplayEnabled, bool txReduceRelayEnabled, bool vpReduceRelayEnabled) -> request_type
Make outbound http request.
Definition: Handshake.cpp:365
-
ripple::makeResponse
http_response_type makeResponse(bool crawlPublic, http_request_type const &req, beast::IP::Address public_ip, beast::IP::Address remote_ip, uint256 const &sharedValue, std::optional< std::uint32_t > networkID, ProtocolVersion protocol, Application &app)
Make http response.
Definition: Handshake.cpp:392
+
ripple::verifyHandshake
PublicKey verifyHandshake(boost::beast::http::fields const &headers, ripple::uint256 const &sharedValue, std::optional< std::uint32_t > networkID, beast::IP::Address public_ip, beast::IP::Address remote, Application &app)
Validate header fields necessary for upgrading the link to the peer protocol.
Definition: Handshake.cpp:228
+
ripple::makeFeaturesResponseHeader
std::string makeFeaturesResponseHeader(http_request_type const &headers, bool comprEnabled, bool ledgerReplayEnabled, bool txReduceRelayEnabled, bool vpReduceRelayEnabled)
Make response header X-Protocol-Ctl value with supported features.
Definition: Handshake.cpp:95
+
ripple::makeRequest
auto makeRequest(bool crawlPublic, bool comprEnabled, bool ledgerReplayEnabled, bool txReduceRelayEnabled, bool vpReduceRelayEnabled) -> request_type
Make outbound http request.
Definition: Handshake.cpp:367
+
ripple::makeResponse
http_response_type makeResponse(bool crawlPublic, http_request_type const &req, beast::IP::Address public_ip, beast::IP::Address remote_ip, uint256 const &sharedValue, std::optional< std::uint32_t > networkID, ProtocolVersion protocol, Application &app)
Make http response.
Definition: Handshake.cpp:394
beast::IP::is_unspecified
bool is_unspecified(Address const &addr)
Returns true if the address is unspecified.
Definition: IPAddress.h:59
ripple::http_request_type
boost::beast::http::request< boost::beast::http::dynamic_body > http_request_type
Definition: Handshake.h:47
beast::abstract_clock< NetClock >::time_point
typename NetClock ::time_point time_point
Definition: abstract_clock.h:63
ripple::http_response_type
boost::beast::http::response< boost::beast::http::dynamic_body > http_response_type
Definition: Handshake.h:49
beast::abstract_clock< NetClock >::duration
typename NetClock ::duration duration
Definition: abstract_clock.h:62
ripple::get
T & get(EitherAmount &amt)
Definition: AmountSpec.h:118
-
ripple::buildHandshake
void buildHandshake(boost::beast::http::fields &h, ripple::uint256 const &sharedValue, std::optional< std::uint32_t > networkID, beast::IP::Address public_ip, beast::IP::Address remote_ip, Application &app)
Insert fields headers necessary for upgrading the link to the peer protocol.
Definition: Handshake.cpp:177
+
ripple::buildHandshake
void buildHandshake(boost::beast::http::fields &h, ripple::uint256 const &sharedValue, std::optional< std::uint32_t > networkID, beast::IP::Address public_ip, beast::IP::Address remote_ip, Application &app)
Insert fields headers necessary for upgrading the link to the peer protocol.
Definition: Handshake.cpp:179
diff --git a/Handshake_8h_source.html b/Handshake_8h_source.html index 9866dcde71..3a7c261a24 100644 --- a/Handshake_8h_source.html +++ b/Handshake_8h_source.html @@ -236,13 +236,13 @@ $(function() {
ripple::DELIM_FEATURE
static constexpr char DELIM_FEATURE[]
Definition: Handshake.h:149
-
ripple::makeFeaturesRequestHeader
std::string makeFeaturesRequestHeader(bool comprEnabled, bool ledgerReplayEnabled, bool txReduceRelayEnabled, bool vpReduceRelayEnabled)
Make request header X-Protocol-Ctl value with supported features.
Definition: Handshake.cpp:74
+
ripple::makeFeaturesRequestHeader
std::string makeFeaturesRequestHeader(bool comprEnabled, bool ledgerReplayEnabled, bool txReduceRelayEnabled, bool vpReduceRelayEnabled)
Make request header X-Protocol-Ctl value with supported features.
Definition: Handshake.cpp:76
ripple::FEATURE_LEDGER_REPLAY
static constexpr char FEATURE_LEDGER_REPLAY[]
Definition: Handshake.h:148
-
ripple::makeSharedValue
std::optional< uint256 > makeSharedValue(stream_type &ssl, beast::Journal journal)
Computes a shared value based on the SSL connection state.
Definition: Handshake.cpp:145
+
ripple::makeSharedValue
std::optional< uint256 > makeSharedValue(stream_type &ssl, beast::Journal journal)
Computes a shared value based on the SSL connection state.
Definition: Handshake.cpp:147
ripple::FEATURE_VPRR
static constexpr char FEATURE_VPRR[]
Definition: Handshake.h:144
-
ripple::isFeatureValue
bool isFeatureValue(boost::beast::http::fields const &headers, std::string const &feature, std::string const &value)
Check if a feature's value is equal to the specified value.
Definition: Handshake.cpp:54
+
ripple::isFeatureValue
bool isFeatureValue(boost::beast::http::fields const &headers, std::string const &feature, std::string const &value)
Check if a feature's value is equal to the specified value.
Definition: Handshake.cpp:56
ripple::FEATURE_TXRR
static constexpr char FEATURE_TXRR[]
Definition: Handshake.h:146
-
ripple::featureEnabled
bool featureEnabled(boost::beast::http::fields const &headers, std::string const &feature)
Check if a feature is enabled.
Definition: Handshake.cpp:66
+
ripple::featureEnabled
bool featureEnabled(boost::beast::http::fields const &headers, std::string const &feature)
Check if a feature is enabled.
Definition: Handshake.cpp:68
ripple::base_uint< 256 >
beast::IP::Address
boost::asio::ip::address Address
Definition: IPAddress.h:41
ripple::PublicKey
A public key.
Definition: PublicKey.h:59
@@ -250,19 +250,19 @@ $(function() {
ripple::DELIM_VALUE
static constexpr char DELIM_VALUE[]
Definition: Handshake.h:150
beast::Journal
A generic endpoint for log messages.
Definition: Journal.h:58
ripple::peerFeatureEnabled
bool peerFeatureEnabled(headers const &request, std::string const &feature, std::string value, bool config)
Check if a feature should be enabled for a peer.
Definition: Handshake.h:199
-
ripple::getFeatureValue
std::optional< std::string > getFeatureValue(boost::beast::http::fields const &headers, std::string const &feature)
Get feature's header value.
Definition: Handshake.cpp:38
+
ripple::getFeatureValue
std::optional< std::string > getFeatureValue(boost::beast::http::fields const &headers, std::string const &feature)
Get feature's header value.
Definition: Handshake.cpp:40
ripple::stream_type
boost::beast::ssl_stream< socket_type > stream_type
Definition: Handshake.h:43
ripple
Use hash_* containers for keys that do not need a cryptographically secure hashing algorithm.
Definition: RCLCensorshipDetector.h:29
ripple::socket_type
boost::beast::tcp_stream socket_type
Definition: Handshake.h:42
ripple::request_type
boost::beast::http::request< boost::beast::http::empty_body > request_type
Definition: Handshake.h:45
-
ripple::verifyHandshake
PublicKey verifyHandshake(boost::beast::http::fields const &headers, ripple::uint256 const &sharedValue, std::optional< std::uint32_t > networkID, beast::IP::Address public_ip, beast::IP::Address remote, Application &app)
Validate header fields necessary for upgrading the link to the peer protocol.
Definition: Handshake.cpp:226
-
ripple::makeFeaturesResponseHeader
std::string makeFeaturesResponseHeader(http_request_type const &headers, bool comprEnabled, bool ledgerReplayEnabled, bool txReduceRelayEnabled, bool vpReduceRelayEnabled)
Make response header X-Protocol-Ctl value with supported features.
Definition: Handshake.cpp:93
-
ripple::makeRequest
auto makeRequest(bool crawlPublic, bool comprEnabled, bool ledgerReplayEnabled, bool txReduceRelayEnabled, bool vpReduceRelayEnabled) -> request_type
Make outbound http request.
Definition: Handshake.cpp:365
-
ripple::makeResponse
http_response_type makeResponse(bool crawlPublic, http_request_type const &req, beast::IP::Address public_ip, beast::IP::Address remote_ip, uint256 const &sharedValue, std::optional< std::uint32_t > networkID, ProtocolVersion protocol, Application &app)
Make http response.
Definition: Handshake.cpp:392
+
ripple::verifyHandshake
PublicKey verifyHandshake(boost::beast::http::fields const &headers, ripple::uint256 const &sharedValue, std::optional< std::uint32_t > networkID, beast::IP::Address public_ip, beast::IP::Address remote, Application &app)
Validate header fields necessary for upgrading the link to the peer protocol.
Definition: Handshake.cpp:228
+
ripple::makeFeaturesResponseHeader
std::string makeFeaturesResponseHeader(http_request_type const &headers, bool comprEnabled, bool ledgerReplayEnabled, bool txReduceRelayEnabled, bool vpReduceRelayEnabled)
Make response header X-Protocol-Ctl value with supported features.
Definition: Handshake.cpp:95
+
ripple::makeRequest
auto makeRequest(bool crawlPublic, bool comprEnabled, bool ledgerReplayEnabled, bool txReduceRelayEnabled, bool vpReduceRelayEnabled) -> request_type
Make outbound http request.
Definition: Handshake.cpp:367
+
ripple::makeResponse
http_response_type makeResponse(bool crawlPublic, http_request_type const &req, beast::IP::Address public_ip, beast::IP::Address remote_ip, uint256 const &sharedValue, std::optional< std::uint32_t > networkID, ProtocolVersion protocol, Application &app)
Make http response.
Definition: Handshake.cpp:394
ripple::http_request_type
boost::beast::http::request< boost::beast::http::dynamic_body > http_request_type
Definition: Handshake.h:47
ripple::http_response_type
boost::beast::http::response< boost::beast::http::dynamic_body > http_response_type
Definition: Handshake.h:49
-
ripple::buildHandshake
void buildHandshake(boost::beast::http::fields &h, ripple::uint256 const &sharedValue, std::optional< std::uint32_t > networkID, beast::IP::Address public_ip, beast::IP::Address remote_ip, Application &app)
Insert fields headers necessary for upgrading the link to the peer protocol.
Definition: Handshake.cpp:177
+
ripple::buildHandshake
void buildHandshake(boost::beast::http::fields &h, ripple::uint256 const &sharedValue, std::optional< std::uint32_t > networkID, beast::IP::Address public_ip, beast::IP::Address remote_ip, Application &app)
Insert fields headers necessary for upgrading the link to the peer protocol.
Definition: Handshake.cpp:179
Generated by   diff --git a/InnerObjectFormats__test_8cpp_source.html b/InnerObjectFormats__test_8cpp_source.html index b8d8e61d37..5409ee70b7 100644 --- a/InnerObjectFormats__test_8cpp_source.html +++ b/InnerObjectFormats__test_8cpp_source.html @@ -288,7 +288,7 @@ $(function() {
ripple::InnerObjectFormatsParsedJSON_test
Definition: InnerObjectFormats_test.cpp:168
ripple
Use hash_* containers for keys that do not need a cryptographically secure hashing algorithm.
Definition: RCLCensorshipDetector.h:29
-
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:76
+
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:74
ripple::test::jtx::Env
A transaction testing environment.
Definition: Env.h:116
Json::Value
Represents a JSON value.
Definition: json_value.h:145
diff --git a/JSONRPCClient_8cpp_source.html b/JSONRPCClient_8cpp_source.html index 145bc41bde..d6d46dd8c5 100644 --- a/JSONRPCClient_8cpp_source.html +++ b/JSONRPCClient_8cpp_source.html @@ -259,7 +259,7 @@ $(function() {
ripple::ParsedPort::ip
std::optional< boost::asio::ip::address > ip
Definition: Port.h:114
ripple::ParsedPort::port
std::optional< std::uint16_t > port
Definition: Port.h:115
-
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:76
+
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:74
std::set::count
T count(T... args)
ripple::test::JSONRPCClient::stream_
boost::asio::ip::tcp::socket stream_
Definition: JSONRPCClient.cpp:74
diff --git a/JSONRPC__test_8cpp_source.html b/JSONRPC__test_8cpp_source.html index 0befdee245..70e57a82d5 100644 --- a/JSONRPC__test_8cpp_source.html +++ b/JSONRPC__test_8cpp_source.html @@ -2636,7 +2636,7 @@ $(function() {
ripple::LoadFeeTrack::getLoadFactor
std::uint32_t getLoadFactor() const
Definition: LoadFeeTrack.h:95
ripple::RPC::TxnTestData::json
char const *const json
Definition: JSONRPC_test.cpp:40
-
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:76
+
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:74
ripple::RPC::txnTestArray
static constexpr TxnTestData txnTestArray[]
Definition: JSONRPC_test.cpp:70
std::ostringstream::str
T str(T... args)
diff --git a/LedgerData__test_8cpp_source.html b/LedgerData__test_8cpp_source.html index 655ac25ac1..3825822b95 100644 --- a/LedgerData__test_8cpp_source.html +++ b/LedgerData__test_8cpp_source.html @@ -619,7 +619,7 @@ $(function() {
ripple::LedgerData_test::testLedgerType
void testLedgerType()
Definition: LedgerData_test.cpp:300
ripple::LedgerData_test::testMarkerFollow
void testMarkerFollow()
Definition: LedgerData_test.cpp:195
ripple::tfUniversal
constexpr std::uint32_t tfUniversal
Definition: TxFlags.h:59
-
ripple::makeRequest
auto makeRequest(bool crawlPublic, bool comprEnabled, bool ledgerReplayEnabled, bool txReduceRelayEnabled, bool vpReduceRelayEnabled) -> request_type
Make outbound http request.
Definition: Handshake.cpp:365
+
ripple::makeRequest
auto makeRequest(bool crawlPublic, bool comprEnabled, bool ledgerReplayEnabled, bool txReduceRelayEnabled, bool vpReduceRelayEnabled) -> request_type
Make outbound http request.
Definition: Handshake.cpp:367
ripple::strUnHex
std::optional< Blob > strUnHex(std::size_t strSize, Iterator begin, Iterator end)
Definition: StringUtilities.h:52
ripple::LedgerData_test::testCurrentLedgerToLimits
void testCurrentLedgerToLimits(bool asAdmin)
Definition: LedgerData_test.cpp:39
ripple::sfPublicKey
const SF_VL sfPublicKey
diff --git a/LedgerLoad__test_8cpp_source.html b/LedgerLoad__test_8cpp_source.html index 2fadb03fac..ddc007a492 100644 --- a/LedgerLoad__test_8cpp_source.html +++ b/LedgerLoad__test_8cpp_source.html @@ -225,7 +225,7 @@ $(function() {
154  copy_file(
155  sd.ledgerFile,
156  ledgerFileCorrupt,
-
157  copy_option::overwrite_if_exists,
+
157  copy_options::overwrite_existing,
158  ec);
159  if (!BEAST_EXPECTS(!ec, ec.message()))
160  return;
diff --git a/LedgerMaster_8cpp_source.html b/LedgerMaster_8cpp_source.html index 4fbad0f82e..d9f5a6f6d0 100644 --- a/LedgerMaster_8cpp_source.html +++ b/LedgerMaster_8cpp_source.html @@ -2543,11 +2543,11 @@ $(function() {
std::map
STL class.
ripple::LedgerHistory::getLedgerBySeq
std::shared_ptr< Ledger const > getLedgerBySeq(LedgerIndex ledgerIndex)
Get a ledger given its sequence number.
Definition: LedgerHistory.cpp:83
-
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:53
+
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:54
ripple::Application::getPathRequests
virtual PathRequests & getPathRequests()=0
ripple::LedgerHolder::get
std::shared_ptr< Ledger const > get()
Definition: LedgerHolder.h:56
ripple::CanonicalTXSet::insert
void insert(std::shared_ptr< STTx const > const &txn)
Definition: CanonicalTXSet.cpp:52
-
ripple::prevMissing
std::optional< T > prevMissing(RangeSet< T > const &rs, T t, T minVal=0)
Find the largest value not in the set that is less than a given value.
Definition: RangeSet.h:182
+
ripple::prevMissing
std::optional< T > prevMissing(RangeSet< T > const &rs, T t, T minVal=0)
Find the largest value not in the set that is less than a given value.
Definition: RangeSet.h:183
ripple::LedgerMaster::getCurrentLedger
std::shared_ptr< ReadView const > getCurrentLedger()
Definition: LedgerMaster.cpp:1654
ripple::PendingSaves::getSnapshot
std::map< LedgerIndex, bool > getSnapshot() const
Get a snapshot of the pending saves.
Definition: PendingSaves.h:137
diff --git a/LedgerMaster_8h_source.html b/LedgerMaster_8h_source.html index 0e36c64cc0..65b2672a92 100644 --- a/LedgerMaster_8h_source.html +++ b/LedgerMaster_8h_source.html @@ -618,7 +618,7 @@ $(function() {
ripple::LedgerMaster::storeLedger
bool storeLedger(std::shared_ptr< Ledger const > ledger)
Definition: LedgerMaster.cpp:536
-
ripple::RangeSet
boost::icl::interval_set< T, std::less, ClosedInterval< T > > RangeSet
A set of closed intervals over the domain T.
Definition: RangeSet.h:69
+
ripple::RangeSet
boost::icl::interval_set< T, std::less, ClosedInterval< T > > RangeSet
A set of closed intervals over the domain T.
Definition: RangeSet.h:70
ripple::LedgerMaster::setLedgerRangePresent
void setLedgerRangePresent(std::uint32_t minV, std::uint32_t maxV)
Definition: LedgerMaster.cpp:1867
ripple::LedgerMaster::consensusBuilt
void consensusBuilt(std::shared_ptr< Ledger const > const &ledger, uint256 const &consensusHash, Json::Value consensus)
Report that the consensus process built a particular ledger.
Definition: LedgerMaster.cpp:1190
ripple::LedgerMaster::tryFill
void tryFill(std::shared_ptr< Ledger const > ledger)
Definition: LedgerMaster.cpp:711
diff --git a/LedgerReplay__test_8cpp_source.html b/LedgerReplay__test_8cpp_source.html index 1d2ff704a6..3faa0158d1 100644 --- a/LedgerReplay__test_8cpp_source.html +++ b/LedgerReplay__test_8cpp_source.html @@ -1820,11 +1820,11 @@ $(function() {
ripple::test::LedgerReplay_test
Definition: LedgerReplay_test.cpp:40
ripple::test::LedgerReplayClient::waitForLedgers
bool waitForLedgers(uint256 const &finishLedgerHash, int totalReplay)
Definition: LedgerReplay_test.cpp:615
ripple::test::LedgerReplayerTimeout_test::testSkipListTimeout
void testSkipListTimeout()
Definition: LedgerReplay_test.cpp:1466
-
ripple::makeRequest
auto makeRequest(bool crawlPublic, bool comprEnabled, bool ledgerReplayEnabled, bool txReduceRelayEnabled, bool vpReduceRelayEnabled) -> request_type
Make outbound http request.
Definition: Handshake.cpp:365
+
ripple::makeRequest
auto makeRequest(bool crawlPublic, bool comprEnabled, bool ledgerReplayEnabled, bool txReduceRelayEnabled, bool vpReduceRelayEnabled) -> request_type
Make outbound http request.
Definition: Handshake.cpp:367
ripple::test::TestPeerSet::TestPeerSet
TestPeerSet(LedgerReplayMsgHandler &me, LedgerReplayMsgHandler &other, PeerSetBehavior bhvr, bool enableLedgerReplay)
Definition: LedgerReplay_test.cpp:330
-
ripple::makeResponse
http_response_type makeResponse(bool crawlPublic, http_request_type const &req, beast::IP::Address public_ip, beast::IP::Address remote_ip, uint256 const &sharedValue, std::optional< std::uint32_t > networkID, ProtocolVersion protocol, Application &app)
Make http response.
Definition: Handshake.cpp:392
+
ripple::makeResponse
http_response_type makeResponse(bool crawlPublic, http_request_type const &req, beast::IP::Address public_ip, beast::IP::Address remote_ip, uint256 const &sharedValue, std::optional< std::uint32_t > networkID, ProtocolVersion protocol, Application &app)
Make http response.
Definition: Handshake.cpp:394
ripple::http_request_type
boost::beast::http::request< boost::beast::http::dynamic_body > http_request_type
Definition: Handshake.h:47
diff --git a/NetworkOPs_8cpp_source.html b/NetworkOPs_8cpp_source.html index 2710162cf2..1d538433c7 100644 --- a/NetworkOPs_8cpp_source.html +++ b/NetworkOPs_8cpp_source.html @@ -4989,7 +4989,7 @@ $(function() {
std::map
STL class.
ripple::LoadFeeTrack::getClusterFee
std::uint32_t getClusterFee() const
Definition: LoadFeeTrack.h:82
-
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:53
+
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:54
ripple::Application::getValidationPublicKey
virtual PublicKey const & getValidationPublicKey() const =0
ripple::NetworkOPsImp::pubValidation
void pubValidation(std::shared_ptr< STValidation > const &val) override
Definition: NetworkOPs.cpp:2125
ripple::amountFromQuality
STAmount amountFromQuality(std::uint64_t rate)
Definition: STAmount.cpp:839
diff --git a/Node_8cpp_source.html b/Node_8cpp_source.html index 9fb7703371..925985e9cc 100644 --- a/Node_8cpp_source.html +++ b/Node_8cpp_source.html @@ -1499,7 +1499,7 @@ $(function() {
ripple::detail::oldestAccountTxPage
std::pair< std::optional< RelationalDatabase::AccountTxMarker >, int > oldestAccountTxPage(soci::session &session, std::function< void(std::uint32_t)> const &onUnsavedLedger, std::function< void(std::uint32_t, std::string const &, Blob &&, Blob &&)> const &onTransaction, RelationalDatabase::AccountTxPageOptions const &options, int limit_used, std::uint32_t page_length)
oldestAccountTxPage Searches oldest transactions for given account which match given criteria startin...
Definition: Node.cpp:1221
std::map
STL class.
-
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:53
+
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:54
ripple::detail::getRows
std::size_t getRows(soci::session &session, TableType type)
getRows Returns number of rows in given table.
Definition: Node.cpp:160
ripple::detail::getOldestAccountTxsB
std::pair< std::vector< RelationalDatabase::txnMetaLedgerType >, int > getOldestAccountTxsB(soci::session &session, Application &app, RelationalDatabase::AccountTxOptions const &options, std::optional< int > const &limit_used, beast::Journal j)
getOldestAccountTxsB Returns oldest transactions in binary form for given account which match given c...
Definition: Node.cpp:1017
diff --git a/Node_8h_source.html b/Node_8h_source.html index e1ad952d2a..23ce9994d8 100644 --- a/Node_8h_source.html +++ b/Node_8h_source.html @@ -313,7 +313,7 @@ $(function() {
ripple::detail::oldestAccountTxPage
std::pair< std::optional< RelationalDatabase::AccountTxMarker >, int > oldestAccountTxPage(soci::session &session, std::function< void(std::uint32_t)> const &onUnsavedLedger, std::function< void(std::uint32_t, std::string const &, Blob &&, Blob &&)> const &onTransaction, RelationalDatabase::AccountTxPageOptions const &options, int limit_used, std::uint32_t page_length)
oldestAccountTxPage Searches oldest transactions for given account which match given criteria startin...
Definition: Node.cpp:1221
std::map
STL class.
-
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:53
+
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:54
ripple::detail::getRows
std::size_t getRows(soci::session &session, TableType type)
getRows Returns number of rows in given table.
Definition: Node.cpp:160
ripple::detail::getOldestAccountTxsB
std::pair< std::vector< RelationalDatabase::txnMetaLedgerType >, int > getOldestAccountTxsB(soci::session &session, Application &app, RelationalDatabase::AccountTxOptions const &options, std::optional< int > const &limit_used, beast::Journal j)
getOldestAccountTxsB Returns oldest transactions in binary form for given account which match given c...
Definition: Node.cpp:1017
@@ -325,7 +325,7 @@ $(function() { -
ripple::ClosedInterval
boost::icl::closed_interval< T > ClosedInterval
A closed interval over the domain T.
Definition: RangeSet.h:44
+
ripple::ClosedInterval
boost::icl::closed_interval< T > ClosedInterval
A closed interval over the domain T.
Definition: RangeSet.h:45
ripple::detail::getOldestAccountTxs
std::pair< RelationalDatabase::AccountTxs, int > getOldestAccountTxs(soci::session &session, Application &app, LedgerMaster &ledgerMaster, RelationalDatabase::AccountTxOptions const &options, std::optional< int > const &limit_used, beast::Journal j)
getOldestAccountTxs Returns oldest transactions for given account which match given criteria starting...
Definition: Node.cpp:896
ripple::detail::getMaxLedgerSeq
std::optional< LedgerIndex > getMaxLedgerSeq(soci::session &session, TableType type)
getMaxLedgerSeq Returns maximum ledger sequence in given table.
Definition: Node.cpp:133
std::unique_ptr
STL class.
diff --git a/OverlayImpl_8cpp_source.html b/OverlayImpl_8cpp_source.html index 51c00902f8..ac6839211e 100644 --- a/OverlayImpl_8cpp_source.html +++ b/OverlayImpl_8cpp_source.html @@ -1788,7 +1788,7 @@ $(function() {
ripple::Application::getShardStore
virtual NodeStore::DatabaseShard * getShardStore()=0
ripple::parseProtocolVersions
std::vector< ProtocolVersion > parseProtocolVersions(boost::beast::string_view const &value)
Parse a set of protocol versions.
Definition: ProtocolVersion.cpp:78
-
ripple::makeSharedValue
std::optional< uint256 > makeSharedValue(stream_type &ssl, beast::Journal journal)
Computes a shared value based on the SSL connection state.
Definition: Handshake.cpp:145
+
ripple::makeSharedValue
std::optional< uint256 > makeSharedValue(stream_type &ssl, beast::Journal journal)
Computes a shared value based on the SSL connection state.
Definition: Handshake.cpp:147
ripple::Cluster::member
std::optional< std::string > member(PublicKey const &node) const
Determines whether a node belongs in the cluster.
Definition: Cluster.cpp:39
ripple::stopwatch
Stopwatch & stopwatch()
Returns an instance of a wall clock.
Definition: chrono.h:88
std::setfill
T setfill(T... args)
@@ -1941,7 +1941,7 @@ $(function() {
ripple::Config::TX_REDUCE_RELAY_ENABLE
bool TX_REDUCE_RELAY_ENABLE
Definition: Config.h:264
ripple::PeerFinder::Config
PeerFinder configuration settings.
Definition: PeerfinderManager.h:40
std::setw
T setw(T... args)
-
ripple::verifyHandshake
PublicKey verifyHandshake(boost::beast::http::fields const &headers, ripple::uint256 const &sharedValue, std::optional< std::uint32_t > networkID, beast::IP::Address public_ip, beast::IP::Address remote, Application &app)
Validate header fields necessary for upgrading the link to the peer protocol.
Definition: Handshake.cpp:226
+
ripple::verifyHandshake
PublicKey verifyHandshake(boost::beast::http::fields const &headers, ripple::uint256 const &sharedValue, std::optional< std::uint32_t > networkID, beast::IP::Address public_ip, beast::IP::Address remote, Application &app)
Validate header fields necessary for upgrading the link to the peer protocol.
Definition: Handshake.cpp:228
ripple::OverlayImpl::findPeerByShortID
std::shared_ptr< Peer > findPeerByShortID(Peer::id_t const &id) const override
Returns the peer with the matching short id, or null.
Definition: OverlayImpl.cpp:1197
diff --git a/Path__test_8cpp_source.html b/Path__test_8cpp_source.html index e39da04de6..7ec6bbbb9b 100644 --- a/Path__test_8cpp_source.html +++ b/Path__test_8cpp_source.html @@ -1557,7 +1557,7 @@ $(function() {
ripple::test::jtx::Env::le
std::shared_ptr< SLE const > le(Account const &account) const
Return an account root.
Definition: Env.cpp:216
ripple::test::Path_test::receive_max
void receive_max()
Definition: Path_test.cpp:1163
ripple::RPC::Tuning::max_auto_src_cur
static constexpr int max_auto_src_cur
Maximum number of auto source currencies in a path find request.
Definition: rpc/impl/Tuning.h:84
-
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:76
+
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:74
ripple::Resource::Consumer
An endpoint that consumes resources.
Definition: Consumer.h:34
ripple::Resource::Charge
A consumption charge.
Definition: Charge.h:30
diff --git a/PeerImp_8cpp_source.html b/PeerImp_8cpp_source.html index 53226d67bd..6f97420034 100644 --- a/PeerImp_8cpp_source.html +++ b/PeerImp_8cpp_source.html @@ -245,7 +245,7 @@ $(function() {
176  if (auto const iter = headers_.find("Closed-Ledger");
177  iter != headers_.end())
178  {
-
179  closed = parseLedgerHash(iter->value().to_string());
+
179  closed = parseLedgerHash(iter->value());
180 
181  if (!closed)
182  fail("Malformed handshake data (1)");
@@ -254,7 +254,7 @@ $(function() {
185  if (auto const iter = headers_.find("Previous-Ledger");
186  iter != headers_.end())
187  {
-
188  previous = parseLedgerHash(iter->value().to_string());
+
188  previous = parseLedgerHash(iter->value());
189 
190  if (!previous)
191  fail("Malformed handshake data (2)");
@@ -441,8 +441,8 @@ $(function() {
372 PeerImp::getVersion() const
373 {
374  if (inbound_)
-
375  return headers_["User-Agent"].to_string();
-
376  return headers_["Server"].to_string();
+
375  return headers_["User-Agent"];
+
376  return headers_["Server"];
377 }
378 
379 Json::Value
@@ -468,8 +468,8 @@ $(function() {
399  if (auto const d = domain(); !d.empty())
400  ret[jss::server_domain] = domain();
401 
-
402  if (auto const nid = headers_["Network-ID"].to_string(); !nid.empty())
-
403  ret[jss::network_id] = nid;
+
402  if (auto const nid = headers_["Network-ID"]; !nid.empty())
+
403  ret[jss::network_id] = std::string(nid);
404 
405  ret[jss::load] = usage_.balance();
406 
@@ -908,7 +908,7 @@ $(function() {
839 std::string
840 PeerImp::domain() const
841 {
-
842  return headers_["Server-Domain"].to_string();
+
842  return headers_["Server-Domain"];
843 }
844 
845 //------------------------------------------------------------------------------
@@ -3869,7 +3869,7 @@ $(function() {
ripple::PeerImp::charge
void charge(Resource::Charge const &fee) override
Adjust this peer's load balance based on the type of load imposed.
Definition: PeerImp.cpp:343
ripple::PeerImp::onMessageUnknown
void onMessageUnknown(std::uint16_t type)
Definition: PeerImp.cpp:1003
-
ripple::makeSharedValue
std::optional< uint256 > makeSharedValue(stream_type &ssl, beast::Journal journal)
Computes a shared value based on the SSL connection state.
Definition: Handshake.cpp:145
+
ripple::makeSharedValue
std::optional< uint256 > makeSharedValue(stream_type &ssl, beast::Journal journal)
Computes a shared value based on the SSL connection state.
Definition: Handshake.cpp:147
ripple::Cluster::member
std::optional< std::string > member(PublicKey const &node) const
Determines whether a node belongs in the cluster.
Definition: Cluster.cpp:39
ripple::JobQueue::addJob
bool addJob(JobType type, std::string const &name, JobHandler &&jobHandler)
Adds a job to the JobQueue.
Definition: JobQueue.h:166
ripple::stopwatch
Stopwatch & stopwatch()
Returns an instance of a wall clock.
Definition: chrono.h:88
@@ -4111,7 +4111,7 @@ $(function() {
ripple::PeerImp::shardInfoMutex_
std::mutex shardInfoMutex_
Definition: PeerImp.h:168
ripple::Resource::Consumer::charge
Disposition charge(Charge const &fee)
Apply a load charge to the consumer.
Definition: Consumer.cpp:99
ripple::PeerImp::overlay_
OverlayImpl & overlay_
Definition: PeerImp.h:90
-
ripple::makeResponse
http_response_type makeResponse(bool crawlPublic, http_request_type const &req, beast::IP::Address public_ip, beast::IP::Address remote_ip, uint256 const &sharedValue, std::optional< std::uint32_t > networkID, ProtocolVersion protocol, Application &app)
Make http response.
Definition: Handshake.cpp:392
+
ripple::makeResponse
http_response_type makeResponse(bool crawlPublic, http_request_type const &req, beast::IP::Address public_ip, beast::IP::Address remote_ip, uint256 const &sharedValue, std::optional< std::uint32_t > networkID, ProtocolVersion protocol, Application &app)
Make http response.
Definition: Handshake.cpp:394
ripple::http_request_type
boost::beast::http::request< boost::beast::http::dynamic_body > http_request_type
Definition: Handshake.h:47
ripple::Tuning::sendQueueLogFreq
@ sendQueueLogFreq
How often to log send queue size.
Definition: overlay/impl/Tuning.h:55
diff --git a/PerfLog__test_8cpp_source.html b/PerfLog__test_8cpp_source.html index a9d5a4fca2..80ae5242ce 100644 --- a/PerfLog__test_8cpp_source.html +++ b/PerfLog__test_8cpp_source.html @@ -1205,7 +1205,7 @@ $(function() {
std::getline
T getline(T... args)
ripple::PerfLog_test::WithFile::yes
@ yes
std
STL namespace.
-
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:76
+
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:74
ripple::JobType
JobType
Definition: Job.h:35
ripple::PerfLog_test::testInvalidID
void testInvalidID(WithFile withFile)
Definition: PerfLog_test.cpp:850
std::vector::end
T end(T... args)
diff --git a/PostgresDatabase_8cpp_source.html b/PostgresDatabase_8cpp_source.html index e1b2d12eea..9005716115 100644 --- a/PostgresDatabase_8cpp_source.html +++ b/PostgresDatabase_8cpp_source.html @@ -1198,7 +1198,7 @@ $(function() {
ripple::PostgresDatabaseImp::getTxHistory
std::vector< std::shared_ptr< Transaction > > getTxHistory(LedgerIndex startIndex) override
getTxHistory Returns the 20 most recent transactions starting from the given number.
Definition: PostgresDatabase.cpp:753
std::map
STL class.
ripple::PostgresDatabaseImp::getMaxLedgerSeq
std::optional< LedgerIndex > getMaxLedgerSeq() override
getMaxLedgerSeq Returns the maximum ledger sequence in the Ledgers table.
Definition: PostgresDatabase.cpp:507
-
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:53
+
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:54
ripple::PostgresDatabaseImp::getLedgerInfoByIndex
std::optional< LedgerInfo > getLedgerInfoByIndex(LedgerIndex ledgerSeq) override
getLedgerInfoByIndex Returns a ledger by its sequence.
Definition: PostgresDatabase.cpp:628
ripple::PostgresDatabaseImp::getTxHashes
std::vector< uint256 > getTxHashes(LedgerIndex seq) override
getTxHashes Returns a vector of the hashes of transactions belonging to the ledger with the provided ...
Definition: PostgresDatabase.cpp:683
ripple::LedgerInfo::drops
XRPAmount drops
Definition: ReadView.h:96
@@ -1214,7 +1214,7 @@ $(function() {
ripple::LedgerInfo::closeTimeResolution
NetClock::duration closeTimeResolution
Definition: ReadView.h:108
Json::Value::asUInt
UInt asUInt() const
Definition: json_value.cpp:545
-
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:76
+
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:74
std::get_if
T get_if(T... args)
ripple::PostgresDatabaseImp::getLedgerInfoByHash
std::optional< LedgerInfo > getLedgerInfoByHash(uint256 const &ledgerHash) override
getLedgerInfoByHash Returns the info of the ledger with given hash.
Definition: PostgresDatabase.cpp:640
@@ -1228,7 +1228,7 @@ $(function() {
ripple::LedgerInfo
Information about the notional ledger backing the view.
Definition: ReadView.h:75
ripple::strHex
std::string strHex(FwdIt begin, FwdIt end)
Definition: strHex.h:30
ripple::TxnsData
RelationalDatabase::AccountTxs TxnsData
Definition: PostgresDatabase.cpp:46
-
ripple::ClosedInterval
boost::icl::closed_interval< T > ClosedInterval
A closed interval over the domain T.
Definition: RangeSet.h:44
+
ripple::ClosedInterval
boost::icl::closed_interval< T > ClosedInterval
A closed interval over the domain T.
Definition: RangeSet.h:45
ripple::NetClock::duration
std::chrono::duration< rep, period > duration
Definition: chrono.h:55
ripple::RelationalDatabase::AccountTxArgs::ledger
std::optional< LedgerSpecifier > ledger
Definition: RelationalDatabase.h:99
ripple::base_uint::parseHex
constexpr bool parseHex(std::string_view sv)
Parse a hex string into a base_uint.
Definition: base_uint.h:496
diff --git a/RCLConsensus_8h_source.html b/RCLConsensus_8h_source.html index 719bcfc47e..6b9bafcc5b 100644 --- a/RCLConsensus_8h_source.html +++ b/RCLConsensus_8h_source.html @@ -455,7 +455,7 @@ $(function() {
ripple::RCLConsensus::mutex_
std::recursive_mutex mutex_
Definition: RCLConsensus.h:527
ripple::RCLConsensus::Adaptor::hasOpenTransactions
bool hasOpenTransactions() const
Whether the open ledger has any transactions.
Definition: RCLConsensus.cpp:253
-
ripple::Consensus
Generic implementation of consensus algorithm.
Definition: Consensus.h:284
+
ripple::Consensus
Generic implementation of consensus algorithm.
Definition: Consensus.h:287
ripple::RCLConsensus::gotTxSet
void gotTxSet(NetClock::time_point const &now, RCLTxSet const &txSet)
Definition: RCLConsensus.cpp:921
ripple::RCLConsensus::Adaptor::getPrevLedger
uint256 getPrevLedger(uint256 ledgerID, RCLCxLedger const &ledger, ConsensusMode mode)
Get the ID of the previous ledger/last closed ledger(LCL) on the network.
Definition: RCLConsensus.cpp:275
diff --git a/RPCCall_8cpp_source.html b/RPCCall_8cpp_source.html index 01a3464976..66ddc9bb18 100644 --- a/RPCCall_8cpp_source.html +++ b/RPCCall_8cpp_source.html @@ -1946,7 +1946,7 @@ $(function() {
ripple::RPCCallImp::onResponse
static bool onResponse(std::function< void(Json::Value const &jvInput)> callbackFuncP, const boost::system::error_code &ecResult, int iStatus, std::string const &strData, beast::Journal j)
Definition: RPCCall.cpp:1385
ripple::rpcClient
std::pair< int, Json::Value > rpcClient(std::vector< std::string > const &args, Config const &config, Logs &logs, std::unordered_map< std::string, std::string > const &headers)
Internal invocation of RPC client.
Definition: RPCCall.cpp:1520
-
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:76
+
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:74
ripple::RPC::apiMaximumSupportedVersion
constexpr unsigned int apiMaximumSupportedVersion
Definition: RPCHelpers.h:244
ripple::RPCParser::parseLedgerId
Json::Value parseLedgerId(Json::Value const &jvParams)
Definition: RPCCall.cpp:737
ripple::rpcLGR_IDX_MALFORMED
@ rpcLGR_IDX_MALFORMED
Definition: ErrorCodes.h:113
diff --git a/RPCCall__test_8cpp_source.html b/RPCCall__test_8cpp_source.html index 7553c1b15c..e47e07d970 100644 --- a/RPCCall__test_8cpp_source.html +++ b/RPCCall__test_8cpp_source.html @@ -6553,7 +6553,7 @@ $(function() {
ripple::test::RPCCallTestData::description
char const *const description
Definition: RPCCall_test.cpp:34
std::vector::begin
T begin(T... args)
-
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:76
+
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:74
ripple::RPC::apiMaximumSupportedVersion
constexpr unsigned int apiMaximumSupportedVersion
Definition: RPCHelpers.h:244
std::string::end
T end(T... args)
diff --git a/RPCHelpers_8cpp_source.html b/RPCHelpers_8cpp_source.html index 5d112c819e..790eafd961 100644 --- a/RPCHelpers_8cpp_source.html +++ b/RPCHelpers_8cpp_source.html @@ -1362,7 +1362,7 @@ $(function() {
ripple::sfHighLimit
const SF_AMOUNT sfHighLimit
ripple::ReadView::succ
virtual std::optional< key_type > succ(key_type const &key, std::optional< key_type > const &last=std::nullopt) const =0
Return the key of the next state item.
ripple::parseGenericSeed
std::optional< Seed > parseGenericSeed(std::string const &str, bool rfc1751)
Attempt to parse a string as a seed.
Definition: Seed.cpp:90
-
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:53
+
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:54
ripple::STLedgerEntry::getType
LedgerEntryType getType() const
Definition: STLedgerEntry.h:119
ripple::LedgerMaster::getCurrentLedger
std::shared_ptr< ReadView const > getCurrentLedger()
Definition: LedgerMaster.cpp:1654
ripple::ReadView::read
virtual std::shared_ptr< SLE const > read(Keylet const &k) const =0
Return the state item associated with a key.
diff --git a/RangeSet_8h_source.html b/RangeSet_8h_source.html index 8ace4c0eec..ccfbd9f65e 100644 --- a/RangeSet_8h_source.html +++ b/RangeSet_8h_source.html @@ -99,131 +99,132 @@ $(function() {
28 
29 #include <optional>
30 #include <string>
-
31 
-
32 namespace ripple {
-
33 
-
43 template <class T>
-
44 using ClosedInterval = boost::icl::closed_interval<T>;
-
45 
-
51 template <class T>
-
52 ClosedInterval<T>
-
53 range(T low, T high)
-
54 {
-
55  return ClosedInterval<T>(low, high);
-
56 }
-
57 
-
68 template <class T>
-
69 using RangeSet = boost::icl::interval_set<T, std::less, ClosedInterval<T>>;
-
70 
-
80 template <class T>
-
81 std::string
-
82 to_string(ClosedInterval<T> const& ci)
-
83 {
-
84  if (ci.first() == ci.last())
-
85  return std::to_string(ci.first());
-
86  return std::to_string(ci.first()) + "-" + std::to_string(ci.last());
-
87 }
-
88 
-
97 template <class T>
-
98 std::string
-
99 to_string(RangeSet<T> const& rs)
-
100 {
-
101  if (rs.empty())
-
102  return "empty";
-
103 
-
104  std::string s;
-
105  for (auto const& interval : rs)
-
106  s += ripple::to_string(interval) + ",";
-
107  s.pop_back();
-
108 
-
109  return s;
-
110 }
-
111 
-
121 template <class T>
-
122 [[nodiscard]] bool
-
123 from_string(RangeSet<T>& rs, std::string const& s)
-
124 {
-
125  std::vector<std::string> intervals;
-
126  std::vector<std::string> tokens;
-
127  bool result{true};
-
128 
-
129  rs.clear();
-
130  boost::split(tokens, s, boost::algorithm::is_any_of(","));
-
131  for (auto const& t : tokens)
-
132  {
-
133  boost::split(intervals, t, boost::algorithm::is_any_of("-"));
-
134  switch (intervals.size())
-
135  {
-
136  case 1: {
-
137  T front;
-
138  if (!beast::lexicalCastChecked(front, intervals.front()))
-
139  result = false;
-
140  else
-
141  rs.insert(front);
-
142  break;
-
143  }
-
144  case 2: {
-
145  T front;
-
146  if (!beast::lexicalCastChecked(front, intervals.front()))
-
147  result = false;
-
148  else
-
149  {
-
150  T back;
-
151  if (!beast::lexicalCastChecked(back, intervals.back()))
-
152  result = false;
-
153  else
-
154  rs.insert(range(front, back));
-
155  }
-
156  break;
-
157  }
-
158  default:
-
159  result = false;
-
160  }
-
161 
-
162  if (!result)
-
163  break;
-
164  intervals.clear();
-
165  }
-
166 
-
167  if (!result)
-
168  rs.clear();
-
169  return result;
-
170 }
-
171 
-
180 template <class T>
-
181 std::optional<T>
-
182 prevMissing(RangeSet<T> const& rs, T t, T minVal = 0)
-
183 {
-
184  if (rs.empty() || t == minVal)
-
185  return std::nullopt;
-
186  RangeSet<T> tgt{ClosedInterval<T>{minVal, t - 1}};
-
187  tgt -= rs;
-
188  if (tgt.empty())
-
189  return std::nullopt;
-
190  return boost::icl::last(tgt);
-
191 }
-
192 
-
193 } // namespace ripple
-
194 
-
195 #endif
+
31 #include <vector>
+
32 
+
33 namespace ripple {
+
34 
+
44 template <class T>
+
45 using ClosedInterval = boost::icl::closed_interval<T>;
+
46 
+
52 template <class T>
+
53 ClosedInterval<T>
+
54 range(T low, T high)
+
55 {
+
56  return ClosedInterval<T>(low, high);
+
57 }
+
58 
+
69 template <class T>
+
70 using RangeSet = boost::icl::interval_set<T, std::less, ClosedInterval<T>>;
+
71 
+
81 template <class T>
+
82 std::string
+
83 to_string(ClosedInterval<T> const& ci)
+
84 {
+
85  if (ci.first() == ci.last())
+
86  return std::to_string(ci.first());
+
87  return std::to_string(ci.first()) + "-" + std::to_string(ci.last());
+
88 }
+
89 
+
98 template <class T>
+
99 std::string
+
100 to_string(RangeSet<T> const& rs)
+
101 {
+
102  if (rs.empty())
+
103  return "empty";
+
104 
+
105  std::string s;
+
106  for (auto const& interval : rs)
+
107  s += ripple::to_string(interval) + ",";
+
108  s.pop_back();
+
109 
+
110  return s;
+
111 }
+
112 
+
122 template <class T>
+
123 [[nodiscard]] bool
+
124 from_string(RangeSet<T>& rs, std::string const& s)
+
125 {
+
126  std::vector<std::string> intervals;
+
127  std::vector<std::string> tokens;
+
128  bool result{true};
+
129 
+
130  rs.clear();
+
131  boost::split(tokens, s, boost::algorithm::is_any_of(","));
+
132  for (auto const& t : tokens)
+
133  {
+
134  boost::split(intervals, t, boost::algorithm::is_any_of("-"));
+
135  switch (intervals.size())
+
136  {
+
137  case 1: {
+
138  T front;
+
139  if (!beast::lexicalCastChecked(front, intervals.front()))
+
140  result = false;
+
141  else
+
142  rs.insert(front);
+
143  break;
+
144  }
+
145  case 2: {
+
146  T front;
+
147  if (!beast::lexicalCastChecked(front, intervals.front()))
+
148  result = false;
+
149  else
+
150  {
+
151  T back;
+
152  if (!beast::lexicalCastChecked(back, intervals.back()))
+
153  result = false;
+
154  else
+
155  rs.insert(range(front, back));
+
156  }
+
157  break;
+
158  }
+
159  default:
+
160  result = false;
+
161  }
+
162 
+
163  if (!result)
+
164  break;
+
165  intervals.clear();
+
166  }
+
167 
+
168  if (!result)
+
169  rs.clear();
+
170  return result;
+
171 }
+
172 
+
181 template <class T>
+
182 std::optional<T>
+
183 prevMissing(RangeSet<T> const& rs, T t, T minVal = 0)
+
184 {
+
185  if (rs.empty() || t == minVal)
+
186  return std::nullopt;
+
187  RangeSet<T> tgt{ClosedInterval<T>{minVal, t - 1}};
+
188  tgt -= rs;
+
189  if (tgt.empty())
+
190  return std::nullopt;
+
191  return boost::icl::last(tgt);
+
192 }
+
193 
+
194 } // namespace ripple
+
195 
+
196 #endif
std::string
STL class.
- +
std::vector::size
T size(T... args)
-
ripple::from_string
bool from_string(RangeSet< T > &rs, std::string const &s)
Convert the given styled string to a RangeSet.
Definition: RangeSet.h:123
+
ripple::from_string
bool from_string(RangeSet< T > &rs, std::string const &s)
Convert the given styled string to a RangeSet.
Definition: RangeSet.h:124
std::vector::back
T back(T... args)
std::vector::front
T front(T... args)
std::vector::clear
T clear(T... args)
std::to_string
T to_string(T... args)
std::string::pop_back
T pop_back(T... args)
-
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:53
-
ripple::prevMissing
std::optional< T > prevMissing(RangeSet< T > const &rs, T t, T minVal=0)
Find the largest value not in the set that is less than a given value.
Definition: RangeSet.h:182
+
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:54
+
ripple::prevMissing
std::optional< T > prevMissing(RangeSet< T > const &rs, T t, T minVal=0)
Find the largest value not in the set that is less than a given value.
Definition: RangeSet.h:183
ripple
Use hash_* containers for keys that do not need a cryptographically secure hashing algorithm.
Definition: RCLCensorshipDetector.h:29
beast::lexicalCastChecked
bool lexicalCastChecked(Out &out, In in)
Intelligently convert from one type to another.
Definition: LexicalCast.h:164
ripple::to_string
std::string to_string(Manifest const &m)
Format the specified manifest to a string for debugging purposes.
Definition: app/misc/impl/Manifest.cpp:41
-
ripple::RangeSet
boost::icl::interval_set< T, std::less, ClosedInterval< T > > RangeSet
A set of closed intervals over the domain T.
Definition: RangeSet.h:69
-
ripple::ClosedInterval
boost::icl::closed_interval< T > ClosedInterval
A closed interval over the domain T.
Definition: RangeSet.h:44
+
ripple::RangeSet
boost::icl::interval_set< T, std::less, ClosedInterval< T > > RangeSet
A set of closed intervals over the domain T.
Definition: RangeSet.h:70
+
ripple::ClosedInterval
boost::icl::closed_interval< T > ClosedInterval
A closed interval over the domain T.
Definition: RangeSet.h:45
diff --git a/RangeSet__test_8cpp_source.html b/RangeSet__test_8cpp_source.html index a3cb1cc834..1367a56f11 100644 --- a/RangeSet__test_8cpp_source.html +++ b/RangeSet__test_8cpp_source.html @@ -215,20 +215,20 @@ $(function() {
144 } // namespace ripple
ripple::BEAST_DEFINE_TESTSUITE
BEAST_DEFINE_TESTSUITE(AccountTxPaging, app, ripple)
-
ripple::from_string
bool from_string(RangeSet< T > &rs, std::string const &s)
Convert the given styled string to a RangeSet.
Definition: RangeSet.h:123
+
ripple::from_string
bool from_string(RangeSet< T > &rs, std::string const &s)
Convert the given styled string to a RangeSet.
Definition: RangeSet.h:124
ripple::RangeSet_test
Definition: RangeSet_test.cpp:24
ripple::set
bool set(T &target, std::string const &name, Section const &section)
Set a value from a configuration Section If the named value is not found or doesn't parse as a T,...
Definition: BasicConfig.h:313
ripple::RangeSet_test::testFromString
void testFromString()
Definition: RangeSet_test.cpp:78
-
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:53
-
ripple::prevMissing
std::optional< T > prevMissing(RangeSet< T > const &rs, T t, T minVal=0)
Find the largest value not in the set that is less than a given value.
Definition: RangeSet.h:182
+
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:54
+
ripple::prevMissing
std::optional< T > prevMissing(RangeSet< T > const &rs, T t, T minVal=0)
Find the largest value not in the set that is less than a given value.
Definition: RangeSet.h:183
ripple::RangeSet_test::run
void run() override
Definition: RangeSet_test.cpp:134
ripple
Use hash_* containers for keys that do not need a cryptographically secure hashing algorithm.
Definition: RCLCensorshipDetector.h:29
ripple::RangeSet_test::testPrevMissing
void testPrevMissing()
Definition: RangeSet_test.cpp:28
ripple::to_string
std::string to_string(Manifest const &m)
Format the specified manifest to a string for debugging purposes.
Definition: app/misc/impl/Manifest.cpp:41
ripple::RangeSet_test::testToString
void testToString()
Definition: RangeSet_test.cpp:57
-
ripple::RangeSet
boost::icl::interval_set< T, std::less, ClosedInterval< T > > RangeSet
A set of closed intervals over the domain T.
Definition: RangeSet.h:69
+
ripple::RangeSet
boost::icl::interval_set< T, std::less, ClosedInterval< T > > RangeSet
A set of closed intervals over the domain T.
Definition: RangeSet.h:70
Generated by   diff --git a/Regression__test_8cpp_source.html b/Regression__test_8cpp_source.html index 59d904405b..012d80a0a9 100644 --- a/Regression__test_8cpp_source.html +++ b/Regression__test_8cpp_source.html @@ -392,7 +392,7 @@ $(function() {
ripple::test::jtx::Env::fund
void fund(bool setDefaultRipple, STAmount const &amount, Account const &account)
Definition: Env.cpp:228
ripple::create_genesis
const create_genesis_t create_genesis
Definition: Ledger.cpp:62
ripple::test::jtx::Env::master
Account const & master
Definition: Env.h:121
-
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:76
+
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:74
ripple::test::Regression_test::testLowBalanceDestroy
void testLowBalanceDestroy()
Definition: Regression_test.cpp:49
ripple::sfBalance
const SF_AMOUNT sfBalance
ripple::sfFee
const SF_AMOUNT sfFee
diff --git a/SQLiteDatabase_8cpp_source.html b/SQLiteDatabase_8cpp_source.html index 6b26ab2944..ae013609c4 100644 --- a/SQLiteDatabase_8cpp_source.html +++ b/SQLiteDatabase_8cpp_source.html @@ -1785,7 +1785,7 @@ $(function() {
ripple::SQLiteDatabaseImp::getKBUsedAll
std::uint32_t getKBUsedAll() override
getKBUsedAll Returns the amount of space used by all databases.
Definition: SQLiteDatabase.cpp:1655
ripple::SQLiteDatabaseImp::deleteTransactionsBeforeLedgerSeq
void deleteTransactionsBeforeLedgerSeq(LedgerIndex ledgerSeq) override
deleteTransactionsBeforeLedgerSeq Deletes all transactions with a sequence number less than or equal ...
Definition: SQLiteDatabase.cpp:625
std::map
STL class.
-
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:53
+
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:54
ripple::detail::getRows
std::size_t getRows(soci::session &session, TableType type)
getRows Returns number of rows in given table.
Definition: Node.cpp:160
ripple::detail::getLedgerInfoByIndex
std::optional< LedgerInfo > getLedgerInfoByIndex(soci::session &session, LedgerIndex ledgerSeq, beast::Journal j)
getLedgerInfoByIndex Returns ledger by its sequence.
Definition: Node.cpp:456
ripple::detail::getShardIndexforLedger
std::optional< std::uint32_t > getShardIndexforLedger(soci::session &session, LedgerHash const &hash)
getShardIndexforLedger Queries the ledger meta database to retrieve the index of the shard that conta...
Definition: app/rdb/backend/detail/impl/Shard.cpp:117
@@ -1822,7 +1822,7 @@ $(function() {
std::vector::end
T end(T... args)
ripple::SQLiteDatabaseImp::getNewestAccountTxsB
MetaTxsList getNewestAccountTxsB(AccountTxOptions const &options) override
getNewestAccountTxsB Returns the newest transactions in binary form for the account that matches the ...
Definition: SQLiteDatabase.cpp:1261
ripple::SQLiteDatabaseImp::getLedgerCountMinMax
RelationalDatabase::CountMinMax getLedgerCountMinMax() override
getLedgerCountMinMax Returns the minimum ledger sequence, maximum ledger sequence and total number of...
Definition: SQLiteDatabase.cpp:732
-
ripple::ClosedInterval
boost::icl::closed_interval< T > ClosedInterval
A closed interval over the domain T.
Definition: RangeSet.h:44
+
ripple::ClosedInterval
boost::icl::closed_interval< T > ClosedInterval
A closed interval over the domain T.
Definition: RangeSet.h:45
ripple::SQLiteDatabaseImp::iterateTransactionBack
bool iterateTransactionBack(std::optional< std::uint32_t > firstIndex, std::function< bool(soci::session &session, std::uint32_t shardIndex)> const &callback)
iterateTransactionBack Checks out transaction databases for all shards in descending order starting f...
Definition: SQLiteDatabase.cpp:432
std::max
T max(T... args)
ripple::detail::getOldestAccountTxs
std::pair< RelationalDatabase::AccountTxs, int > getOldestAccountTxs(soci::session &session, Application &app, LedgerMaster &ledgerMaster, RelationalDatabase::AccountTxOptions const &options, std::optional< int > const &limit_used, beast::Journal j)
getOldestAccountTxs Returns oldest transactions for given account which match given criteria starting...
Definition: Node.cpp:896
diff --git a/SQLiteDatabase_8h_source.html b/SQLiteDatabase_8h_source.html index 428ac82821..ecbeca38f1 100644 --- a/SQLiteDatabase_8h_source.html +++ b/SQLiteDatabase_8h_source.html @@ -212,7 +212,7 @@ $(function() {
ripple::ValStatus::current
@ current
This was a new validation and was added.
ripple::SQLiteDatabase::getLimitedOldestLedgerInfo
virtual std::optional< LedgerInfo > getLimitedOldestLedgerInfo(LedgerIndex ledgerFirstIndex)=0
getLimitedOldestLedgerInfo Returns the info of the oldest ledger whose sequence number is greater tha...
-
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:53
+
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:54
ripple::SQLiteDatabase::getOldestAccountTxsB
virtual MetaTxsList getOldestAccountTxsB(AccountTxOptions const &options)=0
getOldestAccountTxsB Returns the oldest transactions in binary form for the account that matches the ...
ripple::SQLiteDatabase::getTransaction
virtual std::variant< AccountTx, TxSearched > getTransaction(uint256 const &id, std::optional< ClosedInterval< uint32_t >> const &range, error_code_i &ec)=0
getTransaction Returns the transaction with the given hash.
ripple
Use hash_* containers for keys that do not need a cryptographically secure hashing algorithm.
Definition: RCLCensorshipDetector.h:29
@@ -224,7 +224,7 @@ $(function() {
ripple::SQLiteDatabase::getKBUsedLedger
virtual uint32_t getKBUsedLedger()=0
getKBUsedLedger Returns the amount of space space used by the ledger database.
ripple::SQLiteDatabase::getLedgerCountMinMax
virtual struct CountMinMax getLedgerCountMinMax()=0
getLedgerCountMinMax Returns the minimum ledger sequence, maximum ledger sequence and total number of...
-
ripple::ClosedInterval
boost::icl::closed_interval< T > ClosedInterval
A closed interval over the domain T.
Definition: RangeSet.h:44
+
ripple::ClosedInterval
boost::icl::closed_interval< T > ClosedInterval
A closed interval over the domain T.
Definition: RangeSet.h:45
ripple::SQLiteDatabase::getNewestAccountTxsB
virtual MetaTxsList getNewestAccountTxsB(AccountTxOptions const &options)=0
getNewestAccountTxsB Returns the newest transactions in binary form for the account that matches the ...
diff --git a/STObject__test_8cpp_source.html b/STObject__test_8cpp_source.html index cc1bba0a88..e268c87d05 100644 --- a/STObject__test_8cpp_source.html +++ b/STObject__test_8cpp_source.html @@ -878,7 +878,7 @@ $(function() {
ripple::SField
Identifies fields.
Definition: SField.h:115
ripple::sfFlags
const SF_UINT32 sfFlags
ripple::STObject::isFieldPresent
bool isFieldPresent(SField const &field) const
Definition: STObject.cpp:428
-
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:76
+
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:74
ripple::sfSignature
const SF_VL sfSignature
diff --git a/ServerHandler_8cpp_source.html b/ServerHandler_8cpp_source.html index f1fdc7b26f..38f4d3d8f6 100644 --- a/ServerHandler_8cpp_source.html +++ b/ServerHandler_8cpp_source.html @@ -319,11 +319,11 @@ $(function() {
248  std::map<std::string, std::string> c;
249  for (auto const& e : h)
250  {
-
251  auto key(e.name_string().to_string());
-
252  std::transform(key.begin(), key.end(), key.begin(), [](auto kc) {
+
251  std::string key(e.name_string());
+
252  std::transform(key.begin(), key.end(), key.begin(), [](auto kc) {
253  return std::tolower(static_cast<unsigned char>(kc));
254  });
-
255  c[key] = e.value().to_string();
+
255  c[key] = e.value();
256  }
257  return c;
258 }
@@ -1517,20 +1517,20 @@ $(function() {
ripple::ParsedPort::pmd_options
boost::beast::websocket::permessage_deflate pmd_options
Definition: Port.h:110
ripple::ServerHandler::Setup::client_t::secure
bool secure
Definition: ServerHandler.h:61
ripple::ServerHandler::m_journal
beast::Journal m_journal
Definition: ServerHandler.h:94
-
std::vector::begin
T begin(T... args)
+
std::string::begin
T begin(T... args)
ripple::ParsedPort::ssl_key
std::string ssl_key
Definition: Port.h:106
ripple::ParsedPort::port
std::optional< std::uint16_t > port
Definition: Port.h:115
std::string::insert
T insert(T... args)
ripple::ParsedPort::user
std::string user
Definition: Port.h:102
ripple::Port::limit
int limit
Definition: Port.h:73
-
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:76
+
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:74
ripple::Resource::Consumer
An endpoint that consumes resources.
Definition: Consumer.h:34
ripple::Resource::Charge
A consumption charge.
Definition: Charge.h:30
ripple::ParsedPort::ws_queue_limit
std::uint16_t ws_queue_limit
Definition: Port.h:112
ripple::setup_Client
static void setup_Client(ServerHandler::Setup &setup)
Definition: ServerHandler.cpp:1196
ripple::Port::password
std::string password
Definition: Port.h:61
ripple::ServerHandler::onRequest
void onRequest(Session &session)
Definition: ServerHandler.cpp:276
-
Json::Reader::getFormatedErrorMessages
std::string getFormatedErrorMessages() const
Returns a user friendly string that list errors in the parsed document.
Definition: json_reader.cpp:933
+
Json::Reader::getFormatedErrorMessages
std::string getFormatedErrorMessages() const
Returns a user friendly string that list errors in the parsed document.
Definition: json_reader.cpp:932
ripple::Application::overlay
virtual Overlay & overlay()=0
std::set::count
T count(T... args)
ripple::Session::port
virtual Port const & port()=0
Returns the Port settings for this connection.
diff --git a/ServerStatus__test_8cpp_source.html b/ServerStatus__test_8cpp_source.html index 3c6db815f8..461867c74d 100644 --- a/ServerStatus__test_8cpp_source.html +++ b/ServerStatus__test_8cpp_source.html @@ -1379,7 +1379,7 @@ $(function() {
std::vector::emplace_back
T emplace_back(T... args)
ripple
Use hash_* containers for keys that do not need a cryptographically secure hashing algorithm.
Definition: RCLCensorshipDetector.h:29
-
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:76
+
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:74
Json::nullValue
@ nullValue
'null' value
Definition: json_value.h:36
ripple::test::ServerStatus_test::testWSHandoff
void testWSHandoff(boost::asio::yield_context &yield)
Definition: ServerStatus_test.cpp:656
ripple::Section::get
std::optional< T > get(std::string const &name) const
Definition: BasicConfig.h:138
diff --git a/ShardInfo_8h_source.html b/ShardInfo_8h_source.html index eab77dd75c..a5710214e1 100644 --- a/ShardInfo_8h_source.html +++ b/ShardInfo_8h_source.html @@ -196,7 +196,7 @@ $(function() {
std::string
STL class.
ripple::NodeStore::ShardInfo::incomplete_
std::map< std::uint32_t, Incomplete > incomplete_
Definition: ShardInfo.h:113
ripple::NodeStore::ShardInfo::setMsgTimestamp
void setMsgTimestamp(NetClock::time_point const &timestamp)
Definition: ShardInfo.h:69
-
ripple::from_string
bool from_string(RangeSet< T > &rs, std::string const &s)
Convert the given styled string to a RangeSet.
Definition: RangeSet.h:123
+
ripple::from_string
bool from_string(RangeSet< T > &rs, std::string const &s)
Convert the given styled string to a RangeSet.
Definition: RangeSet.h:124
ripple::NodeStore::ShardInfo::update
bool update(std::uint32_t shardIndex, ShardState state, std::uint32_t percentProgress)
Definition: ShardInfo.cpp:55
ripple::ShardState
ShardState
Shard states.
Definition: nodestore/Types.h:60
ripple::NodeStore::ShardInfo::Incomplete::Incomplete
Incomplete(ShardState state, std::uint32_t percentProgress)
Definition: ShardInfo.h:39
@@ -218,7 +218,7 @@ $(function() {
ripple::NodeStore::ShardInfo::incompleteToString
std::string incompleteToString() const
Definition: ShardInfo.cpp:38
ripple::NodeStore::ShardInfo::finalizedToString
std::string finalizedToString() const
Definition: ShardInfo.cpp:30
ripple::NodeStore::ShardInfo::Incomplete::state
ShardState state() const noexcept
Definition: ShardInfo.h:45
-
ripple::RangeSet
boost::icl::interval_set< T, std::less, ClosedInterval< T > > RangeSet
A set of closed intervals over the domain T.
Definition: RangeSet.h:69
+
ripple::RangeSet
boost::icl::interval_set< T, std::less, ClosedInterval< T > > RangeSet
A set of closed intervals over the domain T.
Definition: RangeSet.h:70
ripple::NodeStore::ShardInfo::Incomplete::percentProgress
std::uint32_t percentProgress() const noexcept
Definition: ShardInfo.h:51
ripple::NodeStore::ShardInfo::finalized
RangeSet< std::uint32_t > const & finalized() const
Definition: ShardInfo.h:84
diff --git a/TER_8cpp_source.html b/TER_8cpp_source.html index a0a17133ca..2f2b359483 100644 --- a/TER_8cpp_source.html +++ b/TER_8cpp_source.html @@ -418,7 +418,7 @@ $(function() {
ripple::tecPATH_PARTIAL
@ tecPATH_PARTIAL
Definition: TER.h:252
ripple::temREDUNDANT
@ temREDUNDANT
Definition: TER.h:110
ripple::tefFAILURE
@ tefFAILURE
Definition: TER.h:150
-
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:53
+
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:54
ripple::temBAD_FEE
@ temBAD_FEE
Definition: TER.h:90
ripple::telCAN_NOT_QUEUE_BLOCKS
@ telCAN_NOT_QUEUE_BLOCKS
Definition: TER.h:60
ripple::tecNEED_MASTER_KEY
@ tecNEED_MASTER_KEY
Definition: TER.h:278
diff --git a/TransactionMaster_8cpp_source.html b/TransactionMaster_8cpp_source.html index c6044940d0..9ecdfe9dbd 100644 --- a/TransactionMaster_8cpp_source.html +++ b/TransactionMaster_8cpp_source.html @@ -257,7 +257,7 @@ $(function() {
ripple::TransactionMaster::getCache
TaggedCache< uint256, Transaction > & getCache()
Definition: TransactionMaster.cpp:162
-
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:53
+
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:54
ripple::TransactionMaster::inLedger
bool inLedger(uint256 const &hash, std::uint32_t ledger)
Definition: TransactionMaster.cpp:40
ripple
Use hash_* containers for keys that do not need a cryptographically secure hashing algorithm.
Definition: RCLCensorshipDetector.h:29
ripple::Transaction::load
static std::variant< std::pair< std::shared_ptr< Transaction >, std::shared_ptr< TxMeta > >, TxSearched > load(uint256 const &id, Application &app, error_code_i &ec)
Definition: Transaction.cpp:114
@@ -265,7 +265,7 @@ $(function() {
std
STL namespace.
ripple::TransactionMaster::fetch
std::variant< std::pair< std::shared_ptr< Transaction >, std::shared_ptr< TxMeta > >, TxSearched > fetch(uint256 const &, error_code_i &ec)
Definition: TransactionMaster.cpp:60
-
ripple::ClosedInterval
boost::icl::closed_interval< T > ClosedInterval
A closed interval over the domain T.
Definition: RangeSet.h:44
+
ripple::ClosedInterval
boost::icl::closed_interval< T > ClosedInterval
A closed interval over the domain T.
Definition: RangeSet.h:45
std::ref
T ref(T... args)
diff --git a/TransactionMaster_8h_source.html b/TransactionMaster_8h_source.html index 525247c15d..9138d366ca 100644 --- a/TransactionMaster_8h_source.html +++ b/TransactionMaster_8h_source.html @@ -171,14 +171,14 @@ $(function() {
ripple::TransactionMaster::TransactionMaster
TransactionMaster(Application &app)
Definition: TransactionMaster.cpp:28
ripple::TransactionMaster::getCache
TaggedCache< uint256, Transaction > & getCache()
Definition: TransactionMaster.cpp:162
-
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:53
+
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:54
ripple::TransactionMaster::inLedger
bool inLedger(uint256 const &hash, std::uint32_t ledger)
Definition: TransactionMaster.cpp:40
ripple::TransactionMaster::operator=
TransactionMaster & operator=(TransactionMaster const &)=delete
ripple
Use hash_* containers for keys that do not need a cryptographically secure hashing algorithm.
Definition: RCLCensorshipDetector.h:29
ripple::TransactionMaster::canonicalize
void canonicalize(std::shared_ptr< Transaction > *pTransaction)
Definition: TransactionMaster.cpp:143
ripple::TransactionMaster::fetch
std::variant< std::pair< std::shared_ptr< Transaction >, std::shared_ptr< TxMeta > >, TxSearched > fetch(uint256 const &, error_code_i &ec)
Definition: TransactionMaster.cpp:60
-
ripple::ClosedInterval
boost::icl::closed_interval< T > ClosedInterval
A closed interval over the domain T.
Definition: RangeSet.h:44
+
ripple::ClosedInterval
boost::icl::closed_interval< T > ClosedInterval
A closed interval over the domain T.
Definition: RangeSet.h:45
diff --git a/Transaction_8cpp_source.html b/Transaction_8cpp_source.html index 8c0a281fb7..abe70ec67c 100644 --- a/Transaction_8cpp_source.html +++ b/Transaction_8cpp_source.html @@ -293,7 +293,7 @@ $(function() {
ripple::txnSqlHeld
@ txnSqlHeld
Definition: STTx.h:39
ripple::CONFLICTED
@ CONFLICTED
Definition: Transaction.h:49
-
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:53
+
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:54
ripple::Transaction::mInLedger
LedgerIndex mInLedger
Definition: Transaction.h:389
ripple
Use hash_* containers for keys that do not need a cryptographically secure hashing algorithm.
Definition: RCLCensorshipDetector.h:29
ripple::Transaction::load
static std::variant< std::pair< std::shared_ptr< Transaction >, std::shared_ptr< TxMeta > >, TxSearched > load(uint256 const &id, Application &app, error_code_i &ec)
Definition: Transaction.cpp:114
@@ -306,7 +306,7 @@ $(function() {
ripple::Transaction::mApp
Application & mApp
Definition: Transaction.h:400
ripple::txnSqlNew
@ txnSqlNew
Definition: STTx.h:37
-
ripple::ClosedInterval
boost::icl::closed_interval< T > ClosedInterval
A closed interval over the domain T.
Definition: RangeSet.h:44
+
ripple::ClosedInterval
boost::icl::closed_interval< T > ClosedInterval
A closed interval over the domain T.
Definition: RangeSet.h:45
std::exception::what
T what(T... args)
Json::Value
Represents a JSON value.
Definition: json_value.h:145
diff --git a/Transaction_8h_source.html b/Transaction_8h_source.html index 046547499f..752ec79be7 100644 --- a/Transaction_8h_source.html +++ b/Transaction_8h_source.html @@ -488,7 +488,7 @@ $(function() {
ripple::Transaction::submitResult_
SubmitResult submitResult_
different ways for transaction to be accepted
Definition: Transaction.h:395
ripple::CONFLICTED
@ CONFLICTED
Definition: Transaction.h:49
-
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:53
+
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:54
ripple::Transaction::mInLedger
LedgerIndex mInLedger
Definition: Transaction.h:389
ripple::Transaction::isValidated
bool isValidated() const
Definition: Transaction.h:106
@@ -504,7 +504,7 @@ $(function() {
ripple::Transaction::j_
beast::Journal j_
Definition: Transaction.h:401
-
ripple::ClosedInterval
boost::icl::closed_interval< T > ClosedInterval
A closed interval over the domain T.
Definition: RangeSet.h:44
+
ripple::ClosedInterval
boost::icl::closed_interval< T > ClosedInterval
A closed interval over the domain T.
Definition: RangeSet.h:45
ripple::Transaction::setApplying
void setApplying()
Set this flag once added to a batch.
Definition: Transaction.h:148
ripple::Transaction::getCurrentLedgerState
std::optional< CurrentLedgerState > getCurrentLedgerState() const
getCurrentLedgerState Get current ledger state of transaction
Definition: Transaction.h:285
diff --git a/TrustedPublisherServer_8h_source.html b/TrustedPublisherServer_8h_source.html index 69e4b14b86..d3b09e98f2 100644 --- a/TrustedPublisherServer_8h_source.html +++ b/TrustedPublisherServer_8h_source.html @@ -645,7 +645,7 @@ $(function() {
574  if (ec)
575  break;
576 
-
577  auto path = req.target().to_string();
+
577  std::string path = req.target();
578  res.insert("Server", "TrustedPublisherServer");
579  res.version(req.version());
580  res.keep_alive(req.keep_alive());
@@ -713,7 +713,7 @@ $(function() {
642  auto const sleep_sec =
643  boost::lexical_cast<unsigned int>(path.substr(7));
644  std::this_thread::sleep_for(
-
645  std::chrono::seconds{sleep_sec});
+
645  std::chrono::seconds(sleep_sec));
646  }
647  else if (boost::starts_with(path, "/redirect"))
648  {
diff --git a/Tx_8cpp_source.html b/Tx_8cpp_source.html index 41a0c8914e..10ed63c620 100644 --- a/Tx_8cpp_source.html +++ b/Tx_8cpp_source.html @@ -472,7 +472,7 @@ $(function() {
Json::Value::isMember
bool isMember(const char *key) const
Return true if the object has a member named key.
Definition: json_value.cpp:932
ripple::SerialIter::skip
void skip(int num)
Definition: Serializer.cpp:352
-
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:53
+
ripple::range
ClosedInterval< T > range(T low, T high)
Create a closed range interval.
Definition: RangeSet.h:54
ripple::TxResult::validated
bool validated
Definition: Tx.cpp:56
ripple::RPC::Status
Status represents the results of an operation that might fail.
Definition: Status.h:39
ripple::rpcINTERNAL
@ rpcINTERNAL
Definition: ErrorCodes.h:130
@@ -496,7 +496,7 @@ $(function() {
ripple::strHex
std::string strHex(FwdIt begin, FwdIt end)
Definition: strHex.h:30
ripple::NodeStore::Database::fetchNodeObject
std::shared_ptr< NodeObject > fetchNodeObject(uint256 const &hash, std::uint32_t ledgerSeq=0, FetchType fetchType=FetchType::synchronous, bool duplicate=false)
Fetch a node object.
Definition: Database.cpp:252
ripple::rpcINVALID_LGR_RANGE
@ rpcINVALID_LGR_RANGE
Definition: ErrorCodes.h:136
-
ripple::ClosedInterval
boost::icl::closed_interval< T > ClosedInterval
A closed interval over the domain T.
Definition: RangeSet.h:44
+
ripple::ClosedInterval
boost::icl::closed_interval< T > ClosedInterval
A closed interval over the domain T.
Definition: RangeSet.h:45
ripple::base_uint::parseHex
constexpr bool parseHex(std::string_view sv)
Parse a hex string into a base_uint.
Definition: base_uint.h:496
ripple::isValidated
static bool isValidated(LedgerMaster &ledgerMaster, std::uint32_t seq, uint256 const &hash)
Definition: Tx.cpp:41
diff --git a/ValidatorList_8cpp_source.html b/ValidatorList_8cpp_source.html index c609715ad2..ee1f573cd0 100644 --- a/ValidatorList_8cpp_source.html +++ b/ValidatorList_8cpp_source.html @@ -2206,7 +2206,7 @@ $(function() {
Json::Value::asUInt
UInt asUInt() const
Definition: json_value.cpp:545
ripple::ListDisposition::invalid
@ invalid
Invalid format or signature.
ripple::ValidatorList::PublisherList::validFrom
TimeKeeper::time_point validFrom
Definition: ValidatorList.h:181
-
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:76
+
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:74
Json::nullValue
@ nullValue
'null' value
Definition: json_value.h:36
ripple::ValidatorList::mutex_
boost::shared_mutex mutex_
Definition: ValidatorList.h:229
ripple::TimeKeeper::now
virtual time_point now() const override=0
Returns the estimate of wall time, in network time.
diff --git a/ValidatorSite_8cpp_source.html b/ValidatorSite_8cpp_source.html index 8865db68f5..d0bd2cef0e 100644 --- a/ValidatorSite_8cpp_source.html +++ b/ValidatorSite_8cpp_source.html @@ -855,7 +855,7 @@ $(function() {
Json::Value::asUInt
UInt asUInt() const
Definition: json_value.cpp:545
ripple::ListDisposition::invalid
@ invalid
Invalid format or signature.
ripple::ValidatorSite::ValidatorSite
ValidatorSite(Application &app, std::optional< beast::Journal > j=std::nullopt, std::chrono::seconds timeout=std::chrono::seconds{20})
Definition: ValidatorSite.cpp:88
-
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:76
+
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:74
ripple::Application::overlay
virtual Overlay & overlay()=0
std::vector::empty
T empty(T... args)
diff --git a/WSClient_8cpp_source.html b/WSClient_8cpp_source.html index bda21da719..f94f32ff0b 100644 --- a/WSClient_8cpp_source.html +++ b/WSClient_8cpp_source.html @@ -427,7 +427,7 @@ $(function() {
ripple::ParsedPort::ip
std::optional< boost::asio::ip::address > ip
Definition: Port.h:114
ripple::ParsedPort::port
std::optional< std::uint16_t > port
Definition: Port.h:115
-
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:76
+
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:74
std::set::count
T count(T... args)
ripple::test::makeWSClient
std::unique_ptr< WSClient > makeWSClient(Config const &cfg, bool v2, unsigned rpc_version, std::unordered_map< std::string, std::string > const &headers)
Returns a client operating through WebSockets/S.
Definition: WSClient.cpp:300
diff --git a/WSInfoSub_8h_source.html b/WSInfoSub_8h_source.html index 3c94c34b0e..1bb7904897 100644 --- a/WSInfoSub_8h_source.html +++ b/WSInfoSub_8h_source.html @@ -121,7 +121,7 @@ $(function() {
50  {
51  auto it = h.find("X-User");
52  if (it != h.end())
-
53  user_ = it->value().to_string();
+
53  user_ = it->value();
54  fwdfor_ = std::string(forwardedFor(h));
55  }
56  }
diff --git a/app_2misc_2impl_2Manifest_8cpp_source.html b/app_2misc_2impl_2Manifest_8cpp_source.html index 7f9606d7e0..4bd081072f 100644 --- a/app_2misc_2impl_2Manifest_8cpp_source.html +++ b/app_2misc_2impl_2Manifest_8cpp_source.html @@ -732,7 +732,7 @@ $(function() {
ripple
Use hash_* containers for keys that do not need a cryptographically secure hashing algorithm.
Definition: RCLCensorshipDetector.h:29
std::vector::cbegin
T cbegin(T... args)
ripple::logMftAct
Stream & logMftAct(Stream &s, std::string const &action, PublicKey const &pk, std::uint32_t seq)
Definition: app/misc/impl/Manifest.cpp:161
-
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:76
+
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:74
ripple::sfSignature
const SF_VL sfSignature
ripple::Manifest::hash
uint256 hash() const
Returns hash of serialized manifest data.
Definition: app/misc/impl/Manifest.cpp:205
diff --git a/classJson_1_1Reader.html b/classJson_1_1Reader.html index b75122229a..d9ae2d3b35 100644 --- a/classJson_1_1Reader.html +++ b/classJson_1_1Reader.html @@ -438,7 +438,7 @@ Private Attributes
Returns
true if the document was successfully parsed, false if an error occurred.
-

Definition at line 76 of file json_reader.cpp.

+

Definition at line 74 of file json_reader.cpp.

@@ -484,7 +484,7 @@ Private Attributes
Returns
true if the document was successfully parsed, false if an error occurred.
-

Definition at line 100 of file json_reader.cpp.

+

Definition at line 98 of file json_reader.cpp.

@@ -517,7 +517,7 @@ Private Attributes

Parse from input stream.

See also
Json::operator>>(std::istream&, Json::Value&).
-

Definition at line 85 of file json_reader.cpp.

+

Definition at line 83 of file json_reader.cpp.

@@ -581,7 +581,7 @@ template<class BufferSequence >

Returns a user friendly string that list errors in the parsed document.

Returns
Formatted error message with the list of errors with their location in the parsed document. An empty string is returned if no error occurred during parsing.
-

Definition at line 933 of file json_reader.cpp.

+

Definition at line 932 of file json_reader.cpp.

@@ -625,7 +625,7 @@ template<class BufferSequence >
-

Definition at line 194 of file json_reader.cpp.

+

Definition at line 192 of file json_reader.cpp.

@@ -653,7 +653,7 @@ template<class BufferSequence >
-

Definition at line 205 of file json_reader.cpp.

+

Definition at line 203 of file json_reader.cpp.

@@ -680,7 +680,7 @@ template<class BufferSequence >
-

Definition at line 294 of file json_reader.cpp.

+

Definition at line 292 of file json_reader.cpp.

@@ -718,7 +718,7 @@ template<class BufferSequence >
-

Definition at line 308 of file json_reader.cpp.

+

Definition at line 306 of file json_reader.cpp.

@@ -745,7 +745,7 @@ template<class BufferSequence >
-

Definition at line 324 of file json_reader.cpp.

+

Definition at line 322 of file json_reader.cpp.

@@ -772,7 +772,7 @@ template<class BufferSequence >
-

Definition at line 338 of file json_reader.cpp.

+

Definition at line 336 of file json_reader.cpp.

@@ -799,7 +799,7 @@ template<class BufferSequence >
-

Definition at line 352 of file json_reader.cpp.

+

Definition at line 350 of file json_reader.cpp.

@@ -826,7 +826,7 @@ template<class BufferSequence >
-

Definition at line 400 of file json_reader.cpp.

+

Definition at line 398 of file json_reader.cpp.

@@ -853,7 +853,7 @@ template<class BufferSequence >
-

Definition at line 366 of file json_reader.cpp.

+

Definition at line 364 of file json_reader.cpp.

@@ -881,7 +881,7 @@ template<class BufferSequence >
-

Definition at line 134 of file json_reader.cpp.

+

Definition at line 132 of file json_reader.cpp.

@@ -919,7 +919,7 @@ template<class BufferSequence >
-

Definition at line 418 of file json_reader.cpp.

+

Definition at line 416 of file json_reader.cpp.

@@ -957,7 +957,7 @@ template<class BufferSequence >
-

Definition at line 491 of file json_reader.cpp.

+

Definition at line 489 of file json_reader.cpp.

@@ -985,7 +985,7 @@ template<class BufferSequence >
-

Definition at line 544 of file json_reader.cpp.

+

Definition at line 542 of file json_reader.cpp.

@@ -1013,7 +1013,7 @@ template<class BufferSequence >
-

Definition at line 665 of file json_reader.cpp.

+

Definition at line 663 of file json_reader.cpp.

@@ -1051,7 +1051,7 @@ template<class BufferSequence >
-

Definition at line 677 of file json_reader.cpp.

+

Definition at line 675 of file json_reader.cpp.

@@ -1079,7 +1079,7 @@ template<class BufferSequence >
-

Definition at line 627 of file json_reader.cpp.

+

Definition at line 625 of file json_reader.cpp.

@@ -1129,7 +1129,7 @@ template<class BufferSequence >
-

Definition at line 756 of file json_reader.cpp.

+

Definition at line 754 of file json_reader.cpp.

@@ -1179,7 +1179,7 @@ template<class BufferSequence >
-

Definition at line 799 of file json_reader.cpp.

+

Definition at line 797 of file json_reader.cpp.

@@ -1223,7 +1223,7 @@ template<class BufferSequence >
-

Definition at line 836 of file json_reader.cpp.

+

Definition at line 834 of file json_reader.cpp.

@@ -1251,7 +1251,7 @@ template<class BufferSequence >
-

Definition at line 847 of file json_reader.cpp.

+

Definition at line 845 of file json_reader.cpp.

@@ -1295,7 +1295,7 @@ template<class BufferSequence >
-

Definition at line 866 of file json_reader.cpp.

+

Definition at line 864 of file json_reader.cpp.

@@ -1347,7 +1347,7 @@ template<class BufferSequence >
-

Definition at line 876 of file json_reader.cpp.

+

Definition at line 874 of file json_reader.cpp.

@@ -1374,7 +1374,7 @@ template<class BufferSequence >
-

Definition at line 882 of file json_reader.cpp.

+

Definition at line 880 of file json_reader.cpp.

@@ -1418,7 +1418,7 @@ template<class BufferSequence >
-

Definition at line 891 of file json_reader.cpp.

+

Definition at line 889 of file json_reader.cpp.

@@ -1446,7 +1446,7 @@ template<class BufferSequence >
-

Definition at line 923 of file json_reader.cpp.

+

Definition at line 921 of file json_reader.cpp.

@@ -1474,7 +1474,7 @@ template<class BufferSequence >
-

Definition at line 185 of file json_reader.cpp.

+

Definition at line 183 of file json_reader.cpp.

diff --git a/classripple_1_1Consensus.html b/classripple_1_1Consensus.html index 29c0fee51f..90587d087a 100644 --- a/classripple_1_1Consensus.html +++ b/classripple_1_1Consensus.html @@ -422,7 +422,7 @@ class ripple::Consensus< Adaptor > -

Definition at line 284 of file Consensus.h.

+

Definition at line 287 of file Consensus.h.

Member Typedef Documentation

◆ Ledger_t

@@ -446,7 +446,7 @@ template<class Adaptor >
-

Definition at line 286 of file Consensus.h.

+

Definition at line 289 of file Consensus.h.

@@ -472,7 +472,7 @@ template<class Adaptor >
-

Definition at line 287 of file Consensus.h.

+

Definition at line 290 of file Consensus.h.

@@ -498,7 +498,7 @@ template<class Adaptor >
-

Definition at line 288 of file Consensus.h.

+

Definition at line 291 of file Consensus.h.

@@ -524,7 +524,7 @@ template<class Adaptor >
-

Definition at line 289 of file Consensus.h.

+

Definition at line 292 of file Consensus.h.

@@ -550,7 +550,7 @@ template<class Adaptor >
-

Definition at line 290 of file Consensus.h.

+

Definition at line 293 of file Consensus.h.

@@ -576,7 +576,7 @@ template<class Adaptor >
-

Definition at line 294 of file Consensus.h.

+

Definition at line 297 of file Consensus.h.

@@ -602,7 +602,7 @@ template<class Adaptor >
-

Definition at line 296 of file Consensus.h.

+

Definition at line 299 of file Consensus.h.

@@ -622,7 +622,7 @@ template<class Adaptor >

Clock type for measuring time within the consensus code.

-

Definition at line 324 of file Consensus.h.

+

Definition at line 327 of file Consensus.h.

@@ -699,7 +699,7 @@ template<class Adaptor > -

Definition at line 605 of file Consensus.h.

+

Definition at line 608 of file Consensus.h.

@@ -764,7 +764,7 @@ template<class Adaptor >
Note
prevLedgerID is not required to the ID of prevLedger since the ID may be known locally before the contents of the ledger arrive
-

Definition at line 616 of file Consensus.h.

+

Definition at line 619 of file Consensus.h.

@@ -806,7 +806,7 @@ template<class Adaptor >
Returns
Whether we should do delayed relay of this proposal.
-

Definition at line 700 of file Consensus.h.

+

Definition at line 703 of file Consensus.h.

@@ -836,7 +836,7 @@ template<class Adaptor > -

Definition at line 815 of file Consensus.h.

+

Definition at line 818 of file Consensus.h.

@@ -877,7 +877,7 @@ template<class Adaptor > -

Definition at line 838 of file Consensus.h.

+

Definition at line 841 of file Consensus.h.

@@ -921,7 +921,7 @@ template<class Adaptor > -

Definition at line 884 of file Consensus.h.

+

Definition at line 887 of file Consensus.h.

@@ -946,7 +946,7 @@ template<class Adaptor >

The previous ledger is the last ledger seen by the consensus code and should correspond to the most recent validated ledger seen by this peer.

Returns
ID of previous ledger
-

Definition at line 412 of file Consensus.h.

+

Definition at line 415 of file Consensus.h.

@@ -967,7 +967,7 @@ template<class Adaptor >
-

Definition at line 418 of file Consensus.h.

+

Definition at line 421 of file Consensus.h.

@@ -999,7 +999,7 @@ template<class Adaptor >
Returns
The Json state.
-

Definition at line 908 of file Consensus.h.

+

Definition at line 911 of file Consensus.h.

@@ -1051,7 +1051,7 @@ template<class Adaptor >
-

Definition at line 662 of file Consensus.h.

+

Definition at line 665 of file Consensus.h.

@@ -1081,7 +1081,7 @@ template<class Adaptor >
-

Definition at line 1006 of file Consensus.h.

+

Definition at line 1009 of file Consensus.h.

@@ -1110,7 +1110,7 @@ template<class Adaptor >

Check if our previous ledger matches the network's.

If the previous ledger differs, we are no longer in sync with the network and need to bow out/switch modes.

-

Definition at line 1051 of file Consensus.h.

+

Definition at line 1054 of file Consensus.h.

@@ -1138,7 +1138,7 @@ template<class Adaptor >

If we radically changed our consensus context for some reason, we need to replay recent proposals so that they're not lost.

-

Definition at line 1074 of file Consensus.h.

+

Definition at line 1077 of file Consensus.h.

@@ -1180,7 +1180,7 @@ template<class Adaptor >

Handle a replayed or a new peer proposal.

-

Definition at line 720 of file Consensus.h.

+

Definition at line 723 of file Consensus.h.

@@ -1209,7 +1209,7 @@ template<class Adaptor >

Handle pre-close phase.

In the pre-close phase, the ledger is open as we wait for new transactions. After enough time has elapsed, we will close the ledger, switch to the establish phase and start the consensus process.

-

Definition at line 1091 of file Consensus.h.

+

Definition at line 1094 of file Consensus.h.

@@ -1239,7 +1239,7 @@ template<class Adaptor >

In the establish phase, the ledger has closed and we work with peers to reach consensus. Update our position only on the timer, and in this phase.

If we have consensus, move to the accepted phase.

-

Definition at line 1258 of file Consensus.h.

+

Definition at line 1261 of file Consensus.h.

@@ -1273,7 +1273,7 @@ template<class Adaptor >

No particular threshold guarantees consensus. Lower thresholds are easier to achieve than higher, but higher thresholds are more likely to reach consensus. Cycle through the phases if lack of synchronization continues.

Current information indicates that no phase is likely to be intrinsically better than any other: the lower the threshold, the less likely that up-to-date nodes will be able to reach consensus without the laggards. But the higher the threshold, the longer the likely resulting pause. 100% is slightly less desirable in the long run because the potential of a single dawdling peer to slow down everything else. So if we accept that no phase is any better than any other phase, but that all of them will potentially enable us to arrive at consensus, cycling through them seems to be appropriate. Further, if we do reach the point of having to cycle back around, then it's likely that something else out of the scope of this delay mechanism is wrong with the network.

-

Definition at line 1144 of file Consensus.h.

+

Definition at line 1147 of file Consensus.h.

@@ -1299,7 +1299,7 @@ template<class Adaptor >
-

Definition at line 1306 of file Consensus.h.

+

Definition at line 1309 of file Consensus.h.

@@ -1325,7 +1325,7 @@ template<class Adaptor >
-

Definition at line 1359 of file Consensus.h.

+

Definition at line 1362 of file Consensus.h.

@@ -1351,7 +1351,7 @@ template<class Adaptor >
-

Definition at line 1543 of file Consensus.h.

+

Definition at line 1546 of file Consensus.h.

@@ -1381,7 +1381,7 @@ template<class Adaptor >
-

Definition at line 1618 of file Consensus.h.

+

Definition at line 1621 of file Consensus.h.

@@ -1421,7 +1421,7 @@ template<class Adaptor >
-

Definition at line 1677 of file Consensus.h.

+

Definition at line 1680 of file Consensus.h.

@@ -1447,7 +1447,7 @@ template<class Adaptor >
-

Definition at line 1601 of file Consensus.h.

+

Definition at line 1604 of file Consensus.h.

@@ -1477,7 +1477,7 @@ template<class Adaptor >
-

Definition at line 1696 of file Consensus.h.

+

Definition at line 1699 of file Consensus.h.

@@ -1504,7 +1504,7 @@ template<class Adaptor >
-

Definition at line 541 of file Consensus.h.

+

Definition at line 544 of file Consensus.h.

@@ -1530,7 +1530,7 @@ template<class Adaptor >
-

Definition at line 543 of file Consensus.h.

+

Definition at line 546 of file Consensus.h.

@@ -1556,7 +1556,7 @@ template<class Adaptor >
-

Definition at line 544 of file Consensus.h.

+

Definition at line 547 of file Consensus.h.

@@ -1582,7 +1582,7 @@ template<class Adaptor >
-

Definition at line 545 of file Consensus.h.

+

Definition at line 548 of file Consensus.h.

@@ -1608,7 +1608,7 @@ template<class Adaptor >
-

Definition at line 546 of file Consensus.h.

+

Definition at line 549 of file Consensus.h.

@@ -1634,7 +1634,7 @@ template<class Adaptor >
-

Definition at line 548 of file Consensus.h.

+

Definition at line 551 of file Consensus.h.

@@ -1660,7 +1660,7 @@ template<class Adaptor >
-

Definition at line 552 of file Consensus.h.

+

Definition at line 555 of file Consensus.h.

@@ -1686,7 +1686,7 @@ template<class Adaptor >
-

Definition at line 555 of file Consensus.h.

+

Definition at line 558 of file Consensus.h.

@@ -1712,7 +1712,7 @@ template<class Adaptor >
-

Definition at line 557 of file Consensus.h.

+

Definition at line 560 of file Consensus.h.

@@ -1738,7 +1738,7 @@ template<class Adaptor >
-

Definition at line 560 of file Consensus.h.

+

Definition at line 563 of file Consensus.h.

@@ -1764,7 +1764,7 @@ template<class Adaptor >
-

Definition at line 567 of file Consensus.h.

+

Definition at line 570 of file Consensus.h.

@@ -1790,7 +1790,7 @@ template<class Adaptor >
-

Definition at line 568 of file Consensus.h.

+

Definition at line 571 of file Consensus.h.

@@ -1816,7 +1816,7 @@ template<class Adaptor >
-

Definition at line 574 of file Consensus.h.

+

Definition at line 577 of file Consensus.h.

@@ -1842,7 +1842,7 @@ template<class Adaptor >
-

Definition at line 576 of file Consensus.h.

+

Definition at line 579 of file Consensus.h.

@@ -1868,7 +1868,7 @@ template<class Adaptor >
-

Definition at line 579 of file Consensus.h.

+

Definition at line 582 of file Consensus.h.

@@ -1894,7 +1894,7 @@ template<class Adaptor >
-

Definition at line 581 of file Consensus.h.

+

Definition at line 584 of file Consensus.h.

@@ -1920,7 +1920,7 @@ template<class Adaptor >
-

Definition at line 582 of file Consensus.h.

+

Definition at line 585 of file Consensus.h.

@@ -1946,7 +1946,7 @@ template<class Adaptor >
-

Definition at line 588 of file Consensus.h.

+

Definition at line 591 of file Consensus.h.

@@ -1972,7 +1972,7 @@ template<class Adaptor >
-

Definition at line 592 of file Consensus.h.

+

Definition at line 595 of file Consensus.h.

@@ -1998,7 +1998,7 @@ template<class Adaptor >
-

Definition at line 595 of file Consensus.h.

+

Definition at line 598 of file Consensus.h.

@@ -2024,7 +2024,7 @@ template<class Adaptor >
-

Definition at line 598 of file Consensus.h.

+

Definition at line 601 of file Consensus.h.

@@ -2050,28 +2050,28 @@ template<class Adaptor >
-

Definition at line 601 of file Consensus.h.

+

Definition at line 604 of file Consensus.h.

std::find
T find(T... args)
-
ripple::Consensus::getJson
Json::Value getJson(bool full) const
Get the Json state of the consensus process.
Definition: Consensus.h:908
-
ripple::Consensus::Result
ConsensusResult< Adaptor > Result
Definition: Consensus.h:296
+
ripple::Consensus::getJson
Json::Value getJson(bool full) const
Get the Json state of the consensus process.
Definition: Consensus.h:911
+
ripple::Consensus::Result
ConsensusResult< Adaptor > Result
Definition: Consensus.h:299
beast::compare
int compare(SemanticVersion const &lhs, SemanticVersion const &rhs)
Compare two SemanticVersions against each other.
Definition: SemanticVersion.cpp:259
ripple::erase
void erase(STObject &st, TypedField< U > const &f)
Remove a field in an STObject.
Definition: STExchange.h:171
-
ripple::Consensus::prevLedgerID
Ledger_t::ID prevLedgerID() const
Get the previous ledger ID.
Definition: Consensus.h:412
-
ripple::Consensus::NodeID_t
typename Adaptor::NodeID_t NodeID_t
Definition: Consensus.h:288
+
ripple::Consensus::prevLedgerID
Ledger_t::ID prevLedgerID() const
Get the previous ledger ID.
Definition: Consensus.h:415
+
ripple::Consensus::NodeID_t
typename Adaptor::NodeID_t NodeID_t
Definition: Consensus.h:291
ripple::HashPrefix::proposal
@ proposal
proposal for signing
std::map
STL class.
-
ripple::Consensus::Ledger_t
typename Adaptor::Ledger_t Ledger_t
Definition: Consensus.h:286
-
ripple::Consensus::PeerPosition_t
typename Adaptor::PeerPosition_t PeerPosition_t
Definition: Consensus.h:290
+
ripple::Consensus::Ledger_t
typename Adaptor::Ledger_t Ledger_t
Definition: Consensus.h:289
+
ripple::Consensus::PeerPosition_t
typename Adaptor::PeerPosition_t PeerPosition_t
Definition: Consensus.h:293
ripple::ConsensusMode
ConsensusMode
Represents how a node currently participates in Consensus.
Definition: ConsensusTypes.h:55
ripple::after
static bool after(NetClock::time_point now, std::uint32_t mark)
Has the specified time passed?
Definition: Escrow.cpp:88
-
ripple::Consensus::TxSet_t
typename Adaptor::TxSet_t TxSet_t
Definition: Consensus.h:287
+
ripple::Consensus::TxSet_t
typename Adaptor::TxSet_t TxSet_t
Definition: Consensus.h:290
ripple::NetClock::duration
std::chrono::duration< rep, period > duration
Definition: chrono.h:55
Json::Value
Represents a JSON value.
Definition: json_value.h:145
diff --git a/classripple_1_1Consensus_1_1MonitoredMode.html b/classripple_1_1Consensus_1_1MonitoredMode.html index a8b1f10a71..f5f2f03043 100644 --- a/classripple_1_1Consensus_1_1MonitoredMode.html +++ b/classripple_1_1Consensus_1_1MonitoredMode.html @@ -93,7 +93,7 @@ Private Attributes class ripple::Consensus< Adaptor >::MonitoredMode -

Definition at line 300 of file Consensus.h.

+

Definition at line 303 of file Consensus.h.

Constructor & Destructor Documentation

◆ MonitoredMode()

@@ -113,7 +113,7 @@ template<class Adaptor >
-

Definition at line 305 of file Consensus.h.

+

Definition at line 308 of file Consensus.h.

@@ -135,7 +135,7 @@ template<class Adaptor >
-

Definition at line 309 of file Consensus.h.

+

Definition at line 312 of file Consensus.h.

@@ -167,7 +167,7 @@ template<class Adaptor >
-

Definition at line 315 of file Consensus.h.

+

Definition at line 318 of file Consensus.h.

@@ -194,7 +194,7 @@ template<class Adaptor >
-

Definition at line 302 of file Consensus.h.

+

Definition at line 305 of file Consensus.h.

diff --git a/classripple_1_1HTTPClient.html b/classripple_1_1HTTPClient.html index 78c3c34d51..7b0ab68c12 100644 --- a/classripple_1_1HTTPClient.html +++ b/classripple_1_1HTTPClient.html @@ -111,7 +111,7 @@ Static Public Attributes

Detailed Description

Provides an asynchronous HTTP client implementation with optional SSL.

-

Definition at line 33 of file HTTPClient.h.

+

Definition at line 37 of file HTTPClient.h.

Constructor & Destructor Documentation

◆ HTTPClient()

@@ -438,7 +438,7 @@ Static Public Attributes
-

Definition at line 38 of file HTTPClient.h.

+

Definition at line 42 of file HTTPClient.h.

diff --git a/classripple_1_1HTTPClientImp.html b/classripple_1_1HTTPClientImp.html index 4eb83b47e5..276e929606 100644 --- a/classripple_1_1HTTPClientImp.html +++ b/classripple_1_1HTTPClientImp.html @@ -1394,7 +1394,7 @@ Private Attributes
-

Definition at line 38 of file HTTPClient.h.

+

Definition at line 42 of file HTTPClient.h.

diff --git a/compression__test_8cpp_source.html b/compression__test_8cpp_source.html index b559df3dfb..9a84e5ef9c 100644 --- a/compression__test_8cpp_source.html +++ b/compression__test_8cpp_source.html @@ -715,8 +715,8 @@ $(function() {
ripple::test::compression_test::testHandshake
void testHandshake()
Definition: compression_test.cpp:463
ripple::Serializer::getLength
int getLength() const
Definition: Serializer.h:199
ripple::sfDomain
const SF_VL sfDomain
-
ripple::makeRequest
auto makeRequest(bool crawlPublic, bool comprEnabled, bool ledgerReplayEnabled, bool txReduceRelayEnabled, bool vpReduceRelayEnabled) -> request_type
Make outbound http request.
Definition: Handshake.cpp:365
-
ripple::makeResponse
http_response_type makeResponse(bool crawlPublic, http_request_type const &req, beast::IP::Address public_ip, beast::IP::Address remote_ip, uint256 const &sharedValue, std::optional< std::uint32_t > networkID, ProtocolVersion protocol, Application &app)
Make http response.
Definition: Handshake.cpp:392
+
ripple::makeRequest
auto makeRequest(bool crawlPublic, bool comprEnabled, bool ledgerReplayEnabled, bool txReduceRelayEnabled, bool vpReduceRelayEnabled) -> request_type
Make outbound http request.
Definition: Handshake.cpp:367
+
ripple::makeResponse
http_response_type makeResponse(bool crawlPublic, http_request_type const &req, beast::IP::Address public_ip, beast::IP::Address remote_ip, uint256 const &sharedValue, std::optional< std::uint32_t > networkID, ProtocolVersion protocol, Application &app)
Make http response.
Definition: Handshake.cpp:394
ripple::http_request_type
boost::beast::http::request< boost::beast::http::dynamic_body > http_request_type
Definition: Handshake.h:47
ripple::strUnHex
std::optional< Blob > strUnHex(std::size_t strSize, Iterator begin, Iterator end)
Definition: StringUtilities.h:52
std::vector::data
T data(T... args)
diff --git a/handshake__test_8cpp_source.html b/handshake__test_8cpp_source.html index 9c47e35446..85f2468e43 100644 --- a/handshake__test_8cpp_source.html +++ b/handshake__test_8cpp_source.html @@ -135,8 +135,8 @@ $(function() {
64 } // namespace ripple
ripple::test::handshake_test::handshake_test
handshake_test()=default
-
ripple::isFeatureValue
bool isFeatureValue(boost::beast::http::fields const &headers, std::string const &feature, std::string const &value)
Check if a feature's value is equal to the specified value.
Definition: Handshake.cpp:54
-
ripple::featureEnabled
bool featureEnabled(boost::beast::http::fields const &headers, std::string const &feature)
Check if a feature is enabled.
Definition: Handshake.cpp:66
+
ripple::isFeatureValue
bool isFeatureValue(boost::beast::http::fields const &headers, std::string const &feature, std::string const &value)
Check if a feature's value is equal to the specified value.
Definition: Handshake.cpp:56
+
ripple::featureEnabled
bool featureEnabled(boost::beast::http::fields const &headers, std::string const &feature)
Check if a feature is enabled.
Definition: Handshake.cpp:68
ripple::test::handshake_test::testHandshake
void testHandshake()
Definition: handshake_test.cpp:33
ripple::test::handshake_test::run
void run() override
Definition: handshake_test.cpp:55
ripple::test::handshake_test
Definition: handshake_test.cpp:27
diff --git a/json__reader_8cpp_source.html b/json__reader_8cpp_source.html index 0c5b1744b5..27b16d420d 100644 --- a/json__reader_8cpp_source.html +++ b/json__reader_8cpp_source.html @@ -101,968 +101,967 @@ $(function() {
30 // Implementation of class Reader
31 // ////////////////////////////////
32 
-
33 constexpr unsigned Reader::nest_limit;
-
34 
-
35 static std::string
-
36 codePointToUTF8(unsigned int cp)
-
37 {
-
38  std::string result;
+
33 static std::string
+
34 codePointToUTF8(unsigned int cp)
+
35 {
+
36  std::string result;
+
37 
+
38  // based on description from http://en.wikipedia.org/wiki/UTF-8
39 
-
40  // based on description from http://en.wikipedia.org/wiki/UTF-8
-
41 
-
42  if (cp <= 0x7f)
-
43  {
-
44  result.resize(1);
-
45  result[0] = static_cast<char>(cp);
-
46  }
-
47  else if (cp <= 0x7FF)
-
48  {
-
49  result.resize(2);
-
50  result[1] = static_cast<char>(0x80 | (0x3f & cp));
-
51  result[0] = static_cast<char>(0xC0 | (0x1f & (cp >> 6)));
-
52  }
-
53  else if (cp <= 0xFFFF)
-
54  {
-
55  result.resize(3);
-
56  result[2] = static_cast<char>(0x80 | (0x3f & cp));
-
57  result[1] = 0x80 | static_cast<char>((0x3f & (cp >> 6)));
-
58  result[0] = 0xE0 | static_cast<char>((0xf & (cp >> 12)));
-
59  }
-
60  else if (cp <= 0x10FFFF)
-
61  {
-
62  result.resize(4);
-
63  result[3] = static_cast<char>(0x80 | (0x3f & cp));
-
64  result[2] = static_cast<char>(0x80 | (0x3f & (cp >> 6)));
-
65  result[1] = static_cast<char>(0x80 | (0x3f & (cp >> 12)));
-
66  result[0] = static_cast<char>(0xF0 | (0x7 & (cp >> 18)));
-
67  }
-
68 
-
69  return result;
-
70 }
-
71 
-
72 // Class Reader
-
73 // //////////////////////////////////////////////////////////////////
-
74 
-
75 bool
-
76 Reader::parse(std::string const& document, Value& root)
-
77 {
-
78  document_ = document;
-
79  const char* begin = document_.c_str();
-
80  const char* end = begin + document_.length();
-
81  return parse(begin, end, root);
-
82 }
-
83 
-
84 bool
-
85 Reader::parse(std::istream& sin, Value& root)
-
86 {
-
87  // std::istream_iterator<char> begin(sin);
-
88  // std::istream_iterator<char> end;
-
89  // Those would allow streamed input from a file, if parse() were a
-
90  // template function.
-
91 
-
92  // Since std::string is reference-counted, this at least does not
-
93  // create an extra copy.
-
94  std::string doc;
-
95  std::getline(sin, doc, (char)EOF);
-
96  return parse(doc, root);
-
97 }
-
98 
-
99 bool
-
100 Reader::parse(const char* beginDoc, const char* endDoc, Value& root)
-
101 {
-
102  begin_ = beginDoc;
-
103  end_ = endDoc;
-
104  current_ = begin_;
-
105  lastValueEnd_ = 0;
-
106  lastValue_ = 0;
-
107  errors_.clear();
-
108 
-
109  while (!nodes_.empty())
-
110  nodes_.pop();
-
111 
-
112  nodes_.push(&root);
-
113  bool successful = readValue(0);
-
114  Token token;
-
115  skipCommentTokens(token);
-
116 
-
117  if (!root.isNull() && !root.isArray() && !root.isObject())
-
118  {
-
119  // Set error location to start of doc, ideally should be first token
-
120  // found in doc
-
121  token.type_ = tokenError;
-
122  token.start_ = beginDoc;
-
123  token.end_ = endDoc;
-
124  addError(
-
125  "A valid JSON document must be either an array or an object value.",
-
126  token);
-
127  return false;
-
128  }
-
129 
-
130  return successful;
-
131 }
-
132 
-
133 bool
-
134 Reader::readValue(unsigned depth)
-
135 {
-
136  Token token;
-
137  skipCommentTokens(token);
-
138  if (depth > nest_limit)
-
139  return addError("Syntax error: maximum nesting depth exceeded", token);
-
140  bool successful = true;
-
141 
-
142  switch (token.type_)
-
143  {
-
144  case tokenObjectBegin:
-
145  successful = readObject(token, depth);
-
146  break;
-
147 
-
148  case tokenArrayBegin:
-
149  successful = readArray(token, depth);
-
150  break;
-
151 
-
152  case tokenInteger:
-
153  successful = decodeNumber(token);
-
154  break;
-
155 
-
156  case tokenDouble:
-
157  successful = decodeDouble(token);
-
158  break;
-
159 
-
160  case tokenString:
-
161  successful = decodeString(token);
-
162  break;
-
163 
-
164  case tokenTrue:
-
165  currentValue() = true;
-
166  break;
-
167 
-
168  case tokenFalse:
-
169  currentValue() = false;
-
170  break;
-
171 
-
172  case tokenNull:
-
173  currentValue() = Value();
-
174  break;
-
175 
-
176  default:
-
177  return addError(
-
178  "Syntax error: value, object or array expected.", token);
-
179  }
-
180 
-
181  return successful;
-
182 }
-
183 
-
184 void
-
185 Reader::skipCommentTokens(Token& token)
-
186 {
-
187  do
-
188  {
-
189  readToken(token);
-
190  } while (token.type_ == tokenComment);
-
191 }
-
192 
-
193 bool
-
194 Reader::expectToken(TokenType type, Token& token, const char* message)
-
195 {
-
196  readToken(token);
-
197 
-
198  if (token.type_ != type)
-
199  return addError(message, token);
-
200 
-
201  return true;
-
202 }
-
203 
-
204 bool
-
205 Reader::readToken(Token& token)
-
206 {
-
207  skipSpaces();
-
208  token.start_ = current_;
-
209  Char c = getNextChar();
-
210  bool ok = true;
-
211 
-
212  switch (c)
-
213  {
-
214  case '{':
-
215  token.type_ = tokenObjectBegin;
-
216  break;
-
217 
-
218  case '}':
-
219  token.type_ = tokenObjectEnd;
-
220  break;
-
221 
-
222  case '[':
-
223  token.type_ = tokenArrayBegin;
-
224  break;
-
225 
-
226  case ']':
-
227  token.type_ = tokenArrayEnd;
-
228  break;
-
229 
-
230  case '"':
-
231  token.type_ = tokenString;
-
232  ok = readString();
-
233  break;
-
234 
-
235  case '/':
-
236  token.type_ = tokenComment;
-
237  ok = readComment();
-
238  break;
-
239 
-
240  case '0':
-
241  case '1':
-
242  case '2':
-
243  case '3':
-
244  case '4':
-
245  case '5':
-
246  case '6':
-
247  case '7':
-
248  case '8':
-
249  case '9':
-
250  case '-':
-
251  token.type_ = readNumber();
-
252  break;
-
253 
-
254  case 't':
-
255  token.type_ = tokenTrue;
-
256  ok = match("rue", 3);
-
257  break;
-
258 
-
259  case 'f':
-
260  token.type_ = tokenFalse;
-
261  ok = match("alse", 4);
-
262  break;
-
263 
-
264  case 'n':
-
265  token.type_ = tokenNull;
-
266  ok = match("ull", 3);
-
267  break;
-
268 
-
269  case ',':
-
270  token.type_ = tokenArraySeparator;
-
271  break;
-
272 
-
273  case ':':
-
274  token.type_ = tokenMemberSeparator;
-
275  break;
-
276 
-
277  case 0:
-
278  token.type_ = tokenEndOfStream;
-
279  break;
-
280 
-
281  default:
-
282  ok = false;
-
283  break;
-
284  }
-
285 
-
286  if (!ok)
-
287  token.type_ = tokenError;
-
288 
-
289  token.end_ = current_;
-
290  return true;
-
291 }
-
292 
-
293 void
-
294 Reader::skipSpaces()
-
295 {
-
296  while (current_ != end_)
-
297  {
-
298  Char c = *current_;
-
299 
-
300  if (c == ' ' || c == '\t' || c == '\r' || c == '\n')
-
301  ++current_;
-
302  else
-
303  break;
-
304  }
-
305 }
-
306 
-
307 bool
-
308 Reader::match(Location pattern, int patternLength)
-
309 {
-
310  if (end_ - current_ < patternLength)
-
311  return false;
+
40  if (cp <= 0x7f)
+
41  {
+
42  result.resize(1);
+
43  result[0] = static_cast<char>(cp);
+
44  }
+
45  else if (cp <= 0x7FF)
+
46  {
+
47  result.resize(2);
+
48  result[1] = static_cast<char>(0x80 | (0x3f & cp));
+
49  result[0] = static_cast<char>(0xC0 | (0x1f & (cp >> 6)));
+
50  }
+
51  else if (cp <= 0xFFFF)
+
52  {
+
53  result.resize(3);
+
54  result[2] = static_cast<char>(0x80 | (0x3f & cp));
+
55  result[1] = 0x80 | static_cast<char>((0x3f & (cp >> 6)));
+
56  result[0] = 0xE0 | static_cast<char>((0xf & (cp >> 12)));
+
57  }
+
58  else if (cp <= 0x10FFFF)
+
59  {
+
60  result.resize(4);
+
61  result[3] = static_cast<char>(0x80 | (0x3f & cp));
+
62  result[2] = static_cast<char>(0x80 | (0x3f & (cp >> 6)));
+
63  result[1] = static_cast<char>(0x80 | (0x3f & (cp >> 12)));
+
64  result[0] = static_cast<char>(0xF0 | (0x7 & (cp >> 18)));
+
65  }
+
66 
+
67  return result;
+
68 }
+
69 
+
70 // Class Reader
+
71 // //////////////////////////////////////////////////////////////////
+
72 
+
73 bool
+
74 Reader::parse(std::string const& document, Value& root)
+
75 {
+
76  document_ = document;
+
77  const char* begin = document_.c_str();
+
78  const char* end = begin + document_.length();
+
79  return parse(begin, end, root);
+
80 }
+
81 
+
82 bool
+
83 Reader::parse(std::istream& sin, Value& root)
+
84 {
+
85  // std::istream_iterator<char> begin(sin);
+
86  // std::istream_iterator<char> end;
+
87  // Those would allow streamed input from a file, if parse() were a
+
88  // template function.
+
89 
+
90  // Since std::string is reference-counted, this at least does not
+
91  // create an extra copy.
+
92  std::string doc;
+
93  std::getline(sin, doc, (char)EOF);
+
94  return parse(doc, root);
+
95 }
+
96 
+
97 bool
+
98 Reader::parse(const char* beginDoc, const char* endDoc, Value& root)
+
99 {
+
100  begin_ = beginDoc;
+
101  end_ = endDoc;
+
102  current_ = begin_;
+
103  lastValueEnd_ = 0;
+
104  lastValue_ = 0;
+
105  errors_.clear();
+
106 
+
107  while (!nodes_.empty())
+
108  nodes_.pop();
+
109 
+
110  nodes_.push(&root);
+
111  bool successful = readValue(0);
+
112  Token token;
+
113  skipCommentTokens(token);
+
114 
+
115  if (!root.isNull() && !root.isArray() && !root.isObject())
+
116  {
+
117  // Set error location to start of doc, ideally should be first token
+
118  // found in doc
+
119  token.type_ = tokenError;
+
120  token.start_ = beginDoc;
+
121  token.end_ = endDoc;
+
122  addError(
+
123  "A valid JSON document must be either an array or an object value.",
+
124  token);
+
125  return false;
+
126  }
+
127 
+
128  return successful;
+
129 }
+
130 
+
131 bool
+
132 Reader::readValue(unsigned depth)
+
133 {
+
134  Token token;
+
135  skipCommentTokens(token);
+
136  if (depth > nest_limit)
+
137  return addError("Syntax error: maximum nesting depth exceeded", token);
+
138  bool successful = true;
+
139 
+
140  switch (token.type_)
+
141  {
+
142  case tokenObjectBegin:
+
143  successful = readObject(token, depth);
+
144  break;
+
145 
+
146  case tokenArrayBegin:
+
147  successful = readArray(token, depth);
+
148  break;
+
149 
+
150  case tokenInteger:
+
151  successful = decodeNumber(token);
+
152  break;
+
153 
+
154  case tokenDouble:
+
155  successful = decodeDouble(token);
+
156  break;
+
157 
+
158  case tokenString:
+
159  successful = decodeString(token);
+
160  break;
+
161 
+
162  case tokenTrue:
+
163  currentValue() = true;
+
164  break;
+
165 
+
166  case tokenFalse:
+
167  currentValue() = false;
+
168  break;
+
169 
+
170  case tokenNull:
+
171  currentValue() = Value();
+
172  break;
+
173 
+
174  default:
+
175  return addError(
+
176  "Syntax error: value, object or array expected.", token);
+
177  }
+
178 
+
179  return successful;
+
180 }
+
181 
+
182 void
+
183 Reader::skipCommentTokens(Token& token)
+
184 {
+
185  do
+
186  {
+
187  readToken(token);
+
188  } while (token.type_ == tokenComment);
+
189 }
+
190 
+
191 bool
+
192 Reader::expectToken(TokenType type, Token& token, const char* message)
+
193 {
+
194  readToken(token);
+
195 
+
196  if (token.type_ != type)
+
197  return addError(message, token);
+
198 
+
199  return true;
+
200 }
+
201 
+
202 bool
+
203 Reader::readToken(Token& token)
+
204 {
+
205  skipSpaces();
+
206  token.start_ = current_;
+
207  Char c = getNextChar();
+
208  bool ok = true;
+
209 
+
210  switch (c)
+
211  {
+
212  case '{':
+
213  token.type_ = tokenObjectBegin;
+
214  break;
+
215 
+
216  case '}':
+
217  token.type_ = tokenObjectEnd;
+
218  break;
+
219 
+
220  case '[':
+
221  token.type_ = tokenArrayBegin;
+
222  break;
+
223 
+
224  case ']':
+
225  token.type_ = tokenArrayEnd;
+
226  break;
+
227 
+
228  case '"':
+
229  token.type_ = tokenString;
+
230  ok = readString();
+
231  break;
+
232 
+
233  case '/':
+
234  token.type_ = tokenComment;
+
235  ok = readComment();
+
236  break;
+
237 
+
238  case '0':
+
239  case '1':
+
240  case '2':
+
241  case '3':
+
242  case '4':
+
243  case '5':
+
244  case '6':
+
245  case '7':
+
246  case '8':
+
247  case '9':
+
248  case '-':
+
249  token.type_ = readNumber();
+
250  break;
+
251 
+
252  case 't':
+
253  token.type_ = tokenTrue;
+
254  ok = match("rue", 3);
+
255  break;
+
256 
+
257  case 'f':
+
258  token.type_ = tokenFalse;
+
259  ok = match("alse", 4);
+
260  break;
+
261 
+
262  case 'n':
+
263  token.type_ = tokenNull;
+
264  ok = match("ull", 3);
+
265  break;
+
266 
+
267  case ',':
+
268  token.type_ = tokenArraySeparator;
+
269  break;
+
270 
+
271  case ':':
+
272  token.type_ = tokenMemberSeparator;
+
273  break;
+
274 
+
275  case 0:
+
276  token.type_ = tokenEndOfStream;
+
277  break;
+
278 
+
279  default:
+
280  ok = false;
+
281  break;
+
282  }
+
283 
+
284  if (!ok)
+
285  token.type_ = tokenError;
+
286 
+
287  token.end_ = current_;
+
288  return true;
+
289 }
+
290 
+
291 void
+
292 Reader::skipSpaces()
+
293 {
+
294  while (current_ != end_)
+
295  {
+
296  Char c = *current_;
+
297 
+
298  if (c == ' ' || c == '\t' || c == '\r' || c == '\n')
+
299  ++current_;
+
300  else
+
301  break;
+
302  }
+
303 }
+
304 
+
305 bool
+
306 Reader::match(Location pattern, int patternLength)
+
307 {
+
308  if (end_ - current_ < patternLength)
+
309  return false;
+
310 
+
311  int index = patternLength;
312 
-
313  int index = patternLength;
-
314 
-
315  while (index--)
-
316  if (current_[index] != pattern[index])
-
317  return false;
-
318 
-
319  current_ += patternLength;
-
320  return true;
-
321 }
-
322 
-
323 bool
-
324 Reader::readComment()
-
325 {
-
326  Char c = getNextChar();
-
327 
-
328  if (c == '*')
-
329  return readCStyleComment();
-
330 
-
331  if (c == '/')
-
332  return readCppStyleComment();
-
333 
-
334  return false;
-
335 }
-
336 
-
337 bool
-
338 Reader::readCStyleComment()
-
339 {
-
340  while (current_ != end_)
-
341  {
-
342  Char c = getNextChar();
-
343 
-
344  if (c == '*' && *current_ == '/')
-
345  break;
-
346  }
-
347 
-
348  return getNextChar() == '/';
-
349 }
-
350 
-
351 bool
-
352 Reader::readCppStyleComment()
-
353 {
-
354  while (current_ != end_)
-
355  {
-
356  Char c = getNextChar();
-
357 
-
358  if (c == '\r' || c == '\n')
-
359  break;
-
360  }
-
361 
-
362  return true;
-
363 }
-
364 
-
365 Reader::TokenType
-
366 Reader::readNumber()
-
367 {
-
368  static char const extended_tokens[] = {'.', 'e', 'E', '+', '-'};
+
313  while (index--)
+
314  if (current_[index] != pattern[index])
+
315  return false;
+
316 
+
317  current_ += patternLength;
+
318  return true;
+
319 }
+
320 
+
321 bool
+
322 Reader::readComment()
+
323 {
+
324  Char c = getNextChar();
+
325 
+
326  if (c == '*')
+
327  return readCStyleComment();
+
328 
+
329  if (c == '/')
+
330  return readCppStyleComment();
+
331 
+
332  return false;
+
333 }
+
334 
+
335 bool
+
336 Reader::readCStyleComment()
+
337 {
+
338  while (current_ != end_)
+
339  {
+
340  Char c = getNextChar();
+
341 
+
342  if (c == '*' && *current_ == '/')
+
343  break;
+
344  }
+
345 
+
346  return getNextChar() == '/';
+
347 }
+
348 
+
349 bool
+
350 Reader::readCppStyleComment()
+
351 {
+
352  while (current_ != end_)
+
353  {
+
354  Char c = getNextChar();
+
355 
+
356  if (c == '\r' || c == '\n')
+
357  break;
+
358  }
+
359 
+
360  return true;
+
361 }
+
362 
+
363 Reader::TokenType
+
364 Reader::readNumber()
+
365 {
+
366  static char const extended_tokens[] = {'.', 'e', 'E', '+', '-'};
+
367 
+
368  TokenType type = tokenInteger;
369 
-
370  TokenType type = tokenInteger;
-
371 
-
372  if (current_ != end_)
-
373  {
-
374  if (*current_ == '-')
-
375  ++current_;
-
376 
-
377  while (current_ != end_)
-
378  {
-
379  if (!std::isdigit(static_cast<unsigned char>(*current_)))
-
380  {
-
381  auto ret = std::find(
-
382  std::begin(extended_tokens),
-
383  std::end(extended_tokens),
-
384  *current_);
-
385 
-
386  if (ret == std::end(extended_tokens))
-
387  break;
-
388 
-
389  type = tokenDouble;
-
390  }
-
391 
-
392  ++current_;
-
393  }
-
394  }
-
395 
-
396  return type;
-
397 }
-
398 
-
399 bool
-
400 Reader::readString()
-
401 {
-
402  Char c = 0;
-
403 
-
404  while (current_ != end_)
-
405  {
-
406  c = getNextChar();
-
407 
-
408  if (c == '\\')
-
409  getNextChar();
-
410  else if (c == '"')
-
411  break;
-
412  }
-
413 
-
414  return c == '"';
-
415 }
-
416 
-
417 bool
-
418 Reader::readObject(Token& tokenStart, unsigned depth)
-
419 {
-
420  Token tokenName;
-
421  std::string name;
-
422  currentValue() = Value(objectValue);
-
423 
-
424  while (readToken(tokenName))
-
425  {
-
426  bool initialTokenOk = true;
-
427 
-
428  while (tokenName.type_ == tokenComment && initialTokenOk)
-
429  initialTokenOk = readToken(tokenName);
-
430 
-
431  if (!initialTokenOk)
-
432  break;
-
433 
-
434  if (tokenName.type_ == tokenObjectEnd && name.empty()) // empty object
-
435  return true;
-
436 
-
437  if (tokenName.type_ != tokenString)
-
438  break;
+
370  if (current_ != end_)
+
371  {
+
372  if (*current_ == '-')
+
373  ++current_;
+
374 
+
375  while (current_ != end_)
+
376  {
+
377  if (!std::isdigit(static_cast<unsigned char>(*current_)))
+
378  {
+
379  auto ret = std::find(
+
380  std::begin(extended_tokens),
+
381  std::end(extended_tokens),
+
382  *current_);
+
383 
+
384  if (ret == std::end(extended_tokens))
+
385  break;
+
386 
+
387  type = tokenDouble;
+
388  }
+
389 
+
390  ++current_;
+
391  }
+
392  }
+
393 
+
394  return type;
+
395 }
+
396 
+
397 bool
+
398 Reader::readString()
+
399 {
+
400  Char c = 0;
+
401 
+
402  while (current_ != end_)
+
403  {
+
404  c = getNextChar();
+
405 
+
406  if (c == '\\')
+
407  getNextChar();
+
408  else if (c == '"')
+
409  break;
+
410  }
+
411 
+
412  return c == '"';
+
413 }
+
414 
+
415 bool
+
416 Reader::readObject(Token& tokenStart, unsigned depth)
+
417 {
+
418  Token tokenName;
+
419  std::string name;
+
420  currentValue() = Value(objectValue);
+
421 
+
422  while (readToken(tokenName))
+
423  {
+
424  bool initialTokenOk = true;
+
425 
+
426  while (tokenName.type_ == tokenComment && initialTokenOk)
+
427  initialTokenOk = readToken(tokenName);
+
428 
+
429  if (!initialTokenOk)
+
430  break;
+
431 
+
432  if (tokenName.type_ == tokenObjectEnd && name.empty()) // empty object
+
433  return true;
+
434 
+
435  if (tokenName.type_ != tokenString)
+
436  break;
+
437 
+
438  name = "";
439 
-
440  name = "";
-
441 
-
442  if (!decodeString(tokenName, name))
-
443  return recoverFromError(tokenObjectEnd);
+
440  if (!decodeString(tokenName, name))
+
441  return recoverFromError(tokenObjectEnd);
+
442 
+
443  Token colon;
444 
-
445  Token colon;
-
446 
-
447  if (!readToken(colon) || colon.type_ != tokenMemberSeparator)
-
448  {
-
449  return addErrorAndRecover(
-
450  "Missing ':' after object member name", colon, tokenObjectEnd);
-
451  }
-
452 
-
453  // Reject duplicate names
-
454  if (currentValue().isMember(name))
-
455  return addError("Key '" + name + "' appears twice.", tokenName);
-
456 
-
457  Value& value = currentValue()[name];
-
458  nodes_.push(&value);
-
459  bool ok = readValue(depth + 1);
-
460  nodes_.pop();
-
461 
-
462  if (!ok) // error already set
-
463  return recoverFromError(tokenObjectEnd);
+
445  if (!readToken(colon) || colon.type_ != tokenMemberSeparator)
+
446  {
+
447  return addErrorAndRecover(
+
448  "Missing ':' after object member name", colon, tokenObjectEnd);
+
449  }
+
450 
+
451  // Reject duplicate names
+
452  if (currentValue().isMember(name))
+
453  return addError("Key '" + name + "' appears twice.", tokenName);
+
454 
+
455  Value& value = currentValue()[name];
+
456  nodes_.push(&value);
+
457  bool ok = readValue(depth + 1);
+
458  nodes_.pop();
+
459 
+
460  if (!ok) // error already set
+
461  return recoverFromError(tokenObjectEnd);
+
462 
+
463  Token comma;
464 
-
465  Token comma;
-
466 
-
467  if (!readToken(comma) ||
-
468  (comma.type_ != tokenObjectEnd &&
-
469  comma.type_ != tokenArraySeparator && comma.type_ != tokenComment))
-
470  {
-
471  return addErrorAndRecover(
-
472  "Missing ',' or '}' in object declaration",
-
473  comma,
-
474  tokenObjectEnd);
-
475  }
+
465  if (!readToken(comma) ||
+
466  (comma.type_ != tokenObjectEnd &&
+
467  comma.type_ != tokenArraySeparator && comma.type_ != tokenComment))
+
468  {
+
469  return addErrorAndRecover(
+
470  "Missing ',' or '}' in object declaration",
+
471  comma,
+
472  tokenObjectEnd);
+
473  }
+
474 
+
475  bool finalizeTokenOk = true;
476 
-
477  bool finalizeTokenOk = true;
-
478 
-
479  while (comma.type_ == tokenComment && finalizeTokenOk)
-
480  finalizeTokenOk = readToken(comma);
-
481 
-
482  if (comma.type_ == tokenObjectEnd)
-
483  return true;
-
484  }
-
485 
-
486  return addErrorAndRecover(
-
487  "Missing '}' or object member name", tokenName, tokenObjectEnd);
-
488 }
-
489 
-
490 bool
-
491 Reader::readArray(Token& tokenStart, unsigned depth)
-
492 {
-
493  currentValue() = Value(arrayValue);
-
494  skipSpaces();
-
495 
-
496  if (*current_ == ']') // empty array
-
497  {
-
498  Token endArray;
-
499  readToken(endArray);
-
500  return true;
-
501  }
+
477  while (comma.type_ == tokenComment && finalizeTokenOk)
+
478  finalizeTokenOk = readToken(comma);
+
479 
+
480  if (comma.type_ == tokenObjectEnd)
+
481  return true;
+
482  }
+
483 
+
484  return addErrorAndRecover(
+
485  "Missing '}' or object member name", tokenName, tokenObjectEnd);
+
486 }
+
487 
+
488 bool
+
489 Reader::readArray(Token& tokenStart, unsigned depth)
+
490 {
+
491  currentValue() = Value(arrayValue);
+
492  skipSpaces();
+
493 
+
494  if (*current_ == ']') // empty array
+
495  {
+
496  Token endArray;
+
497  readToken(endArray);
+
498  return true;
+
499  }
+
500 
+
501  int index = 0;
502 
-
503  int index = 0;
-
504 
-
505  while (true)
-
506  {
-
507  Value& value = currentValue()[index++];
-
508  nodes_.push(&value);
-
509  bool ok = readValue(depth + 1);
-
510  nodes_.pop();
-
511 
-
512  if (!ok) // error already set
-
513  return recoverFromError(tokenArrayEnd);
-
514 
-
515  Token token;
-
516  // Accept Comment after last item in the array.
-
517  ok = readToken(token);
-
518 
-
519  while (token.type_ == tokenComment && ok)
-
520  {
-
521  ok = readToken(token);
-
522  }
-
523 
-
524  bool badTokenType =
-
525  (token.type_ != tokenArraySeparator &&
-
526  token.type_ != tokenArrayEnd);
-
527 
-
528  if (!ok || badTokenType)
-
529  {
-
530  return addErrorAndRecover(
-
531  "Missing ',' or ']' in array declaration",
-
532  token,
-
533  tokenArrayEnd);
-
534  }
-
535 
-
536  if (token.type_ == tokenArrayEnd)
-
537  break;
-
538  }
-
539 
-
540  return true;
-
541 }
-
542 
-
543 bool
-
544 Reader::decodeNumber(Token& token)
-
545 {
-
546  Location current = token.start_;
-
547  bool isNegative = *current == '-';
-
548 
-
549  if (isNegative)
-
550  ++current;
-
551 
-
552  if (current == token.end_)
-
553  {
-
554  return addError(
-
555  "'" + std::string(token.start_, token.end_) +
-
556  "' is not a valid number.",
-
557  token);
-
558  }
-
559 
-
560  // The existing Json integers are 32-bit so using a 64-bit value here avoids
-
561  // overflows in the conversion code below.
-
562  std::int64_t value = 0;
-
563 
-
564  static_assert(
-
565  sizeof(value) > sizeof(Value::maxUInt),
-
566  "The JSON integer overflow logic will need to be reworked.");
-
567 
-
568  while (current < token.end_ && (value <= Value::maxUInt))
-
569  {
-
570  Char c = *current++;
-
571 
-
572  if (c < '0' || c > '9')
-
573  {
-
574  return addError(
-
575  "'" + std::string(token.start_, token.end_) +
-
576  "' is not a number.",
-
577  token);
-
578  }
-
579 
-
580  value = (value * 10) + (c - '0');
-
581  }
-
582 
-
583  // More tokens left -> input is larger than largest possible return value
-
584  if (current != token.end_)
-
585  {
-
586  return addError(
-
587  "'" + std::string(token.start_, token.end_) +
-
588  "' exceeds the allowable range.",
-
589  token);
-
590  }
-
591 
-
592  if (isNegative)
-
593  {
-
594  value = -value;
-
595 
-
596  if (value < Value::minInt || value > Value::maxInt)
-
597  {
-
598  return addError(
-
599  "'" + std::string(token.start_, token.end_) +
-
600  "' exceeds the allowable range.",
-
601  token);
-
602  }
-
603 
-
604  currentValue() = static_cast<Value::Int>(value);
-
605  }
-
606  else
-
607  {
-
608  if (value > Value::maxUInt)
-
609  {
-
610  return addError(
-
611  "'" + std::string(token.start_, token.end_) +
-
612  "' exceeds the allowable range.",
-
613  token);
-
614  }
-
615 
-
616  // If it's representable as a signed integer, construct it as one.
-
617  if (value <= Value::maxInt)
-
618  currentValue() = static_cast<Value::Int>(value);
-
619  else
-
620  currentValue() = static_cast<Value::UInt>(value);
-
621  }
-
622 
-
623  return true;
-
624 }
-
625 
-
626 bool
-
627 Reader::decodeDouble(Token& token)
-
628 {
-
629  double value = 0;
-
630  const int bufferSize = 32;
-
631  int count;
-
632  int length = int(token.end_ - token.start_);
-
633  // Sanity check to avoid buffer overflow exploits.
-
634  if (length < 0)
-
635  {
-
636  return addError("Unable to parse token length", token);
-
637  }
-
638  // Avoid using a string constant for the format control string given to
-
639  // sscanf, as this can cause hard to debug crashes on OS X. See here for
-
640  // more info:
-
641  //
-
642  // http://developer.apple.com/library/mac/#DOCUMENTATION/DeveloperTools/gcc-4.0.1/gcc/Incompatibilities.html
-
643  char format[] = "%lf";
-
644  if (length <= bufferSize)
-
645  {
-
646  Char buffer[bufferSize + 1];
-
647  memcpy(buffer, token.start_, length);
-
648  buffer[length] = 0;
-
649  count = sscanf(buffer, format, &value);
-
650  }
-
651  else
-
652  {
-
653  std::string buffer(token.start_, token.end_);
-
654  count = sscanf(buffer.c_str(), format, &value);
-
655  }
-
656  if (count != 1)
-
657  return addError(
-
658  "'" + std::string(token.start_, token.end_) + "' is not a number.",
-
659  token);
-
660  currentValue() = value;
-
661  return true;
-
662 }
-
663 
-
664 bool
-
665 Reader::decodeString(Token& token)
-
666 {
-
667  std::string decoded;
-
668 
-
669  if (!decodeString(token, decoded))
-
670  return false;
-
671 
-
672  currentValue() = decoded;
-
673  return true;
-
674 }
-
675 
-
676 bool
-
677 Reader::decodeString(Token& token, std::string& decoded)
-
678 {
-
679  decoded.reserve(token.end_ - token.start_ - 2);
-
680  Location current = token.start_ + 1; // skip '"'
-
681  Location end = token.end_ - 1; // do not include '"'
-
682 
-
683  while (current != end)
-
684  {
-
685  Char c = *current++;
-
686 
-
687  if (c == '"')
-
688  break;
-
689  else if (c == '\\')
-
690  {
-
691  if (current == end)
-
692  return addError(
-
693  "Empty escape sequence in string", token, current);
+
503  while (true)
+
504  {
+
505  Value& value = currentValue()[index++];
+
506  nodes_.push(&value);
+
507  bool ok = readValue(depth + 1);
+
508  nodes_.pop();
+
509 
+
510  if (!ok) // error already set
+
511  return recoverFromError(tokenArrayEnd);
+
512 
+
513  Token token;
+
514  // Accept Comment after last item in the array.
+
515  ok = readToken(token);
+
516 
+
517  while (token.type_ == tokenComment && ok)
+
518  {
+
519  ok = readToken(token);
+
520  }
+
521 
+
522  bool badTokenType =
+
523  (token.type_ != tokenArraySeparator &&
+
524  token.type_ != tokenArrayEnd);
+
525 
+
526  if (!ok || badTokenType)
+
527  {
+
528  return addErrorAndRecover(
+
529  "Missing ',' or ']' in array declaration",
+
530  token,
+
531  tokenArrayEnd);
+
532  }
+
533 
+
534  if (token.type_ == tokenArrayEnd)
+
535  break;
+
536  }
+
537 
+
538  return true;
+
539 }
+
540 
+
541 bool
+
542 Reader::decodeNumber(Token& token)
+
543 {
+
544  Location current = token.start_;
+
545  bool isNegative = *current == '-';
+
546 
+
547  if (isNegative)
+
548  ++current;
+
549 
+
550  if (current == token.end_)
+
551  {
+
552  return addError(
+
553  "'" + std::string(token.start_, token.end_) +
+
554  "' is not a valid number.",
+
555  token);
+
556  }
+
557 
+
558  // The existing Json integers are 32-bit so using a 64-bit value here avoids
+
559  // overflows in the conversion code below.
+
560  std::int64_t value = 0;
+
561 
+
562  static_assert(
+
563  sizeof(value) > sizeof(Value::maxUInt),
+
564  "The JSON integer overflow logic will need to be reworked.");
+
565 
+
566  while (current < token.end_ && (value <= Value::maxUInt))
+
567  {
+
568  Char c = *current++;
+
569 
+
570  if (c < '0' || c > '9')
+
571  {
+
572  return addError(
+
573  "'" + std::string(token.start_, token.end_) +
+
574  "' is not a number.",
+
575  token);
+
576  }
+
577 
+
578  value = (value * 10) + (c - '0');
+
579  }
+
580 
+
581  // More tokens left -> input is larger than largest possible return value
+
582  if (current != token.end_)
+
583  {
+
584  return addError(
+
585  "'" + std::string(token.start_, token.end_) +
+
586  "' exceeds the allowable range.",
+
587  token);
+
588  }
+
589 
+
590  if (isNegative)
+
591  {
+
592  value = -value;
+
593 
+
594  if (value < Value::minInt || value > Value::maxInt)
+
595  {
+
596  return addError(
+
597  "'" + std::string(token.start_, token.end_) +
+
598  "' exceeds the allowable range.",
+
599  token);
+
600  }
+
601 
+
602  currentValue() = static_cast<Value::Int>(value);
+
603  }
+
604  else
+
605  {
+
606  if (value > Value::maxUInt)
+
607  {
+
608  return addError(
+
609  "'" + std::string(token.start_, token.end_) +
+
610  "' exceeds the allowable range.",
+
611  token);
+
612  }
+
613 
+
614  // If it's representable as a signed integer, construct it as one.
+
615  if (value <= Value::maxInt)
+
616  currentValue() = static_cast<Value::Int>(value);
+
617  else
+
618  currentValue() = static_cast<Value::UInt>(value);
+
619  }
+
620 
+
621  return true;
+
622 }
+
623 
+
624 bool
+
625 Reader::decodeDouble(Token& token)
+
626 {
+
627  double value = 0;
+
628  const int bufferSize = 32;
+
629  int count;
+
630  int length = int(token.end_ - token.start_);
+
631  // Sanity check to avoid buffer overflow exploits.
+
632  if (length < 0)
+
633  {
+
634  return addError("Unable to parse token length", token);
+
635  }
+
636  // Avoid using a string constant for the format control string given to
+
637  // sscanf, as this can cause hard to debug crashes on OS X. See here for
+
638  // more info:
+
639  //
+
640  // http://developer.apple.com/library/mac/#DOCUMENTATION/DeveloperTools/gcc-4.0.1/gcc/Incompatibilities.html
+
641  char format[] = "%lf";
+
642  if (length <= bufferSize)
+
643  {
+
644  Char buffer[bufferSize + 1];
+
645  memcpy(buffer, token.start_, length);
+
646  buffer[length] = 0;
+
647  count = sscanf(buffer, format, &value);
+
648  }
+
649  else
+
650  {
+
651  std::string buffer(token.start_, token.end_);
+
652  count = sscanf(buffer.c_str(), format, &value);
+
653  }
+
654  if (count != 1)
+
655  return addError(
+
656  "'" + std::string(token.start_, token.end_) + "' is not a number.",
+
657  token);
+
658  currentValue() = value;
+
659  return true;
+
660 }
+
661 
+
662 bool
+
663 Reader::decodeString(Token& token)
+
664 {
+
665  std::string decoded;
+
666 
+
667  if (!decodeString(token, decoded))
+
668  return false;
+
669 
+
670  currentValue() = decoded;
+
671  return true;
+
672 }
+
673 
+
674 bool
+
675 Reader::decodeString(Token& token, std::string& decoded)
+
676 {
+
677  decoded.reserve(token.end_ - token.start_ - 2);
+
678  Location current = token.start_ + 1; // skip '"'
+
679  Location end = token.end_ - 1; // do not include '"'
+
680 
+
681  while (current != end)
+
682  {
+
683  Char c = *current++;
+
684 
+
685  if (c == '"')
+
686  break;
+
687  else if (c == '\\')
+
688  {
+
689  if (current == end)
+
690  return addError(
+
691  "Empty escape sequence in string", token, current);
+
692 
+
693  Char escape = *current++;
694 
-
695  Char escape = *current++;
-
696 
-
697  switch (escape)
-
698  {
-
699  case '"':
-
700  decoded += '"';
-
701  break;
-
702 
-
703  case '/':
-
704  decoded += '/';
-
705  break;
-
706 
-
707  case '\\':
-
708  decoded += '\\';
-
709  break;
-
710 
-
711  case 'b':
-
712  decoded += '\b';
-
713  break;
-
714 
-
715  case 'f':
-
716  decoded += '\f';
-
717  break;
-
718 
-
719  case 'n':
-
720  decoded += '\n';
-
721  break;
-
722 
-
723  case 'r':
-
724  decoded += '\r';
-
725  break;
-
726 
-
727  case 't':
-
728  decoded += '\t';
-
729  break;
-
730 
-
731  case 'u': {
-
732  unsigned int unicode;
-
733 
-
734  if (!decodeUnicodeCodePoint(token, current, end, unicode))
-
735  return false;
-
736 
-
737  decoded += codePointToUTF8(unicode);
-
738  }
-
739  break;
-
740 
-
741  default:
-
742  return addError(
-
743  "Bad escape sequence in string", token, current);
-
744  }
-
745  }
-
746  else
-
747  {
-
748  decoded += c;
-
749  }
-
750  }
-
751 
-
752  return true;
-
753 }
-
754 
-
755 bool
-
756 Reader::decodeUnicodeCodePoint(
-
757  Token& token,
-
758  Location& current,
-
759  Location end,
-
760  unsigned int& unicode)
-
761 {
-
762  if (!decodeUnicodeEscapeSequence(token, current, end, unicode))
-
763  return false;
-
764 
-
765  if (unicode >= 0xD800 && unicode <= 0xDBFF)
-
766  {
-
767  // surrogate pairs
-
768  if (end - current < 6)
-
769  return addError(
-
770  "additional six characters expected to parse unicode surrogate "
-
771  "pair.",
-
772  token,
-
773  current);
+
695  switch (escape)
+
696  {
+
697  case '"':
+
698  decoded += '"';
+
699  break;
+
700 
+
701  case '/':
+
702  decoded += '/';
+
703  break;
+
704 
+
705  case '\\':
+
706  decoded += '\\';
+
707  break;
+
708 
+
709  case 'b':
+
710  decoded += '\b';
+
711  break;
+
712 
+
713  case 'f':
+
714  decoded += '\f';
+
715  break;
+
716 
+
717  case 'n':
+
718  decoded += '\n';
+
719  break;
+
720 
+
721  case 'r':
+
722  decoded += '\r';
+
723  break;
+
724 
+
725  case 't':
+
726  decoded += '\t';
+
727  break;
+
728 
+
729  case 'u': {
+
730  unsigned int unicode;
+
731 
+
732  if (!decodeUnicodeCodePoint(token, current, end, unicode))
+
733  return false;
+
734 
+
735  decoded += codePointToUTF8(unicode);
+
736  }
+
737  break;
+
738 
+
739  default:
+
740  return addError(
+
741  "Bad escape sequence in string", token, current);
+
742  }
+
743  }
+
744  else
+
745  {
+
746  decoded += c;
+
747  }
+
748  }
+
749 
+
750  return true;
+
751 }
+
752 
+
753 bool
+
754 Reader::decodeUnicodeCodePoint(
+
755  Token& token,
+
756  Location& current,
+
757  Location end,
+
758  unsigned int& unicode)
+
759 {
+
760  if (!decodeUnicodeEscapeSequence(token, current, end, unicode))
+
761  return false;
+
762 
+
763  if (unicode >= 0xD800 && unicode <= 0xDBFF)
+
764  {
+
765  // surrogate pairs
+
766  if (end - current < 6)
+
767  return addError(
+
768  "additional six characters expected to parse unicode surrogate "
+
769  "pair.",
+
770  token,
+
771  current);
+
772 
+
773  unsigned int surrogatePair;
774 
-
775  unsigned int surrogatePair;
-
776 
-
777  if (*(current++) == '\\' && *(current++) == 'u')
-
778  {
-
779  if (decodeUnicodeEscapeSequence(token, current, end, surrogatePair))
-
780  {
-
781  unicode = 0x10000 + ((unicode & 0x3FF) << 10) +
-
782  (surrogatePair & 0x3FF);
-
783  }
-
784  else
-
785  return false;
-
786  }
-
787  else
-
788  return addError(
-
789  "expecting another \\u token to begin the second half of a "
-
790  "unicode surrogate pair",
-
791  token,
-
792  current);
-
793  }
-
794 
-
795  return true;
-
796 }
-
797 
-
798 bool
-
799 Reader::decodeUnicodeEscapeSequence(
-
800  Token& token,
-
801  Location& current,
-
802  Location end,
-
803  unsigned int& unicode)
-
804 {
-
805  if (end - current < 4)
-
806  return addError(
-
807  "Bad unicode escape sequence in string: four digits expected.",
-
808  token,
-
809  current);
+
775  if (*(current++) == '\\' && *(current++) == 'u')
+
776  {
+
777  if (decodeUnicodeEscapeSequence(token, current, end, surrogatePair))
+
778  {
+
779  unicode = 0x10000 + ((unicode & 0x3FF) << 10) +
+
780  (surrogatePair & 0x3FF);
+
781  }
+
782  else
+
783  return false;
+
784  }
+
785  else
+
786  return addError(
+
787  "expecting another \\u token to begin the second half of a "
+
788  "unicode surrogate pair",
+
789  token,
+
790  current);
+
791  }
+
792 
+
793  return true;
+
794 }
+
795 
+
796 bool
+
797 Reader::decodeUnicodeEscapeSequence(
+
798  Token& token,
+
799  Location& current,
+
800  Location end,
+
801  unsigned int& unicode)
+
802 {
+
803  if (end - current < 4)
+
804  return addError(
+
805  "Bad unicode escape sequence in string: four digits expected.",
+
806  token,
+
807  current);
+
808 
+
809  unicode = 0;
810 
-
811  unicode = 0;
-
812 
-
813  for (int index = 0; index < 4; ++index)
-
814  {
-
815  Char c = *current++;
-
816  unicode *= 16;
-
817 
-
818  if (c >= '0' && c <= '9')
-
819  unicode += c - '0';
-
820  else if (c >= 'a' && c <= 'f')
-
821  unicode += c - 'a' + 10;
-
822  else if (c >= 'A' && c <= 'F')
-
823  unicode += c - 'A' + 10;
-
824  else
-
825  return addError(
-
826  "Bad unicode escape sequence in string: hexadecimal digit "
-
827  "expected.",
-
828  token,
-
829  current);
-
830  }
-
831 
-
832  return true;
-
833 }
-
834 
-
835 bool
-
836 Reader::addError(std::string const& message, Token& token, Location extra)
-
837 {
-
838  ErrorInfo info;
-
839  info.token_ = token;
-
840  info.message_ = message;
-
841  info.extra_ = extra;
-
842  errors_.push_back(info);
-
843  return false;
-
844 }
-
845 
-
846 bool
-
847 Reader::recoverFromError(TokenType skipUntilToken)
-
848 {
-
849  int errorCount = int(errors_.size());
-
850  Token skip;
-
851 
-
852  while (true)
-
853  {
-
854  if (!readToken(skip))
-
855  errors_.resize(errorCount); // discard errors caused by recovery
-
856 
-
857  if (skip.type_ == skipUntilToken || skip.type_ == tokenEndOfStream)
-
858  break;
-
859  }
-
860 
-
861  errors_.resize(errorCount);
-
862  return false;
-
863 }
-
864 
-
865 bool
-
866 Reader::addErrorAndRecover(
-
867  std::string const& message,
-
868  Token& token,
-
869  TokenType skipUntilToken)
-
870 {
-
871  addError(message, token);
-
872  return recoverFromError(skipUntilToken);
-
873 }
-
874 
-
875 Value&
-
876 Reader::currentValue()
-
877 {
-
878  return *(nodes_.top());
-
879 }
-
880 
-
881 Reader::Char
-
882 Reader::getNextChar()
-
883 {
-
884  if (current_ == end_)
-
885  return 0;
-
886 
-
887  return *current_++;
-
888 }
-
889 
-
890 void
-
891 Reader::getLocationLineAndColumn(Location location, int& line, int& column)
-
892  const
-
893 {
-
894  Location current = begin_;
-
895  Location lastLineStart = current;
-
896  line = 0;
-
897 
-
898  while (current < location && current != end_)
-
899  {
-
900  Char c = *current++;
-
901 
-
902  if (c == '\r')
-
903  {
-
904  if (*current == '\n')
-
905  ++current;
-
906 
-
907  lastLineStart = current;
-
908  ++line;
-
909  }
-
910  else if (c == '\n')
-
911  {
-
912  lastLineStart = current;
-
913  ++line;
-
914  }
-
915  }
-
916 
-
917  // column & line start at 1
-
918  column = int(location - lastLineStart) + 1;
-
919  ++line;
-
920 }
-
921 
-
922 std::string
-
923 Reader::getLocationLineAndColumn(Location location) const
-
924 {
-
925  int line, column;
-
926  getLocationLineAndColumn(location, line, column);
-
927  char buffer[18 + 16 + 16 + 1];
-
928  sprintf(buffer, "Line %d, Column %d", line, column);
-
929  return buffer;
-
930 }
-
931 
-
932 std::string
-
933 Reader::getFormatedErrorMessages() const
-
934 {
-
935  std::string formattedMessage;
-
936 
-
937  for (Errors::const_iterator itError = errors_.begin();
-
938  itError != errors_.end();
-
939  ++itError)
-
940  {
-
941  const ErrorInfo& error = *itError;
-
942  formattedMessage +=
-
943  "* " + getLocationLineAndColumn(error.token_.start_) + "\n";
-
944  formattedMessage += " " + error.message_ + "\n";
-
945 
-
946  if (error.extra_)
-
947  formattedMessage += "See " +
-
948  getLocationLineAndColumn(error.extra_) + " for detail.\n";
-
949  }
-
950 
-
951  return formattedMessage;
-
952 }
-
953 
-
954 std::istream&
-
955 operator>>(std::istream& sin, Value& root)
-
956 {
-
957  Json::Reader reader;
-
958  bool ok = reader.parse(sin, root);
-
959 
-
960  // JSON_ASSERT( ok );
-
961  if (!ok)
-
962  ripple::Throw<std::runtime_error>(reader.getFormatedErrorMessages());
-
963 
-
964  return sin;
-
965 }
-
966 
-
967 } // namespace Json
+
811  for (int index = 0; index < 4; ++index)
+
812  {
+
813  Char c = *current++;
+
814  unicode *= 16;
+
815 
+
816  if (c >= '0' && c <= '9')
+
817  unicode += c - '0';
+
818  else if (c >= 'a' && c <= 'f')
+
819  unicode += c - 'a' + 10;
+
820  else if (c >= 'A' && c <= 'F')
+
821  unicode += c - 'A' + 10;
+
822  else
+
823  return addError(
+
824  "Bad unicode escape sequence in string: hexadecimal digit "
+
825  "expected.",
+
826  token,
+
827  current);
+
828  }
+
829 
+
830  return true;
+
831 }
+
832 
+
833 bool
+
834 Reader::addError(std::string const& message, Token& token, Location extra)
+
835 {
+
836  ErrorInfo info;
+
837  info.token_ = token;
+
838  info.message_ = message;
+
839  info.extra_ = extra;
+
840  errors_.push_back(info);
+
841  return false;
+
842 }
+
843 
+
844 bool
+
845 Reader::recoverFromError(TokenType skipUntilToken)
+
846 {
+
847  int errorCount = int(errors_.size());
+
848  Token skip;
+
849 
+
850  while (true)
+
851  {
+
852  if (!readToken(skip))
+
853  errors_.resize(errorCount); // discard errors caused by recovery
+
854 
+
855  if (skip.type_ == skipUntilToken || skip.type_ == tokenEndOfStream)
+
856  break;
+
857  }
+
858 
+
859  errors_.resize(errorCount);
+
860  return false;
+
861 }
+
862 
+
863 bool
+
864 Reader::addErrorAndRecover(
+
865  std::string const& message,
+
866  Token& token,
+
867  TokenType skipUntilToken)
+
868 {
+
869  addError(message, token);
+
870  return recoverFromError(skipUntilToken);
+
871 }
+
872 
+
873 Value&
+
874 Reader::currentValue()
+
875 {
+
876  return *(nodes_.top());
+
877 }
+
878 
+
879 Reader::Char
+
880 Reader::getNextChar()
+
881 {
+
882  if (current_ == end_)
+
883  return 0;
+
884 
+
885  return *current_++;
+
886 }
+
887 
+
888 void
+
889 Reader::getLocationLineAndColumn(Location location, int& line, int& column)
+
890  const
+
891 {
+
892  Location current = begin_;
+
893  Location lastLineStart = current;
+
894  line = 0;
+
895 
+
896  while (current < location && current != end_)
+
897  {
+
898  Char c = *current++;
+
899 
+
900  if (c == '\r')
+
901  {
+
902  if (*current == '\n')
+
903  ++current;
+
904 
+
905  lastLineStart = current;
+
906  ++line;
+
907  }
+
908  else if (c == '\n')
+
909  {
+
910  lastLineStart = current;
+
911  ++line;
+
912  }
+
913  }
+
914 
+
915  // column & line start at 1
+
916  column = int(location - lastLineStart) + 1;
+
917  ++line;
+
918 }
+
919 
+
920 std::string
+
921 Reader::getLocationLineAndColumn(Location location) const
+
922 {
+
923  int line, column;
+
924  getLocationLineAndColumn(location, line, column);
+
925  constexpr std::size_t n = 18 + 16 + 16 + 1;
+
926  char buffer[n];
+
927  snprintf(buffer, n, "Line %d, Column %d", line, column);
+
928  return buffer;
+
929 }
+
930 
+
931 std::string
+
932 Reader::getFormatedErrorMessages() const
+
933 {
+
934  std::string formattedMessage;
+
935 
+
936  for (Errors::const_iterator itError = errors_.begin();
+
937  itError != errors_.end();
+
938  ++itError)
+
939  {
+
940  const ErrorInfo& error = *itError;
+
941  formattedMessage +=
+
942  "* " + getLocationLineAndColumn(error.token_.start_) + "\n";
+
943  formattedMessage += " " + error.message_ + "\n";
+
944 
+
945  if (error.extra_)
+
946  formattedMessage += "See " +
+
947  getLocationLineAndColumn(error.extra_) + " for detail.\n";
+
948  }
+
949 
+
950  return formattedMessage;
+
951 }
+
952 
+
953 std::istream&
+
954 operator>>(std::istream& sin, Value& root)
+
955 {
+
956  Json::Reader reader;
+
957  bool ok = reader.parse(sin, root);
+
958 
+
959  // JSON_ASSERT( ok );
+
960  if (!ok)
+
961  ripple::Throw<std::runtime_error>(reader.getFormatedErrorMessages());
+
962 
+
963  return sin;
+
964 }
+
965 
+
966 } // namespace Json
Json::Value::Int
Json::Int Int
Definition: json_value.h:154
std::string::resize
T resize(T... args)
-
Json::Reader::addError
bool addError(std::string const &message, Token &token, Location extra=0)
Definition: json_reader.cpp:836
+
Json::Reader::addError
bool addError(std::string const &message, Token &token, Location extra=0)
Definition: json_reader.cpp:834
std::string
STL class.
-
Json::Reader::skipCommentTokens
void skipCommentTokens(Token &token)
Definition: json_reader.cpp:185
+
Json::Reader::skipCommentTokens
void skipCommentTokens(Token &token)
Definition: json_reader.cpp:183
Json::Reader::current_
Location current_
Definition: json_reader.h:205
Json::arrayValue
@ arrayValue
array value (ordered list)
Definition: json_value.h:42
-
Json::Reader::decodeDouble
bool decodeDouble(Token &token)
Definition: json_reader.cpp:627
+
Json::Reader::decodeDouble
bool decodeDouble(Token &token)
Definition: json_reader.cpp:625
std::string::reserve
T reserve(T... args)
-
Json::Reader::decodeString
bool decodeString(Token &token)
Definition: json_reader.cpp:665
+
Json::Reader::decodeString
bool decodeString(Token &token)
Definition: json_reader.cpp:663
std::find
T find(T... args)
std::string::length
T length(T... args)
-
Json::Reader::readCStyleComment
bool readCStyleComment()
Definition: json_reader.cpp:338
+
Json::Reader::readCStyleComment
bool readCStyleComment()
Definition: json_reader.cpp:336
-
Json::Reader::readObject
bool readObject(Token &token, unsigned depth)
Definition: json_reader.cpp:418
+
Json::Reader::readObject
bool readObject(Token &token, unsigned depth)
Definition: json_reader.cpp:416
Json::Reader
Unserialize a JSON document into a Value.
Definition: json_reader.h:36
-
Json::Reader::expectToken
bool expectToken(TokenType type, Token &token, const char *message)
Definition: json_reader.cpp:194
+
Json::Reader::expectToken
bool expectToken(TokenType type, Token &token, const char *message)
Definition: json_reader.cpp:192
-
Json::Reader::readValue
bool readValue(unsigned depth)
Definition: json_reader.cpp:134
+
Json::Reader::readValue
bool readValue(unsigned depth)
Definition: json_reader.cpp:132
Json::Reader::tokenMemberSeparator
@ tokenMemberSeparator
Definition: json_reader.h:106
@@ -1074,28 +1073,28 @@ $(function() {
Json
JSON (JavaScript Object Notation).
Definition: json_reader.cpp:29
Json::Reader::document_
std::string document_
Definition: json_reader.h:202
-
Json::Reader::decodeNumber
bool decodeNumber(Token &token)
Definition: json_reader.cpp:544
+
Json::Reader::decodeNumber
bool decodeNumber(Token &token)
Definition: json_reader.cpp:542
Json::Reader::end_
Location end_
Definition: json_reader.h:204
Json::objectValue
@ objectValue
object value (collection of name/value pairs).
Definition: json_value.h:43
-
Json::Reader::match
bool match(Location pattern, int patternLength)
Definition: json_reader.cpp:308
+
Json::Reader::match
bool match(Location pattern, int patternLength)
Definition: json_reader.cpp:306
std::string::c_str
T c_str(T... args)
std::stack::pop
T pop(T... args)
std::stack::top
T top(T... args)
-
Json::Reader::decodeUnicodeCodePoint
bool decodeUnicodeCodePoint(Token &token, Location &current, Location end, unsigned int &unicode)
Definition: json_reader.cpp:756
-
Json::Reader::getLocationLineAndColumn
void getLocationLineAndColumn(Location location, int &line, int &column) const
Definition: json_reader.cpp:891
-
Json::Reader::decodeUnicodeEscapeSequence
bool decodeUnicodeEscapeSequence(Token &token, Location &current, Location end, unsigned int &unicode)
Definition: json_reader.cpp:799
+
Json::Reader::decodeUnicodeCodePoint
bool decodeUnicodeCodePoint(Token &token, Location &current, Location end, unsigned int &unicode)
Definition: json_reader.cpp:754
+
Json::Reader::getLocationLineAndColumn
void getLocationLineAndColumn(Location location, int &line, int &column) const
Definition: json_reader.cpp:889
+
Json::Reader::decodeUnicodeEscapeSequence
bool decodeUnicodeEscapeSequence(Token &token, Location &current, Location end, unsigned int &unicode)
Definition: json_reader.cpp:797
-
Json::Reader::currentValue
Value & currentValue()
Definition: json_reader.cpp:876
+
Json::Reader::currentValue
Value & currentValue()
Definition: json_reader.cpp:874
Json::Reader::begin_
Location begin_
Definition: json_reader.h:203
Json::Value::UInt
Json::UInt UInt
Definition: json_value.h:153
-
Json::Reader::skipSpaces
void skipSpaces()
Definition: json_reader.cpp:294
+
Json::Reader::skipSpaces
void skipSpaces()
Definition: json_reader.cpp:292
-
Json::Reader::readComment
bool readComment()
Definition: json_reader.cpp:324
+
Json::Reader::readComment
bool readComment()
Definition: json_reader.cpp:322
@@ -1104,32 +1103,33 @@ $(function() {
Json::Reader::errors_
Errors errors_
Definition: json_reader.h:201
Json::Value::maxUInt
static const UInt maxUInt
Definition: json_value.h:160
-
Json::codePointToUTF8
static std::string codePointToUTF8(unsigned int cp)
Definition: json_reader.cpp:36
-
Json::operator>>
std::istream & operator>>(std::istream &sin, Value &root)
Read from 'sin' into 'root'.
Definition: json_reader.cpp:955
+
Json::codePointToUTF8
static std::string codePointToUTF8(unsigned int cp)
Definition: json_reader.cpp:34
+
Json::operator>>
std::istream & operator>>(std::istream &sin, Value &root)
Read from 'sin' into 'root'.
Definition: json_reader.cpp:954
std::begin
T begin(T... args)
std::getline
T getline(T... args)
Json::Reader::nest_limit
static constexpr unsigned nest_limit
Definition: json_reader.h:90
-
Json::Reader::readToken
bool readToken(Token &token)
Definition: json_reader.cpp:205
-
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:76
-
Json::Reader::getFormatedErrorMessages
std::string getFormatedErrorMessages() const
Returns a user friendly string that list errors in the parsed document.
Definition: json_reader.cpp:933
+
Json::Reader::readToken
bool readToken(Token &token)
Definition: json_reader.cpp:203
+
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:74
+
Json::Reader::getFormatedErrorMessages
std::string getFormatedErrorMessages() const
Returns a user friendly string that list errors in the parsed document.
Definition: json_reader.cpp:932
Json::Reader::lastValue_
Value * lastValue_
Definition: json_reader.h:207
-
Json::Reader::recoverFromError
bool recoverFromError(TokenType skipUntilToken)
Definition: json_reader.cpp:847
+
Json::Reader::recoverFromError
bool recoverFromError(TokenType skipUntilToken)
Definition: json_reader.cpp:845
std::stack::empty
T empty(T... args)
std::stack::push
T push(T... args)
+
std::end
T end(T... args)
-
Json::Reader::readArray
bool readArray(Token &token, unsigned depth)
Definition: json_reader.cpp:491
-
Json::Reader::readNumber
Reader::TokenType readNumber()
Definition: json_reader.cpp:366
+
Json::Reader::readArray
bool readArray(Token &token, unsigned depth)
Definition: json_reader.cpp:489
+
Json::Reader::readNumber
Reader::TokenType readNumber()
Definition: json_reader.cpp:364
-
Json::Reader::readCppStyleComment
bool readCppStyleComment()
Definition: json_reader.cpp:352
+
Json::Reader::readCppStyleComment
bool readCppStyleComment()
Definition: json_reader.cpp:350
std::istream
STL class.
-
Json::Reader::getNextChar
Char getNextChar()
Definition: json_reader.cpp:882
+
Json::Reader::getNextChar
Char getNextChar()
Definition: json_reader.cpp:880
-
Json::Reader::addErrorAndRecover
bool addErrorAndRecover(std::string const &message, Token &token, TokenType skipUntilToken)
Definition: json_reader.cpp:866
+
Json::Reader::addErrorAndRecover
bool addErrorAndRecover(std::string const &message, Token &token, TokenType skipUntilToken)
Definition: json_reader.cpp:864
Json::Value
Represents a JSON value.
Definition: json_value.h:145
-
Json::Reader::readString
bool readString()
Definition: json_reader.cpp:400
+
Json::Reader::readString
bool readString()
Definition: json_reader.cpp:398
diff --git a/json__reader_8h_source.html b/json__reader_8h_source.html index 09b3ca5d57..b1cf82b50b 100644 --- a/json__reader_8h_source.html +++ b/json__reader_8h_source.html @@ -264,52 +264,52 @@ $(function() {
251 #endif // CPPTL_JSON_READER_H_INCLUDED
-
Json::Reader::addError
bool addError(std::string const &message, Token &token, Location extra=0)
Definition: json_reader.cpp:836
+
Json::Reader::addError
bool addError(std::string const &message, Token &token, Location extra=0)
Definition: json_reader.cpp:834
std::string
STL class.
-
Json::Reader::skipCommentTokens
void skipCommentTokens(Token &token)
Definition: json_reader.cpp:185
+
Json::Reader::skipCommentTokens
void skipCommentTokens(Token &token)
Definition: json_reader.cpp:183
Json::Reader::current_
Location current_
Definition: json_reader.h:205
-
Json::Reader::decodeDouble
bool decodeDouble(Token &token)
Definition: json_reader.cpp:627
+
Json::Reader::decodeDouble
bool decodeDouble(Token &token)
Definition: json_reader.cpp:625
std::string::reserve
T reserve(T... args)
-
Json::Reader::decodeString
bool decodeString(Token &token)
Definition: json_reader.cpp:665
-
Json::Reader::readCStyleComment
bool readCStyleComment()
Definition: json_reader.cpp:338
+
Json::Reader::decodeString
bool decodeString(Token &token)
Definition: json_reader.cpp:663
+
Json::Reader::readCStyleComment
bool readCStyleComment()
Definition: json_reader.cpp:336
-
Json::Reader::readObject
bool readObject(Token &token, unsigned depth)
Definition: json_reader.cpp:418
+
Json::Reader::readObject
bool readObject(Token &token, unsigned depth)
Definition: json_reader.cpp:416
Json::Reader
Unserialize a JSON document into a Value.
Definition: json_reader.h:36
-
Json::Reader::expectToken
bool expectToken(TokenType type, Token &token, const char *message)
Definition: json_reader.cpp:194
+
Json::Reader::expectToken
bool expectToken(TokenType type, Token &token, const char *message)
Definition: json_reader.cpp:192
-
Json::Reader::readValue
bool readValue(unsigned depth)
Definition: json_reader.cpp:134
+
Json::Reader::readValue
bool readValue(unsigned depth)
Definition: json_reader.cpp:132
Json::Reader::tokenMemberSeparator
@ tokenMemberSeparator
Definition: json_reader.h:106
Json::Reader::lastValueEnd_
Location lastValueEnd_
Definition: json_reader.h:206
Json
JSON (JavaScript Object Notation).
Definition: json_reader.cpp:29
Json::Reader::document_
std::string document_
Definition: json_reader.h:202
-
Json::Reader::decodeNumber
bool decodeNumber(Token &token)
Definition: json_reader.cpp:544
+
Json::Reader::decodeNumber
bool decodeNumber(Token &token)
Definition: json_reader.cpp:542
Json::Reader::end_
Location end_
Definition: json_reader.h:204
-
Json::Reader::match
bool match(Location pattern, int patternLength)
Definition: json_reader.cpp:308
+
Json::Reader::match
bool match(Location pattern, int patternLength)
Definition: json_reader.cpp:306
-
Json::Reader::decodeUnicodeCodePoint
bool decodeUnicodeCodePoint(Token &token, Location &current, Location end, unsigned int &unicode)
Definition: json_reader.cpp:756
+
Json::Reader::decodeUnicodeCodePoint
bool decodeUnicodeCodePoint(Token &token, Location &current, Location end, unsigned int &unicode)
Definition: json_reader.cpp:754
-
Json::Reader::getLocationLineAndColumn
void getLocationLineAndColumn(Location location, int &line, int &column) const
Definition: json_reader.cpp:891
-
Json::Reader::decodeUnicodeEscapeSequence
bool decodeUnicodeEscapeSequence(Token &token, Location &current, Location end, unsigned int &unicode)
Definition: json_reader.cpp:799
+
Json::Reader::getLocationLineAndColumn
void getLocationLineAndColumn(Location location, int &line, int &column) const
Definition: json_reader.cpp:889
+
Json::Reader::decodeUnicodeEscapeSequence
bool decodeUnicodeEscapeSequence(Token &token, Location &current, Location end, unsigned int &unicode)
Definition: json_reader.cpp:797
-
Json::Reader::currentValue
Value & currentValue()
Definition: json_reader.cpp:876
+
Json::Reader::currentValue
Value & currentValue()
Definition: json_reader.cpp:874
Json::Reader::begin_
Location begin_
Definition: json_reader.h:203
std::string::append
T append(T... args)
-
Json::Reader::skipSpaces
void skipSpaces()
Definition: json_reader.cpp:294
+
Json::Reader::skipSpaces
void skipSpaces()
Definition: json_reader.cpp:292
-
Json::Reader::readComment
bool readComment()
Definition: json_reader.cpp:324
+
Json::Reader::readComment
bool readComment()
Definition: json_reader.cpp:322
@@ -317,27 +317,27 @@ $(function() {
Json::Reader::errors_
Errors errors_
Definition: json_reader.h:201
-
Json::operator>>
std::istream & operator>>(std::istream &sin, Value &root)
Read from 'sin' into 'root'.
Definition: json_reader.cpp:955
+
Json::operator>>
std::istream & operator>>(std::istream &sin, Value &root)
Read from 'sin' into 'root'.
Definition: json_reader.cpp:954
Json::Reader::Reader
Reader()=default
Constructs a Reader allowing all features for parsing.
Json::Reader::nest_limit
static constexpr unsigned nest_limit
Definition: json_reader.h:90
-
Json::Reader::readToken
bool readToken(Token &token)
Definition: json_reader.cpp:205
-
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:76
-
Json::Reader::getFormatedErrorMessages
std::string getFormatedErrorMessages() const
Returns a user friendly string that list errors in the parsed document.
Definition: json_reader.cpp:933
+
Json::Reader::readToken
bool readToken(Token &token)
Definition: json_reader.cpp:203
+
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:74
+
Json::Reader::getFormatedErrorMessages
std::string getFormatedErrorMessages() const
Returns a user friendly string that list errors in the parsed document.
Definition: json_reader.cpp:932
Json::Reader::lastValue_
Value * lastValue_
Definition: json_reader.h:207
-
Json::Reader::recoverFromError
bool recoverFromError(TokenType skipUntilToken)
Definition: json_reader.cpp:847
-
Json::Reader::readArray
bool readArray(Token &token, unsigned depth)
Definition: json_reader.cpp:491
-
Json::Reader::readNumber
Reader::TokenType readNumber()
Definition: json_reader.cpp:366
+
Json::Reader::recoverFromError
bool recoverFromError(TokenType skipUntilToken)
Definition: json_reader.cpp:845
+
Json::Reader::readArray
bool readArray(Token &token, unsigned depth)
Definition: json_reader.cpp:489
+
Json::Reader::readNumber
Reader::TokenType readNumber()
Definition: json_reader.cpp:364
-
Json::Reader::readCppStyleComment
bool readCppStyleComment()
Definition: json_reader.cpp:352
+
Json::Reader::readCppStyleComment
bool readCppStyleComment()
Definition: json_reader.cpp:350
Json::Reader::skipUntilSpace
void skipUntilSpace()
std::istream
STL class.
-
Json::Reader::getNextChar
Char getNextChar()
Definition: json_reader.cpp:882
+
Json::Reader::getNextChar
Char getNextChar()
Definition: json_reader.cpp:880
-
Json::Reader::addErrorAndRecover
bool addErrorAndRecover(std::string const &message, Token &token, TokenType skipUntilToken)
Definition: json_reader.cpp:866
+
Json::Reader::addErrorAndRecover
bool addErrorAndRecover(std::string const &message, Token &token, TokenType skipUntilToken)
Definition: json_reader.cpp:864
Json::Value
Represents a JSON value.
Definition: json_value.h:145
-
Json::Reader::readString
bool readString()
Definition: json_reader.cpp:400
+
Json::Reader::readString
bool readString()
Definition: json_reader.cpp:398
diff --git a/json__value__test_8cpp_source.html b/json__value__test_8cpp_source.html index 8e1b70fd6d..335b51384c 100644 --- a/json__value__test_8cpp_source.html +++ b/json__value__test_8cpp_source.html @@ -1534,7 +1534,7 @@ $(function() {
Json::Value::asUInt
UInt asUInt() const
Definition: json_value.cpp:545
Json::Value::isUInt
bool isUInt() const
Definition: json_value.cpp:985
ripple::json_value_test::test_access
void test_access()
Definition: json_value_test.cpp:1085
-
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:76
+
Json::Reader::parse
bool parse(std::string const &document, Value &root)
Read a Value from a JSON document.
Definition: json_reader.cpp:74
Json::nullValue
@ nullValue
'null' value
Definition: json_value.h:36
std::count_if
T count_if(T... args)
ripple::json_value_test::test_conversions
void test_conversions()
Definition: json_value_test.cpp:848
diff --git a/namespaceJson.html b/namespaceJson.html index 6f439398b9..05c6d0c4f7 100644 --- a/namespaceJson.html +++ b/namespaceJson.html @@ -403,7 +403,7 @@ Variables
-

Definition at line 36 of file json_reader.cpp.

+

Definition at line 34 of file json_reader.cpp.

@@ -452,7 +452,7 @@ Variables
See also
Json::operator<<()
-

Definition at line 955 of file json_reader.cpp.

+

Definition at line 954 of file json_reader.cpp.

diff --git a/namespaceripple.html b/namespaceripple.html index 19c93930c1..7acb246d54 100644 --- a/namespaceripple.html +++ b/namespaceripple.html @@ -6593,7 +6593,7 @@ template<class T >

For an instance ClosedInterval c, this represents the closed interval (c.first(), c.last()). A single element interval has c.first() == c.last().

This is simply a type-alias for boost interval container library interval set, so users should consult that documentation for available supporting member and free functions.

-

Definition at line 44 of file RangeSet.h.

+

Definition at line 45 of file RangeSet.h.

@@ -6615,7 +6615,7 @@ template<class T >

Represents a set of values of the domain T using the minimum number of disjoint ClosedInterval<T>. This is useful to represent ranges of T where a few instances are missing, e.g. the set 1-5,8-9,11-14.

This is simply a type-alias for boost interval container library interval set, so users should consult that documentation for available supporting member and free functions.

-

Definition at line 69 of file RangeSet.h.

+

Definition at line 70 of file RangeSet.h.

@@ -22024,7 +22024,7 @@ template<class T >

Create a closed range interval.

Helper function to create a closed range interval without having to qualify the template argument.

-

Definition at line 53 of file RangeSet.h.

+

Definition at line 54 of file RangeSet.h.

@@ -22056,7 +22056,7 @@ template<class T >
Returns
The style string
-

Definition at line 82 of file RangeSet.h.

+

Definition at line 83 of file RangeSet.h.

@@ -22088,7 +22088,7 @@ template<class T >
Returns
The styled string
-

Definition at line 99 of file RangeSet.h.

+

Definition at line 100 of file RangeSet.h.

@@ -22131,7 +22131,7 @@ template<class T >
Returns
True on successfully converting styled string
-

Definition at line 123 of file RangeSet.h.

+

Definition at line 124 of file RangeSet.h.

@@ -22180,7 +22180,7 @@ template<class T >
Returns
The largest v such that minV <= v < t and !contains(rs, v) or std::nullopt if no such v exists.
-

Definition at line 182 of file RangeSet.h.

+

Definition at line 183 of file RangeSet.h.

@@ -23349,7 +23349,7 @@ template<class Char , class Traits >
Returns
the number of participants which must agree
-

Definition at line 1350 of file Consensus.h.

+

Definition at line 1353 of file Consensus.h.

@@ -26803,7 +26803,7 @@ template<class Clock , class Duration , class Rep , class Period >
Returns
seated optional with feature's value if the feature is found in the header, unseated optional otherwise
-

Definition at line 38 of file Handshake.cpp.

+

Definition at line 40 of file Handshake.cpp.

@@ -26850,7 +26850,7 @@ template<class Clock , class Duration , class Rep , class Period >
Returns
true if the feature's value matches the specified value, false if doesn't match or the feature is not found in the header
-

Definition at line 54 of file Handshake.cpp.

+

Definition at line 56 of file Handshake.cpp.

@@ -26890,7 +26890,7 @@ template<class Clock , class Duration , class Rep , class Period >
Returns
true if enabled
-

Definition at line 66 of file Handshake.cpp.

+

Definition at line 68 of file Handshake.cpp.

@@ -26944,7 +26944,7 @@ template<class Clock , class Duration , class Rep , class Period >
Returns
X-Protocol-Ctl header value
-

Definition at line 74 of file Handshake.cpp.

+

Definition at line 76 of file Handshake.cpp.

@@ -27006,7 +27006,7 @@ template<class Clock , class Duration , class Rep , class Period >
Returns
X-Protocol-Ctl header value
-

Definition at line 93 of file Handshake.cpp.

+

Definition at line 95 of file Handshake.cpp.

@@ -27059,7 +27059,7 @@ template<class Clock , class Duration , class Rep , class Period >
Returns
true if successful, false otherwise.
Note
This construct is non-standard. There are potential "standard" alternatives that should be considered. For a discussion, on this topic, see https://github.com/openssl/openssl/issues/5509 and https://github.com/ripple/rippled/issues/2413.
-

Definition at line 127 of file Handshake.cpp.

+

Definition at line 129 of file Handshake.cpp.

@@ -27099,7 +27099,7 @@ template<class Clock , class Duration , class Rep , class Period >
Returns
A 256-bit value on success; an unseated optional otherwise.
-

Definition at line 145 of file Handshake.cpp.

+

Definition at line 147 of file Handshake.cpp.

@@ -27155,7 +27155,7 @@ template<class Clock , class Duration , class Rep , class Period >

Insert fields headers necessary for upgrading the link to the peer protocol.

-

Definition at line 177 of file Handshake.cpp.

+

Definition at line 179 of file Handshake.cpp.

@@ -27219,7 +27219,7 @@ template<class Clock , class Duration , class Rep , class Period > -

Definition at line 226 of file Handshake.cpp.

+

Definition at line 228 of file Handshake.cpp.

@@ -27280,7 +27280,7 @@ template<class Clock , class Duration , class Rep , class Period >
Returns
http request with empty body
-

Definition at line 365 of file Handshake.cpp.

+

Definition at line 367 of file Handshake.cpp.

@@ -27362,7 +27362,7 @@ template<class Clock , class Duration , class Rep , class Period >
Returns
http response
-

Definition at line 392 of file Handshake.cpp.

+

Definition at line 394 of file Handshake.cpp.

diff --git a/nodestore_2impl_2Shard_8cpp_source.html b/nodestore_2impl_2Shard_8cpp_source.html index 7e043744aa..e77129ea75 100644 --- a/nodestore_2impl_2Shard_8cpp_source.html +++ b/nodestore_2impl_2Shard_8cpp_source.html @@ -1386,7 +1386,7 @@ $(function() {
ripple::NodeStore::FetchReport
Contains information about a fetch operation.
Definition: ripple/nodestore/Scheduler.h:32
ripple::NodeStore::Shard::isOpen
bool isOpen() const
Returns true if the database are open.
Definition: nodestore/impl/Shard.cpp:127
ripple::DatabaseCon::Setup::dataDir
boost::filesystem::path dataDir
Definition: DatabaseCon.h:91
-
ripple::from_string
bool from_string(RangeSet< T > &rs, std::string const &s)
Convert the given styled string to a RangeSet.
Definition: RangeSet.h:123
+
ripple::from_string
bool from_string(RangeSet< T > &rs, std::string const &s)
Convert the given styled string to a RangeSet.
Definition: RangeSet.h:124
ripple::Family::getFullBelowCache
virtual std::shared_ptr< FullBelowCache > getFullBelowCache(std::uint32_t ledgerSeq)=0
Return a pointer to the Family Full Below Cache.
ripple::NodeStore::Shard::finalKey
static const uint256 finalKey
Definition: nodestore/impl/Shard.h:251
@@ -1446,7 +1446,7 @@ $(function() {
ripple::NodeStore::Scheduler
Scheduling for asynchronous backend activity.
Definition: ripple/nodestore/Scheduler.h:60
-
ripple::prevMissing
std::optional< T > prevMissing(RangeSet< T > const &rs, T t, T minVal=0)
Find the largest value not in the set that is less than a given value.
Definition: RangeSet.h:182
+
ripple::prevMissing
std::optional< T > prevMissing(RangeSet< T > const &rs, T t, T minVal=0)
Find the largest value not in the set that is less than a given value.
Definition: RangeSet.h:183
ripple::NodeStore::Shard::index
std::uint32_t index() const noexcept
Definition: nodestore/impl/Shard.h:149
ripple::NodeStore::Status
Status
Return codes from Backend operations.
Definition: nodestore/Types.h:44
diff --git a/nodestore_2impl_2Shard_8h_source.html b/nodestore_2impl_2Shard_8h_source.html index d3ba6b9142..0e0a90c8a6 100644 --- a/nodestore_2impl_2Shard_8h_source.html +++ b/nodestore_2impl_2Shard_8h_source.html @@ -533,7 +533,7 @@ $(function() {
std::mutex
STL class.
ripple::NodeStore::Shard::init
bool init(Scheduler &scheduler, nudb::context &context)
Initialize shard.
Definition: nodestore/impl/Shard.cpp:95
ripple::to_string
std::string to_string(Manifest const &m)
Format the specified manifest to a string for debugging purposes.
Definition: app/misc/impl/Manifest.cpp:41
-
ripple::RangeSet
boost::icl::interval_set< T, std::less, ClosedInterval< T > > RangeSet
A set of closed intervals over the domain T.
Definition: RangeSet.h:69
+
ripple::RangeSet
boost::icl::interval_set< T, std::less, ClosedInterval< T > > RangeSet
A set of closed intervals over the domain T.
Definition: RangeSet.h:70
ripple::NodeStore::Shard::finalize
bool finalize(bool writeSQLite, std::optional< uint256 > const &referenceHash)
Finalize shard by walking its ledgers, verifying each Merkle tree and creating a deterministic backen...
Definition: nodestore/impl/Shard.cpp:556
ripple::NodeStore::Shard::setLedgerStored
bool setLedgerStored(std::shared_ptr< Ledger const > const &ledger)
Definition: nodestore/impl/Shard.cpp:416
ripple::NodeStore::Shard::getState
ShardState getState() const noexcept
Definition: nodestore/impl/Shard.h:170
diff --git a/reduce__relay__test_8cpp_source.html b/reduce__relay__test_8cpp_source.html index 595a958bb2..8aad7e91ba 100644 --- a/reduce__relay__test_8cpp_source.html +++ b/reduce__relay__test_8cpp_source.html @@ -1841,9 +1841,9 @@ $(function() {
ripple::test::reduce_relay_test::State
State
Definition: reduce_relay_test.cpp:915
ripple::test::reduce_relay_test::Handler::unsquelch
void unsquelch(PublicKey const &, Peer::id_t) const override
Unsquelch handler.
Definition: reduce_relay_test.cpp:1403
-
ripple::makeRequest
auto makeRequest(bool crawlPublic, bool comprEnabled, bool ledgerReplayEnabled, bool txReduceRelayEnabled, bool vpReduceRelayEnabled) -> request_type
Make outbound http request.
Definition: Handshake.cpp:365
+
ripple::makeRequest
auto makeRequest(bool crawlPublic, bool comprEnabled, bool ledgerReplayEnabled, bool txReduceRelayEnabled, bool vpReduceRelayEnabled) -> request_type
Make outbound http request.
Definition: Handshake.cpp:367
ripple::test::reduce_relay_test::Handler::maxDuration_
int maxDuration_
Definition: reduce_relay_test.cpp:1406
-
ripple::makeResponse
http_response_type makeResponse(bool crawlPublic, http_request_type const &req, beast::IP::Address public_ip, beast::IP::Address remote_ip, uint256 const &sharedValue, std::optional< std::uint32_t > networkID, ProtocolVersion protocol, Application &app)
Make http response.
Definition: Handshake.cpp:392
+
ripple::makeResponse
http_response_type makeResponse(bool crawlPublic, http_request_type const &req, beast::IP::Address public_ip, beast::IP::Address remote_ip, uint256 const &sharedValue, std::optional< std::uint32_t > networkID, ProtocolVersion protocol, Application &app)
Make http response.
Definition: Handshake.cpp:394
ripple::test::Validator::for_links
void for_links(std::vector< Peer::id_t > peers, LinkIterCB f)
Definition: reduce_relay_test.cpp:371
ripple::http_request_type
boost::beast::http::request< boost::beast::http::dynamic_body > http_request_type
Definition: Handshake.h:47
std::shuffle
T shuffle(T... args)
diff --git a/short__read__test_8cpp_source.html b/short__read__test_8cpp_source.html index f714a90bb7..293d787c1e 100644 --- a/short__read__test_8cpp_source.html +++ b/short__read__test_8cpp_source.html @@ -768,7 +768,7 @@ $(function() {
std::lock_guard
STL class.
ripple::short_read_test::Base::remove
void remove(Child *child)
Definition: short_read_test.cpp:126
ripple::short_read_test::Base::Child
Definition: short_read_test.cpp:86
-
ripple::from_string
bool from_string(RangeSet< T > &rs, std::string const &s)
Convert the given styled string to a RangeSet.
Definition: RangeSet.h:123
+
ripple::from_string
bool from_string(RangeSet< T > &rs, std::string const &s)
Convert the given styled string to a RangeSet.
Definition: RangeSet.h:124
ripple::short_read_test::context_
std::shared_ptr< boost::asio::ssl::context > context_
Definition: short_read_test.cpp:68
ripple::short_read_test::Base::~Base
~Base()
Definition: short_read_test.cpp:112
ripple::short_read_test::Server::Connection::Connection
Connection(Server &server, socket_type &&socket)
Definition: short_read_test.cpp:264
diff --git a/test_2csf_2Peer_8h_source.html b/test_2csf_2Peer_8h_source.html index b161186ba0..a7258a70ef 100644 --- a/test_2csf_2Peer_8h_source.html +++ b/test_2csf_2Peer_8h_source.html @@ -995,7 +995,7 @@ $(function() {
ripple::test::csf::Peer::onAccept
void onAccept(Result const &result, Ledger const &prevLedger, NetClock::duration const &closeResolution, ConsensusCloseTimes const &rawCloseTimes, ConsensusMode const &mode, Json::Value &&consensusJson)
Definition: test/csf/Peer.h:533
ripple::test::csf::Peer::trusts
bool trusts(PeerID const &oId)
Definition: test/csf/Peer.h:345
ripple::test::csf::Peer::updateOperatingMode
void updateOperatingMode(std::size_t const positions) const
Definition: test/csf/Peer.h:869
-
ripple::Consensus
Generic implementation of consensus algorithm.
Definition: Consensus.h:284
+
ripple::Consensus
Generic implementation of consensus algorithm.
Definition: Consensus.h:287
ripple::test::csf::Scheduler
Simulated discrete-event scheduler.
Definition: test/csf/Scheduler.h:47
diff --git a/tx__reduce__relay__test_8cpp_source.html b/tx__reduce__relay__test_8cpp_source.html index c8637009e3..a7139cb290 100644 --- a/tx__reduce__relay__test_8cpp_source.html +++ b/tx__reduce__relay__test_8cpp_source.html @@ -356,7 +356,7 @@ $(function() {
ripple::test::tx_reduce_relay_test::protocolVersion_
ProtocolVersion protocolVersion_
Definition: tx_reduce_relay_test.cpp:149
std::vector
STL class.
-
ripple::makeFeaturesRequestHeader
std::string makeFeaturesRequestHeader(bool comprEnabled, bool ledgerReplayEnabled, bool txReduceRelayEnabled, bool vpReduceRelayEnabled)
Make request header X-Protocol-Ctl value with supported features.
Definition: Handshake.cpp:74
+
ripple::makeFeaturesRequestHeader
std::string makeFeaturesRequestHeader(bool comprEnabled, bool ledgerReplayEnabled, bool txReduceRelayEnabled, bool vpReduceRelayEnabled)
Make request header X-Protocol-Ctl value with supported features.
Definition: Handshake.cpp:76
ripple::make_SSLContext
std::shared_ptr< boost::asio::ssl::context > make_SSLContext(std::string const &cipherList)
Create a self-signed SSL context that allows anonymous Diffie Hellman.
Definition: make_SSLContext.cpp:364
ripple::test::tx_reduce_relay_test::PeerTest::addTxQueue
void addTxQueue(const uint256 &hash) override
Add transaction's hash to the transactions' hashes queue.
Definition: tx_reduce_relay_test.cpp:130