Skip to content

Commit c6bcd98

Browse files
committed
Merge branch 'master' into no-fuzz-proptest
2 parents 81a8b79 + 6dd7ff4 commit c6bcd98

File tree

7 files changed

+36
-6
lines changed

7 files changed

+36
-6
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,4 +150,4 @@ dprint-check: ## Check formatting with dprint
150150
echo "Installing dprint..."; \
151151
cargo install dprint; \
152152
fi
153-
dprint check
153+
dprint check

crates/anvil/core/src/eth/transaction/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,7 @@ impl TypedTransaction {
801801
input: t.tx().tx().input.clone(),
802802
nonce: t.tx().tx().nonce,
803803
gas_limit: t.tx().tx().gas_limit,
804-
gas_price: Some(t.tx().tx().max_fee_per_blob_gas),
804+
gas_price: None,
805805
max_fee_per_gas: Some(t.tx().tx().max_fee_per_gas),
806806
max_priority_fee_per_gas: Some(t.tx().tx().max_priority_fee_per_gas),
807807
max_fee_per_blob_gas: Some(t.tx().tx().max_fee_per_blob_gas),
@@ -815,7 +815,7 @@ impl TypedTransaction {
815815
input: t.tx().input.clone(),
816816
nonce: t.tx().nonce,
817817
gas_limit: t.tx().gas_limit,
818-
gas_price: Some(t.tx().max_fee_per_gas),
818+
gas_price: None,
819819
max_fee_per_gas: Some(t.tx().max_fee_per_gas),
820820
max_priority_fee_per_gas: Some(t.tx().max_priority_fee_per_gas),
821821
max_fee_per_blob_gas: None,

crates/cast/src/cmd/call.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ use foundry_evm::{
3030
opts::EvmOpts,
3131
traces::{InternalTraceMode, TraceMode},
3232
};
33+
use itertools::Either;
3334
use regex::Regex;
3435
use revm::context::TransactionType;
3536
use std::{str::FromStr, sync::LazyLock};
@@ -311,6 +312,12 @@ impl CallArgs {
311312
}
312313
}
313314

315+
if let Some(auth) = tx.inner.authorization_list {
316+
env_tx.authorization_list = auth.into_iter().map(Either::Left).collect();
317+
318+
env_tx.tx_type = TransactionType::Eip7702 as u8;
319+
}
320+
314321
let trace = match tx_kind {
315322
TxKind::Create => {
316323
let deploy_result = executor.deploy(from, input, value, None);

crates/evm/fuzz/src/strategies/param.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ fn fuzz_param_inner(
105105
}
106106

107107
/// Mutates the current value of a given a parameter type and value.
108-
/// TODO: add more mutations, see https://github.com/fuzzland/ityfuzz/blob/master/src/mutation_utils.rs#L449-L452
109-
/// for static args,
108+
/// TODO: add more mutations, see <https://github.com/fuzzland/ityfuzz/blob/master/src/mutation_utils.rs#L449-L452>
109+
/// for static args.
110110
pub fn mutate_param_value(
111111
param: &DynSolType,
112112
value: DynSolValue,

crates/forge/src/cmd/fmt.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ impl FmtArgs {
7070
}
7171
[one] if one == Path::new("-") => {
7272
let mut s = String::new();
73-
io::stdin().read_to_string(&mut s).expect("Failed to read from stdin");
73+
io::stdin().read_to_string(&mut s).wrap_err("failed to read from stdin")?;
7474
Input::Stdin(s)
7575
}
7676
paths => {

crates/forge/tests/cli/config.rs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1856,3 +1856,20 @@ contract Counter {
18561856
assert_eq!("true", enabled.unwrap().to_string());
18571857
assert_eq!("800", runs.unwrap().to_string());
18581858
});
1859+
1860+
// <https://github.com/foundry-rs/foundry/issues/11227>
1861+
forgetest_init!(test_exclude_lints_config, |prj, cmd| {
1862+
prj.update_config(|config| {
1863+
config.lint.exclude_lints = vec![
1864+
"asm-keccak256".to_string(),
1865+
"incorrect-shift".to_string(),
1866+
"divide-before-multiply".to_string(),
1867+
"mixed-case-variable".to_string(),
1868+
"mixed-case-function".to_string(),
1869+
"screaming-snake-case-const".to_string(),
1870+
"screaming-snake-case-immutable".to_string(),
1871+
"unwrapped-modifier-logic".to_string(),
1872+
]
1873+
});
1874+
cmd.args(["lint"]).assert_success().stdout_eq(str![""]);
1875+
});

crates/lint/src/sol/mod.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,12 @@ impl<'a> TryFrom<&'a str> for SolLint {
370370
}
371371
}
372372

373+
for &lint in codesize::REGISTERED_LINTS {
374+
if lint.id() == value {
375+
return Ok(lint);
376+
}
377+
}
378+
373379
Err(SolLintError::InvalidId(value.to_string()))
374380
}
375381
}

0 commit comments

Comments
 (0)