Add AI tool file to .gitignore

.gitattributes

@@ -1,10 +1,6 @@
 # Set default behaviour, in case users don't have core.autocrlf set.
 #* text=auto
 
-# These annoying files
-rippled.1 binary
-LICENSE binary
-
 # Visual Studio
 *.sln       text eol=crlf
 *.vcproj    text eol=crlf

.github/scripts/rename/cmake.sh

@@ -74,19 +74,12 @@ if grep -q '"xrpld"' cmake/XrplCore.cmake; then
   # The script has been rerun, so just restore the name of the binary.
   ${SED_COMMAND} -i 's/"xrpld"/"rippled"/' cmake/XrplCore.cmake
 elif ! grep -q '"rippled"' cmake/XrplCore.cmake; then
-  ${HEAD_COMMAND} -n -1 cmake/XrplCore.cmake > cmake.tmp
+  ghead -n -1 cmake/XrplCore.cmake > cmake.tmp
   echo '  # For the time being, we will keep the name of the binary as it was.' >> cmake.tmp
   echo '  set_target_properties(xrpld PROPERTIES OUTPUT_NAME "rippled")' >> cmake.tmp
   tail -1 cmake/XrplCore.cmake >> cmake.tmp
   mv cmake.tmp cmake/XrplCore.cmake
 fi
 
-# Restore the symlink from 'xrpld' to 'rippled'.
-${SED_COMMAND} -i -E 's@create_symbolic_link\(xrpld@create_symbolic_link(rippled@' cmake/XrplInstall.cmake
-
-# Remove the symlink that previously pointed from 'ripple' to 'xrpl' but now is
-# no longer needed.
-${SED_COMMAND} -z -i -E 's@install\(CODE.+CMAKE_INSTALL_INCLUDEDIR}/xrpl\)\n"\)\n+@@' cmake/XrplInstall.cmake
-
 popd
 echo "Renaming complete."

.gitignore

@@ -1,69 +1,42 @@
 # .gitignore
 
-bin/boostbook_catalog.xml
-bin/config.log
-bin/project-cache.jam
-
-# Ignore vim swap files.
-*.swp
-
-# Ignore SCons support files.
-.sconsign.dblite
-
-# Ignore python compiled files.
-*.pyc
-
-# Ignore Macintosh Desktop Services Store files.
+# Macintosh Desktop Services Store files.
 .DS_Store
 
-# Ignore backup/temps
+# Build, intermediate, and temporary artifacts.
 *~
-
-# Ignore object files.
 *.o
-.nih_c
-tags
-TAGS
-GTAGS
-GRTAGS
-GPATH
-bin/rippled
-Debug/*.*
-Release/*.*
+*.pdb
+*.swp
+.clangd
+Debug/
+Release/
+/.build/
+/build/
+/db/
+/out.txt
+/tmp/
+CMakeSettings.json
+CMakeUserPresets.json
 
-# Ignore coverage files.
+# Coverage files.
 *.gcno
 *.gcda
 *.gcov
 
-# Levelization checking
+# Profiling data.
+gmon.out
+
+# Levelization data.
 .github/scripts/levelization/results/*
 !.github/scripts/levelization/results/loops.txt
 !.github/scripts/levelization/results/ordering.txt
 
-# Ignore tmp directory.
-tmp
-
-# Ignore database directory.
-db/
-db/*.db
-db/*.db-*
-
-# Ignore debug logs
-debug_log.txt
-
-# Ignore customized configs
+# Customized configs.
 rippled.cfg
 validators.txt
 
-# Doxygen generated documentation output
-HtmlDocumentation
-docs/html_doc
-
-# Xcode user-specific project settings
-# Xcode
-.DS_Store
-/build/
+# XCode IDE.
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -76,38 +49,14 @@ xcuserdata
 profile
 *.moved-aside
 DerivedData
-.idea/
 *.hmap
 
-# Intel Parallel Studio 2013 XE
-My Amplifier XE Results - RippleD
+# JetBrains IDE.
+/.idea/
 
-# Compiler intermediate output
-/out.txt
-
-# Build Log
-rippled-build.log
-
-# Profiling data
-gmon.out
-
-Builds/VisualStudio2015/*.db
-Builds/VisualStudio2015/*.user
-Builds/VisualStudio2015/*.opendb
-Builds/VisualStudio2015/*.sdf
-
-# MSVC
-*.pdb
+# Microsoft Visual Studio IDE.
 .vs/
-CMakeSettings.json
-compile_commands.json
-.clangd
-packages
-pkg_out
-pkg
-CMakeUserPresets.json
-bld.rippled/
-.vscode
+.vscode/
 
-# Suggested in-tree build directory
-/.build*/
+# AI tools.
+.augment

