diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 121494f..0000000 --- a/.gitmodules +++ /dev/null @@ -1,6 +0,0 @@ -[submodule "vendor/governor"] - path = vendor/governor - url = https://github.com/AcalaNetwork/governor.git -[submodule "vendor/jsonrpsee"] - path = vendor/jsonrpsee - url = https://github.com/AcalaNetwork/jsonrpsee.git diff --git a/Cargo.lock b/Cargo.lock index 690f169..8b7aa9d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1644,7 +1644,9 @@ dependencies = [ [[package]] name = "governor" -version = "0.6.0" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" dependencies = [ "cfg-if 1.0.0", "dashmap", @@ -1653,9 +1655,11 @@ dependencies = [ "no-std-compat", "nonzero_ext", "parking_lot 0.12.2", - "quanta 0.11.1", + "portable-atomic", + "quanta", "rand 0.8.5", "smallvec", + "spinning_top", ] [[package]] @@ -2269,9 +2273,9 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.23.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67210bd846b2dca59dc73f34717d6e1589305d506cdd6f14c849115d08e40876" +checksum = "95a130d27083a4001b7b2d72a19f08786299550f76c9bd5307498dce2c2b20fa" dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core", @@ -2287,9 +2291,9 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.23.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c171d64176ae8f57eec75bca9f9dda2b2f746314adef9160a5bbbb2a7c82cb" +checksum = "039db9fe25cd63b7221c3f8788c1ef4ea07987d40ec25a1e7d7a3c3e3e3fd130" dependencies = [ "base64 0.22.1", "futures-channel", @@ -2312,9 +2316,9 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.23.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e966c12c8b6c1790ce67683c792cea9dd250860df49f6b64f1b1ff6c6946850" +checksum = "21545a9445fbd582840ff5160a9a3e12b8e6da582151cdb07bde9a1970ba3a24" dependencies = [ "anyhow", "async-trait", @@ -2341,9 +2345,9 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.23.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0187f1969287e5890d84460fe9f6556d98231e70b06179d4416e5c8c47167d" +checksum = "fb25cab482c8512c4f3323a5c90b95a3b8f7c90681a87bf7a68b942d52f08933" dependencies = [ "async-trait", "base64 0.22.1", @@ -2366,9 +2370,9 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.23.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7af1b5071dc1c61b06900f8f3e17f886b1b08e926166e575018643879f63b6" +checksum = "c18184cd09b386feb18085609e8bf77bdc942482bdd82777b433b8d015edf561" dependencies = [ "heck 0.5.0", "proc-macro-crate", @@ -2379,9 +2383,9 @@ dependencies = [ [[package]] name = "jsonrpsee-server" -version = "0.23.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba63ec742f5f9c4016ca4c443d04dc3ca56e240a26ebe6e56609a5109bd9d13f" +checksum = "810f63eff0f78fa8d413d678c0e55b702e2ea61d4587774c0db4ea2fc554ef92" dependencies = [ "anyhow", "futures-util", @@ -2407,11 +2411,10 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.23.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "328c33717b7bdc4f47cdf31c21d5449c5b713a800cb05cb767841ccf2944f9d9" +checksum = "f511b714bca46f9a3e97c0e0eb21d2c112e83e444d2db535b5ec7093f5836d73" dependencies = [ - "anyhow", "beef", "http 1.1.0", "serde", @@ -2421,9 +2424,9 @@ dependencies = [ [[package]] name = "jsonrpsee-wasm-client" -version = "0.23.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c1c1b2f71c32f763d85c1b9836c1a522377b3972177a76b3e66ba42f2582929" +checksum = "8c8a6dfa0c35c8549fa8e003ce0bbcf37b051ab7ef85fce587e8f0ed7881c84d" dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core", @@ -2432,9 +2435,9 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.23.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeb22661e1c018eb503d5a47be2d39a176de832b047d2757fa86b3d2b34fc84e" +checksum = "786c100eb67df2f2d863d231c2c6978bcf80ff4bf606ffc40e7e68ef562da7bf" dependencies = [ "http 1.1.0", "jsonrpsee-client-transport", @@ -2537,15 +2540,6 @@ dependencies = [ "linked-hash-map", ] -[[package]] -name = "mach2" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" -dependencies = [ - "libc", -] - [[package]] name = "matchers" version = "0.1.0" @@ -2676,7 +2670,7 @@ dependencies = [ "futures-util", "once_cell", "parking_lot 0.12.2", - "quanta 0.12.3", + "quanta", "rustc_version 0.4.0", "smallvec", "tagptr", @@ -3165,6 +3159,12 @@ dependencies = [ "plotters-backend", ] +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + [[package]] name = "pprof" version = "0.13.0" @@ -3288,22 +3288,6 @@ dependencies = [ "prost", ] -[[package]] -name = "quanta" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab" -dependencies = [ - "crossbeam-utils", - "libc", - "mach2", - "once_cell", - "raw-cpuid 10.7.0", - "wasi 0.11.0+wasi-snapshot-preview1", - "web-sys", - "winapi 0.3.9", -] - [[package]] name = "quanta" version = "0.12.3" @@ -3313,7 +3297,7 @@ dependencies = [ "crossbeam-utils", "libc", "once_cell", - "raw-cpuid 11.0.2", + "raw-cpuid", "wasi 0.11.0+wasi-snapshot-preview1", "web-sys", "winapi 0.3.9", @@ -3438,15 +3422,6 @@ dependencies = [ "rand_core 0.6.4", ] -[[package]] -name = "raw-cpuid" -version = "10.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "raw-cpuid" version = "11.0.2" @@ -3728,9 +3703,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.7" +version = "0.23.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebbbdb961df0ad3f2652da8f3fdc4b36122f568f968f45ad3316f26c025c677b" +checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" dependencies = [ "log", "once_cell", @@ -3799,9 +3774,9 @@ checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad" [[package]] name = "rustls-webpki" -version = "0.102.3" +version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ "ring", "rustls-pki-types", @@ -4102,6 +4077,15 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +[[package]] +name = "spinning_top" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300" +dependencies = [ + "lock_api", +] + [[package]] name = "spki" version = "0.7.3" @@ -4500,9 +4484,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" [[package]] name = "toml_edit" @@ -4933,9 +4917,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.1" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" dependencies = [ "rustls-pki-types", ] @@ -5191,9 +5175,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] diff --git a/Cargo.toml b/Cargo.toml index 2a54708..51bd63f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,16 +23,18 @@ chrono = "0.4.24" clap = { version = "4.1.1", features = ["derive"] } enumflags2 = "0.7.7" futures = "0.3.25" +garde = { version = "0.18", features = ["full"] } +governor = "0.6.3" http = "1" http-body = "1" http-body-util = "0.1" hyper = "1.3" +jsonrpsee = { version = "0.23", features = ["full"] } moka = { version = "0.12", features = ["future"] } opentelemetry = { version = "0.21.0" } opentelemetry-datadog = { version = "0.9.0", features = ["reqwest-client"] } opentelemetry-jaeger = { version = "0.20.0", features = ["rt-tokio"] } opentelemetry_sdk = { version = "0.21.1", features = ["rt-tokio", "trace"] } - rand = "0.8.5" regex = "1.10.4" serde = "1.0.152" @@ -45,10 +47,6 @@ tower-http = { version = "0.5.2", features = ["full"] } tracing = "0.1.40" tracing-serde = "0.1.3" tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"] } -garde = { version = "0.18", features = ["full"] } - -jsonrpsee = { version = "0.23", features = ["full"] } -governor = { path = "./vendor/governor/governor" } # Alloy alloy-eips = { version = "0.1.1" } diff --git a/vendor/governor b/vendor/governor deleted file mode 160000 index 870dfb0..0000000 --- a/vendor/governor +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 870dfb073892b5637f988aaa25a322fdc3d3ef59