Merge remote-tracking branch 'upstream/develop' into ct-merge-dev-may-4

Browse Source

# Conflicts:
#	include/xrpl/protocol/detail/features.macro
#	include/xrpl/protocol/detail/ledger_entries.macro
#	include/xrpl/protocol/detail/secp256k1.h
#	include/xrpl/protocol/detail/transactions.macro
#	src/libxrpl/ledger/helpers/TokenHelpers.cpp
#	src/libxrpl/protocol/PublicKey.cpp
#	src/libxrpl/tx/invariants/MPTInvariant.cpp
#	src/libxrpl/tx/transactors/token/MPTokenIssuanceSet.cpp
#	src/test/app/Delegate_test.cpp
#	src/test/jtx/impl/mpt.cpp
#	src/test/jtx/mpt.h

...

This commit is contained in:

Shawn Xie

2026-05-04 13:51:58 -04:00

parent 9a62a1e471 d050073842

commit 5afa29cd39

1561 changed files with 64812 additions and 61971 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1578

src/test/app/Invariants_test.cpp

File diff suppressed because it is too large Load Diff