Proposed 1.7.0-b5

.travis.yml

@@ -226,24 +226,12 @@ matrix:
         - BUILD_TYPE=Debug
         - NINJA_BUILD=false
     # misc alternative compilers
-    - <<: *linux
-      compiler: gcc-7
-      name: gcc-7
-      env:
-        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
-        - BUILD_TYPE=Debug
     - <<: *linux
       compiler: gcc-9
       name: gcc-9
       env:
         - MATRIX_EVAL="CC=gcc-9 && CXX=g++-9"
         - BUILD_TYPE=Debug
-    - <<: *linux
-      compiler: clang-7
-      name: clang-7
-      env:
-        - MATRIX_EVAL="CC=clang-7 && CXX=clang++-7"
-        - BUILD_TYPE=Debug
     - <<: *linux
       compiler: clang-9
       name: clang-9
@@ -274,8 +262,8 @@ matrix:
       if: commit_message !~ /travis_run_/ OR commit_message =~ /travis_run_mac/
       stage: build
       os: osx
-      osx_image: xcode10.3
-      name: xcode10, debug
+      osx_image: xcode11.2
+      name: xcode11.2, debug
       env:
         # put NIH in non-cache location since it seems to
         # cause failures when homebrew updates
@@ -313,7 +301,7 @@ matrix:
         - travis_wait ${MAX_TIME_MIN} cmake --build . --parallel --verbose
         - ./rippled --unittest --quiet --unittest-log --unittest-jobs ${NUM_PROCESSORS} ${TEST_EXTRA_ARGS}
     - <<: *macos
-      name: xcode10, release
+      name: xcode11.2, release
       before_script:
         - export BLD_CONFIG=Release
         - export CMAKE_EXTRA_ARGS="${CMAKE_EXTRA_ARGS} -Dassert=ON"
@@ -323,7 +311,7 @@ matrix:
         - export TEST_EXTRA_ARGS="--unittest-ipv6"
     - <<: *macos
       osx_image: xcode11.2
-      name: xcode11, debug
+      name: xcode11.2, debug
     # windows
     - &windows
       if: commit_message !~ /travis_run_/ OR commit_message =~ /travis_run_win/

Builds/CMake/RippledCore.cmake

