Skip to content

fix: address false positive #2914

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Aug 25, 2022
Merged

fix: address false positive #2914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d231e8b
fix: address false positive
odyslam Aug 24, 2022
0e49338
fix: refactor for unstable warning
odyslam Aug 24, 2022
c3c83a1
fix: correct encoding of null values
odyslam Aug 25, 2022
2f9dc9f
chore: add test for non-address H160
odyslam Aug 25, 2022
54e8129
fix: correct use-case to be string, not bytes
odyslam Aug 25, 2022
a63fa8d
chore: forge fmt
gakonst Aug 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions evm/src/executor/inspector/cheatcodes/ext.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,19 +239,19 @@ fn value_to_token(value: &Value) -> Result<Token, Token> {
if let Some(boolean) = value.as_bool() {
Ok(Token::Bool(boolean))
} else if let Some(string) = value.as_str() {
// If it can decoded as an address, it's an address
if let Ok(addr) = H160::from_str(string) {
Ok(Token::Address(addr))
} else if let Some(val) = string.strip_prefix("0x") {
// If incornrect length, pad 0 at the beginning
if hex::decode(val).is_ok() {
if let Some(val) = string.strip_prefix("0x") {
// If it can decoded as an address, it's an address
if let Ok(addr) = H160::from_str(string) {
Ok(Token::Address(addr))
} else if hex::decode(val).is_ok() {
// if length == 32 bytes, then encode as Bytes32, else Bytes
Ok(if val.len() == 64 {
Token::FixedBytes(Vec::from_hex(val).unwrap())
} else {
Token::Bytes(Vec::from_hex(val).unwrap())
})
} else {
// If incornrect length, pad 0 at the beginning
let arr = format!("0{}", val);
Ok(Token::Bytes(Vec::from_hex(arr).unwrap()))
}
Expand All @@ -271,7 +271,7 @@ fn value_to_token(value: &Value) -> Result<Token, Token> {
object.values().map(|val| value_to_token(val).unwrap()).collect::<Vec<Token>>();
Ok(Token::Tuple(values))
} else if value.is_null() {
Ok(Token::FixedBytes(Vec::with_capacity(32)))
Ok(Token::FixedBytes(vec![0; 32]))
} else {
Err(Token::String("Could not decode field".to_string()))
}
Expand Down
Loading