Skip to content

Commit 83a2145

Browse files
authored
Merge branch 'master' into master
2 parents 8fd0fbf + 09970aa commit 83a2145

File tree

13 files changed

+266
-74
lines changed

13 files changed

+266
-74
lines changed

.github/workflows/release.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
tags:
66
- "stable"
77
- "rc"
8+
- "rc-*"
89
- "v*.*.*"
910
schedule:
1011
- cron: "0 6 * * *"
@@ -14,7 +15,7 @@ env:
1415
CARGO_TERM_COLOR: always
1516
IS_NIGHTLY: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
1617
PROFILE: maxperf
17-
STABLE_VERSION: "v0.3.0"
18+
STABLE_VERSION: "v1.0.0"
1819

1920
jobs:
2021
prepare:

Cargo.lock

+48-48
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ build-%:
4444

4545
.PHONY: docker-build-push
4646
docker-build-push: docker-build-prepare ## Build and push a cross-arch Docker image tagged with DOCKER_IMAGE_NAME.
47-
$(MAKE) build-x86_64-unknown-linux-gnu
47+
FEATURES="jemalloc aws-kms cli asm-keccak" $(MAKE) build-x86_64-unknown-linux-gnu
4848
mkdir -p $(BIN_DIR)/amd64
4949
for bin in anvil cast chisel forge; do \
5050
cp $(CARGO_TARGET_DIR)/x86_64-unknown-linux-gnu/$(PROFILE)/$$bin $(BIN_DIR)/amd64/; \
5151
done
5252

53-
$(MAKE) build-aarch64-unknown-linux-gnu
53+
FEATURES="aws-kms cli asm-keccak" $(MAKE) build-aarch64-unknown-linux-gnu
5454
mkdir -p $(BIN_DIR)/arm64
5555
for bin in anvil cast chisel forge; do \
5656
cp $(CARGO_TARGET_DIR)/aarch64-unknown-linux-gnu/$(PROFILE)/$$bin $(BIN_DIR)/arm64/; \

crates/anvil/src/eth/api.rs

+16-11
Original file line numberDiff line numberDiff line change
@@ -2659,17 +2659,22 @@ impl EthApi {
26592659
}
26602660
}
26612661

2662-
self.backend
2663-
.with_database_at(Some(block_request), |mut state, block| {
2664-
if let Some(overrides) = overrides {
2665-
state = Box::new(state::apply_state_override(
2666-
overrides.into_iter().collect(),
2667-
state,
2668-
)?);
2669-
}
2670-
self.do_estimate_gas_with_state(request, &state, block)
2671-
})
2672-
.await?
2662+
// this can be blocking for a bit, especially in forking mode
2663+
// <https://github.com/foundry-rs/foundry/issues/6036>
2664+
self.on_blocking_task(|this| async move {
2665+
this.backend
2666+
.with_database_at(Some(block_request), |mut state, block| {
2667+
if let Some(overrides) = overrides {
2668+
state = Box::new(state::apply_state_override(
2669+
overrides.into_iter().collect(),
2670+
state,
2671+
)?);
2672+
}
2673+
this.do_estimate_gas_with_state(request, &state, block)
2674+
})
2675+
.await?
2676+
})
2677+
.await
26732678
}
26742679

26752680
/// Estimates the gas usage of the `request` with the state.

crates/cheatcodes/src/inspector.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ use proptest::test_runner::{RngAlgorithm, TestRng, TestRunner};
4646
use rand::Rng;
4747
use revm::{
4848
interpreter::{
49-
opcode as op, CallInputs, CallOutcome, CallScheme, CallValue, CreateInputs, CreateOutcome,
49+
opcode as op, CallInputs, CallOutcome, CallScheme, CreateInputs, CreateOutcome,
5050
EOFCreateInputs, EOFCreateKind, Gas, InstructionResult, Interpreter, InterpreterAction,
5151
InterpreterResult,
5252
},
@@ -1047,8 +1047,6 @@ where {
10471047
if let CallScheme::DelegateCall | CallScheme::ExtDelegateCall = call.scheme {
10481048
call.target_address = prank.new_caller;
10491049
call.caller = prank.new_caller;
1050-
let acc = ecx.journaled_state.account(prank.new_caller);
1051-
call.value = CallValue::Apparent(acc.info.balance);
10521050
if let Some(new_origin) = prank.new_origin {
10531051
ecx.env.tx.caller = new_origin;
10541052
}

0 commit comments

Comments
 (0)