@@ -272,19 +272,6 @@ install (
   DESTINATION include/ripple/beast/core)
 install (
   FILES
-    src/ripple/beast/crypto/detail/mac_facade.h
-    src/ripple/beast/crypto/detail/ripemd_context.h
-    src/ripple/beast/crypto/detail/sha2_context.h
-    src/ripple/beast/crypto/ripemd.h
-    src/ripple/beast/crypto/sha2.h
-  DESTINATION include/ripple/beast/crypto)
-install (
-  FILES
-    src/ripple/beast/cxx17/type_traits.h
-  DESTINATION include/ripple/beast/cxx17)
-install (
-  FILES
-    src/ripple/beast/hash/endian.h
     src/ripple/beast/hash/hash_append.h
     src/ripple/beast/hash/meta.h
     src/ripple/beast/hash/uhash.h
@@ -648,7 +635,9 @@ target_sources (rippled PRIVATE
   src/ripple/shamap/impl/NodeFamily.cpp
   src/ripple/shamap/impl/SHAMap.cpp
   src/ripple/shamap/impl/SHAMapDelta.cpp
+  src/ripple/shamap/impl/SHAMapInnerNode.cpp
   src/ripple/shamap/impl/SHAMapItem.cpp
+  src/ripple/shamap/impl/SHAMapLeafNode.cpp
   src/ripple/shamap/impl/SHAMapNodeID.cpp
   src/ripple/shamap/impl/SHAMapSync.cpp
   src/ripple/shamap/impl/SHAMapTreeNode.cpp
@@ -895,7 +884,6 @@ target_sources (rippled PRIVATE
   src/test/protocol/Seed_test.cpp
   src/test/protocol/SeqProxy_test.cpp
   src/test/protocol/TER_test.cpp
-  src/test/protocol/digest_test.cpp
   src/test/protocol/types_test.cpp
   #[===============================[
      test sources:

Builds/CMake/RippledInterface.cmake

@@ -16,9 +16,6 @@ target_compile_definitions (opts
       BOOST_BEAST_ALLOW_DEPRECATED
       BOOST_FILESYSTEM_DEPRECATED
     >
-    $<$<BOOL:${beast_hashers}>:
-      USE_BEAST_HASHER
-    >
     $<$<BOOL:${beast_no_unit_test_inline}>:BEAST_NO_UNIT_TEST_INLINE=1>
     $<$<BOOL:${beast_disable_autolink}>:BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES=1>
     $<$<BOOL:${single_io_service_thread}>:RIPPLE_SINGLE_IO_SERVICE_THREAD=1>)

bin/ci/test.sh

@@ -24,7 +24,6 @@ declare -a manual_tests=(
   'ripple.consensus.ByzantineFailureSim'
   'ripple.consensus.DistributedValidators'
   'ripple.consensus.ScaleFreeSim'
-  'ripple.ripple_data.digest'
   'ripple.tx.CrossingLimits'
   'ripple.tx.FindOversizeCross'
   'ripple.tx.Offer_manual'

bin/ci/ubuntu/build-and-test.sh

@@ -137,7 +137,6 @@ else
     # descending execution time (longest running tests at top)
     declare -a manual_tests=(
         'ripple.ripple_data.reduce_relay_simulate'
-        'ripple.ripple_data.digest'
         'ripple.tx.Offer_manual'
         'ripple.tx.CrossingLimits'
         'ripple.tx.PlumpBook'

cfg/rippled-example.cfg

@@ -489,6 +489,23 @@
 #       single host from consuming all inbound slots. If the value is not
 #       present the server will autoconfigure an appropriate limit.
 #
+#   max_unknown_time = <number>
+#
+#       The maximum amount of time, in seconds, that an outbound connection
+#       is allowed to stay in the "unknown" tracking state. This option can
+#       take any value between 300 and 1800 seconds, inclusive. If the option
+#       is not present the server will autoconfigure an appropriate limit.
+#
+#       The current default (which is subject to change) is 600 seconds.
+#
+#   max_diverged_time = <number>
+#
+#       The maximum amount of time, in seconds, that an outbound connection
+#       is allowed to stay in the "diverged" tracking state. The option can
+#       take any value between 60 and 900 seconds, inclusive. If the option
+#       is not present the server will autoconfigure an appropriate limit.
+#
+#       The current default (which is subject to change) is 300 seconds.
 #
 #
 # [transaction_queue] EXPERIMENTAL
@@ -590,13 +607,13 @@
 #
 #-------------------------------------------------------------------------------
 #
-# 3. Ripple Protocol
+# 3. Protocol
 #
 #-------------------
 #
 #   These settings affect the behavior of the server instance with respect
-#   to Ripple payment protocol level activities such as validating and
-#   closing ledgers or adjusting fees in response to server overloads.
+#   to protocol level activities such as validating and closing ledgers
+#   adjusting fees in response to server overloads.
 #
 #
 #
@@ -617,12 +634,6 @@
 #   Legal values are: "trusted" and "all". The default is "all".
 #
 #
-# [node_size]
-#
-#   Tunes the servers based on the expected load and available memory. Legal
-#   sizes are "tiny", "small", "medium", "large", and "huge". We recommend
-#   you start at the default and raise the setting if you have extra memory.
-#   The default is "tiny".
 #
 #
 #
@@ -1191,6 +1202,14 @@
 #
 #-----------------
 #
+# [node_size]
+#
+#   Tunes the servers based on the expected load and available memory. Legal
+#   sizes are "tiny", "small", "medium", "large", and "huge". We recommend
+#   you start at the default and raise the setting if you have extra memory.
+#   If no value is specified, the code assumes the proper size is "tiny". The
+#   default configuration file explicitly specifies "medium" as the size.
+#
 # [signing_support]
 #
 #   Specifies whether the server will accept "sign" and "sign_for" commands

src/ripple/app/consensus/RCLConsensus.cpp

@@ -315,9 +315,8 @@ RCLConsensus::Adaptor::onClose(
         Serializer s(2048);
         tx.first->add(s);
         initialSet->addItem(
-            SHAMapItem(tx.first->getTransactionID(), std::move(s)),
-            true,
-            false);
+            SHAMapNodeType::tnTRANSACTION_NM,
+            SHAMapItem(tx.first->getTransactionID(), std::move(s)));
     }
 
     // Add pseudo-transactions to the set

src/ripple/app/consensus/RCLCxPeerPos.h

@@ -113,12 +113,6 @@ class RCLCxPeerPos
             Slice const& signature,
             uint256 const& suppress,
             Proposal&& proposal);
-
-        static char const*
-        getCountedObjectName()
-        {
-            return "RCLCxPeerPos::Data";
-        }
     };
 
     std::shared_ptr<Data> data_;

src/ripple/app/consensus/RCLCxTx.h

@@ -91,7 +91,8 @@ class RCLTxSet
         insert(Tx const& t)
         {
             return map_->addItem(
-                SHAMapItem{t.id(), t.tx_.peekData()}, true, false);
+                SHAMapNodeType::tnTRANSACTION_NM,
+                SHAMapItem{t.id(), t.tx_.peekData()});
         }
 
         /** Remove a transaction from the set.

src/ripple/app/ledger/AcceptedLedgerTx.cpp

@@ -74,7 +74,7 @@ std::string
 AcceptedLedgerTx::getEscMeta() const
 {
     assert(!mRawMeta.empty());
-    return sqlEscape(mRawMeta);
+    return sqlBlobLiteral(mRawMeta);
 }
 
 void

src/ripple/app/ledger/AccountStateSF.cpp

@@ -27,7 +27,7 @@ AccountStateSF::gotNode(
     SHAMapHash const& nodeHash,
     std::uint32_t ledgerSeq,
     Blob&& nodeData,
-    SHAMapTreeNode::TNType) const
+    SHAMapNodeType) const
 {
     db_.store(
         hotACCOUNT_NODE, std::move(nodeData), nodeHash.as_uint256(), ledgerSeq);

src/ripple/app/ledger/AccountStateSF.h

@@ -42,7 +42,7 @@ class AccountStateSF : public SHAMapSyncFilter
         SHAMapHash const& nodeHash,
         std::uint32_t ledgerSeq,
         Blob&& nodeData,
-        SHAMapTreeNode::TNType type) const override;
+        SHAMapNodeType type) const override;
 
     boost::optional<Blob>
     getNode(SHAMapHash const& nodeHash) const override;

src/ripple/app/ledger/ConsensusTransSetSF.cpp

@@ -41,14 +41,14 @@ ConsensusTransSetSF::gotNode(
     SHAMapHash const& nodeHash,
     std::uint32_t,
     Blob&& nodeData,
-    SHAMapTreeNode::TNType type) const
+    SHAMapNodeType type) const
 {
     if (fromFilter)
         return;
 
     m_nodeCache.insert(nodeHash, nodeData);
 
-    if ((type == SHAMapTreeNode::tnTRANSACTION_NM) && (nodeData.size() > 16))
+    if ((type == SHAMapNodeType::tnTRANSACTION_NM) && (nodeData.size() > 16))
     {
         // this is a transaction, and we didn't have it
         JLOG(j_.debug())

src/ripple/app/ledger/ConsensusTransSetSF.h

@@ -45,7 +45,7 @@ class ConsensusTransSetSF : public SHAMapSyncFilter
         SHAMapHash const& nodeHash,
         std::uint32_t ledgerSeq,
         Blob&& nodeData,
-        SHAMapTreeNode::TNType type) const override;
+        SHAMapNodeType type) const override;
 
     boost::optional<Blob>
     getNode(SHAMapHash const& nodeHash) const override;

src/ripple/app/ledger/InboundLedger.h

@@ -38,12 +38,6 @@ class InboundLedger final : public PeerSet,
 public:
     using clock_type = beast::abstract_clock<std::chrono::steady_clock>;
 
-    static char const*
-    getCountedObjectName()
-    {
-        return "InboundLedger";
-    }
-
     using PeerDataPairType =
         std::pair<std::weak_ptr<Peer>, std::shared_ptr<protocol::TMLedgerData>>;
 

src/ripple/app/ledger/InboundLedgers.h

@@ -36,7 +36,7 @@ class InboundLedgers
 public:
     using clock_type = beast::abstract_clock<std::chrono::steady_clock>;
 
-    virtual ~InboundLedgers() = 0;
+    virtual ~InboundLedgers() = default;
 
     // VFALCO TODO Should this be called findOrAdd ?
     //