feat(forge vb): --ignore-predeploy-immutables
#8850
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
yash-atreya
requested review from
DaniPopes,
klkvr,
mattsse,
grandizzy and
zerosnacks
as code owners
yash-atreya
changed the title
forge vb): --ignore-immutablesforge vb): --ignore-predeploy-immutables
klkvr
requested changes
Oct 10, 2024
Comment on lines
+160
to
+175
| for offset in offsets { | ||
| let start = offset.start as usize; | ||
| let end = (offset.start + offset.length) as usize; | ||
|
|
||
| total_len_extracted_expected += offset.length; | ||
|
|
||
| // Remove this sections of bytes from the bytecode | ||
| let start_section = bytecode.slice(0..start); | ||
| let end_section = bytecode.slice(end..bytecode.len()); | ||
|
|
||
| // Combine the start and end sections | ||
| let mut start_section_vec = start_section.to_vec(); | ||
|
|
||
| start_section_vec.extend_from_slice(&end_section); | ||
|
|
||
| bytecode = Bytes::from(start_section_vec); |
There was a problem hiding this comment.
we should account for bytecode being shifted on every iteration, thus requiring next offsets to be shifted too
Comment on lines
+140
to
+151
| pub fn get_immutable_refs( | ||
| artifact: &CompactContractBytecode, | ||
| ) -> Option<BTreeMap<String, Vec<Offsets>>> { | ||
| if artifact.deployed_bytecode.as_ref().is_some_and(|b| !b.immutable_references.is_empty()) { | ||
| let immutable_refs = | ||
| artifact.deployed_bytecode.as_ref().unwrap().immutable_references.clone(); | ||
|
|
||
| return Some(immutable_refs); | ||
| } | ||
|
|
||
| None | ||
| } |
There was a problem hiding this comment.
nit: can we make this just return a Vec of (start, end) tuples so that we can just iterate over offsets in extract_immutable_refs
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
Closes #8849
Solution
deployed_bytecodeandonchain_runtime_codeusing the offsets provided underimmutableReferencesin the artifact.