-
Notifications
You must be signed in to change notification settings - Fork 3
feat(#3): support call encodings #50
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
Open
re1ro
wants to merge
1
commit into
feature/typed-encoder-step2
Choose a base branch
from
feature/typed-encoder-step3
base: feature/typed-encoder-step2
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+536
−2
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -195,10 +195,39 @@ library TypedEncoder { | |
| if (s.encodingType == EncodingType.ABI) { | ||
| return _encodeAbi(s); | ||
| } | ||
| // CallWithSelector and CallWithSignature return raw calldata (selector + params) | ||
| if (s.encodingType == EncodingType.CallWithSelector) { | ||
| // Validate CallWithSelector encoding structure before forwarding | ||
| if (s.chunks.length != 1) { | ||
| revert InvalidCallEncodingStructure(); | ||
| } | ||
| Chunk memory chunk = s.chunks[0]; | ||
| if (chunk.primitives.length != 1 || chunk.structs.length != 1 || chunk.arrays.length != 0) { | ||
| revert InvalidCallEncodingStructure(); | ||
| } | ||
| Primitive memory selectorPrim = chunk.primitives[0]; | ||
| if (selectorPrim.isDynamic || selectorPrim.data.length != 4) { | ||
| revert InvalidCallEncodingStructure(); | ||
| } | ||
| return _encodeCallWithSelector(s); | ||
| } | ||
| if (s.encodingType == EncodingType.CallWithSignature) { | ||
| // Validate CallWithSignature encoding structure before forwarding | ||
| if (s.chunks.length != 1) { | ||
| revert InvalidCallEncodingStructure(); | ||
| } | ||
| Chunk memory chunk = s.chunks[0]; | ||
| if (chunk.primitives.length != 1 || chunk.structs.length != 1 || chunk.arrays.length != 0) { | ||
| revert InvalidCallEncodingStructure(); | ||
| } | ||
| if (!chunk.primitives[0].isDynamic) { | ||
| revert InvalidCallEncodingStructure(); | ||
| } | ||
| return _encodeCallWithSignature(s); | ||
| } | ||
|
Comment on lines
+199
to
+227
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why not do the validations inside the corresponding _encode method? These validations right now don't happen for |
||
| // Encoding types implemented in later commits | ||
| if ( | ||
| s.encodingType == EncodingType.CallWithSelector || s.encodingType == EncodingType.CallWithSignature | ||
| || s.encodingType == EncodingType.Hash || s.encodingType == EncodingType.Create | ||
| s.encodingType == EncodingType.Hash || s.encodingType == EncodingType.Create | ||
| || s.encodingType == EncodingType.Create2 || s.encodingType == EncodingType.Create3 | ||
| ) { | ||
| revert EncodingTypeNotImplemented(); | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The validation checks
selectorPrim.data.length != 4, but this checks the length of the bytes array itself, not the actual selector content. When usingabi.encodePacked(bytes4), the resulting bytes array has a length field followed by 4 bytes of data. The check should validate that the data contains exactly 4 bytes of selector data. Consider using assembly to extract and validate the actual 4-byte content, or document thatdatashould be created withabi.encodePacked(selector)which produces a 4-byte array.