Fix length calculations of blob-type txs #5884
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
flcl42
reviewed
Jul 4, 2023
LukaszRozmej
reviewed
Jul 6, 2023
| @@ -201,7 +201,7 @@ public class SystemTransaction : Transaction { } | |||
| /// <remarks>Created because of cyclic dependencies between Core and Rlp modules</remarks> | |||
| public interface ITransactionSizeCalculator | |||
| { | |||
| int GetLength(Transaction tx); | |||
| int GetNetworkTxLength(Transaction tx); | |||
There was a problem hiding this comment.
I would keep it as GetLength and then have a NetworkTransactionSizeCalculator that would take TxDecoder and call GetLength(tx, RlpBehaviors.InMempoolForm);
Then you can reuse this interface for other calculators if needed, rather than hardcoding that in TxDecoder.
LukaszRozmej
reviewed
Jul 6, 2023
| @@ -136,7 +136,7 @@ private void ClearPreHashInternal() | |||
| /// </summary> | |||
| public int GetLength(ITransactionSizeCalculator sizeCalculator) | |||
| { | |||
| return _size ??= sizeCalculator.GetLength(this); | |||
| return _size ??= sizeCalculator.GetNetworkTxLength(this); | |||
There was a problem hiding this comment.
Now there is no differentiation what _size is. Makes it confusing.
flcl42
approved these changes
Jul 6, 2023
LukaszRozmej
approved these changes
Jul 6, 2023
| @@ -136,7 +136,7 @@ private void ClearPreHashInternal() | |||
| /// </summary> | |||
| public int GetLength(ITransactionSizeCalculator sizeCalculator) | |||
| { | |||
| return _size ??= sizeCalculator.GetNetworkTxLength(this); | |||
| return _size ??= sizeCalculator.GetLength(this); | |||
There was a problem hiding this comment.
_size can be confusing as it will differ per sizecalculator
# Conflicts: # src/Nethermind/Nethermind.TxPool/TransactionExtensions.cs
marcindsobczak
added a commit
that referenced
this pull request
Jul 6, 2023
* regression test * fix * fiz typo * adjust test * rename GetLength to GetNetworkTxLength * refactor (cherry picked from commit 88e4d31)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
Without
RlpBehaviors.InMempoolForminGetLengthofITransactionSizeCalculatoractual blobs were not included in calculation of tx size.While calculating content length we were not entering here:
https://github.com/NethermindEth/nethermind/blob/master/src/Nethermind/Nethermind.Serialization.Rlp/TxDecoder.cs#L724-L732
Which caused not adding size of actual blobs:
https://github.com/NethermindEth/nethermind/blob/master/src/Nethermind/Nethermind.Serialization.Rlp/TxDecoder.cs#L677-L684
And it causes, that we are sending huge messages on 4844 devnets which are rejected by peers (e.g.
PooledTransactionsMessagewith size 147x bigger than expected and 19x bigger than biggest possible 6-blob tx). Also ourNewPooledTransactionHashesMessageineth68version has not correct sizes of blob txs.Types of changes
What types of changes does your code introduce?
Testing
Requires testing
If yes, did you write tests?
Documentation
Requires documentation update
Requires explanation in Release Notes