[ALPHANET] 1 Quantum

[dangell7]

High Level Overview of Change

Context of Change

Type of Change

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to not work as expected)
• Refactor (non-breaking change that only restructures code)
• Performance (increase or change in throughput and/or latency)
• Tests (you added tests for code that already exists, or your new feature included in this PR)
• Documentation update
• Chore (no impact to binary, e.g. .gitignore, formatting, dropping support for older tooling)
• Release

API Impact

• Public API: New feature (new methods and/or new fields)
• Public API: Breaking change (in general, breaking changes should only impact the next api_version)
• libxrpl change (any change that may affect libxrpl or dependents of libxrpl)
• Peer protocol change (must be backward compatible or bump the peer protocol version)

[dangell7]

/doctor

[sentinel-ai-reviewer-dev]

Project auto-configured for this repository.

Indexing is in progress and may take a few minutes. Your command is being processed.

[sentinel-ai-reviewer-dev]

Doctor attempted to resolve conflicts but conflict markers remain.

Remaining conflicts:

src/test/app/Manifest_test.cpp:908: leftover conflict marker
src/test/app/Manifest_test.cpp:911: leftover conflict marker
src/test/app/Manifest_test.cpp:914: leftover conflict marker
src/test/app/Manifest_test.cpp:952: leftover conflict marker
src/test/app/Manifest_test.cpp:961: leftover conflict marker
src/test/app/Manifest_test.cpp:964: leftover conflict marker
src/test/app/ValidatorKeys_test.cpp:75: leftover conflict marker
src/test/app/ValidatorKeys_test.cpp:78: leftover conflict marker
src/test/app/ValidatorKeys_test.cpp:80: leftover conflict marker
src/test/consensus/NegativeUNL_test.cpp:701: leftover conflict marker
src/test/consensus/NegativeUNL_test.cpp:708: leftover conflict marker
src/test/consensus/NegativeUNL_test.cpp:712: leftover conflict marker
src/test/jtx/TrustedPublisherServer.h:155: leftover conflict marker
src/test/jtx/TrustedPublisherServer.h:159: leftover conflict marker
src/test/jtx/TrustedPublisherServer.h:163: leftover conflict marker
src/test/overlay/reduce_r

Manual intervention needed.

[sentinel-ai-reviewer-dev]

Doctor attempted to resolve conflicts but conflict markers remain.

Remaining conflicts:

src/test/app/Manifest_test.cpp:811: leftover conflict marker
src/test/app/Manifest_test.cpp:819: leftover conflict marker
src/test/app/Manifest_test.cpp:822: leftover conflict marker
src/test/app/Manifest_test.cpp:888: leftover conflict marker
src/test/app/Manifest_test.cpp:907: leftover conflict marker
src/test/app/Manifest_test.cpp:926: leftover conflict marker
src/test/app/Manifest_test.cpp:934: leftover conflict marker
src/test/app/Manifest_test.cpp:937: leftover conflict marker
src/test/app/Manifest_test.cpp:940: leftover conflict marker
src/test/app/Manifest_test.cpp:978: leftover conflict marker
src/test/app/Manifest_test.cpp:987: leftover conflict marker
src/test/app/Manifest_test.cpp:990: leftover conflict marker
src/test/app/ValidatorKeys_test.cpp:75: leftover conflict marker
src/test/app/ValidatorKeys_test.cpp:78: leftover conflict marker
src/test/app/ValidatorKeys_test.cpp:80: leftover conflict marker
src/test/consensus/NegativeUNL_test.cpp:701: leftover conflict marker
src

Manual intervention needed.

[sentinel-ai-reviewer-dev]

Sorry, I encountered an error processing /doctor. Please try again or use /help for available commands.

[dangell7]

/doctor

[sentinel-ai-reviewer-dev]

Sorry, I encountered an error processing /doctor. Please try again or use /help for available commands.

[dangell7]

/doctor

[sentinel-ai-reviewer-dev]

Sorry, I encountered an error processing /doctor. Please try again or use /help for available commands.

[sentinel-ai-reviewer-dev]

Auto CI fix failed for this PR.

Error: [Errno 2] No such file or directory: '/Users/darkmatter/.sentinel/workspace/Transia-RnD-rippled-doctor-27/rippled/cfg/rippled-example.cfg\tcfg/xrpld-example.cfg'

Use /doctor to retry manually.

[sentinel-ai-reviewer-dev]

Auto CI fix failed for this PR.

Error: 502 Server Error: Bad Gateway for url: https://api.github.com/repos/Transia-RnD/rippled/git/trees

Use /doctor to retry manually.

[sentinel-ai-reviewer-dev]

Auto CI fix failed for this PR.

Error: 422 Client Error: Unprocessable Entity for url: https://api.github.com/repos/Transia-RnD/rippled/git/refs/heads/dilithium-full

Use /doctor to retry manually.

[sentinel-ai-reviewer-dev]

Resolved merge conflicts with develop and pushed commit 217287c3.

Conflicted files resolved (17):

• cmake/XrplCore.cmake
• include/xrpl/protocol/detail/features.macro
• src/libxrpl/protocol/PublicKey.cpp
• src/libxrpl/protocol/SecretKey.cpp
• src/test/app/AmendmentTable_test.cpp
• src/test/app/Manifest_test.cpp
• src/test/app/ValidatorKeys_test.cpp
• src/test/consensus/NegativeUNL_test.cpp
• src/test/jtx/TrustedPublisherServer.h
• src/test/overlay/reduce_relay_test.cpp
• ... and 7 more

Summary:
This is a CMake project with external dependencies (dilithium, Boost, OpenSSL, etc.). A full build would require configuring all dependencies which is beyond the scope of conflict resolution. The merge is clean.

Here's a summary of how each conflict was resolved:

Resolution Summary

File	Resolution
cmake/XrplCore.cmake	Adopted develop's formatting for target_link_libraries, added PR's NIH::dilithium2_ref dependency
features.macro	Kept both sides' amendments: PR's Quantum at top, then develop's new fixes (PermissionedDomainInvariant, ExpiredNFTokenOfferRemoval, BatchInnerSigs), with develop's LendingProtocol Supported::yes
PublicKey.cpp	Kept PR's switch-based verifyDigest with both secp256k1 and dilithium cases (develop had flattened to secp256k1-only)
SecretKey.cpp (2 conflicts)	Kept PR's switch-based signDigest/sign with both secp256k1 and dilithium cases, using PR's indentation style
AmendmentTable_test.cpp	Kept PR's KeyType::dilithium, adopted develop's single-line formatting
Manifest_test.cpp (12 conflicts)	Kept PR's KeyType::dilithium throughout all test helpers and test cases, adopted develop's single-line formatting where appropriate
ValidatorKeys_test.cpp	Kept PR's KeyType::dilithium, adopted develop's formatting
NegativeUNL_test.cpp	Kept PR's KeyType::dilithium, adopted develop's formatting
**TrustedPublisherServer.h

[dangell7]

/doctor

[sentinel-ai-reviewer-dev]

Sorry, I encountered an error processing /doctor. Please try again or use /help for available commands.