Conflict resolutions:
- include/xrpl/ledger/helpers/LendingHelpers.h,
src/libxrpl/ledger/helpers/LendingHelpers.cpp: Keep both branches' additions.
Preserve isPaymentLate() from lending-impairment alongside develop's new
cash-basis accounting helpers (accrual/cash_basis dispatchers).
- src/libxrpl/tx/transactors/lending/LoanManage.cpp: Rerere-resolved to
combine lending-impairment's featureLendingProtocolV1_1 gating with
develop's refactor from owedToVault() to loanVaultExposure().
- src/test/app/Loan_test.cpp (deleted upstream, modified locally): Accept
the deletion and migrate our four impairment/LoanPay regression tests
into src/test/app/lending/LoanSecurity_test.cpp:
* testImpairmentPaymentDateUnchanged
* testImpairmentPaymentDatePreAmendment
* testImpairedOverdueLoanPayRequiresLateFlag
* testImpairedOverdueLoanPayBypassPreAmendment
- src/test/app/lending/LoanCashBasis_test.cpp: Adjust the impair calls in
runImpairUnimpair, runDefault, and testLegacyVaultKeepsAccrualAfterAmendmentEnabled
to advance the clock past sfNextPaymentDueDate before impairing, since
featureLendingProtocolV1_1 now rejects impairment on non-late loans.
* upstream/release/3.3.x: (41 commits)
chore: Bump version to 3.3.0
chore: Bump version to 3.3.0-rc7
fix: Increase manifest protocol message size cap and fix manifests relay
fix: Cap untrusted manifests per message and drop oversized ones
chore: Bump version to 3.2.1
chore: Bump version to 3.2.1-rc1
fix: Cap untrusted manifests per message and drop oversized ones
fix: Reject oversized validator manifest before decoding
fix: Reduce untrusted manifest cache cap to 100
fix: Bound untrusted manifest cache
chore: Bump version to 3.3.0-rc6
feat: Package validator-keys inside rippled
chore: Bump version to 3.3.0-rc5
fix: Switch SponsorshipSet to use a delta for sfFeeAmount
fix: Re-revert "fix: Set request size limits and differential pricing for get-object-by-hash calls"
chore: Bump version to 3.3.0-rc4
fix: Revert "fix: Set request size limits and differential pricing for get-object-by-hash calls"
chore: Bump version to 3.3.0-rc3
fix: Reduce untrusted manifest cache cap to 100
fix: Revert "fix: Reject oversized SHAMap nodes in gotStaleData and fetch-pack path"
...
* release/3.2.x:
chore: Bump version to 3.2.1
chore: Bump version to 3.2.1-rc1
fix: Cap untrusted manifests per message and drop oversized ones
fix: Reject oversized validator manifest before decoding
fix: Reduce untrusted manifest cache cap to 100
fix: Bound untrusted manifest cache
Bound the number of manifests carried in a single TMManifests message
(kMaxManifestsPerMessage). Trusted manifests are always included and
processed; untrusted gossip is capped per message on both send and
receive, and the sender is charged only when untrusted entries are
actually skipped. Oversized TMManifests messages are dropped without
penalty at the protocol layer so an unpatched peer is not disconnected.
Complements the cache bound from #276/#323.
