Conflict resolution:
- sfields.macro: both sides claimed INT32 code 2. sfRemainingOwnerCountDelta
is already in develop, so it keeps code 2 and sfVMReturnCode moves to 3.
This changes the Smart Escrow serialization, which is safe while the
amendment is unactivated, but is a deliberate renumber rather than a
mechanical merge.
- EscrowFinish.cpp: took the SeqProxy form of the keylet::escrow call and
kept this branch's comment.
Follow-on fixes the merge required:
- Adapted two keylet::escrow calls in EscrowSmart_test.cpp to SeqProxy; they
are only on this branch, so the earlier pass over the wasm code did not
cover them.
- Updated two gas expectations that the trace host function refactor and the
regenerated fixtures invalidated: the codecov allowance in Wasm_test.cpp is
now 264'467 and sfGasUsed in EscrowSmart_test.cpp is now 48'433. Both are
measured, not estimated.
- Disabled testKeyletHostFunctions. kAllKeyletsWasmHex was built against the
old trace ABI and is rejected with temINVALID_BYTECODE. Regenerating it
needs the all_keylets source ported to the current stdlib first, along with
float_tests and float_0, which are stale for the same reason. See the TODO
on the test.
Conflict resolution:
- features.macro: both sides added an amendment at the top of the list.
Kept both, with fixCleanup3_4_0 above SmartEscrow.
- NetworkOPs.cpp: develop moved the ledgerClosed stream publisher out of
pubLedger and into the new publishLedgerStreams helper, while this branch
had added the Smart Escrow fee fields to the old inline version. Took the
helper and moved the gas_limit / bytecode_size_limit / gas_price block into
it, keeping the featureSmartEscrow guard.
* 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"
...
