From a259b2b9553064ad216006b396478cebd91412d1 Mon Sep 17 00:00:00 2001 From: Bryan Stitt Date: Wed, 11 Oct 2023 10:57:41 -0700 Subject: [PATCH] 1.43.39 --- Cargo.lock | 18 ++++++++---------- web3_proxy/Cargo.toml | 4 ++-- web3_proxy/src/rpcs/many.rs | 2 ++ web3_proxy_cli/Cargo.toml | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e875f26e..e94ec73d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4161,7 +4161,6 @@ dependencies = [ "num_enum 0.5.11", "openssl-sys", "pkg-config", - "zstd-sys", ] [[package]] @@ -4231,7 +4230,7 @@ dependencies = [ "aho-corasick", "memchr", "regex-automata 0.4.1", - "regex-syntax 0.8.0", + "regex-syntax 0.8.1", ] [[package]] @@ -4251,7 +4250,7 @@ checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.0", + "regex-syntax 0.8.1", ] [[package]] @@ -4268,9 +4267,9 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "regex-syntax" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3cbb081b9784b07cceb8824c8583f86db4814d172ab043f3c23f7dc600bf83d" +checksum = "56d84fdd47036b038fc80dd333d10b6aab10d5d31f4a366e20014def75328d33" [[package]] name = "rend" @@ -6575,7 +6574,7 @@ dependencies = [ [[package]] name = "web3_proxy" -version = "1.43.38" +version = "1.43.39" dependencies = [ "anyhow", "arc-swap", @@ -6652,7 +6651,7 @@ dependencies = [ [[package]] name = "web3_proxy_cli" -version = "1.43.38" +version = "1.43.39" dependencies = [ "env_logger", "parking_lot", @@ -6914,11 +6913,10 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/web3_proxy/Cargo.toml b/web3_proxy/Cargo.toml index 6880f429..9872a1aa 100644 --- a/web3_proxy/Cargo.toml +++ b/web3_proxy/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "web3_proxy" -version = "1.43.38" +version = "1.43.39" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -9,7 +9,7 @@ edition = "2021" default = [] mimalloc = ["dep:mimalloc"] -rdkafka-src = ["rdkafka/cmake-build", "rdkafka/libz", "rdkafka/ssl-vendored", "rdkafka/zstd-pkg-config"] +rdkafka-src = ["rdkafka/cmake-build", "rdkafka/ssl-vendored"] stripe = ["dep:async-stripe"] tests-needing-docker = [] tokio-console = ["dep:tokio-console", "dep:console-subscriber"] diff --git a/web3_proxy/src/rpcs/many.rs b/web3_proxy/src/rpcs/many.rs index 4814b6f4..606d5dd7 100644 --- a/web3_proxy/src/rpcs/many.rs +++ b/web3_proxy/src/rpcs/many.rs @@ -637,6 +637,7 @@ impl fmt::Debug for Web3Rpcs { // TODO: the default formatter takes forever to write. this is too quiet though let consensus_rpcs = self.watch_ranked_rpcs.borrow().is_some(); + // todo!(get names) // let names = self.by_name.blocking_read(); // let names = names.values().map(|x| x.name.as_str()).collect::>(); let names = (); @@ -659,6 +660,7 @@ impl Serialize for Web3Rpcs { let mut state = serializer.serialize_struct("Web3Rpcs", 5)?; { + // todo!(get rpcs) // let by_name = self.by_name.read().await; // let rpcs: Vec<&Arc> = by_name.values().collect(); // TODO: coordinate with frontend team to rename "conns" to "rpcs" diff --git a/web3_proxy_cli/Cargo.toml b/web3_proxy_cli/Cargo.toml index b89f4c0d..8469dd3e 100644 --- a/web3_proxy_cli/Cargo.toml +++ b/web3_proxy_cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "web3_proxy_cli" -version = "1.43.38" +version = "1.43.39" edition = "2021" default-run = "web3_proxy_cli"