Set version to 3.0.0-b1 (#5859)

src/libxrpl/protocol/BuildInfo.cpp

@@ -36,7 +36,7 @@ namespace BuildInfo {
 //  and follow the format described at http://semver.org/
 //------------------------------------------------------------------------------
 // clang-format off
-char const* const versionString = "2.6.1"
+char const* const versionString = "3.0.0-b1"
 // clang-format on
 
 #if defined(DEBUG) || defined(SANITIZER)

src/xrpld/consensus/Validations.h

@@ -29,8 +29,6 @@
 #include <xrpl/beast/container/aged_unordered_map.h>
 #include <xrpl/protocol/PublicKey.h>
 
-#include "xrpld/shamap/SHAMapMissingNode.h"
-
 #include <mutex>
 #include <optional>
 #include <type_traits>
@@ -388,18 +386,8 @@ private:
     {
         for (auto it = acquiring_.begin(); it != acquiring_.end();)
         {
-            std::optional<Ledger> ledger;
+            if (std::optional<Ledger> ledger =
-            try
+                    adaptor_.acquire(it->first.second))
-            {
-                // Skip if we haven't finished acquiring this ledger,
-                // or the ledger we acquired isn't complete, which can happen
-                // because we're still trying to catch up.
-                ledger = adaptor_.acquire(it->first.second);
-            }
-            catch (SHAMapMissingNode const&)
-            {
-            }
-            if (ledger)
             {
                 for (NodeID const& nodeID : it->second)
                     updateTrie(lock, nodeID, *ledger);