This commit is contained in:
Bryan Stitt 2023-10-23 15:41:03 -07:00
parent 45fb2e5ea6
commit 7a019bd1f1
4 changed files with 78 additions and 65 deletions

131
Cargo.lock generated

@ -51,14 +51,15 @@ dependencies = [
[[package]]
name = "ahash"
version = "0.8.3"
version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d"
dependencies = [
"cfg-if",
"getrandom 0.2.10",
"once_cell",
"version_check",
"zerocopy",
]
[[package]]
@ -358,7 +359,7 @@ checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
dependencies = [
"async-trait",
"axum-core",
"base64 0.21.4",
"base64 0.21.5",
"bitflags 1.3.2",
"bytes",
"futures-util",
@ -457,9 +458,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "base64"
version = "0.21.4"
version = "0.21.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
[[package]]
name = "base64ct"
@ -626,9 +627,9 @@ dependencies = [
[[package]]
name = "bytecount"
version = "0.6.4"
version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad152d03a2c813c80bb94fedbf3a3f02b28f793e39e7c214c8a0bcc196343de7"
checksum = "d1a12477b7237a01c11a80a51278165f9ba0edd28fa6db00a65ab230320dc58c"
[[package]]
name = "byteorder"
@ -893,7 +894,7 @@ version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5286a0843c21f8367f7be734f89df9b822e0321d8bcce8d6e735aadff7d74979"
dependencies = [
"base64 0.21.4",
"base64 0.21.5",
"bech32",
"bs58",
"digest",
@ -1338,12 +1339,6 @@ dependencies = [
"syn 1.0.109",
]
[[package]]
name = "diff"
version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
[[package]]
name = "digest"
version = "0.10.7"
@ -1508,7 +1503,7 @@ version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe81b5c06ecfdbc71dd845216f225f53b62a10cb8a16c946836a3467f701d05b"
dependencies = [
"base64 0.21.4",
"base64 0.21.5",
"bytes",
"hex",
"k256",
@ -1816,7 +1811,7 @@ checksum = "6838fa110e57d572336178b7c79e94ff88ef976306852d8cb87d9e5b1fc7c0b5"
dependencies = [
"async-trait",
"auto_impl",
"base64 0.21.4",
"base64 0.21.5",
"bytes",
"const-hex",
"enr",
@ -2336,7 +2331,7 @@ version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
dependencies = [
"ahash 0.8.3",
"ahash 0.8.5",
]
[[package]]
@ -2345,7 +2340,7 @@ version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
dependencies = [
"ahash 0.8.3",
"ahash 0.8.5",
"allocator-api2",
"serde",
]
@ -2388,7 +2383,7 @@ version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270"
dependencies = [
"base64 0.21.4",
"base64 0.21.5",
"bytes",
"headers-core",
"http",
@ -2714,7 +2709,7 @@ name = "influxdb2"
version = "0.4.2"
source = "git+https://github.com/llamanodes/influxdb2?rev=2d125128696a29d7e0b9abc052c928937e7c0579#2d125128696a29d7e0b9abc052c928937e7c0579"
dependencies = [
"base64 0.21.4",
"base64 0.21.5",
"bytes",
"chrono",
"csv",
@ -2788,9 +2783,9 @@ dependencies = [
[[package]]
name = "ipnet"
version = "2.8.0"
version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
[[package]]
name = "iri-string"
@ -2861,7 +2856,7 @@ version = "8.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378"
dependencies = [
"base64 0.21.4",
"base64 0.21.5",
"pem",
"ring",
"serde",
@ -2894,16 +2889,14 @@ dependencies = [
[[package]]
name = "lalrpop"
version = "0.20.0"
version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da4081d44f4611b66c6dd725e6de3169f9f63905421e8626fcb86b6a898998b8"
checksum = "83be602e051ada38d90c7841092adabeb585197afe9dabb20e4f8375cc87846e"
dependencies = [
"ascii-canvas",
"bit-set",
"diff",
"ena",
"is-terminal",
"itertools 0.10.5",
"itertools 0.11.0",
"lalrpop-util",
"petgraph",
"regex",
@ -2916,9 +2909,9 @@ dependencies = [
[[package]]
name = "lalrpop-util"
version = "0.20.0"
version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d"
checksum = "365d88f9d803538a06641e6736f21d95ecf9226dc1693421212e62c405cdd199"
[[package]]
name = "latency"
@ -3102,9 +3095,9 @@ dependencies = [
[[package]]
name = "mio"
version = "0.8.8"
version = "0.8.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
dependencies = [
"libc",
"log",
@ -3791,9 +3784,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
[[package]]
name = "portable-atomic"
version = "1.4.3"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b"
checksum = "b559898e0b4931ed2d3b959ab0c2da4d99cc644c4b0b1a35b4d344027f474023"
[[package]]
name = "powerfmt"
@ -4288,7 +4281,7 @@ version = "0.11.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
dependencies = [
"base64 0.21.4",
"base64 0.21.5",
"bytes",
"encoding_rs",
"futures-core",
@ -4519,7 +4512,7 @@ version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
dependencies = [
"base64 0.21.4",
"base64 0.21.5",
]
[[package]]
@ -4683,9 +4676,9 @@ dependencies = [
[[package]]
name = "sea-orm-macros"
version = "0.12.4"
version = "0.12.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edc4e1945c3b07bbc3031dd5de75808d8e94221625f548b5fd582d301da86022"
checksum = "a836864040c92d0615497eeccf97e1aee312857bf2ab36d74a74ce1c5c2cefc3"
dependencies = [
"heck",
"proc-macro2",
@ -5075,9 +5068,9 @@ dependencies = [
[[package]]
name = "serde_spanned"
version = "0.6.3"
version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80"
dependencies = [
"serde",
]
@ -5377,7 +5370,7 @@ version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d"
dependencies = [
"ahash 0.8.3",
"ahash 0.8.5",
"atoi",
"bigdecimal",
"byteorder",
@ -5465,7 +5458,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db"
dependencies = [
"atoi",
"base64 0.21.4",
"base64 0.21.5",
"bigdecimal",
"bitflags 2.4.1",
"byteorder",
@ -5512,7 +5505,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624"
dependencies = [
"atoi",
"base64 0.21.4",
"base64 0.21.5",
"bigdecimal",
"bitflags 2.4.1",
"byteorder",
@ -6014,21 +6007,21 @@ dependencies = [
[[package]]
name = "toml"
version = "0.8.2"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
checksum = "2ef75d881185fd2df4a040793927c153d863651108a93c7e17a9e591baa95cc6"
dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
"toml_edit 0.20.2",
"toml_edit 0.20.4",
]
[[package]]
name = "toml_datetime"
version = "0.6.3"
version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
dependencies = [
"serde",
]
@ -6048,9 +6041,9 @@ dependencies = [
[[package]]
name = "toml_edit"
version = "0.20.2"
version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
checksum = "380f9e8120405471f7c9ad1860a713ef5ece6a670c7eae39225e477340f32fc4"
dependencies = [
"indexmap 2.0.2",
"serde",
@ -6068,7 +6061,7 @@ dependencies = [
"async-stream",
"async-trait",
"axum",
"base64 0.21.4",
"base64 0.21.5",
"bytes",
"h2",
"http",
@ -6192,12 +6185,12 @@ dependencies = [
[[package]]
name = "tracing-log"
version = "0.1.3"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2"
dependencies = [
"lazy_static",
"log",
"once_cell",
"tracing-core",
]
@ -6362,7 +6355,7 @@ version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3"
dependencies = [
"base64 0.21.4",
"base64 0.21.5",
"log",
"once_cell",
"rustls",
@ -6573,7 +6566,7 @@ dependencies = [
[[package]]
name = "web3_proxy"
version = "1.43.56"
version = "1.43.57"
dependencies = [
"anyhow",
"arc-swap",
@ -6583,7 +6576,7 @@ dependencies = [
"axum",
"axum-client-ip",
"axum-macros",
"base64 0.21.4",
"base64 0.21.5",
"bytes",
"chrono",
"deduped_broadcast",
@ -6637,7 +6630,7 @@ dependencies = [
"time",
"tokio",
"tokio-stream",
"toml 0.8.2",
"toml 0.8.4",
"tower-http",
"tracing",
"tracing-subscriber",
@ -6648,7 +6641,7 @@ dependencies = [
[[package]]
name = "web3_proxy_cli"
version = "1.43.56"
version = "1.43.57"
dependencies = [
"console-subscriber",
"env_logger",
@ -6844,6 +6837,26 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
[[package]]
name = "zerocopy"
version = "0.7.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c19fae0c8a9efc6a8281f2e623db8af1db9e57852e04cde3e754dd2dc29340f"
dependencies = [
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
version = "0.7.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc56589e9ddd1f1c28d4b4b5c773ce232910a6bb67a70133d61c9e347585efe9"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.38",
]
[[package]]
name = "zeroize"
version = "1.6.0"

@ -6,7 +6,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
portable-atomic = { version = "1.4.3", features = ["float"] }
portable-atomic = { version = "1.5.0", features = ["float"] }
serde = { version = "1.0.189", features = [] }
tokio = { version = "1.33.0", features = ["full"] }
tracing = "0.1.40"

@ -1,6 +1,6 @@
[package]
name = "web3_proxy"
version = "1.43.56"
version = "1.43.57"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@ -44,7 +44,7 @@ async-stripe = { version = "0.25.2", default-features = false, features = ["bill
axum = { version = "0.6.20", features = ["headers", "tracing", "ws"] }
axum-client-ip = "0.4.2"
axum-macros = "0.3.8"
base64 = "0.21.4"
base64 = "0.21.5"
bytes = "1.5.0"
chrono = { version = "0.4.31" }
derivative = "2.2.0"
@ -61,7 +61,7 @@ hdrhistogram = "7.5.2"
hostname = "0.3.1"
http = "0.2.9"
hyper = { version = "0.14.27", features = ["full", "nightly"] }
ipnet = { version = "2.8.0" }
ipnet = { version = "2.9.0" }
itertools = "0.11.0"
listenfd = { version = "1.0.1", optional = true }
mimalloc = { version = "0.1.39", optional = true }
@ -86,7 +86,7 @@ strum = { version = "0.25.0", features = ["derive"] }
time = { version = "0.3" }
tokio = { version = "1.33.0", features = ["full", "tracing"] }
tokio-stream = { version = "0.1.14", features = ["sync"] }
toml = "0.8.2"
toml = "0.8.4"
tower-http = { version = "0.4.4", features = ["cors", "normalize-path", "sensitive-headers", "trace"] }
tracing = "0.1"
ulid = { version = "1.1.0", features = ["rand", "uuid", "serde"] }

@ -1,6 +1,6 @@
[package]
name = "web3_proxy_cli"
version = "1.43.56"
version = "1.43.57"
edition = "2021"
default-run = "web3_proxy_cli"