From f78d7019d01d81153751d506e97962afbf31c854 Mon Sep 17 00:00:00 2001 From: Igor Zhirkov Date: Fri, 7 Feb 2025 14:59:07 +0100 Subject: [PATCH] fix dependency resolution --- Cargo.lock | 38 ++++++++++++++++++++++++++++++-------- e2e-tests-rust/Cargo.toml | 2 +- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 225c8722..77e16c16 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1450,6 +1450,26 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +[[package]] +name = "const_format" +version = "0.2.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd" +dependencies = [ + "const_format_proc_macros", +] + +[[package]] +name = "const_format_proc_macros" +version = "0.2.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -3831,28 +3851,30 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.12" +version = "3.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" +checksum = "c9fde3d0718baf5bc92f577d652001da0f8d54cd03a7974e118d04fc888dc23d" dependencies = [ "arrayvec 0.7.6", "bitvec", "byte-slice-cast", + "const_format", "impl-trait-for-tuples", "parity-scale-codec-derive", + "rustversion", "serde", ] [[package]] name = "parity-scale-codec-derive" -version = "3.6.12" +version = "3.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" +checksum = "581c837bb6b9541ce7faa9377c20616e4fb7650f6b0f68bc93c827ee504fb7b3" dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.98", ] [[package]] @@ -7133,7 +7155,7 @@ dependencies = [ [[package]] name = "zksync-error-codegen" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-error?branch=dev#915de42dafbb2c33ce4179a488b77825ee288ce6" +source = "git+https://github.com/matter-labs/zksync-error?branch=dev#f48702e6625d74d67e604c7e9653e8bcc9a91862" dependencies = [ "cargo_metadata", "include_dir", @@ -7157,7 +7179,7 @@ dependencies = [ [[package]] name = "zksync-error-description" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-error?branch=dev#915de42dafbb2c33ce4179a488b77825ee288ce6" +source = "git+https://github.com/matter-labs/zksync-error?branch=dev#f48702e6625d74d67e604c7e9653e8bcc9a91862" dependencies = [ "serde", "serde_json", @@ -7176,7 +7198,7 @@ dependencies = [ [[package]] name = "zksync-error-model" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-error?branch=dev#915de42dafbb2c33ce4179a488b77825ee288ce6" +source = "git+https://github.com/matter-labs/zksync-error?branch=dev#f48702e6625d74d67e604c7e9653e8bcc9a91862" dependencies = [ "serde", "serde_json", diff --git a/e2e-tests-rust/Cargo.toml b/e2e-tests-rust/Cargo.toml index 008024f6..ba13e3c4 100644 --- a/e2e-tests-rust/Cargo.toml +++ b/e2e-tests-rust/Cargo.toml @@ -19,7 +19,7 @@ fs2 = "0.4.3" tokio = { version = "1", features = ["time", "rt", "process"] } futures = "0.3.31" itertools = "0.13.0" -async-trait = "0.1.83" +async-trait = "0.1.86" reqwest = "0.12.9" reqwest-middleware = { version = "0.4", features = ["json"] } serde_json = "1"