feat(cast): add --int flag to from-rlp #9210
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
TropicalDog17
requested review from
DaniPopes,
klkvr,
mattsse,
grandizzy,
yash-atreya and
zerosnacks
as code owners
klkvr
reviewed
Oct 27, 2024
crates/cast/src/lib.rs
Outdated
Comment on lines
1467
to
1499
| pub fn from_rlp(value: impl AsRef<str>, as_int: bool) -> Result<String> { | ||
| fn validate_canonical_int(item: &Item) -> Result<()> { | ||
| use eyre::bail; | ||
|
|
||
| let bytes = match item { | ||
| Item::Data(b) => b, | ||
| _ => return Ok(()), | ||
| }; | ||
|
|
||
| if bytes.is_empty() { | ||
| return Ok(()); | ||
| } | ||
|
|
||
| // Check for leading zeros | ||
| if bytes[0] == 0 { | ||
| bail!("rlp: non-canonical integer (leading zero bytes)"); | ||
| } | ||
|
|
||
| if bytes.len() == 1 && bytes[0] < 0x80 { | ||
| bail!("rlp: non-canonical size information"); | ||
| } | ||
|
|
||
| Ok(()) | ||
| } | ||
|
|
||
| let bytes = hex::decode(value.as_ref()).wrap_err("Could not decode hex")?; | ||
| let item = Item::decode(&mut &bytes[..]).wrap_err("Could not decode rlp")?; | ||
| if as_int { | ||
| validate_canonical_int(&item).wrap_err("Non-canonical integer")?; | ||
| } | ||
|
|
||
| Ok(item.to_string()) | ||
| } |
There was a problem hiding this comment.
I think if as_int is true we should parse and return it as U256, otherwise as Item
klkvr
reviewed
Oct 27, 2024
crates/cast/src/lib.rs
Outdated
Comment on lines
1503
to
1508
| if as_int { | ||
| validate_canonical_int(&bytes).wrap_err("Non-canonical integer")?; | ||
| let uint_value = U256::from_str(value.as_ref())?; | ||
| return Ok(format!("{uint_value:#?}")); | ||
| } | ||
|
|
There was a problem hiding this comment.
sorry I mean decode rlp as uint (just U256::decode), that way we don't need the extra validation because the decoding would just fail if it's an incorrect integer
There was a problem hiding this comment.
thank you so much, I've updated
klkvr
approved these changes
Oct 28, 2024
rplusq
pushed a commit
to rplusq/foundry
that referenced
this pull request
Nov 29, 2024
* bet * fmt * bet * bet * remove unneccessary validation
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
Fixes #9197
Solution