Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reverse merge hotfix release 2.3.1 #5260

Merged
merged 5 commits into from
Jan 30, 2025
Merged

Reverse merge hotfix release 2.3.1 #5260

merged 5 commits into from
Jan 30, 2025

Conversation

ximinez
Copy link
Collaborator

@ximinez ximinez commented Jan 29, 2025

High Level Overview of Change

This PR must be merged manually using a push. Do not use the Github UI.

Reverse-merge hotfix 2.3.1 from master down into develop.

Context of Change

https://github.com/XRPLF/rippled/releases/tag/2.3.1

It fixes an ongoing issue where normal peer traffic is charged incorrectly, causing peers to be disconnected inappropriately during normal operations. This affects network connectivity and the ability of some UNL validators to reach consensus with the others.
Version 2.3.1 does not introduce any new amendments over 2.3.0.

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • Chore (no impact to binary, e.g. .gitignore, formatting, dropping support for older tooling)
  • Release

vlntb and others added 5 commits January 27, 2025 19:41
- Fix an erroneous high fee penalty that peers could incur for sending
  older transactions.
- Update to the fees charged for imposing a load on the server.
- Prevent the relaying of internal pseudo-transactions.
  - Before: Pseudo-transactions received from a peer will fail the signature
    check, even if they were requested (using TMGetObjectByHash), because
    they have no signature. This causes the peer to be charge for an
    invalid signature.
  - After: Pseudo-transactions, are put into the global cache
    (TransactionMaster) only. If the transaction is not part of
    a TMTransactions batch, the peer is charged an unwanted data fee.
    These fees will not be a problem in the normal course of operations,
    but should dissuade peers from behaving badly by sending a bunch of
    junk.
- Improve logging: include the reason for fees charged to a peer.

Co-authored-by: Ed Hennis <ed@ripple.com>
Hotfix: version 2.3.1
  Reduce the peer charges for well-behaved peers
  Update conan in the "nix" CI jobs
@ximinez ximinez added CI Continuous Integration Functionality Build System Bug Trivial Simple change with minimal effect, or already tested. Only needs one approval. labels Jan 29, 2025
@ximinez ximinez changed the title Reduce the peer charges for well-behaved peers: Reverse merge hotfix release 2.3.1 Jan 29, 2025
Copy link

codecov bot commented Jan 29, 2025

Codecov Report

Attention: Patch coverage is 24.29379% with 134 lines in your changes missing coverage. Please review.

Project coverage is 78.1%. Comparing base (50b8f19) to head (3d02580).
Report is 6 commits behind head on develop.

Files with missing lines Patch % Lines
src/xrpld/overlay/detail/PeerImp.cpp 1.0% 102 Missing ⚠️
src/xrpld/overlay/detail/OverlayImpl.cpp 60.0% 8 Missing ⚠️
src/xrpld/overlay/detail/PeerImp.h 0.0% 7 Missing ⚠️
src/xrpld/app/ledger/detail/InboundLedger.cpp 0.0% 5 Missing ⚠️
...rc/xrpld/app/ledger/detail/InboundTransactions.cpp 0.0% 4 Missing ⚠️
src/xrpld/app/ledger/detail/LedgerMaster.cpp 0.0% 4 Missing ⚠️
src/libxrpl/resource/Charge.cpp 0.0% 2 Missing ⚠️
include/xrpl/resource/detail/Logic.h 92.3% 1 Missing ⚠️
src/xrpld/rpc/detail/ServerHandler.cpp 88.9% 1 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff            @@
##           develop   #5260     +/-   ##
=========================================
+ Coverage     78.0%   78.1%   +0.1%     
=========================================
  Files          789     790      +1     
  Lines        67061   67340    +279     
  Branches      8108    8154     +46     
=========================================
+ Hits         52324   52588    +264     
- Misses       14737   14752     +15     
Files with missing lines Coverage Δ
src/libxrpl/resource/Consumer.cpp 89.8% <100.0%> (ø)
src/xrpld/overlay/Overlay.h 70.0% <ø> (ø)
src/xrpld/overlay/Peer.h 100.0% <ø> (ø)
src/xrpld/overlay/detail/OverlayImpl.h 40.0% <ø> (ø)
src/xrpld/rpc/detail/RPCHelpers.cpp 82.8% <100.0%> (ø)
src/xrpld/rpc/handlers/GatewayBalances.cpp 89.8% <100.0%> (ø)
src/xrpld/rpc/handlers/LedgerHandler.cpp 22.6% <100.0%> (ø)
src/xrpld/rpc/handlers/PathFind.cpp 48.3% <100.0%> (ø)
src/xrpld/rpc/handlers/RipplePathFind.cpp 42.5% <100.0%> (ø)
src/xrpld/rpc/handlers/SignFor.cpp 92.3% <100.0%> (ø)
... and 11 more

... and 17 files with indirect coverage changes

Impacted file tree graph

@ximinez ximinez merged commit 3d02580 into develop Jan 30, 2025
25 of 26 checks passed
@ximinez ximinez deleted the ximinez/merge231 branch January 30, 2025 00:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Build System CI Continuous Integration Functionality Trivial Simple change with minimal effect, or already tested. Only needs one approval.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants