This commit is contained in:
Bryan Stitt 2023-10-20 12:17:07 -07:00
parent b5d34b0fad
commit da7bb4b07c
7 changed files with 82 additions and 73 deletions

139
Cargo.lock generated

@ -1050,9 +1050,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
[[package]]
name = "cpufeatures"
version = "0.2.9"
version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4"
dependencies = [
"libc",
]
@ -1270,7 +1270,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
dependencies = [
"serde",
"uuid 1.4.1",
"uuid 1.5.0",
]
[[package]]
@ -2341,9 +2341,9 @@ dependencies = [
[[package]]
name = "hashbrown"
version = "0.14.1"
version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
dependencies = [
"ahash 0.8.3",
"allocator-api2",
@ -2365,7 +2365,7 @@ version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
dependencies = [
"hashbrown 0.14.1",
"hashbrown 0.14.2",
]
[[package]]
@ -2571,7 +2571,7 @@ dependencies = [
"httpdate",
"itoa",
"pin-project-lite",
"socket2 0.4.9",
"socket2 0.4.10",
"tokio",
"tower-service",
"tracing",
@ -2700,7 +2700,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
dependencies = [
"equivalent",
"hashbrown 0.14.1",
"hashbrown 0.14.2",
]
[[package]]
@ -2986,15 +2986,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0500463acd96259d219abb05dc57e5a076ef04b2db9a2112846929b5f174c96"
dependencies = [
"libc",
"uuid 1.4.1",
"uuid 1.5.0",
"winapi",
]
[[package]]
name = "lock_api"
version = "0.4.10"
version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
dependencies = [
"autocfg",
"scopeguard",
@ -3133,7 +3133,7 @@ dependencies = [
"tagptr",
"thiserror",
"triomphe",
"uuid 1.4.1",
"uuid 1.5.0",
]
[[package]]
@ -3507,9 +3507,9 @@ dependencies = [
[[package]]
name = "parking"
version = "2.1.1"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067"
checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
[[package]]
name = "parking_lot"
@ -3523,15 +3523,15 @@ dependencies = [
[[package]]
name = "parking_lot_core"
version = "0.9.8"
version = "0.9.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
dependencies = [
"backtrace",
"cfg-if",
"libc",
"petgraph",
"redox_syscall 0.3.5",
"redox_syscall 0.4.1",
"smallvec",
"thread-id",
"windows-targets",
@ -4203,6 +4203,15 @@ dependencies = [
"bitflags 1.3.2",
]
[[package]]
name = "redox_syscall"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
dependencies = [
"bitflags 1.3.2",
]
[[package]]
name = "redox_users"
version = "0.4.3"
@ -4363,7 +4372,7 @@ dependencies = [
"rkyv_derive",
"seahash",
"tinyvec",
"uuid 1.4.1",
"uuid 1.5.0",
]
[[package]]
@ -4469,9 +4478,9 @@ dependencies = [
[[package]]
name = "rustix"
version = "0.38.19"
version = "0.38.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed"
checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0"
dependencies = [
"bitflags 2.4.1",
"errno",
@ -4555,9 +4564,9 @@ dependencies = [
[[package]]
name = "scale-info"
version = "2.9.0"
version = "2.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "35c0a159d0c45c12b20c5a844feb1fe4bea86e28f17b92a5f0c42193634d3782"
checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60"
dependencies = [
"cfg-if",
"derive_more",
@ -4567,9 +4576,9 @@ dependencies = [
[[package]]
name = "scale-info-derive"
version = "2.9.0"
version = "2.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "912e55f6d20e0e80d63733872b40e1227c0bce1e1ab81ba67d696339bfd7fd29"
checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19"
dependencies = [
"proc-macro-crate 1.3.1",
"proc-macro2",
@ -4629,9 +4638,9 @@ dependencies = [
[[package]]
name = "sea-orm"
version = "0.12.3"
version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da5b2d70c255bc5cbe1d49f69c3c8eadae0fbbaeb18ee978edbf2f75775cb94d"
checksum = "14d17105eb8049488d2528580ecc3f0912ab177d600f10e8e292d6994870ba6a"
dependencies = [
"async-stream",
"async-trait",
@ -4652,14 +4661,14 @@ dependencies = [
"time",
"tracing",
"url",
"uuid 1.4.1",
"uuid 1.5.0",
]
[[package]]
name = "sea-orm-cli"
version = "0.12.3"
version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6bef60732e6016c5643350c87f43a697e8c074e41e4e2a9d961c056cb1310915"
checksum = "d66b46c28caf05824ecd1e68865de762959aa3640e1c21a415a00090e67b1658"
dependencies = [
"chrono",
"clap 4.4.6",
@ -4674,9 +4683,9 @@ dependencies = [
[[package]]
name = "sea-orm-macros"
version = "0.12.3"
version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7c8d455fad40194fb9774fdc4810c0f2700ff0dc0e93bd5ce9d641cc3f5dd75"
checksum = "edc4e1945c3b07bbc3031dd5de75808d8e94221625f548b5fd582d301da86022"
dependencies = [
"heck",
"proc-macro2",
@ -4688,9 +4697,9 @@ dependencies = [
[[package]]
name = "sea-orm-migration"
version = "0.12.3"
version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e53b6ddaf6dbb84e5dfc3fb78634ed0a4d6d64e7479500ab2585db239747031"
checksum = "a340d727bafe3d817b55f920498cc469e8664e8b654017d2ec93a31aed40b70f"
dependencies = [
"async-trait",
"clap 4.4.6",
@ -4718,7 +4727,7 @@ dependencies = [
"sea-query-derive",
"serde_json",
"time",
"uuid 1.4.1",
"uuid 1.5.0",
]
[[package]]
@ -4734,19 +4743,19 @@ dependencies = [
"serde_json",
"sqlx",
"time",
"uuid 1.4.1",
"uuid 1.5.0",
]
[[package]]
name = "sea-query-derive"
version = "0.4.0"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd78f2e0ee8e537e9195d1049b752e0433e2cac125426bccb7b5c3e508096117"
checksum = "25a82fcb49253abcb45cdcb2adf92956060ec0928635eb21b4f7a6d8f25ab0bc"
dependencies = [
"heck",
"proc-macro2",
"quote",
"syn 1.0.109",
"syn 2.0.38",
"thiserror",
]
@ -4953,7 +4962,7 @@ dependencies = [
"thiserror",
"time",
"url",
"uuid 1.4.1",
"uuid 1.5.0",
]
[[package]]
@ -5281,9 +5290,9 @@ dependencies = [
[[package]]
name = "socket2"
version = "0.4.9"
version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
dependencies = [
"libc",
"winapi",
@ -5291,9 +5300,9 @@ dependencies = [
[[package]]
name = "socket2"
version = "0.5.4"
version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e"
checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
dependencies = [
"libc",
"windows-sys",
@ -5406,7 +5415,7 @@ dependencies = [
"tokio-stream",
"tracing",
"url",
"uuid 1.4.1",
"uuid 1.5.0",
"webpki-roots 0.24.0",
]
@ -5492,7 +5501,7 @@ dependencies = [
"thiserror",
"time",
"tracing",
"uuid 1.4.1",
"uuid 1.5.0",
"whoami",
]
@ -5537,7 +5546,7 @@ dependencies = [
"thiserror",
"time",
"tracing",
"uuid 1.4.1",
"uuid 1.5.0",
"whoami",
]
@ -5563,7 +5572,7 @@ dependencies = [
"time",
"tracing",
"url",
"uuid 1.4.1",
"uuid 1.5.0",
]
[[package]]
@ -5769,18 +5778,18 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
[[package]]
name = "thiserror"
version = "1.0.49"
version = "1.0.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.49"
version = "1.0.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
dependencies = [
"proc-macro2",
"quote",
@ -5874,7 +5883,7 @@ dependencies = [
"parking_lot",
"pin-project-lite",
"signal-hook-registry",
"socket2 0.5.4",
"socket2 0.5.5",
"tokio-macros",
"tracing",
"windows-sys",
@ -6130,9 +6139,9 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
[[package]]
name = "tracing"
version = "0.1.39"
version = "0.1.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9"
checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
dependencies = [
"log",
"pin-project-lite",
@ -6275,7 +6284,7 @@ checksum = "7e37c4b6cbcc59a8dcd09a6429fbc7890286bcbb79215cea7b38a3c4c0921d93"
dependencies = [
"rand 0.8.5",
"serde",
"uuid 1.4.1",
"uuid 1.5.0",
]
[[package]]
@ -6398,9 +6407,9 @@ dependencies = [
[[package]]
name = "uuid"
version = "1.4.1"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
dependencies = [
"getrandom 0.2.10",
"rand 0.8.5",
@ -6566,7 +6575,7 @@ dependencies = [
[[package]]
name = "web3_proxy"
version = "1.43.54"
version = "1.43.55"
dependencies = [
"anyhow",
"arc-swap",
@ -6592,7 +6601,7 @@ dependencies = [
"futures-util",
"glob",
"handlebars",
"hashbrown 0.14.1",
"hashbrown 0.14.2",
"hdrhistogram",
"hostname",
"http",
@ -6636,12 +6645,12 @@ dependencies = [
"tracing-subscriber",
"ulid",
"url",
"uuid 1.4.1",
"uuid 1.5.0",
]
[[package]]
name = "web3_proxy_cli"
version = "1.43.54"
version = "1.43.55"
dependencies = [
"console-subscriber",
"env_logger",
@ -6839,9 +6848,9 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
[[package]]
name = "zerocopy"
version = "0.6.4"
version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20707b61725734c595e840fb3704378a0cd2b9c74cc9e6e20724838fc6a1e2f9"
checksum = "96f8f25c15a0edc9b07eb66e7e6e97d124c0505435c382fde1ab7ceb188aa956"
dependencies = [
"byteorder",
"zerocopy-derive",
@ -6849,9 +6858,9 @@ dependencies = [
[[package]]
name = "zerocopy-derive"
version = "0.6.4"
version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56097d5b91d711293a42be9289403896b68654625021732067eac7a4ca388a1f"
checksum = "855e0f6af9cd72b87d8a6c586f3cb583f5cdcc62c2c80869d8cd7e96fdf7ee20"
dependencies = [
"proc-macro2",
"quote",

@ -10,4 +10,4 @@ redis-rate-limiter = { path = "../redis-rate-limiter" }
anyhow = "1.0.75"
moka = { version = "0.12.1", features = ["future"] }
tokio = "1.33.0"
tracing = "0.1.39"
tracing = "0.1.40"

@ -11,6 +11,6 @@ path = "src/mod.rs"
[dependencies]
ethers = { version = "2.0.10", default-features = false }
sea-orm = "0.12.3"
sea-orm = "0.12.4"
serde = "1.0.189"
ulid = "1.1.0"

@ -9,7 +9,7 @@ edition = "2021"
portable-atomic = { version = "1.4.3", features = ["float"] }
serde = { version = "1.0.189", features = [] }
tokio = { version = "1.33.0", features = ["full"] }
tracing = "0.1.39"
tracing = "0.1.40"
watermill = "0.1.1"
[dev-dependencies]

@ -13,7 +13,7 @@ tokio = { version = "1.33.0", features = ["full", "tracing"] }
chrono = "0.4.31"
[dependencies.sea-orm-migration]
version = "0.12.3"
version = "0.12.4"
features = [
# Enable at least one `ASYNC_RUNTIME` and `DATABASE_DRIVER` feature if you want to run migration via CLI.
# View the list of supported features at https://www.sea-ql.org/SeaORM/docs/install-and-config/database-and-async-runtime.

@ -1,6 +1,6 @@
[package]
name = "web3_proxy"
version = "1.43.54"
version = "1.43.55"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@ -56,7 +56,7 @@ futures = { version = "0.3.28" }
futures-util = "0.3.28"
glob = "0.3.1"
handlebars = "4.4.0"
hashbrown = { version = "0.14.1", features = ["serde", "nightly"] }
hashbrown = { version = "0.14.2", features = ["serde", "nightly"] }
hdrhistogram = "7.5.2"
hostname = "0.3.1"
http = "0.2.9"
@ -91,7 +91,7 @@ tower-http = { version = "0.4.4", features = ["cors", "normalize-path", "sensiti
tracing = "0.1"
ulid = { version = "1.1.0", features = ["rand", "uuid", "serde"] }
url = { version = "2.4.1" }
uuid = { version = "1.4.1", default-features = false, features = ["fast-rng", "v4", "zerocopy"] }
uuid = { version = "1.5.0", default-features = false, features = ["fast-rng", "v4", "zerocopy"] }
# TODO: why doesn't this work in dev-dependencies. i think because of how we split web3_proxy and web3_proxy_cli. im not sure that is even helping anymore
test-log = { version = "0.2.13", default-features = false, features = ["trace"] }

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