Skip to content

feat: mutable access for all fields in BundleBuilder #1524

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
rakita merged 5 commits into from
Jun 16, 2024
Merged

feat: mutable access for all fields in BundleBuilder #1524

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
824e33f
feat: mutable access to state_storage and revert_storage in BundleBui…
jpgonzalezra Jun 14, 2024
20e46ee
self review
jpgonzalezra Jun 14, 2024
5f1442b
Revert "self review"
jpgonzalezra Jun 15, 2024
d491514
Revert "feat: mutable access to state_storage and revert_storage in B…
jpgonzalezra Jun 15, 2024
f14f173
feat: Add mutable getters for bundle state fields
jpgonzalezra Jun 15, 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
27 changes: 18 additions & 9 deletions crates/revm/src/db/states/bundle_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,14 @@ impl BundleBuilder {
}

/// Collect storage info of BundleState state
pub fn state_storage(mut self, address: Address, storage: HashMap<U256, (U256, U256)>) -> Self {
pub fn state_storage(
mut self,
address: Address,
storage: &mut HashMap<U256, (U256, U256)>,
Copy link
Member

@rakita rakita Jun 15, 2024

Choose a reason for hiding this comment

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

This is not what the requirement was.

It is to add get_state_storage_mut( function

Copy link
Member

@rakita rakita Jun 15, 2024

Choose a reason for hiding this comment

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

While we are at it, it would be good to add mut getters for all fields

Copy link
Contributor Author

@jpgonzalezra jpgonzalezra Jun 15, 2024

Choose a reason for hiding this comment

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

my bad, i'm going to fix it 💪

) -> Self {
self.states.insert(address);
self.state_storage.insert(address, storage);
let entry = self.state_storage.entry(address).or_default();
entry.extend(storage.drain());
self
}

Expand Down Expand Up @@ -138,10 +143,14 @@ impl BundleBuilder {
mut self,
block_number: u64,
address: Address,
storage: Vec<(U256, U256)>,
storage: &mut Vec<(U256, U256)>,
) -> Self {
self.reverts.insert((block_number, address));
self.revert_storage.insert((block_number, address), storage);
let entry = self
.revert_storage
.entry((block_number, address))
.or_default();
entry.append(storage);
self
}

Expand Down Expand Up @@ -832,7 +841,7 @@ mod tests {
)
.state_storage(
account1(),
HashMap::from([(slot1(), (U256::from(0), U256::from(10)))]),
&mut HashMap::from([(slot1(), (U256::from(0), U256::from(10)))]),
)
.state_address(account2())
.state_present_account_info(
Expand All @@ -846,7 +855,7 @@ mod tests {
)
.revert_address(0, account1())
.revert_account_info(0, account1(), Some(None))
.revert_storage(0, account1(), vec![(slot1(), U256::from(0))])
.revert_storage(0, account1(), &mut vec![(slot1(), U256::from(0))])
.revert_account_info(0, account2(), Some(None))
.build()
}
Expand All @@ -865,7 +874,7 @@ mod tests {
)
.state_storage(
account1(),
HashMap::from([(slot1(), (U256::from(0), U256::from(15)))]),
&mut HashMap::from([(slot1(), (U256::from(0), U256::from(15)))]),
)
.revert_address(0, account1())
.revert_account_info(
Expand All @@ -878,7 +887,7 @@ mod tests {
code: None,
})),
)
.revert_storage(0, account1(), vec![(slot1(), U256::from(10))])
.revert_storage(0, account1(), &mut vec![(slot1(), U256::from(10))])
.build()
}

Expand Down Expand Up @@ -1008,7 +1017,7 @@ mod tests {
.revert_address(2, account2())
.revert_account_info(0, account1(), Some(None))
.revert_account_info(2, account2(), None)
.revert_storage(0, account1(), vec![(slot1(), U256::from(10))])
.revert_storage(0, account1(), &mut vec![(slot1(), U256::from(10))])
.build();

assert_eq!(state.reverts.len(), 4);
Expand Down