Skip to content

Commit d241588

Browse files
authored
fix: backport create collision fix, bump 1.3.6 (#11661)
* fix(forge): ensure broadcast account is touched (#11650) * chore: bump version 1.3.6 (#11658)
1 parent 9979a41 commit d241588

File tree

3 files changed

+36
-32
lines changed

3 files changed

+36
-32
lines changed

Cargo.lock

Lines changed: 31 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ members = [
2929
resolver = "2"
3030

3131
[workspace.package]
32-
version = "1.3.5"
32+
version = "1.3.6"
3333
edition = "2024"
3434
# Remember to update clippy.toml as well
3535
rust-version = "1.88"

crates/cheatcodes/src/inspector.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -848,6 +848,8 @@ impl Cheatcodes {
848848
let is_fixed_gas_limit = check_if_fixed_gas_limit(&ecx, call.gas_limit);
849849

850850
let input = TransactionInput::new(call.input.bytes(ecx));
851+
// Ensure account is touched.
852+
ecx.journaled_state.touch(broadcast.new_origin);
851853

852854
let account =
853855
ecx.journaled_state.inner.state().get_mut(&broadcast.new_origin).unwrap();
@@ -1597,6 +1599,8 @@ impl Inspector<EthEvmContext<&mut dyn DatabaseExt>> for Cheatcodes {
15971599
if curr_depth == broadcast.depth {
15981600
input.set_caller(broadcast.new_origin);
15991601
let is_fixed_gas_limit = check_if_fixed_gas_limit(&ecx, input.gas_limit());
1602+
// Ensure account is touched.
1603+
ecx.journaled_state.touch(broadcast.new_origin);
16001604

16011605
let account = &ecx.journaled_state.inner.state()[&broadcast.new_origin];
16021606
self.broadcastable_transactions.push_back(BroadcastableTransaction {

0 commit comments

Comments
 (0)