cmake/XrplInstall.cmake

@@ -37,6 +37,13 @@ install(
   DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
 )
 
+install(CODE "
+  set(CMAKE_MODULE_PATH \"${CMAKE_MODULE_PATH}\")
+  include(create_symbolic_link)
+  create_symbolic_link(xrpl \
+    \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/xrpl)
+")
+
 install (EXPORT XrplExports
   FILE XrplTargets.cmake
   NAMESPACE Xrpl::
@@ -67,7 +74,7 @@ if (is_root_project AND TARGET xrpld)
   install(CODE "
     set(CMAKE_MODULE_PATH \"${CMAKE_MODULE_PATH}\")
     include(create_symbolic_link)
-    create_symbolic_link(rippled${suffix} \
+    create_symbolic_link(xrpld${suffix} \
        \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/xrpld${suffix})
   ")
 endif ()

docs/.gitignore

@@ -1,3 +0,0 @@
-html
-temp
-out.txt

include/xrpl/protocol/Feature.h

@@ -78,15 +78,12 @@ namespace detail {
 #undef XRPL_FEATURE
 #pragma push_macro("XRPL_FIX")
 #undef XRPL_FIX
-#pragma push_macro("XRPL_RETIRE_FEATURE")
-#undef XRPL_RETIRE_FEATURE
-#pragma push_macro("XRPL_RETIRE_FIX")
-#undef XRPL_RETIRE_FIX
+#pragma push_macro("XRPL_RETIRE")
+#undef XRPL_RETIRE
 
 #define XRPL_FEATURE(name, supported, vote) +1
 #define XRPL_FIX(name, supported, vote) +1
-#define XRPL_RETIRE_FEATURE(name) +1
-#define XRPL_RETIRE_FIX(name) +1
+#define XRPL_RETIRE(name) +1
 
 // This value SHOULD be equal to the number of amendments registered in
 // Feature.cpp. Because it's only used to reserve storage, and determine how
@@ -97,10 +94,8 @@ static constexpr std::size_t numFeatures =
 #include <xrpl/protocol/detail/features.macro>
     );
 
-#undef XRPL_RETIRE_FEATURE
-#pragma pop_macro("XRPL_RETIRE_FEATURE")
-#undef XRPL_RETIRE_FIX
-#pragma pop_macro("XRPL_RETIRE_FIX")
+#undef XRPL_RETIRE
+#pragma pop_macro("XRPL_RETIRE")
 #undef XRPL_FIX
 #pragma pop_macro("XRPL_FIX")
 #undef XRPL_FEATURE
@@ -344,22 +339,17 @@ foreachFeature(FeatureBitset bs, F&& f)
 #undef XRPL_FEATURE
 #pragma push_macro("XRPL_FIX")
 #undef XRPL_FIX
-#pragma push_macro("XRPL_RETIRE_FEATURE")
-#undef XRPL_RETIRE_FEATURE
-#pragma push_macro("XRPL_RETIRE_FIX")
-#undef XRPL_RETIRE_FIX
+#pragma push_macro("XRPL_RETIRE")
+#undef XRPL_RETIRE
 
 #define XRPL_FEATURE(name, supported, vote) extern uint256 const feature##name;
 #define XRPL_FIX(name, supported, vote) extern uint256 const fix##name;
-#define XRPL_RETIRE_FEATURE(name)
-#define XRPL_RETIRE_FIX(name)
+#define XRPL_RETIRE(name)
 
 #include <xrpl/protocol/detail/features.macro>
 
-#undef XRPL_RETIRE_FEATURE
-#pragma pop_macro("XRPL_RETIRE_FEATURE")
-#undef XRPL_RETIRE_FIX
-#pragma pop_macro("XRPL_RETIRE_FIX")
+#undef XRPL_RETIRE
+#pragma pop_macro("XRPL_RETIRE")
 #undef XRPL_FIX
 #pragma pop_macro("XRPL_FIX")
 #undef XRPL_FEATURE

include/xrpl/protocol/detail/features.macro

@@ -4,11 +4,8 @@
 #if !defined(XRPL_FIX)
 #error "undefined macro: XRPL_FIX"
 #endif
-#if !defined(XRPL_RETIRE_FEATURE)
-#error "undefined macro: XRPL_RETIRE_FEATURE"
-#endif
-#if !defined(XRPL_RETIRE_FIX)
-#error "undefined macro: XRPL_RETIRE_FIX"
+#if !defined(XRPL_RETIRE)
+#error "undefined macro: XRPL_RETIRE"
 #endif
 
 // Add new amendments to the top of this list.
@@ -97,42 +94,41 @@ XRPL_FEATURE(CryptoConditionsSuite, Supported::yes, VoteBehavior::Obsolete)
 // All known amendments and amendments that may appear in a validated ledger
 // must be registered either here or above with the "active" amendments
 //
-// Please keep both lists sorted alphabetically for convenience.
-XRPL_RETIRE_FIX(1201)
-XRPL_RETIRE_FIX(1368)
-XRPL_RETIRE_FIX(1373)
-XRPL_RETIRE_FIX(1512)
-XRPL_RETIRE_FIX(1513)
-XRPL_RETIRE_FIX(1515)
-XRPL_RETIRE_FIX(1523)
-XRPL_RETIRE_FIX(1528)
-XRPL_RETIRE_FIX(1543)
-XRPL_RETIRE_FIX(1571)
-XRPL_RETIRE_FIX(1578)
-XRPL_RETIRE_FIX(1623)
-XRPL_RETIRE_FIX(1781)
-XRPL_RETIRE_FIX(AmendmentMajorityCalc)
-XRPL_RETIRE_FIX(CheckThreading)
-XRPL_RETIRE_FIX(NonFungibleTokensV1_2)
-XRPL_RETIRE_FIX(NFTokenRemint)
-XRPL_RETIRE_FIX(MasterKeyAsRegularKey)
-XRPL_RETIRE_FIX(QualityUpperBound)
-XRPL_RETIRE_FIX(ReducedOffersV1)
-XRPL_RETIRE_FIX(RmSmallIncreasedQOffers)
-XRPL_RETIRE_FIX(STAmountCanonicalize)
-XRPL_RETIRE_FIX(TakerDryOfferRemoval)
-XRPL_RETIRE_FIX(TrustLinesToSelf)
-
-XRPL_RETIRE_FEATURE(CryptoConditions)
-XRPL_RETIRE_FEATURE(Escrow)
-XRPL_RETIRE_FEATURE(EnforceInvariants)
-XRPL_RETIRE_FEATURE(FeeEscalation)
-XRPL_RETIRE_FEATURE(FlowCross)
-XRPL_RETIRE_FEATURE(HardenedValidations)
-XRPL_RETIRE_FEATURE(ImmediateOfferKilled)
-XRPL_RETIRE_FEATURE(MultiSign)
-XRPL_RETIRE_FEATURE(NonFungibleTokensV1_1)
-XRPL_RETIRE_FEATURE(PayChan)
-XRPL_RETIRE_FEATURE(SortedDirectories)
-XRPL_RETIRE_FEATURE(TickSize)
-XRPL_RETIRE_FEATURE(TrustSetAuth)
+// Please keep this list sorted alphabetically for convenience.
+XRPL_RETIRE(fix1201)
+XRPL_RETIRE(fix1368)
+XRPL_RETIRE(fix1373)
+XRPL_RETIRE(fix1512)
+XRPL_RETIRE(fix1513)
+XRPL_RETIRE(fix1515)
+XRPL_RETIRE(fix1523)
+XRPL_RETIRE(fix1528)
+XRPL_RETIRE(fix1543)
+XRPL_RETIRE(fix1571)
+XRPL_RETIRE(fix1578)
+XRPL_RETIRE(fix1623)
+XRPL_RETIRE(fix1781)
+XRPL_RETIRE(fixAmendmentMajorityCalc)
+XRPL_RETIRE(fixCheckThreading)
+XRPL_RETIRE(fixNonFungibleTokensV1_2)
+XRPL_RETIRE(fixNFTokenRemint)
+XRPL_RETIRE(fixMasterKeyAsRegularKey)
+XRPL_RETIRE(fixQualityUpperBound)
+XRPL_RETIRE(fixReducedOffersV1)
+XRPL_RETIRE(fixRmSmallIncreasedQOffers)
+XRPL_RETIRE(fixSTAmountCanonicalize)
+XRPL_RETIRE(fixTakerDryOfferRemoval)
+XRPL_RETIRE(fixTrustLinesToSelf)
+XRPL_RETIRE(CryptoConditions)
+XRPL_RETIRE(Escrow)
+XRPL_RETIRE(EnforceInvariants)
+XRPL_RETIRE(FeeEscalation)
+XRPL_RETIRE(FlowCross)
+XRPL_RETIRE(HardenedValidations)
+XRPL_RETIRE(ImmediateOfferKilled)
+XRPL_RETIRE(MultiSign)
+XRPL_RETIRE(NonFungibleTokensV1_1)
+XRPL_RETIRE(PayChan)
+XRPL_RETIRE(SortedDirectories)
+XRPL_RETIRE(TickSize)
+XRPL_RETIRE(TrustSetAuth)

src/libxrpl/protocol/Feature.cpp

@@ -411,10 +411,8 @@ featureToName(uint256 const& f)
 #undef XRPL_FEATURE
 #pragma push_macro("XRPL_FIX")
 #undef XRPL_FIX
-#pragma push_macro("XRPL_RETIRE_FEATURE")
-#undef XRPL_RETIRE_FEATURE
-#pragma push_macro("XRPL_RETIRE_FIX")
-#undef XRPL_RETIRE_FIX
+#pragma push_macro("XRPL_RETIRE")
+#undef XRPL_RETIRE
 
 #define XRPL_FEATURE(name, supported, vote) \
     uint256 const feature##name = registerFeature(#name, supported, vote);
@@ -422,23 +420,16 @@ featureToName(uint256 const& f)
     uint256 const fix##name = registerFeature("fix" #name, supported, vote);
 
 // clang-format off
-#define XRPL_RETIRE_FEATURE(name)                                       \
-    [[deprecated("The referenced feature amendment has been retired")]]         \
-    [[maybe_unused]]                                                    \
-    uint256 const retiredFeature##name = retireFeature(#name);
-
-#define XRPL_RETIRE_FIX(name)                                           \
-[[deprecated("The referenced fix amendment has been retired")]]             \
-[[maybe_unused]]                                                        \
-uint256 const retiredFix##name = retireFeature("fix" #name);
+#define XRPL_RETIRE(name)                                       \
+    [[deprecated("The referenced amendment has been retired")]] \
+    [[maybe_unused]]                                            \
+    uint256 const retired##name = retireFeature(#name);
 // clang-format on
 
 #include <xrpl/protocol/detail/features.macro>
 
-#undef XRPL_RETIRE_FEATURE
-#pragma pop_macro("XRPL_RETIRE_FEATURE")
-#undef XRPL_RETIRE_FIX
-#pragma pop_macro("XRPL_RETIRE_FIX")
+#undef XRPL_RETIRE
+#pragma pop_macro("XRPL_RETIRE")
 #undef XRPL_FIX
 #pragma pop_macro("XRPL_FIX")
 #undef XRPL_FEATURE

src/xrpld/app/ledger/OrderBookDB.cpp

@@ -106,7 +106,7 @@ OrderBookDB::update(std::shared_ptr<ReadView const> const& ledger)
                 book.domain = (*sle)[~sfDomainID];
 
                 if (book.domain)
-                    domainBooks[{book.in, *book.domain}].insert(book.out);
+                    domainBooks_[{book.in, *book.domain}].insert(book.out);
                 else
                     allBooks[book.in].insert(book.out);