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

Jump to bottom

fix: exclude empty artifacts from ContractsByArtifact #7713

Merged
merged 5 commits into from
Apr 18, 2024
Merged

fix: exclude empty artifacts from ContractsByArtifact #7713

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9478ac3
fix: exclude empty artifacts from ContractsByArtifact
klkvr Apr 18, 2024
1f69056
additional check
klkvr Apr 18, 2024
6a9ad5d
fmt
klkvr Apr 18, 2024
96504c6
doc
klkvr Apr 18, 2024
3ad0a43
use Option for bytecodes
klkvr Apr 18, 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
7 changes: 7 additions & 0 deletions crates/common/src/contracts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ impl ContractsByArtifact {
let bytecode = artifact.bytecode.and_then(|b| b.into_bytes())?;
let deployed_bytecode =
artifact.deployed_bytecode.and_then(|b| b.into_bytes())?;

if bytecode.is_empty() {
Copy link
Member

Choose a reason for hiding this comment

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

nit: add small comment on what empty bytecode means, just like the pr description

return None;
}
if deployed_bytecode.is_empty() {
return None;
}
let abi = artifact.abi?;

Some((id, ContractData { name, abi, bytecode, deployed_bytecode }))
Expand Down
4 changes: 4 additions & 0 deletions crates/script/src/verify.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,10 @@ impl VerifyBundle {
libraries: &[String],
) -> Option<VerifyArgs> {
for (artifact, contract) in self.known_contracts.iter() {
// Avoid comparing to empty bytecode.
if contract.bytecode.is_empty() {
Copy link
Member

Choose a reason for hiding this comment

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

we don't need this check if we add the check in ContractsByArtifact i think?

Copy link
Member Author

Choose a reason for hiding this comment

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

yeah, but I've seen this bug before so would like to keep this as impact of this bug is pretty high and it's pretty easy to miss while working with artifacts

Copy link
Member Author

@klkvr klkvr Apr 18, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

also I think this would've been caught by verification tests which are disabled rn

cc @mattsse

continue;
}
// If it's a CREATE2, the tx.data comes with a 32-byte salt in the beginning
// of the transaction
if data.split_at(create2_offset).1.starts_with(&contract.bytecode) {
Expand Down
Loading