mirror of
https://github.com/XRPLF/rippled.git
synced 2026-06-09 03:36:49 +00:00
Conflicts resolved in: - src/libxrpl/ledger/helpers/VaultHelpers.cpp: combined granular includes from lending-fix-amendment with TxFlags.h needed by isVaultDonate; kept both isVaultDonate (vault-donation) and isSoleShareholder (lending-fix) - src/libxrpl/tx/transactors/vault/VaultDeposit.cpp: kept both getFlagsMask (vault-donation) and roundToVaultScale (lending-fix); preserved donate path logic (assets deposited without share exchange) with accountID_ rename and beast::kZero from lending-fix-amendment - src/libxrpl/tx/invariants/VaultInvariant.cpp: merged includes; preserved isDonate invariant checks (donation must not change shares) inside the new isDonate/else structure; added makeDelta body and split computeCoarsestScale from lending-fix-amendment; used kZero throughout - src/test/jtx/impl/vault.cpp: used toJson rename from lending-fix-amendment while preserving flags support added by vault-donation