Skip to content
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

fix(chisel): final statement & fetch err with complex type fixes #9081

Merged
merged 4 commits into from
Oct 10, 2024
+46 −4
Merged

fix(chisel): final statement & fetch err with complex type fixes #9081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1f205e
fix(chisel): consider assembly block return as final statement
grandizzy Oct 9, 2024
70bc442
Fix 4938
grandizzy Oct 9, 2024
e34f9a5
Start from first assembly block when checking for return statement
grandizzy Oct 9, 2024
94e8a32
Fix 6618
grandizzy Oct 9, 2024
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: 17 additions & 2 deletions crates/chisel/src/dispatcher.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use crate::{
},
session_source::SessionSource,
};
use alloy_json_abi::JsonAbi;
use alloy_json_abi::{InternalType, JsonAbi};
use alloy_primitives::{hex, Address};
use forge_fmt::FormatterConfig;
use foundry_config::{Config, RpcEndpoint};
Expand Down Expand Up @@ -528,7 +528,22 @@ impl ChiselDispatcher {
err.name,
Copy link
Member

Choose a reason for hiding this comment

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

omg why does this exist. We have ABI to solidity in cast and forge already, and a whole crate to interface with etherscan (foundry-block-explorers), please just use those to fix a trillion other bugs

Copy link
Member

Choose a reason for hiding this comment

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

this definitely needs a cleanup pass but should happen in a followup

err.inputs
.iter()
.map(|input| format_param!(input))
.map(|input| {
let mut param_type = &input.ty;
// If complex type then add the name of custom type.
// see <https://github.com/foundry-rs/foundry/issues/6618>.
if input.is_complex_type() {
if let Some(
InternalType::Enum { contract: _, ty } |
InternalType::Struct { contract: _, ty } |
InternalType::Other { contract: _, ty },
) = &input.internal_type
{
param_type = ty;
}
}
format!("{} {}", param_type, input.name)
})
.collect::<Vec<_>>()
.join(",")
));
Expand Down
31 changes: 29 additions & 2 deletions crates/chisel/src/executor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,22 @@ impl SessionSource {
// Fetch the run function's body statement
let run_func_statements = compiled.intermediate.run_func_body()?;

// Record loc of first yul block return statement (if any).
// This is used to decide which is the final statement within the `run()` method.
// see <https://github.com/foundry-rs/foundry/issues/4617>.
let last_yul_return = run_func_statements.iter().find_map(|statement| {
if let pt::Statement::Assembly { loc: _, dialect: _, flags: _, block } = statement {
if let Some(statement) = block.statements.last() {
if let pt::YulStatement::FunctionCall(yul_call) = statement {
if yul_call.id.name == "return" {
return Some(statement.loc())
}
}
}
}
None
});

// Find the last statement within the "run()" method and get the program
// counter via the source map.
if let Some(final_statement) = run_func_statements.last() {
Expand All @@ -58,9 +74,13 @@ impl SessionSource {
//
// There is some code duplication within the arms due to the difference between
// the [pt::Statement] type and the [pt::YulStatement] types.
let source_loc = match final_statement {
let mut source_loc = match final_statement {
pt::Statement::Assembly { loc: _, dialect: _, flags: _, block } => {
if let Some(statement) = block.statements.last() {
// Select last non variable declaration statement, see <https://github.com/foundry-rs/foundry/issues/4938>.
let last_statement = block.statements.iter().rev().find(|statement| {
!matches!(statement, pt::YulStatement::VariableDeclaration(_, _, _))
});
if let Some(statement) = last_statement {
statement.loc()
} else {
// In the case where the block is empty, attempt to grab the statement
Expand Down Expand Up @@ -88,6 +108,13 @@ impl SessionSource {
_ => final_statement.loc(),
};

// Consider yul return statement as final statement (if it's loc is lower) .
if let Some(yul_return) = last_yul_return {
if yul_return.end() < source_loc.start() {
source_loc = yul_return;
}
}

// Map the source location of the final statement of the `run()` function to its
// corresponding runtime program counter
let final_pc = {
Expand Down
Loading