Fix encoding for branch and extension for inlined data. #391
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
Scooletz
requested changes
Sep 16, 2024
| @@ -649,7 +649,9 @@ private void EncodeBranch(scoped in Key key, scoped in ComputeContext ctx, scope | |||
| // Write length of length in front of the payload, resetting the stream properly | |||
| var end = stream.Position; | |||
| var actualLength = end - initialShift; | |||
| var lengthOfLength = Rlp.LengthOfLength(actualLength) + 1; | |||
| var lengthOfLength = Rlp.LengthOfLength(actualLength); | |||
| if (actualLength >= 56) //to match StartSequence | |||
There was a problem hiding this comment.
Should we have it extracted as a const under Rlp maybe? Then both Rlp.LengthOfLength and this place could refer to it properly?
There was a problem hiding this comment.
Added constant in Rlp
| @@ -692,7 +694,10 @@ private void EncodeExtension(scoped in Key key, scoped in ComputeContext ctx, sc | |||
| RlpStream stream = new(pooled.Span.Slice(slice, totalLength)); | |||
| stream.StartSequence(contentLength); | |||
| stream.Encode(span); | |||
| stream.Encode(keccakOrRlp.Keccak); | |||
| if (keccakOrRlp.DataType == KeccakOrRlp.Type.Rlp) | |||
There was a problem hiding this comment.
Clearly, after following the test, this check was missing.
Minimum allowed line rate is |
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.
Fix RLP encoding for small inlined data:
KeccakorRlp-contentLengthalready takes that into account