Merge dev (c3e8039c5) into sync-2.4.0: fixXahauGenesisOwnerCount + docs#687
Merged
RichardAH merged 3 commits intosync-2.4.0from Feb 19, 2026
Merged
Merge dev (c3e8039c5) into sync-2.4.0: fixXahauGenesisOwnerCount + docs#687RichardAH merged 3 commits intosync-2.4.0from
RichardAH merged 3 commits intosync-2.4.0from
Conversation
…3e8039c5 # Conflicts: # BUILD.md # cfg/xahaud-example.cfg # src/xrpld/app/tx/detail/Change.cpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Merges
dev(top commitc3e8039c5) intosync-2.4.0, bringing in 2 commits:fixXahauGenesisOwnerCount— Bug fix: replaces hardcoded owner count increments withSetHook::computeHookReserve()inChange::activateXahauGenesis(). Promotes thecomputeHookReservelambda to a public static method onSetHook.Update Build Instructions and Example Configuration File— Docs: renamesrippled→xahaudin BUILD.md, adds[ips]mainnet peers and[network_id]tocfg/xahaud-example.cfg.Conflict Resolution
3 conflicts resolved:
src/xrpld/app/tx/detail/Change.cpp— Include path rename (dev uses oldsrc/ripple/paths). Took ours (newxrpld/xrplpaths), added new#include <xrpld/app/tx/detail/SetHook.h>from dev.BUILD.md— Took dev's version (xahaud naming).cfg/xahaud-example.cfg— Took dev's version (mainnet peers + network_id).Known Issue
XahauGenesis_test.cpp:253from PR fixXahauGenesisOwnerCount #666 — tracked in bug: ternary precedence bug in XahauGenesis_test owner count assertion #686. Should be fixed in a PR todev.Merge Instructions
Please merge using a merge commit (not squash) to preserve git ancestry for future dev syncs.