Skip to content

Commit 1aef588

Browse files
authored
chore(deps): update dependencies including fixes for incompatible versions (#11123)
* bump deps * apply major bump for incompatible deps, bump vergen 9.0, ui_test 0.30 * revert vergen, repin idna_adapter
1 parent e566080 commit 1aef588

File tree

9 files changed

+181
-160
lines changed

9 files changed

+181
-160
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -215,61 +215,61 @@ solar-sema = { version = "=0.1.5", default-features = false }
215215
solar-data-structures = { version = "=0.1.5", default-features = false }
216216

217217
## alloy
218-
alloy-consensus = { version = "1.0.22", default-features = false }
219-
alloy-contract = { version = "1.0.22", default-features = false }
220-
alloy-eips = { version = "1.0.22", default-features = false }
221-
alloy-ens = { version = "1.0.22", default-features = false }
222-
alloy-genesis = { version = "1.0.22", default-features = false }
223-
alloy-json-rpc = { version = "1.0.22", default-features = false }
224-
alloy-network = { version = "1.0.22", default-features = false }
225-
alloy-provider = { version = "1.0.22", default-features = false }
226-
alloy-pubsub = { version = "1.0.22", default-features = false }
227-
alloy-rpc-client = { version = "1.0.22", default-features = false }
228-
alloy-rpc-types = { version = "1.0.22", default-features = true }
229-
alloy-serde = { version = "1.0.22", default-features = false }
230-
alloy-signer = { version = "1.0.22", default-features = false }
231-
alloy-signer-aws = { version = "1.0.22", default-features = false }
232-
alloy-signer-gcp = { version = "1.0.22", default-features = false }
233-
alloy-signer-ledger = { version = "1.0.22", default-features = false }
234-
alloy-signer-local = { version = "1.0.22", default-features = false }
235-
alloy-signer-trezor = { version = "1.0.22", default-features = false }
236-
alloy-transport = { version = "1.0.22", default-features = false }
237-
alloy-transport-http = { version = "1.0.22", default-features = false }
238-
alloy-transport-ipc = { version = "1.0.22", default-features = false }
239-
alloy-transport-ws = { version = "1.0.22", default-features = false }
218+
alloy-consensus = { version = "1.0.23", default-features = false }
219+
alloy-contract = { version = "1.0.23", default-features = false }
220+
alloy-eips = { version = "1.0.23", default-features = false }
221+
alloy-ens = { version = "1.0.23", default-features = false }
222+
alloy-genesis = { version = "1.0.23", default-features = false }
223+
alloy-json-rpc = { version = "1.0.23", default-features = false }
224+
alloy-network = { version = "1.0.23", default-features = false }
225+
alloy-provider = { version = "1.0.23", default-features = false }
226+
alloy-pubsub = { version = "1.0.23", default-features = false }
227+
alloy-rpc-client = { version = "1.0.23", default-features = false }
228+
alloy-rpc-types = { version = "1.0.23", default-features = true }
229+
alloy-serde = { version = "1.0.23", default-features = false }
230+
alloy-signer = { version = "1.0.23", default-features = false }
231+
alloy-signer-aws = { version = "1.0.23", default-features = false }
232+
alloy-signer-gcp = { version = "1.0.23", default-features = false }
233+
alloy-signer-ledger = { version = "1.0.23", default-features = false }
234+
alloy-signer-local = { version = "1.0.23", default-features = false }
235+
alloy-signer-trezor = { version = "1.0.23", default-features = false }
236+
alloy-transport = { version = "1.0.23", default-features = false }
237+
alloy-transport-http = { version = "1.0.23", default-features = false }
238+
alloy-transport-ipc = { version = "1.0.23", default-features = false }
239+
alloy-transport-ws = { version = "1.0.23", default-features = false }
240240
alloy-hardforks = { version = "0.2.12", default-features = false }
241241
alloy-op-hardforks = { version = "0.2.12", default-features = false }
242242

243243
## alloy-core
244-
alloy-dyn-abi = "1.2.1"
245-
alloy-json-abi = "1.2.1"
246-
alloy-primitives = { version = "1.2.1", features = [
244+
alloy-dyn-abi = "1.3.0"
245+
alloy-json-abi = "1.3.0"
246+
alloy-primitives = { version = "1.3.0", features = [
247247
"getrandom",
248248
"rand",
249249
"map-fxhash",
250250
"map-foldhash",
251251
] }
252-
alloy-sol-macro-expander = "1.2.1"
253-
alloy-sol-macro-input = "1.2.1"
254-
alloy-sol-types = "1.2.1"
252+
alloy-sol-macro-expander = "1.3.0"
253+
alloy-sol-macro-input = "1.3.0"
254+
alloy-sol-types = "1.3.0"
255255

256256
alloy-chains = "0.2"
257257
alloy-rlp = "0.3"
258258
alloy-trie = "0.9"
259259

260260
## op-alloy
261-
op-alloy-consensus = "0.17.2"
262-
op-alloy-rpc-types = "0.17.2"
261+
op-alloy-consensus = "0.18.13"
262+
op-alloy-rpc-types = "0.18.13"
263263
op-alloy-flz = "0.13.1"
264264

265265
## revm
266-
revm = { version = "27.0.3", default-features = false }
267-
revm-inspectors = { version = "0.26.5", features = ["serde"] }
268-
op-revm = { version = "8.0.3", default-features = false }
266+
revm = { version = "27.1.0", default-features = false }
267+
revm-inspectors = { version = "0.27.1", features = ["serde"] }
268+
op-revm = { version = "8.1.0", default-features = false }
269269

270270
## alloy-evm
271-
alloy-evm = "0.15.0"
272-
alloy-op-evm = "0.15.0"
271+
alloy-evm = "0.16.0"
272+
alloy-op-evm = "0.16.0"
273273

274274
## cli
275275
anstream = "0.6"
@@ -313,7 +313,7 @@ eyre = "0.6"
313313
figment = "0.10"
314314
futures = "0.3"
315315
hyper = "1.6"
316-
indicatif = "0.17"
316+
indicatif = "0.18"
317317
itertools = "0.14"
318318
jsonpath_lib = "0.3"
319319
k256 = "0.13"

crates/cheatcodes/spec/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ alloy-sol-types = { workspace = true, features = ["json"] }
2020
serde.workspace = true
2121

2222
# schema
23-
schemars = { version = "0.8", optional = true }
23+
schemars = { version = "1.0", optional = true }
2424

2525
[dev-dependencies]
2626
serde_json.workspace = true

crates/chisel/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ eyre.workspace = true
4444
regex.workspace = true
4545
reqwest.workspace = true
4646
revm.workspace = true
47-
rustyline = "15"
47+
rustyline = "16"
4848
semver.workspace = true
4949
serde_json.workspace = true
5050
serde.workspace = true

crates/config/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ serde.workspace = true
4343
soldeer-core.workspace = true
4444
thiserror.workspace = true
4545
toml = { workspace = true, features = ["preserve_order"] }
46-
toml_edit = "0.22"
46+
toml_edit = "0.23"
4747
tracing.workspace = true
4848
walkdir.workspace = true
4949
yansi.workspace = true

crates/debugger/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ revm-inspectors.workspace = true
2121

2222
alloy-primitives.workspace = true
2323

24-
crossterm = "0.28"
24+
crossterm = "0.29"
2525
eyre.workspace = true
2626
ratatui = { version = "0.29", default-features = false, features = [
2727
"crossterm",

crates/forge/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ solar-sema.workspace = true
8282
strum = { workspace = true, features = ["derive"] }
8383
thiserror.workspace = true
8484
tokio = { workspace = true, features = ["time"] }
85-
toml_edit = "0.22"
85+
toml_edit = "0.23"
8686
watchexec = "8.0"
8787
watchexec-events = "6.0"
8888
watchexec-signals = "5.0"
@@ -93,7 +93,7 @@ path-slash.workspace = true
9393
# doc server
9494
axum = { workspace = true, features = ["ws"] }
9595
tower-http = { workspace = true, features = ["fs"] }
96-
opener = "0.7"
96+
opener = "0.8"
9797

9898
# soldeer
9999
soldeer-commands.workspace = true

crates/test-utils/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] }
3232
rand.workspace = true
3333
snapbox = { version = "0.6", features = ["json", "regex", "term-svg"] }
3434
tempfile.workspace = true
35-
ui_test = "0.29.2"
35+
ui_test = "0.30.2"
3636

3737
# Pinned dependencies. See /Cargo.toml.
3838
[target.'cfg(any())'.dependencies]

crates/test-utils/src/ui_runner.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
use std::path::Path;
2-
use ui_test::spanned::Spanned;
2+
use ui_test::{
3+
spanned::Spanned,
4+
status_emitter::{Gha, StatusEmitter},
5+
};
36

47
/// Test runner based on `ui_test`. Adapted from `https://github.com/paradigmxyz/solar/blob/main/tools/tester/src/lib.rs`.
58
pub fn run_tests<'a>(cmd: &str, cmd_path: &'a Path, testdata: &'a Path) -> eyre::Result<()> {
@@ -24,11 +27,8 @@ pub fn run_tests<'a>(cmd: &str, cmd_path: &'a Path, testdata: &'a Path) -> eyre:
2427

2528
let config = config(cmd, cmd_path, &args, testdata);
2629

27-
let text_emitter = match args.format {
28-
ui_test::Format::Terse => ui_test::status_emitter::Text::quiet(),
29-
ui_test::Format::Pretty => ui_test::status_emitter::Text::verbose(),
30-
};
31-
let gha_emitter = ui_test::status_emitter::Gha::<true> { name: "Foundry Lint UI".to_string() };
30+
let text_emitter: Box<dyn StatusEmitter> = args.format.into();
31+
let gha_emitter = Gha { name: "Foundry Lint UI".to_string(), group: true };
3232
let status_emitter = (text_emitter, gha_emitter);
3333

3434
// run tests on all .sol files

0 commit comments

Comments
 (0)