feat: add deserde check for JsonStorageKey #1915
Open
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
stevencartavia
requested review from
DaniPopes,
gakonst,
mattsse,
onbjerg and
klkvr
as code owners
mattsse
requested changes
Jan 14, 2025
crates/serde/src/storage.rs
Outdated
Comment on lines
76
to
81
| let hex_str = s.strip_prefix("0x").unwrap_or(s); | ||
| let is_prefixed = s.starts_with("0x"); | ||
|
|
||
| if (is_prefixed && hex_str.len() > 64) || (!is_prefixed && hex_str.len() > 66) { | ||
| return Err(ParseError::BaseConvertError(BaseConvertError::Overflow)); | ||
| } |
There was a problem hiding this comment.
this we can change a bit by changing the order in which we check
if it's > 66 -> return err
else if doesn't start with 0x -> return err
There was a problem hiding this comment.
I think this needs to be updated because the second assert fails with the else if !is_prefixed
#[test]
fn test_from_str_parsing() {
let hex_str = "0x0101010101010101010101010101010101010101010101010101010101010101";
let key = JsonStorageKey::from_str(hex_str).unwrap();
assert_eq!(key, JsonStorageKey::Hash(B256::from_str(hex_str).unwrap()));
let num_str = "42";
let key = JsonStorageKey::from_str(num_str).unwrap();
assert_eq!(key, JsonStorageKey::Number(U256::from(42)));
}
There was a problem hiding this comment.
yeah looks like this test is indeed invalid
mattsse
requested changes
Jan 18, 2025
crates/serde/src/storage.rs
Outdated
| @@ -70,6 +73,14 @@ impl FromStr for JsonStorageKey { | |||
| type Err = ParseError; | |||
|
|
|||
| fn from_str(s: &str) -> Result<Self, Self::Err> { | |||
| let is_prefixed = s.starts_with("0x"); | |||
There was a problem hiding this comment.
this check is redundant here and should be moved inside the len >= 66 check
crates/serde/src/storage.rs
Outdated
| if s.len() > 66 { | ||
| return Err(ParseError::BaseConvertError(BaseConvertError::Overflow)); | ||
| } else if !is_prefixed { | ||
| return Err(ParseError::InvalidDigit(s.chars().next().unwrap())); |
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.
Motivation
should close #1902
Solution
PR Checklist