From 542b5b578a9835356b1e2dcc35f74e840e4c8f77 Mon Sep 17 00:00:00 2001 From: Mirko von Leipzig Date: Mon, 6 Mar 2023 09:50:52 +0200 Subject: [PATCH 1/2] chore: bump tempfile dep to fix cve --- Cargo.lock | 18 ++++-------------- crates/pathfinder/Cargo.toml | 2 +- crates/rpc/Cargo.toml | 2 +- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e37810d458..8323bf1070 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6180,15 +6180,6 @@ version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3bf6b372449361333ac1f498b7edae4dd5e70dccd7c0c2a7c7bce8f05ede648" -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - [[package]] name = "reqwest" version = "0.11.14" @@ -7311,16 +7302,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" dependencies = [ "cfg-if", "fastrand", - "libc", "redox_syscall", - "remove_dir_all", - "winapi", + "rustix", + "windows-sys", ] [[package]] diff --git a/crates/pathfinder/Cargo.toml b/crates/pathfinder/Cargo.toml index 8fd5d924af..57535aa85d 100644 --- a/crates/pathfinder/Cargo.toml +++ b/crates/pathfinder/Cargo.toml @@ -44,7 +44,7 @@ serde = { version = "1.0.149", features = ["derive"] } stark_hash = { path = "../stark_hash" } starknet-gateway-client = { path = "../gateway-client" } starknet-gateway-types = { path = "../gateway-types" } -tempfile = "3" +tempfile = "3.4" tokio = { workspace = true, features = ["process"] } toml = "0.5.9" tracing = "0.1.37" diff --git a/crates/rpc/Cargo.toml b/crates/rpc/Cargo.toml index 33885974e5..4de007b1eb 100644 --- a/crates/rpc/Cargo.toml +++ b/crates/rpc/Cargo.toml @@ -52,7 +52,7 @@ serde_json = { version = "1.0.89", features = ["arbitrary_precision", "raw_value stark_hash = { path = "../stark_hash" } starknet-gateway-client = { path = "../gateway-client", features = ["test-utils"] } starknet-gateway-test-fixtures = { path = "../gateway-test-fixtures" } -tempfile = "3" +tempfile = "3.4" test-log = { version = "0.2.11", default-features = false, features = ["trace"] } tokio = { workspace = true, features = ["test-util", "process"] } tracing-subscriber = { version = "0.3.16", features = ["env-filter"] } From 2bd5e506816a9274464b98f7d0e16414972904dc Mon Sep 17 00:00:00 2001 From: Mirko von Leipzig Date: Mon, 6 Mar 2023 09:58:06 +0200 Subject: [PATCH 2/2] chore: bump tokio dep for semver fixes --- Cargo.toml | 2 +- crates/load-test/Cargo.lock | 68 +++++++++++++++++++++++++------------ crates/load-test/Cargo.toml | 2 +- 3 files changed, 48 insertions(+), 24 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 59eddb4953..1d03ad0452 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,4 +33,4 @@ resolver = "2" [workspace.dependencies] fake = { version = "2.5.0", features = ["derive"] } rand = "0.8.5" -tokio = "1.24.0" +tokio = "1.24.2" diff --git a/crates/load-test/Cargo.lock b/crates/load-test/Cargo.lock index 8e03f8a9c6..4973a24f81 100644 --- a/crates/load-test/Cargo.lock +++ b/crates/load-test/Cargo.lock @@ -1551,9 +1551,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.24.1" +version = "1.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae" +checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" dependencies = [ "autocfg", "bytes", @@ -1564,7 +1564,7 @@ dependencies = [ "pin-project-lite", "socket2", "tokio-macros", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -1876,19 +1876,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_x86_64_msvc 0.42.1", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.1", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] name = "windows_aarch64_msvc" @@ -1898,9 +1922,9 @@ checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] name = "windows_i686_gnu" @@ -1910,9 +1934,9 @@ checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] name = "windows_i686_msvc" @@ -1922,9 +1946,9 @@ checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] name = "windows_x86_64_gnu" @@ -1934,15 +1958,15 @@ checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] name = "windows_x86_64_msvc" @@ -1952,9 +1976,9 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] name = "winreg" diff --git a/crates/load-test/Cargo.toml b/crates/load-test/Cargo.toml index ef760db636..5c15d1d1b7 100644 --- a/crates/load-test/Cargo.toml +++ b/crates/load-test/Cargo.toml @@ -12,4 +12,4 @@ rand = "0.8.5" serde = { version = "1.0.149", features = ["derive"] } serde_json = { version = "1.0.89", features = ["arbitrary_precision", "raw_value"] } stark_hash = { path = "../stark_hash" } -tokio = "1.24.0" +tokio = "1.24.2"