Skip to content

improve cdd json parsing #9928

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

Closed
wants to merge 8 commits into from
Closed

improve cdd json parsing #9928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4cc94cb
add the ability for cdd to parse array parameters into json arrays in…
tclemos Feb 20, 2025
9d11ce4
remove unnecessary comment slash
tclemos Feb 20, 2025
daa8728
add missing ref
tclemos Feb 20, 2025
207192c
fix code format
tclemos Feb 20, 2025
75da782
add unit test for cdd with json flag and array params
tclemos Feb 20, 2025
27c94b6
Merge branch 'foundry-rs:master' into master
tclemos Feb 20, 2025
5c6b9ae
Merge branch 'master' into master
tclemos Feb 26, 2025
de2bffd
Merge branch 'master' into master
tclemos Feb 26, 2025
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
19 changes: 18 additions & 1 deletion crates/cast/bin/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ use foundry_common::{
shell, stdin,
};
use foundry_config::Config;
use regex::Regex;
use serde_json::{self, Value};
use std::time::Instant;

pub mod args;
Expand Down Expand Up @@ -723,7 +725,22 @@ async fn main_args(args: CastArgs) -> Result<()> {
fn print_tokens(tokens: &[DynSolValue]) {
if shell::is_json() {
let tokens: Vec<String> = format_tokens_raw(tokens).collect();
let _ = sh_println!("{}", serde_json::to_string_pretty(&tokens).unwrap());
let tokens_str: String = serde_json::to_string(&tokens).unwrap();
let input = tokens_str.replace("(", "[").replace(")", "]");
let data: Vec<String> = serde_json::from_str(&input).unwrap();
let re = Regex::new(r"0x[0-9a-fA-F]+").unwrap();
let mut result: Vec<Value> = Vec::new();

for i in data {
let i =
re.replace_all(&i, |caps: &regex::Captures<'_>| format!(r#""{}""#, &caps[0]));
Copy link
Member

@DaniPopes DaniPopes Apr 29, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not the right fix, instead we should have a separate function in crates/common/fmt/src/dynamic.rs that prints as JSON recursively instead of just the top layer, or perhaps even converting DynSolValue to serde_json::Value and print that instead.

I understand this is a more complex change, if you don't have capacity / will to do this we should open an issue for it and close this PR.


let d: Value = serde_json::from_str(&i).unwrap();
result.push(d);
}

let output = serde_json::to_string_pretty(&result).unwrap();
let _ = sh_println!("{}", output);
} else {
let tokens = format_tokens(tokens);
tokens.for_each(|t| {
Expand Down
122 changes: 122 additions & 0 deletions crates/cast/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2231,6 +2231,8 @@ fn explorer_client(
mod tests {
use super::SimpleCast as Cast;
use alloy_primitives::hex;
use alloy_signer::k256::{elliptic_curve::bigint::Integer, sha2::digest::typenum::uint};
use itertools::Itertools;

#[test]
fn simple_selector() {
Expand Down Expand Up @@ -2347,6 +2349,126 @@ mod tests {
);
}

#[test]
fn calldata_decode_array_param() {
let data = "0xdb5b0ed700000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000006772bf190000000000000000000000000000000000000000000000000000000000020716000000000000000000000000af9d27ffe4d51ed54ac8eec78f2785d7e11e5ab100000000000000000000000000000000000000000000000000000000000002c0000000000000000000000000000000000000000000000000000000000000000404366a6dc4b2f348a85e0066e46f0cc206fca6512e0ed7f17ca7afb88e9a4c27000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000093922dee6e380c28a50c008ab167b7800bb24c2026cd1b22f1c6fb884ceed7400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060f85e59ecad6c1a6be343a945abedb7d5b5bfad7817c4d8cc668da7d391faf700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000093dfbf04395fbec1f1aed4ad0f9d3ba880ff58a60485df5d33f8f5e0fb73188600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000aa334a426ea9e21d5f84eb2d4723ca56b92382b9260ab2b6769b7c23d437b6b512322a25cecc954127e60cf91ef056ac1da25f90b73be81c3ff1872fa48d10c7ef1ccb4087bbeedb54b1417a24abbb76f6cd57010a65bb03c7b6602b1eaf0e32c67c54168232d4edc0bfa1b815b2af2a2d0a5c109d675a4f2de684e51df9abb324ab1b19a81bac80f9ce3a45095f3df3a7cf69ef18fc08e94ac3cbc1c7effeacca68e3bfe5d81e26a659b500000000000000000000000000000000000000000000";
let sig = "sequenceBatchesValidium((bytes32,bytes32,uint64,bytes32)[],uint64,uint64,address,bytes)";
let decoded = Cast::calldata_decode(sig, data, true).unwrap();
let decoded = (
(
(
fixed_bytes_to_hex(
decoded[0].as_array().unwrap()[0].as_tuple().unwrap()[0].as_fixed_bytes(),
),
fixed_bytes_to_hex(
decoded[0].as_array().unwrap()[0].as_tuple().unwrap()[1].as_fixed_bytes(),
),
decoded[0].as_array().unwrap()[0].as_tuple().unwrap()[2]
.as_uint()
.unwrap()
.0
.to_string(),
fixed_bytes_to_hex(
decoded[0].as_array().unwrap()[0].as_tuple().unwrap()[3].as_fixed_bytes(),
),
),
(
fixed_bytes_to_hex(
decoded[0].as_array().unwrap()[1].as_tuple().unwrap()[0].as_fixed_bytes(),
),
fixed_bytes_to_hex(
decoded[0].as_array().unwrap()[1].as_tuple().unwrap()[1].as_fixed_bytes(),
),
decoded[0].as_array().unwrap()[1].as_tuple().unwrap()[2]
.as_uint()
.unwrap()
.0
.to_string(),
fixed_bytes_to_hex(
decoded[0].as_array().unwrap()[1].as_tuple().unwrap()[3].as_fixed_bytes(),
),
),
(
fixed_bytes_to_hex(
decoded[0].as_array().unwrap()[2].as_tuple().unwrap()[0].as_fixed_bytes(),
),
fixed_bytes_to_hex(
decoded[0].as_array().unwrap()[2].as_tuple().unwrap()[1].as_fixed_bytes(),
),
decoded[0].as_array().unwrap()[2].as_tuple().unwrap()[2]
.as_uint()
.unwrap()
.0
.to_string(),
fixed_bytes_to_hex(
decoded[0].as_array().unwrap()[2].as_tuple().unwrap()[3].as_fixed_bytes(),
),
),
(
fixed_bytes_to_hex(
decoded[0].as_array().unwrap()[3].as_tuple().unwrap()[0].as_fixed_bytes(),
),
fixed_bytes_to_hex(
decoded[0].as_array().unwrap()[3].as_tuple().unwrap()[1].as_fixed_bytes(),
),
decoded[0].as_array().unwrap()[3].as_tuple().unwrap()[2]
.as_uint()
.unwrap()
.0
.to_string(),
fixed_bytes_to_hex(
decoded[0].as_array().unwrap()[3].as_tuple().unwrap()[3].as_fixed_bytes(),
),
),
),
decoded[1].as_uint().unwrap().0.to_string(),
decoded[2].as_uint().unwrap().0.to_string(),
decoded[3].as_address().unwrap().to_string().to_lowercase(),
format!("0x{}", hex::encode(decoded[4].as_bytes().unwrap())),
);
assert_eq!(
decoded,
(
(
(
"0x04366a6dc4b2f348a85e0066e46f0cc206fca6512e0ed7f17ca7afb88e9a4c27".to_string(),
"0x0000000000000000000000000000000000000000000000000000000000000000".to_string(),
"0".to_string(),
"0x0000000000000000000000000000000000000000000000000000000000000000".to_string()
),
(
"0x093922dee6e380c28a50c008ab167b7800bb24c2026cd1b22f1c6fb884ceed74".to_string(),
"0x0000000000000000000000000000000000000000000000000000000000000000".to_string(),
"0".to_string(),
"0x0000000000000000000000000000000000000000000000000000000000000000".to_string()
),
(
"0x60f85e59ecad6c1a6be343a945abedb7d5b5bfad7817c4d8cc668da7d391faf7".to_string(),
"0x0000000000000000000000000000000000000000000000000000000000000000".to_string(),
"0".to_string(),
"0x0000000000000000000000000000000000000000000000000000000000000000".to_string()
),
(
"0x93dfbf04395fbec1f1aed4ad0f9d3ba880ff58a60485df5d33f8f5e0fb731886".to_string(),
"0x0000000000000000000000000000000000000000000000000000000000000000".to_string(),
"0".to_string(),
"0x0000000000000000000000000000000000000000000000000000000000000000".to_string()
)
),
"1735573273".to_string(),
"132886".to_string(),
"0xAF9d27ffe4d51eD54AC8eEc78f2785D7E11E5ab1".to_string().to_lowercase(),
"0x334a426ea9e21d5f84eb2d4723ca56b92382b9260ab2b6769b7c23d437b6b512322a25cecc954127e60cf91ef056ac1da25f90b73be81c3ff1872fa48d10c7ef1ccb4087bbeedb54b1417a24abbb76f6cd57010a65bb03c7b6602b1eaf0e32c67c54168232d4edc0bfa1b815b2af2a2d0a5c109d675a4f2de684e51df9abb324ab1b19a81bac80f9ce3a45095f3df3a7cf69ef18fc08e94ac3cbc1c7effeacca68e3bfe5d81e26a659b5".to_string().to_lowercase()
)
);
}

fn fixed_bytes_to_hex(fixed_bytes: Option<(&[u8], usize)>) -> String {
let fixed_bytes_as_slice = hex::encode(fixed_bytes.unwrap().0.iter().as_slice());
let fixed_bytes_hex = format!("0x{}", fixed_bytes_as_slice);
fixed_bytes_hex
}

#[test]
fn concat_hex() {
assert_eq!(Cast::concat_hex(["0x00", "0x01"]), "0x0001");
Expand Down