From 522903681b51120ac318a659cb87ada2d04b5044 Mon Sep 17 00:00:00 2001 From: Brandon Kite Date: Wed, 29 Mar 2023 00:12:31 -0700 Subject: [PATCH 01/10] honeycomb tracing subscription --- Cargo.lock | 1121 ++++++++++++----- bin/fuel-core/Cargo.toml | 5 +- bin/fuel-core/src/cli.rs | 57 +- bin/fuel-core/src/cli/run.rs | 23 +- bin/fuel-core/src/cli/snapshot.rs | 7 +- crates/fuel-core/Cargo.toml | 2 + crates/fuel-core/src/graphql_api.rs | 2 + crates/fuel-core/src/graphql_api/honeycomb.rs | 117 ++ crates/fuel-core/src/graphql_api/service.rs | 16 +- crates/fuel-core/src/service/genesis.rs | 11 +- 10 files changed, 1050 insertions(+), 311 deletions(-) create mode 100644 crates/fuel-core/src/graphql_api/honeycomb.rs diff --git a/Cargo.lock b/Cargo.lock index eb089f117b1..acd988ca3f3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -64,7 +64,7 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cipher 0.3.0", "cpufeatures", "opaque-debug 0.3.0", @@ -76,7 +76,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cipher 0.4.4", "cpufeatures", ] @@ -146,7 +146,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "once_cell", "version_check", ] @@ -160,6 +160,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + [[package]] name = "anes" version = "0.1.6" @@ -215,7 +224,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time", + "time 0.3.20", ] [[package]] @@ -231,7 +240,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time", + "time 0.3.20", ] [[package]] @@ -242,7 +251,7 @@ checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "synstructure", ] @@ -254,7 +263,7 @@ checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "synstructure", ] @@ -266,7 +275,7 @@ checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -308,7 +317,7 @@ dependencies = [ "async-stream", "async-trait", "base64 0.13.1", - "bytes", + "bytes 1.4.0", "fnv", "futures-util", "http", @@ -341,7 +350,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "thiserror", ] @@ -363,7 +372,7 @@ version = "4.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a941b499fead4a3fb5392cabf42446566d18c86313f69f2deab69560394d65f" dependencies = [ - "bytes", + "bytes 1.4.0", "indexmap", "serde", "serde_json", @@ -384,7 +393,7 @@ dependencies = [ "parking", "polling", "slab", - "socket2", + "socket2 0.4.9", "waker-fn", "windows-sys 0.42.0", ] @@ -417,7 +426,7 @@ checksum = "e4655ae1a7b0cdf149156f780c5bf3f1352bc53cbd9e0a361a7ef7b22947e965" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -428,7 +437,7 @@ checksum = "b84f9ebcc6c1f5b8cb160f6990096a5c127f423fcb6e1ccc46c370cbdfb75dfc" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -448,7 +457,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06a0daa378f5fd10634e44b0a29b2a87b890657658e072a30d6f26e57ddee182" dependencies = [ - "bytes", + "bytes 1.4.0", "futures-sink", "futures-util", "memchr", @@ -478,7 +487,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi 0.1.19", "libc", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -490,7 +499,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -502,7 +511,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -520,12 +529,12 @@ dependencies = [ "async-trait", "axum-core", "bitflags", - "bytes", + "bytes 1.4.0", "futures-util", "http", - "http-body", - "hyper", - "itoa", + "http-body 0.4.5", + "hyper 0.14.25", + "itoa 1.0.6", "matchit", "memchr", "mime", @@ -535,7 +544,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "sync_wrapper", - "tokio", + "tokio 1.26.0", "tower", "tower-http", "tower-layer", @@ -549,10 +558,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37e5939e02c56fecd5c017c37df4238c0a839fa76b7f97acdd7efb804fd181cc" dependencies = [ "async-trait", - "bytes", + "bytes 1.4.0", "futures-util", "http", - "http-body", + "http-body 0.4.5", "mime", "tower-layer", "tower-service", @@ -648,7 +657,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn", + "syn 1.0.109", ] [[package]] @@ -791,6 +800,12 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +[[package]] +name = "bytes" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" + [[package]] name = "bytes" version = "1.4.0" @@ -878,6 +893,12 @@ dependencies = [ "nom", ] +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + [[package]] name = "cfg-if" version = "1.0.0" @@ -890,7 +911,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cipher 0.3.0", "cpufeatures", "zeroize", @@ -915,8 +936,14 @@ version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" dependencies = [ + "iana-time-zone", + "js-sys", "num-integer", "num-traits", + "serde", + "time 0.1.45", + "wasm-bindgen", + "winapi 0.3.9", ] [[package]] @@ -1022,7 +1049,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1049,6 +1076,16 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + [[package]] name = "coins-bip32" version = "0.7.0" @@ -1188,7 +1225,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" dependencies = [ "percent-encoding", - "time", + "time 0.3.20", "version_check", ] @@ -1204,7 +1241,7 @@ dependencies = [ "publicsuffix", "serde", "serde_json", - "time", + "time 0.3.20", "url", ] @@ -1272,7 +1309,7 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -1287,7 +1324,7 @@ dependencies = [ "ciborium", "clap 3.2.23", "criterion-plot", - "itertools", + "itertools 0.10.5", "lazy_static", "num-traits", "oorandom", @@ -1308,7 +1345,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ "cast", - "itertools", + "itertools 0.10.5", ] [[package]] @@ -1323,7 +1360,7 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "crossbeam-utils", ] @@ -1333,7 +1370,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "crossbeam-epoch", "crossbeam-utils", ] @@ -1345,7 +1382,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" dependencies = [ "autocfg", - "cfg-if", + "cfg-if 1.0.0", "crossbeam-utils", "memoffset 0.8.0", "scopeguard", @@ -1357,7 +1394,7 @@ version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -1425,7 +1462,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1475,7 +1512,7 @@ version = "4.0.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d4ba9852b42210c7538b75484f9daa0655e9a3ac04f693747bb0f02cf3cfe16" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "fiat-crypto", "packed_simd_2", "platforms", @@ -1483,6 +1520,50 @@ dependencies = [ "zeroize", ] +[[package]] +name = "cxx" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn 2.0.11", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.11", +] + [[package]] name = "cynic" version = "2.2.8" @@ -1490,7 +1571,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1afa0591b1021e427e548a1f0f147fe6168f6c7c7f7006bace77f28856051b8" dependencies = [ "cynic-proc-macros", - "reqwest", + "reqwest 0.11.14", "serde", "serde_json", "static_assertions", @@ -1510,7 +1591,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn", + "syn 1.0.109", ] [[package]] @@ -1520,7 +1601,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa595c4ed7a5374e0e58c5c34f9d93bd6b7d45062790963bd4b4c3c0bf520c4d" dependencies = [ "cynic-codegen", - "syn", + "syn 1.0.109", ] [[package]] @@ -1554,7 +1635,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn", + "syn 1.0.109", ] [[package]] @@ -1568,7 +1649,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn", + "syn 1.0.109", ] [[package]] @@ -1579,7 +1660,7 @@ checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core 0.13.4", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1590,7 +1671,7 @@ checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ "darling_core 0.14.4", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1616,7 +1697,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db" dependencies = [ "data-encoding", - "syn", + "syn 1.0.109", ] [[package]] @@ -1666,7 +1747,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1687,7 +1768,7 @@ dependencies = [ "darling 0.14.4", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1697,7 +1778,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" dependencies = [ "derive_builder_core", - "syn", + "syn 1.0.109", ] [[package]] @@ -1710,7 +1791,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn", + "syn 1.0.109", ] [[package]] @@ -1765,7 +1846,7 @@ checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", "redox_users", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -1776,7 +1857,7 @@ checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1878,7 +1959,7 @@ version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -1890,7 +1971,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1910,7 +1991,7 @@ checksum = "355f93763ef7b0ae1c43c4d8eccc9d5848d84ad1a1d8ce61c421d1ac85a19d05" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1921,7 +2002,7 @@ checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" dependencies = [ "errno-dragonfly", "libc", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -2057,7 +2138,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d4e5ad46aede34901f71afdb7bb555710ed9613d88d644245c657dc371aa228" dependencies = [ "Inflector", - "cfg-if", + "cfg-if 1.0.0", "dunce", "ethers-core", "eyre", @@ -2066,10 +2147,10 @@ dependencies = [ "proc-macro2", "quote", "regex", - "reqwest", + "reqwest 0.11.14", "serde", "serde_json", - "syn", + "syn 1.0.109", "toml", "url", "walkdir", @@ -2087,7 +2168,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn", + "syn 1.0.109", ] [[package]] @@ -2097,7 +2178,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade3e9c97727343984e1ceada4fdab11142d2ee3472d2c67027d56b1251d4f15" dependencies = [ "arrayvec", - "bytes", + "bytes 1.4.0", "cargo_metadata", "chrono", "convert_case 0.6.0", @@ -2115,7 +2196,7 @@ dependencies = [ "serde", "serde_json", "strum", - "syn", + "syn 1.0.109", "thiserror", "tiny-keccak", "unicode-xid", @@ -2129,7 +2210,7 @@ checksum = "a9713f525348e5dde025d09b0a4217429f8074e8ff22c886263cc191e87d8216" dependencies = [ "ethers-core", "getrandom 0.2.8", - "reqwest", + "reqwest 0.11.14", "semver", "serde", "serde-aux", @@ -2154,11 +2235,11 @@ dependencies = [ "futures-locks", "futures-util", "instant", - "reqwest", + "reqwest 0.11.14", "serde", "serde_json", "thiserror", - "tokio", + "tokio 1.26.0", "tracing", "tracing-futures", "url", @@ -2185,11 +2266,11 @@ dependencies = [ "once_cell", "parking_lot 0.11.2", "pin-project", - "reqwest", + "reqwest 0.11.14", "serde", "serde_json", "thiserror", - "tokio", + "tokio 1.26.0", "tokio-tungstenite", "tracing", "tracing-futures", @@ -2232,12 +2313,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9146112ee3ce031aa5aebe3e049e10b1d353b9c7630cc6be488c2c62cc5d9c42" dependencies = [ "futures", - "hyper", + "hyper 0.14.25", "hyper-rustls 0.22.1", "hyper-timeout", "log", "pin-project", - "tokio", + "tokio 1.26.0", ] [[package]] @@ -2340,6 +2421,22 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" +[[package]] +name = "fuchsia-zircon" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +dependencies = [ + "bitflags", + "fuchsia-zircon-sys", +] + +[[package]] +name = "fuchsia-zircon-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" + [[package]] name = "fuel-asm" version = "0.28.1" @@ -2382,8 +2479,8 @@ dependencies = [ "fuel-core-types", "futures", "hex", - "hyper", - "itertools", + "hyper 0.14.25", + "itertools 0.10.5", "mockall", "num_cpus", "postcard", @@ -2397,10 +2494,11 @@ dependencies = [ "tempfile", "test-case", "thiserror", - "tokio", + "tokio 1.26.0", "tokio-stream", "tower-http", "tracing", + "tracing-honeycomb", "uuid 1.3.0", ] @@ -2426,7 +2524,7 @@ version = "0.17.4" dependencies = [ "anyhow", "parking_lot 0.12.1", - "tokio", + "tokio 1.26.0", ] [[package]] @@ -2440,10 +2538,12 @@ dependencies = [ "fuel-core", "humantime", "lazy_static", + "libhoney-rust", "serde_json", "test-case", - "tokio", + "tokio 1.26.0", "tracing", + "tracing-honeycomb", "tracing-subscriber", "url", ] @@ -2458,7 +2558,7 @@ dependencies = [ "fuel-core-types", "hex", "insta", - "itertools", + "itertools 0.10.5", "postcard", "rand 0.8.5", "serde", @@ -2480,8 +2580,8 @@ dependencies = [ "hex", "hyper-rustls 0.22.1", "insta", - "itertools", - "reqwest", + "itertools 0.10.5", + "reqwest 0.11.14", "schemafy_lib", "serde", "serde_json", @@ -2498,7 +2598,7 @@ dependencies = [ "fuel-core-client", "fuel-core-types", "serde_json", - "tokio", + "tokio 1.26.0", ] [[package]] @@ -2510,7 +2610,7 @@ dependencies = [ "fuel-core-poa", "fuel-core-types", "test-case", - "tokio", + "tokio 1.26.0", ] [[package]] @@ -2540,7 +2640,7 @@ dependencies = [ "libtest-mimic", "serde", "tempfile", - "tokio", + "tokio 1.26.0", "toml", ] @@ -2566,7 +2666,7 @@ dependencies = [ "mockall", "test-case", "thiserror", - "tokio", + "tokio 1.26.0", "tracing", ] @@ -2626,7 +2726,7 @@ dependencies = [ "serde", "serde_with", "sha2 0.10.6", - "tokio", + "tokio 1.26.0", "tracing", "tracing-attributes", "tracing-subscriber", @@ -2645,7 +2745,7 @@ dependencies = [ "mockall", "rand 0.8.5", "test-case", - "tokio", + "tokio 1.26.0", "tokio-stream", "tracing", ] @@ -2662,7 +2762,7 @@ dependencies = [ "fuel-core-types", "rand 0.8.5", "thiserror", - "tokio", + "tokio 1.26.0", "tracing", ] @@ -2672,7 +2772,7 @@ version = "0.17.4" dependencies = [ "anyhow", "async-trait", - "bytes", + "bytes 1.4.0", "ethers-contract", "ethers-core", "ethers-providers", @@ -2689,7 +2789,7 @@ dependencies = [ "serde_json", "test-case", "thiserror", - "tokio", + "tokio 1.26.0", "tracing", "url", ] @@ -2703,7 +2803,7 @@ dependencies = [ "futures", "mockall", "parking_lot 0.12.1", - "tokio", + "tokio 1.26.0", "tracing", ] @@ -2730,7 +2830,7 @@ dependencies = [ "futures", "mockall", "test-case", - "tokio", + "tokio 1.26.0", "tracing", ] @@ -2749,16 +2849,16 @@ dependencies = [ "fuel-core-txpool", "fuel-core-types", "futures", - "hyper", + "hyper 0.14.25", "insta", - "itertools", + "itertools 0.10.5", "rand 0.8.5", - "reqwest", + "reqwest 0.11.14", "rstest", "serde_json", "tempfile", "test-case", - "tokio", + "tokio 1.26.0", ] [[package]] @@ -2784,11 +2884,11 @@ dependencies = [ "fuel-core-trace", "fuel-core-txpool", "fuel-core-types", - "itertools", + "itertools 0.10.5", "mockall", "parking_lot 0.12.1", "rstest", - "tokio", + "tokio 1.26.0", "tokio-stream", "tracing", ] @@ -2856,7 +2956,7 @@ dependencies = [ "fuel-crypto", "fuel-merkle", "fuel-types", - "itertools", + "itertools 0.10.5", "num-integer", "rand 0.8.5", "serde", @@ -2889,7 +2989,7 @@ dependencies = [ "fuel-storage", "fuel-tx", "fuel-types", - "itertools", + "itertools 0.10.5", "rand 0.8.5", "serde", "sha3", @@ -2986,7 +3086,7 @@ checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -3070,7 +3170,7 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", "wasi 0.9.0+wasi-snapshot-preview1", ] @@ -3081,7 +3181,7 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", @@ -3135,13 +3235,33 @@ dependencies = [ "subtle", ] +[[package]] +name = "h2" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" +dependencies = [ + "bytes 0.5.6", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio 0.2.25", + "tokio-util 0.3.1", + "tracing", + "tracing-futures", +] + [[package]] name = "h2" version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" dependencies = [ - "bytes", + "bytes 1.4.0", "fnv", "futures-core", "futures-sink", @@ -3149,8 +3269,8 @@ dependencies = [ "http", "indexmap", "slab", - "tokio", - "tokio-util", + "tokio 1.26.0", + "tokio-util 0.7.7", "tracing", ] @@ -3312,7 +3432,7 @@ checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" dependencies = [ "libc", "match_cfg", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -3321,9 +3441,19 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ - "bytes", + "bytes 1.4.0", "fnv", - "itoa", + "itoa 1.0.6", +] + +[[package]] +name = "http-body" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" +dependencies = [ + "bytes 0.5.6", + "http", ] [[package]] @@ -3332,7 +3462,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes", + "bytes 1.4.0", "http", "pin-project-lite 0.2.9", ] @@ -3349,6 +3479,12 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +[[package]] +name = "httpdate" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" + [[package]] name = "httpdate" version = "1.0.2" @@ -3371,30 +3507,70 @@ dependencies = [ "serde", ] +[[package]] +name = "hyper" +version = "0.13.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" +dependencies = [ + "bytes 0.5.6", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.2.7", + "http", + "http-body 0.3.1", + "httparse", + "httpdate 0.3.2", + "itoa 0.4.8", + "pin-project", + "socket2 0.3.19", + "tokio 0.2.25", + "tower-service", + "tracing", + "want", +] + [[package]] name = "hyper" version = "0.14.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" dependencies = [ - "bytes", + "bytes 1.4.0", "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.16", "http", - "http-body", + "http-body 0.4.5", "httparse", - "httpdate", - "itoa", + "httpdate 1.0.2", + "itoa 1.0.6", "pin-project-lite 0.2.9", - "socket2", - "tokio", + "socket2 0.4.9", + "tokio 1.26.0", "tower-service", "tracing", "want", ] +[[package]] +name = "hyper-rustls" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37743cc83e8ee85eacfce90f2f4102030d9ff0a95244098d781e9bee4a90abb6" +dependencies = [ + "bytes 0.5.6", + "futures-util", + "hyper 0.13.10", + "log", + "rustls 0.18.1", + "tokio 0.2.25", + "tokio-rustls 0.14.1", + "webpki 0.21.4", +] + [[package]] name = "hyper-rustls" version = "0.22.1" @@ -3403,11 +3579,11 @@ checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" dependencies = [ "ct-logs", "futures-util", - "hyper", + "hyper 0.14.25", "log", "rustls 0.19.1", "rustls-native-certs", - "tokio", + "tokio 1.26.0", "tokio-rustls 0.22.0", "webpki 0.21.4", "webpki-roots 0.21.1", @@ -3420,9 +3596,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ "http", - "hyper", + "hyper 0.14.25", "rustls 0.20.8", - "tokio", + "tokio 1.26.0", "tokio-rustls 0.23.4", ] @@ -3432,12 +3608,36 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper", + "hyper 0.14.25", "pin-project-lite 0.2.9", - "tokio", + "tokio 1.26.0", "tokio-io-timeout", ] +[[package]] +name = "iana-time-zone" +version = "0.1.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c17cc76786e99f8d2f055c11159e7f0091c42474dcc3189fbab96072e873e6d" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows 0.46.0", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -3472,7 +3672,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbc0fa01ffc752e9dbc72818cdb072cd028b86be5e09dd04c5a643704fe101a9" dependencies = [ "libc", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -3490,8 +3690,8 @@ dependencies = [ "log", "rtnetlink", "system-configuration", - "tokio", - "windows", + "tokio 1.26.0", + "windows 0.34.0", ] [[package]] @@ -3529,7 +3729,7 @@ checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -3577,7 +3777,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "js-sys", "wasm-bindgen", "web-sys", @@ -3590,13 +3790,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e8a11ae2da61704edada656798b61c94b35ecac2c58eb955156987d5e6be90b" dependencies = [ "async-trait", - "bytes", + "bytes 1.4.0", "log", "rand 0.8.5", "rtcp", "rtp", "thiserror", - "tokio", + "tokio 1.26.0", "waitgroup", "webrtc-srtp", "webrtc-util", @@ -3612,6 +3812,15 @@ dependencies = [ "windows-sys 0.45.0", ] +[[package]] +name = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + [[package]] name = "ip_network" version = "0.4.1" @@ -3624,10 +3833,10 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd302af1b90f2463a98fa5ad469fc212c8e3175a41c3068601bfa2727591c5be" dependencies = [ - "socket2", + "socket2 0.4.9", "widestring", - "winapi", - "winreg", + "winapi 0.3.9", + "winreg 0.10.1", ] [[package]] @@ -3648,6 +3857,15 @@ dependencies = [ "windows-sys 0.45.0", ] +[[package]] +name = "itertools" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +dependencies = [ + "either", +] + [[package]] name = "itertools" version = "0.10.5" @@ -3657,6 +3875,12 @@ dependencies = [ "either", ] +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + [[package]] name = "itoa" version = "1.0.6" @@ -3687,7 +3911,7 @@ version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "ecdsa", "elliptic-curve", "sha2 0.10.6", @@ -3703,6 +3927,16 @@ dependencies = [ "cpufeatures", ] +[[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -3721,14 +3955,31 @@ version = "0.2.140" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +[[package]] +name = "libhoney-rust" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10229f6f716bca15e59862b9a5cb724a53bf02083a70f8e7d2cd43f226a0e63e" +dependencies = [ + "chrono", + "crossbeam-channel", + "log", + "parking_lot 0.11.2", + "rand 0.8.5", + "reqwest 0.10.10", + "serde", + "serde_json", + "tokio 0.2.25", +] + [[package]] name = "libloading" version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ - "cfg-if", - "winapi", + "cfg-if 1.0.0", + "winapi 0.3.9", ] [[package]] @@ -3743,7 +3994,7 @@ version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e0a0d2f693675f49ded13c5d510c48b78069e23cbd9108d7ccd59f6dc568819" dependencies = [ - "bytes", + "bytes 1.4.0", "futures", "futures-timer", "getrandom 0.2.8", @@ -3856,7 +4107,7 @@ dependencies = [ "asynchronous-codec", "base64 0.13.1", "byteorder", - "bytes", + "bytes 1.4.0", "fnv", "futures", "hex_fmt", @@ -3925,7 +4176,7 @@ checksum = "40ee545eedf4f88502b2a4a2323405c3225d212d643212b0615856ca227fb9c3" dependencies = [ "arrayvec", "asynchronous-codec", - "bytes", + "bytes 1.4.0", "either", "fnv", "futures", @@ -3959,8 +4210,8 @@ dependencies = [ "log", "rand 0.8.5", "smallvec", - "socket2", - "tokio", + "socket2 0.4.9", + "tokio 1.26.0", "trust-dns-proto", "void", ] @@ -3986,7 +4237,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03805b44107aa013e7cbbfa5627b31c36cbedfdfb00603c0311998882bc4bace" dependencies = [ "asynchronous-codec", - "bytes", + "bytes 1.4.0", "futures", "libp2p-core 0.38.0", "log", @@ -4003,7 +4254,7 @@ version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a978cb57efe82e892ec6f348a536bfbd9fee677adbe5689d7a93ad3a9bffbf2e" dependencies = [ - "bytes", + "bytes 1.4.0", "curve25519-dalek 3.2.0", "futures", "libp2p-core 0.38.0", @@ -4026,7 +4277,7 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c87c2803deffeae94108072a0387f8c9ff494af68a4908454c11c811e27b5e5" dependencies = [ - "bytes", + "bytes 1.4.0", "curve25519-dalek 3.2.0", "futures", "libp2p-core 0.39.1", @@ -4049,7 +4300,7 @@ version = "0.7.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6b26abd81cd2398382a1edfe739b539775be8a90fa6914f39b2ab49571ec735" dependencies = [ - "bytes", + "bytes 1.4.0", "futures", "futures-timer", "if-watch", @@ -4062,7 +4313,7 @@ dependencies = [ "rand 0.8.5", "rustls 0.20.8", "thiserror", - "tokio", + "tokio 1.26.0", ] [[package]] @@ -4072,7 +4323,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3236168796727bfcf4927f766393415361e2c644b08bedb6a6b13d957c9a4884" dependencies = [ "async-trait", - "bytes", + "bytes 1.4.0", "futures", "instant", "libp2p-core 0.38.0", @@ -4101,7 +4352,7 @@ dependencies = [ "rand 0.8.5", "smallvec", "thiserror", - "tokio", + "tokio 1.26.0", "void", ] @@ -4113,7 +4364,7 @@ checksum = "9d527d5827582abd44a6d80c07ff8b50b4ee238a8979e05998474179e79dc400" dependencies = [ "heck", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4128,8 +4379,8 @@ dependencies = [ "libc", "libp2p-core 0.38.0", "log", - "socket2", - "tokio", + "socket2 0.4.9", + "tokio 1.26.0", ] [[package]] @@ -4159,7 +4410,7 @@ checksum = "ffd0c3af5921e3bdd5fecdf3eef3be5a197def64c1d23cd3ea79abcadbd461f7" dependencies = [ "async-trait", "asynchronous-codec", - "bytes", + "bytes 1.4.0", "futures", "futures-timer", "hex", @@ -4177,8 +4428,8 @@ dependencies = [ "stun", "thiserror", "tinytemplate", - "tokio", - "tokio-util", + "tokio 1.26.0", + "tokio-util 0.7.7", "webrtc", ] @@ -4300,6 +4551,15 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "link-cplusplus" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +dependencies = [ + "cc", +] + [[package]] name = "linked-hash-map" version = "0.5.6" @@ -4328,7 +4588,7 @@ version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -4415,6 +4675,16 @@ version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -4430,6 +4700,25 @@ dependencies = [ "adler", ] +[[package]] +name = "mio" +version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +dependencies = [ + "cfg-if 0.1.10", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", + "kernel32-sys", + "libc", + "log", + "miow", + "net2", + "slab", + "winapi 0.2.8", +] + [[package]] name = "mio" version = "0.8.6" @@ -4442,13 +4731,25 @@ dependencies = [ "windows-sys 0.45.0", ] +[[package]] +name = "miow" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +dependencies = [ + "kernel32-sys", + "net2", + "winapi 0.2.8", + "ws2_32-sys", +] + [[package]] name = "mockall" version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50e4a1c770583dac7ab5e2f6c139153b783a53a1bbee9729613f193e59828326" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "downcast", "fragile", "lazy_static", @@ -4463,10 +4764,10 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "832663583d5fa284ca8810bf7015e46c9fff9622d3cf34bd1eea5003fec06dd0" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4475,7 +4776,7 @@ version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ed4198ce7a4cbd2a57af78d28c6fbb57d81ac5f1d6ad79ac6c5587419cbdf22" dependencies = [ - "bytes", + "bytes 1.4.0", "encoding_rs", "futures-util", "http", @@ -4570,7 +4871,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "synstructure", ] @@ -4586,7 +4887,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8552ab875c1313b97b8d20cb857b9fd63e2d1d6a0a1b53ce9821e575405f27a" dependencies = [ - "bytes", + "bytes 1.4.0", "futures", "log", "pin-project", @@ -4594,6 +4895,17 @@ dependencies = [ "unsigned-varint", ] +[[package]] +name = "net2" +version = "0.2.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "winapi 0.3.9", +] + [[package]] name = "netlink-packet-core" version = "0.4.2" @@ -4638,13 +4950,13 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65b4b14489ab424703c092062176d52ba55485a89c076b4f9db05092b7223aa6" dependencies = [ - "bytes", + "bytes 1.4.0", "futures", "log", "netlink-packet-core", "netlink-sys", "thiserror", - "tokio", + "tokio 1.26.0", ] [[package]] @@ -4653,11 +4965,11 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" dependencies = [ - "bytes", + "bytes 1.4.0", "futures", "libc", "log", - "tokio", + "tokio 1.26.0", ] [[package]] @@ -4667,7 +4979,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ "bitflags", - "cfg-if", + "cfg-if 1.0.0", "libc", "memoffset 0.6.5", ] @@ -4679,7 +4991,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ "bitflags", - "cfg-if", + "cfg-if 1.0.0", "libc", "static_assertions", ] @@ -4713,7 +5025,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" dependencies = [ "overload", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -4806,7 +5118,7 @@ checksum = "786393f80485445794f6043fd3138854dd109cc6c4bd1a6383db304c9ce9b9ce" dependencies = [ "arrayvec", "auto_impl 1.0.1", - "bytes", + "bytes 1.4.0", "ethereum-types", "open-fastrlp-derive", ] @@ -4817,10 +5129,10 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "003b2be5c6c53c1cfeb0a238b8a1c3915cd410feb684457a36c10038f764bb1c" dependencies = [ - "bytes", + "bytes 1.4.0", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4869,7 +5181,7 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libm", ] @@ -4896,7 +5208,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4932,12 +5244,12 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "instant", "libc", "redox_syscall", "smallvec", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -4946,7 +5258,7 @@ version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", "redox_syscall", "smallvec", @@ -5059,7 +5371,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -5138,7 +5450,7 @@ checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa" dependencies = [ "autocfg", "bitflags", - "cfg-if", + "cfg-if 1.0.0", "concurrent-queue", "libc", "log", @@ -5163,7 +5475,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "opaque-debug 0.3.0", "universal-hash 0.4.1", @@ -5175,7 +5487,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef234e08c11dfcb2e56f79fd70f6f2eb7f025c0ce2333e82f4f0518ecad30c6" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "opaque-debug 0.3.0", "universal-hash 0.5.0", @@ -5206,7 +5518,7 @@ checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ "difflib", "float-cmp", - "itertools", + "itertools 0.10.5", "normalize-line-endings", "predicates-core", "regex", @@ -5220,7 +5532,7 @@ checksum = "1ba7d6ead3e3966038f68caa9fc1f860185d95a793180bbcfe0d0da47b3961ed" dependencies = [ "anstyle", "difflib", - "itertools", + "itertools 0.10.5", "predicates-core", ] @@ -5247,7 +5559,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ "proc-macro2", - "syn", + "syn 1.0.109", ] [[package]] @@ -5283,7 +5595,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -5314,7 +5626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83cd1b99916654a69008fd66b4f9397fbe08e6e51dfe23d4417acf5d3b8cb87c" dependencies = [ "dtoa", - "itoa", + "itoa 1.0.6", "parking_lot 0.12.1", "prometheus-client-derive-text-encode", ] @@ -5327,7 +5639,7 @@ checksum = "66a455fbcb954c1a7decf3c586e860fd7889cddf4b8e164be736dbac95a953cd" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -5336,7 +5648,7 @@ version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48e50df39172a3e7eb17e14642445da64996989bc212b583015435d39a58537" dependencies = [ - "bytes", + "bytes 1.4.0", "prost-derive", ] @@ -5346,9 +5658,9 @@ version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c828f93f5ca4826f97fedcbd3f9a536c16b12cff3dbbb4a007f932bbad95b12" dependencies = [ - "bytes", + "bytes 1.4.0", "heck", - "itertools", + "itertools 0.10.5", "lazy_static", "log", "multimap", @@ -5357,7 +5669,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn", + "syn 1.0.109", "tempfile", "which", ] @@ -5369,7 +5681,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dc34979ff898b6e141106178981ce2596c387ea6e62533facfc61a37fc879c0" dependencies = [ "asynchronous-codec", - "bytes", + "bytes 1.4.0", "prost", "thiserror", "unsigned-varint", @@ -5382,10 +5694,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ea9b0f8cbe5e15a8a042d030bd96668db28ecb567ec37d691971ff5731d2b1b" dependencies = [ "anyhow", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -5435,7 +5747,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1693116345026436eb2f10b677806169c1a1260c1c60eaaffe3fb5a29ae23d8b" dependencies = [ "asynchronous-codec", - "bytes", + "bytes 1.4.0", "quick-protobuf", "thiserror", "unsigned-varint", @@ -5458,7 +5770,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72ef4ced82a24bb281af338b9e8f94429b6eca01b4e66d899f40031f074e74c9" dependencies = [ - "bytes", + "bytes 1.4.0", "rand 0.8.5", "ring", "rustc-hash", @@ -5592,7 +5904,7 @@ checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" dependencies = [ "pem", "ring", - "time", + "time 0.3.20", "x509-parser 0.13.2", "yasna", ] @@ -5605,7 +5917,7 @@ checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", "ring", - "time", + "time 0.3.20", "yasna", ] @@ -5655,6 +5967,43 @@ version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +[[package]] +name = "reqwest" +version = "0.10.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" +dependencies = [ + "base64 0.13.1", + "bytes 0.5.6", + "encoding_rs", + "futures-core", + "futures-util", + "http", + "http-body 0.3.1", + "hyper 0.13.10", + "hyper-rustls 0.21.0", + "ipnet", + "js-sys", + "lazy_static", + "log", + "mime", + "mime_guess", + "percent-encoding", + "pin-project-lite 0.2.9", + "rustls 0.18.1", + "serde", + "serde_json", + "serde_urlencoded", + "tokio 0.2.25", + "tokio-rustls 0.14.1", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots 0.20.0", + "winreg 0.7.0", +] + [[package]] name = "reqwest" version = "0.11.14" @@ -5662,15 +6011,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" dependencies = [ "base64 0.21.0", - "bytes", + "bytes 1.4.0", "cookie_store", "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.16", "http", - "http-body", - "hyper", + "http-body 0.4.5", + "hyper 0.14.25", "hyper-rustls 0.23.2", "ipnet", "js-sys", @@ -5684,7 +6033,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "tokio", + "tokio 1.26.0", "tokio-rustls 0.23.4", "tower-service", "url", @@ -5692,7 +6041,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "webpki-roots 0.22.6", - "winreg", + "winreg 0.10.1", ] [[package]] @@ -5728,7 +6077,7 @@ dependencies = [ "spin 0.5.2", "untrusted", "web-sys", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -5746,7 +6095,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec" dependencies = [ - "bytes", + "bytes 1.4.0", "rustc-hex", ] @@ -5758,7 +6107,7 @@ checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -5789,11 +6138,11 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5015e68a0685a95ade3eee617ff7101ab6a3fc689203101ca16ebc16f2b89c66" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "proc-macro2", "quote", "rustc_version", - "syn", + "syn 1.0.109", ] [[package]] @@ -5802,7 +6151,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1919efd6d4a6a85d13388f9487549bb8e359f17198cc03ffd72f79b553873691" dependencies = [ - "bytes", + "bytes 1.4.0", "thiserror", "webrtc-util", ] @@ -5819,7 +6168,7 @@ dependencies = [ "netlink-proto", "nix 0.24.3", "thiserror", - "tokio", + "tokio 1.26.0", ] [[package]] @@ -5829,7 +6178,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2a095411ff00eed7b12e4c6a118ba984d113e1079582570d56a5ee723f11f80" dependencies = [ "async-trait", - "bytes", + "bytes 1.4.0", "rand 0.8.5", "serde", "thiserror", @@ -5880,6 +6229,19 @@ dependencies = [ "windows-sys 0.45.0", ] +[[package]] +name = "rustls" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81" +dependencies = [ + "base64 0.12.3", + "log", + "ring", + "sct 0.6.1", + "webpki 0.21.4", +] + [[package]] name = "rustls" version = "0.19.1" @@ -5973,7 +6335,7 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "001cf62ece89779fd16105b5f515ad0e5cedcd5440d3dd806bb067978e7c3608" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "derive_more", "parity-scale-codec", "scale-info-derive", @@ -5988,7 +6350,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -6023,7 +6385,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "syn", + "syn 1.0.109", ] [[package]] @@ -6032,6 +6394,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "scratch" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" + [[package]] name = "scrypt" version = "0.10.0" @@ -6183,7 +6551,7 @@ checksum = "d7e29c4601e36bcec74a223228dce795f4cd3616341a4af93520ca1a837c087d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -6192,7 +6560,7 @@ version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" dependencies = [ - "itoa", + "itoa 1.0.6", "ryu", "serde", ] @@ -6204,7 +6572,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa", + "itoa 1.0.6", "ryu", "serde", ] @@ -6228,7 +6596,7 @@ dependencies = [ "darling 0.13.4", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -6238,7 +6606,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f82e6c8c047aa50a7328632d067bcae6ef38772a79e28daf32f735e0e4f3dd10" dependencies = [ "indexmap", - "itoa", + "itoa 1.0.6", "ryu", "serde", "unsafe-libyaml", @@ -6251,7 +6619,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ "block-buffer 0.9.0", - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", @@ -6263,7 +6631,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "digest 0.10.6", ] @@ -6274,7 +6642,7 @@ version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "digest 0.10.6", ] @@ -6298,7 +6666,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", @@ -6310,7 +6678,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "digest 0.10.6", ] @@ -6397,6 +6765,17 @@ dependencies = [ "subtle", ] +[[package]] +name = "socket2" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "winapi 0.3.9", +] + [[package]] name = "socket2" version = "0.4.9" @@ -6404,7 +6783,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -6414,7 +6793,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" dependencies = [ "base64 0.13.1", - "bytes", + "bytes 1.4.0", "flate2", "futures", "httparse", @@ -6485,7 +6864,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn", + "syn 1.0.109", ] [[package]] @@ -6502,7 +6881,7 @@ dependencies = [ "ring", "subtle", "thiserror", - "tokio", + "tokio 1.26.0", "url", "webrtc-util", ] @@ -6533,6 +6912,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21e3787bb71465627110e7d87ed4faaa36c1f61042ee67badb9e2ef173accc40" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "sync_wrapper" version = "0.1.2" @@ -6547,7 +6937,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "unicode-xid", ] @@ -6593,7 +6983,7 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "fastrand", "redox_syscall", "rustix", @@ -6630,11 +7020,11 @@ version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e45b7bf6e19353ddd832745c8fcf77a17a93171df7151187f26623f2b75b5b26" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -6660,7 +7050,7 @@ checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -6669,7 +7059,7 @@ version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "once_cell", ] @@ -6692,13 +7082,24 @@ dependencies = [ "libc", ] +[[package]] +name = "time" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi 0.3.9", +] + [[package]] name = "time" version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" dependencies = [ - "itoa", + "itoa 1.0.6", "serde", "time-core", "time-macros", @@ -6753,6 +7154,24 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +[[package]] +name = "tokio" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" +dependencies = [ + "bytes 0.5.6", + "fnv", + "futures-core", + "iovec", + "lazy_static", + "memchr", + "mio 0.6.23", + "num_cpus", + "pin-project-lite 0.1.12", + "slab", +] + [[package]] name = "tokio" version = "1.26.0" @@ -6760,15 +7179,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" dependencies = [ "autocfg", - "bytes", + "bytes 1.4.0", "libc", "memchr", - "mio", + "mio 0.8.6", "num_cpus", "parking_lot 0.12.1", "pin-project-lite 0.2.9", "signal-hook-registry", - "socket2", + "socket2 0.4.9", "tokio-macros", "windows-sys 0.45.0", ] @@ -6780,7 +7199,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" dependencies = [ "pin-project-lite 0.2.9", - "tokio", + "tokio 1.26.0", ] [[package]] @@ -6791,7 +7210,19 @@ checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", +] + +[[package]] +name = "tokio-rustls" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a" +dependencies = [ + "futures-core", + "rustls 0.18.1", + "tokio 0.2.25", + "webpki 0.21.4", ] [[package]] @@ -6801,7 +7232,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ "rustls 0.19.1", - "tokio", + "tokio 1.26.0", "webpki 0.21.4", ] @@ -6812,7 +7243,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ "rustls 0.20.8", - "tokio", + "tokio 1.26.0", "webpki 0.22.0", ] @@ -6824,8 +7255,8 @@ checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" dependencies = [ "futures-core", "pin-project-lite 0.2.9", - "tokio", - "tokio-util", + "tokio 1.26.0", + "tokio-util 0.7.7", ] [[package]] @@ -6837,25 +7268,39 @@ dependencies = [ "futures-util", "log", "rustls 0.20.8", - "tokio", + "tokio 1.26.0", "tokio-rustls 0.23.4", "tungstenite", "webpki 0.22.0", "webpki-roots 0.22.6", ] +[[package]] +name = "tokio-util" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" +dependencies = [ + "bytes 0.5.6", + "futures-core", + "futures-sink", + "log", + "pin-project-lite 0.1.12", + "tokio 0.2.25", +] + [[package]] name = "tokio-util" version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" dependencies = [ - "bytes", + "bytes 1.4.0", "futures-core", "futures-io", "futures-sink", "pin-project-lite 0.2.9", - "tokio", + "tokio 1.26.0", "tracing", ] @@ -6878,7 +7323,7 @@ dependencies = [ "futures-util", "pin-project", "pin-project-lite 0.2.9", - "tokio", + "tokio 1.26.0", "tower-layer", "tower-service", "tracing", @@ -6891,11 +7336,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" dependencies = [ "bitflags", - "bytes", + "bytes 1.4.0", "futures-core", "futures-util", "http", - "http-body", + "http-body 0.4.5", "http-range-header", "pin-project-lite 0.2.9", "tower", @@ -6922,7 +7367,7 @@ version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "log", "pin-project-lite 0.2.9", "tracing-attributes", @@ -6936,7 +7381,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" dependencies = [ "crossbeam-channel", - "time", + "time 0.3.20", "tracing-subscriber", ] @@ -6948,7 +7393,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -6961,6 +7406,19 @@ dependencies = [ "valuable", ] +[[package]] +name = "tracing-distributed" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de30b98573d9e63e82996b3c9bf950210ba3f2dcf363f7eec000acebef1a4377" +dependencies = [ + "itertools 0.9.0", + "parking_lot 0.11.2", + "tracing", + "tracing-core", + "tracing-subscriber", +] + [[package]] name = "tracing-futures" version = "0.2.5" @@ -6973,6 +7431,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "tracing-honeycomb" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cced581bc7226c4c3e6d48905f256eef9100c1dc2f9a0e441bdeed825cd831de" +dependencies = [ + "chrono", + "libhoney-rust", + "parking_lot 0.11.2", + "rand 0.7.3", + "serde", + "serde_json", + "sha-1 0.9.8", + "tracing", + "tracing-core", + "tracing-distributed", + "uuid 0.8.2", +] + [[package]] name = "tracing-log" version = "0.1.3" @@ -7022,7 +7499,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" dependencies = [ "async-trait", - "cfg-if", + "cfg-if 1.0.0", "data-encoding", "enum-as-inner", "futures-channel", @@ -7033,10 +7510,10 @@ dependencies = [ "lazy_static", "rand 0.8.5", "smallvec", - "socket2", + "socket2 0.4.9", "thiserror", "tinyvec", - "tokio", + "tokio 1.26.0", "tracing", "url", ] @@ -7047,7 +7524,7 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "futures-util", "ipconfig", "lazy_static", @@ -7056,7 +7533,7 @@ dependencies = [ "resolv-conf", "smallvec", "thiserror", - "tokio", + "tokio 1.26.0", "tracing", "trust-dns-proto", ] @@ -7075,7 +7552,7 @@ checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" dependencies = [ "base64 0.13.1", "byteorder", - "bytes", + "bytes 1.4.0", "http", "httparse", "log", @@ -7103,7 +7580,7 @@ dependencies = [ "ring", "stun", "thiserror", - "tokio", + "tokio 1.26.0", "webrtc-util", ] @@ -7131,6 +7608,15 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "unicase" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ + "version_check", +] + [[package]] name = "unicode-bidi" version = "0.3.11" @@ -7158,6 +7644,12 @@ version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + [[package]] name = "unicode-xid" version = "0.2.4" @@ -7206,7 +7698,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836" dependencies = [ "asynchronous-codec", - "bytes", + "bytes 1.4.0", "futures-io", "futures-util", ] @@ -7308,7 +7800,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" dependencies = [ "same-file", - "winapi", + "winapi 0.3.9", "winapi-util", ] @@ -7328,6 +7820,12 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -7340,7 +7838,9 @@ version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", + "serde", + "serde_json", "wasm-bindgen-macro", ] @@ -7355,7 +7855,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-shared", ] @@ -7365,7 +7865,7 @@ version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "js-sys", "wasm-bindgen", "web-sys", @@ -7389,7 +7889,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7445,6 +7945,15 @@ dependencies = [ "untrusted", ] +[[package]] +name = "webpki-roots" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f" +dependencies = [ + "webpki 0.21.4", +] + [[package]] name = "webpki-roots" version = "0.21.1" @@ -7471,7 +7980,7 @@ checksum = "2d3bc9049bdb2cea52f5fd4f6f728184225bdb867ed0dc2410eab6df5bdd67bb" dependencies = [ "arc-swap", "async-trait", - "bytes", + "bytes 1.4.0", "hex", "interceptor", "lazy_static", @@ -7489,8 +7998,8 @@ dependencies = [ "sha2 0.10.6", "stun", "thiserror", - "time", - "tokio", + "time 0.3.20", + "tokio 1.26.0", "turn", "url", "waitgroup", @@ -7510,11 +8019,11 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ef36a4d12baa6e842582fe9ec16a57184ba35e1a09308307b67d43ec8883100" dependencies = [ - "bytes", + "bytes 1.4.0", "derive_builder", "log", "thiserror", - "tokio", + "tokio 1.26.0", "webrtc-sctp", "webrtc-util", ] @@ -7553,7 +8062,7 @@ dependencies = [ "signature", "subtle", "thiserror", - "tokio", + "tokio 1.26.0", "webpki 0.21.4", "webrtc-util", "x25519-dalek 2.0.0-pre.1", @@ -7575,7 +8084,7 @@ dependencies = [ "serde_json", "stun", "thiserror", - "tokio", + "tokio 1.26.0", "turn", "url", "uuid 1.3.0", @@ -7591,9 +8100,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f08dfd7a6e3987e255c4dbe710dde5d94d0f0574f8a21afa95d171376c143106" dependencies = [ "log", - "socket2", + "socket2 0.4.9", "thiserror", - "tokio", + "tokio 1.26.0", "webrtc-util", ] @@ -7604,7 +8113,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee2a3c157a040324e5049bcbd644ffc9079e6738fa2cfab2bcff64e5cc4c00d7" dependencies = [ "byteorder", - "bytes", + "bytes 1.4.0", "derive_builder", "displaydoc", "rand 0.8.5", @@ -7621,12 +8130,12 @@ checksum = "0d47adcd9427eb3ede33d5a7f3424038f63c965491beafcc20bc650a2f6679c0" dependencies = [ "arc-swap", "async-trait", - "bytes", + "bytes 1.4.0", "crc", "log", "rand 0.8.5", "thiserror", - "tokio", + "tokio 1.26.0", "webrtc-util", ] @@ -7641,7 +8150,7 @@ dependencies = [ "aes-gcm 0.9.4", "async-trait", "byteorder", - "bytes", + "bytes 1.4.0", "ctr 0.8.0", "hmac 0.11.0", "log", @@ -7650,7 +8159,7 @@ dependencies = [ "sha-1 0.9.8", "subtle", "thiserror", - "tokio", + "tokio 1.26.0", "webrtc-util", ] @@ -7662,7 +8171,7 @@ checksum = "93f1db1727772c05cf7a2cfece52c3aca8045ca1e176cd517d323489aa3c6d87" dependencies = [ "async-trait", "bitflags", - "bytes", + "bytes 1.4.0", "cc", "ipnet", "lazy_static", @@ -7671,8 +8180,8 @@ dependencies = [ "nix 0.24.3", "rand 0.8.5", "thiserror", - "tokio", - "winapi", + "tokio 1.26.0", + "winapi 0.3.9", ] [[package]] @@ -7692,6 +8201,12 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + [[package]] name = "winapi" version = "0.3.9" @@ -7702,6 +8217,12 @@ dependencies = [ "winapi-x86_64-pc-windows-gnu", ] +[[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" @@ -7714,7 +8235,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi", + "winapi 0.3.9", ] [[package]] @@ -7736,6 +8257,15 @@ dependencies = [ "windows_x86_64_msvc 0.34.0", ] +[[package]] +name = "windows" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +dependencies = [ + "windows-targets", +] + [[package]] name = "windows-sys" version = "0.42.0" @@ -7847,13 +8377,32 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +[[package]] +name = "winreg" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" +dependencies = [ + "winapi 0.3.9", +] + [[package]] name = "winreg" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" dependencies = [ - "winapi", + "winapi 0.3.9", +] + +[[package]] +name = "ws2_32-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +dependencies = [ + "winapi 0.2.8", + "winapi-build", ] [[package]] @@ -7922,7 +8471,7 @@ dependencies = [ "ring", "rusticata-macros", "thiserror", - "time", + "time 0.3.20", ] [[package]] @@ -7940,7 +8489,7 @@ dependencies = [ "oid-registry 0.6.1", "rusticata-macros", "thiserror", - "time", + "time 0.3.20", ] [[package]] @@ -7980,7 +8529,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" dependencies = [ - "time", + "time 0.3.20", ] [[package]] @@ -8000,6 +8549,6 @@ checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "synstructure", ] diff --git a/bin/fuel-core/Cargo.toml b/bin/fuel-core/Cargo.toml index 82abd6eb25f..eaf860c391e 100644 --- a/bin/fuel-core/Cargo.toml +++ b/bin/fuel-core/Cargo.toml @@ -21,8 +21,10 @@ clap = { workspace = true, features = ["derive", "env"] } const_format = { version = "0.2", optional = true } dirs = "4.0" fuel-core = { workspace = true } +tracing-honeycomb = { version = "0.4", features = ["use_parking_lot"], optional = true } humantime = "2.1" lazy_static = { workspace = true } +libhoney-rust = { version = "0.1.6", optional = true } serde_json = { workspace = true, features = ["raw_value"], optional = true } tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } tracing = { workspace = true } @@ -44,5 +46,6 @@ p2p = ["fuel-core/p2p", "const_format"] relayer = ["fuel-core/relayer", "dep:url", "dep:serde_json"] rocksdb = ["fuel-core/rocksdb"] rocksdb-production = ["fuel-core/rocksdb-production"] +honeycomb = ["dep:tracing-honeycomb", "dep:libhoney-rust", "fuel-core/honeycomb"] # features to enable in production, but increase build times -production = ["metrics", "relayer", "rocksdb-production", "p2p"] +production = ["metrics", "relayer", "rocksdb-production", "p2p", "honeycomb"] diff --git a/bin/fuel-core/src/cli.rs b/bin/fuel-core/src/cli.rs index 9dbf9e0ac60..ab988655ea5 100644 --- a/bin/fuel-core/src/cli.rs +++ b/bin/fuel-core/src/cli.rs @@ -5,7 +5,16 @@ use std::{ str::FromStr, }; use tracing::log::warn; -use tracing_subscriber::filter::EnvFilter; +use tracing_honeycomb::{ + self, + new_honeycomb_telemetry_layer, +}; +use tracing_subscriber::{ + filter::EnvFilter, + layer::SubscriberExt, + registry, + Layer, +}; lazy_static::lazy_static! { pub static ref DEFAULT_DB_PATH: PathBuf = dirs::home_dir().unwrap().join(".fuel").join("db"); @@ -36,7 +45,11 @@ pub enum Fuel { pub const LOG_FILTER: &str = "RUST_LOG"; pub const HUMAN_LOGGING: &str = "HUMAN_LOGGING"; -pub async fn init_logging() -> anyhow::Result<()> { +pub async fn init_logging( + service_name: String, + network_name: String, + honeycomb_key: Option, +) -> anyhow::Result<()> { let filter = match env::var_os(LOG_FILTER) { Some(_) => { EnvFilter::try_from_default_env().expect("Invalid `RUST_LOG` provided") @@ -51,33 +64,51 @@ pub async fn init_logging() -> anyhow::Result<()> { }) .unwrap_or(true); - let sub = tracing_subscriber::fmt::Subscriber::builder() - .with_writer(std::io::stderr) - .with_env_filter(filter); + let layer = tracing_subscriber::fmt::Layer::default().with_writer(std::io::stderr); - if human_logging { + let telemetry_layer = honeycomb_key.map(|honeycomb_key| { + let service_name = format!("node-{}-{}", service_name, network_name); + let honeycomb_config = libhoney::Config { + options: libhoney::client::Options { + api_key: honeycomb_key, + dataset: service_name, + ..libhoney::client::Options::default() + }, + transmission_options: libhoney::transmission::Options::default(), + }; + new_honeycomb_telemetry_layer("fuel-core", honeycomb_config) + }); + + let fmt = if human_logging { // use pretty logs - sub.with_ansi(true) + layer + .with_ansi(true) .with_level(true) .with_line_number(true) - .init(); + .boxed() } else { // use machine parseable structured logs - sub + layer // disable terminal colors .with_ansi(false) .with_level(true) .with_line_number(true) // use json .json() - .init(); - } + .boxed() + }; + + let subscriber = registry::Registry::default() // provide underlying span data store + .with(filter) // filter out low-level debug tracing (eg tokio executor) + .with(fmt) // log to stdout + .with(telemetry_layer); // publish to honeycomb backend + + tracing::subscriber::set_global_default(subscriber) + .expect("setting global default failed"); Ok(()) } pub async fn run_cli() -> anyhow::Result<()> { - init_logging().await?; - let opt = Opt::try_parse(); if opt.is_err() { let command = run::Command::try_parse(); diff --git a/bin/fuel-core/src/cli/run.rs b/bin/fuel-core/src/cli/run.rs index 04aaa22546d..549fbeb72f8 100644 --- a/bin/fuel-core/src/cli/run.rs +++ b/bin/fuel-core/src/cli/run.rs @@ -1,6 +1,7 @@ #![allow(unused_variables)] use crate::{ cli::{ + init_logging, run::consensus::PoATriggerArgs, DEFAULT_DB_PATH, }, @@ -67,6 +68,10 @@ pub struct Command { #[clap(long = "port", default_value = "4000", env)] pub port: u16, + /// Vanity name for node, used in telemetry + #[clap(long = "service-name", default_value = "fuel-core", value_parser, env)] + pub service_name: String, + #[clap( name = "DB_PATH", long = "db-path", @@ -153,6 +158,9 @@ pub struct Command { #[clap(long = "tx-pool-ttl", default_value = "5m", env)] pub tx_pool_ttl: humantime::Duration, + + #[clap(long = "honeycomb-api-key", env)] + pub honeycomb_key: Option, } impl Command { @@ -160,6 +168,7 @@ impl Command { let Command { ip, port, + service_name: name, database_path, database_type, chain_config, @@ -181,6 +190,7 @@ impl Command { max_da_lag, max_wait_time, tx_pool_ttl, + honeycomb_key: _, } = self; let addr = net::SocketAddr::new(ip, port); @@ -267,14 +277,25 @@ impl Command { #[cfg(feature = "p2p")] sync: sync_args.into(), consensus_key, - name: String::default(), + name, verifier, }) } } pub async fn exec(command: Command) -> anyhow::Result<()> { + let service_name = command.service_name.clone(); + let honeycomb_api_key = command.honeycomb_key.clone(); let config = command.get_config()?; + let network_name = { + #[cfg(feature = "p2p")] + { + config.p2p.unwrap().network_name + } + #[cfg(not(feature = "p2p"))] + "default_network".to_string() + }; + init_logging(service_name, network_name, honeycomb_api_key).await?; // log fuel-core version info!("Fuel Core version v{}", env!("CARGO_PKG_VERSION")); trace!("Initializing in TRACE mode."); diff --git a/bin/fuel-core/src/cli/snapshot.rs b/bin/fuel-core/src/cli/snapshot.rs index fab0747f95a..b8abd58676b 100644 --- a/bin/fuel-core/src/cli/snapshot.rs +++ b/bin/fuel-core/src/cli/snapshot.rs @@ -1,4 +1,7 @@ -use crate::cli::DEFAULT_DB_PATH; +use crate::cli::{ + init_logging, + DEFAULT_DB_PATH, +}; use clap::Parser; use std::path::PathBuf; @@ -36,7 +39,7 @@ pub async fn exec(command: Command) -> anyhow::Result<()> { }, database::Database, }; - + init_logging("snapshot".to_string(), "local".to_string(), None).await?; let path = command.database_path; let config: ChainConfig = command.chain_config.parse()?; let db = Database::open(&path).context(format!( diff --git a/crates/fuel-core/Cargo.toml b/crates/fuel-core/Cargo.toml index fdd87bb0c86..f41280a7183 100644 --- a/crates/fuel-core/Cargo.toml +++ b/crates/fuel-core/Cargo.toml @@ -59,6 +59,7 @@ tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } tokio-stream = { workspace = true, features = ["sync"] } tower-http = { version = "0.3", features = ["set-header", "trace"] } tracing = { workspace = true } +tracing-honeycomb = { version = "0.4", features = ["use_parking_lot"], optional = true } uuid = { version = "1.1", features = ["v4"] } [dev-dependencies] @@ -73,6 +74,7 @@ test-case = { workspace = true } [features] debug = ["fuel-core-types/debug"] default = ["debug", "metrics", "rocksdb"] +honeycomb = ["dep:tracing-honeycomb"] metrics = ["dep:fuel-core-metrics"] p2p = ["dep:fuel-core-p2p", "dep:fuel-core-sync"] relayer = ["dep:fuel-core-relayer"] diff --git a/crates/fuel-core/src/graphql_api.rs b/crates/fuel-core/src/graphql_api.rs index c04e094744e..7e3b25c87e2 100644 --- a/crates/fuel-core/src/graphql_api.rs +++ b/crates/fuel-core/src/graphql_api.rs @@ -9,6 +9,8 @@ use fuel_core_types::{ }; use std::net::SocketAddr; +#[cfg(feature = "honeycomb")] +mod honeycomb; pub mod ports; pub mod service; diff --git a/crates/fuel-core/src/graphql_api/honeycomb.rs b/crates/fuel-core/src/graphql_api/honeycomb.rs new file mode 100644 index 00000000000..5bb49543e8c --- /dev/null +++ b/crates/fuel-core/src/graphql_api/honeycomb.rs @@ -0,0 +1,117 @@ +use async_graphql::{ + extensions::{ + Extension, + ExtensionContext, + ExtensionFactory, + NextExecute, + NextParseQuery, + NextRequest, + NextResolve, + NextSubscribe, + NextValidation, + ResolveInfo, + Tracing, + }, + parser::types::ExecutableDocument, + Response, + ServerError, + ServerResult, + ValidationResult, + Value, + Variables, +}; +use futures::stream::BoxStream; +use std::sync::Arc; +use tracing::instrument; +use tracing_honeycomb::{ + register_dist_tracing_root, + TraceId, +}; + +pub(crate) struct HoneyTrace; + +impl ExtensionFactory for HoneyTrace { + fn create(&self) -> Arc { + Arc::new(InternalHoneyTrace { + inner_trace: Tracing::create(&Tracing), + }) + } +} + +struct InternalHoneyTrace { + inner_trace: Arc, +} + +#[async_trait::async_trait] +impl Extension for InternalHoneyTrace { + #[instrument(skip(self, ctx, next))] + async fn request( + &self, + ctx: &ExtensionContext<'_>, + next: NextRequest<'_>, + ) -> Response { + let response = self.inner_trace.request(ctx, next); + register_dist_tracing_root(TraceId::new(), None).unwrap(); + response.await + } + + #[instrument(skip(self, ctx, stream, next))] + fn subscribe<'s>( + &self, + ctx: &ExtensionContext<'_>, + stream: BoxStream<'s, Response>, + next: NextSubscribe<'_>, + ) -> BoxStream<'s, Response> { + let response = self.inner_trace.subscribe(ctx, stream, next); + register_dist_tracing_root(TraceId::new(), None).unwrap(); + response + } + + #[instrument(skip(self, ctx, query, variables, next))] + async fn parse_query( + &self, + ctx: &ExtensionContext<'_>, + query: &str, + variables: &Variables, + next: NextParseQuery<'_>, + ) -> ServerResult { + let response = self.inner_trace.parse_query(ctx, query, variables, next); + register_dist_tracing_root(TraceId::new(), None).unwrap(); + response.await + } + + #[instrument(skip(self, ctx, next))] + async fn validation( + &self, + ctx: &ExtensionContext<'_>, + next: NextValidation<'_>, + ) -> Result> { + let response = self.inner_trace.validation(ctx, next); + register_dist_tracing_root(TraceId::new(), None).unwrap(); + response.await + } + + #[instrument(skip(self, ctx, operation_name, next))] + async fn execute( + &self, + ctx: &ExtensionContext<'_>, + operation_name: Option<&str>, + next: NextExecute<'_>, + ) -> Response { + let response = self.inner_trace.execute(ctx, operation_name, next); + register_dist_tracing_root(TraceId::new(), None).unwrap(); + response.await + } + + #[instrument(skip(self, ctx, info, next))] + async fn resolve( + &self, + ctx: &ExtensionContext<'_>, + info: ResolveInfo<'_>, + next: NextResolve<'_>, + ) -> ServerResult> { + let response = self.inner_trace.resolve(ctx, info, next); + register_dist_tracing_root(TraceId::new(), None).unwrap(); + response.await + } +} diff --git a/crates/fuel-core/src/graphql_api/service.rs b/crates/fuel-core/src/graphql_api/service.rs index 73dd8cf5b1c..ec0996efa2d 100644 --- a/crates/fuel-core/src/graphql_api/service.rs +++ b/crates/fuel-core/src/graphql_api/service.rs @@ -1,3 +1,5 @@ +#[cfg(feature = "honeycomb")] +use crate::graphql_api::honeycomb::HoneyTrace; use crate::{ fuel_core_graphql_api::ports::{ BlockProducerPort, @@ -12,8 +14,9 @@ use crate::{ }, service::metrics::metrics, }; +#[cfg(not(feature = "honeycomb"))] +use async_graphql::extensions::Tracing; use async_graphql::{ - extensions::Tracing, http::{ playground_source, GraphQLPlaygroundConfig, @@ -153,14 +156,17 @@ pub fn new_service( ) -> anyhow::Result { let network_addr = config.addr; - let schema = schema + let builder = schema .data(config) .data(database) .data(txpool) .data(producer) - .data(consensus_module) - .extension(Tracing) - .finish(); + .data(consensus_module); + #[cfg(feature = "honeycomb")] + let builder = builder.extension(HoneyTrace); + #[cfg(not(feature = "honeycomb"))] + let builder = builder.extension(Tracing); + let schema = builder.finish(); let router = Router::new() .route("/playground", get(graphql_playground)) diff --git a/crates/fuel-core/src/service/genesis.rs b/crates/fuel-core/src/service/genesis.rs index 0490f5f9952..9602d907ab7 100644 --- a/crates/fuel-core/src/service/genesis.rs +++ b/crates/fuel-core/src/service/genesis.rs @@ -37,7 +37,10 @@ use fuel_core_types::{ ConsensusHeader, PartialBlockHeader, }, - primitives::Empty, + primitives::{ + BlockHeight, + Empty, + }, SealedBlock, }, entities::{ @@ -200,7 +203,7 @@ fn init_coin_state( // ensure coin can't point to blocks in the future if coin.tx_pointer.block_height() - > state.height.unwrap_or_default().into() + > >::into(state.height.unwrap_or_default()) { return Err(anyhow!( "coin tx_pointer height cannot be greater than genesis block" @@ -263,7 +266,9 @@ fn init_contracts( TxPointer::default() }; - if tx_pointer.block_height() > state.height.unwrap_or_default().into() { + if tx_pointer.block_height() + > >::into(state.height.unwrap_or_default()) + { return Err(anyhow!( "contract tx_pointer cannot be greater than genesis block" )) From f2b4ffbb91571ca14c4aa34dd30b37143e54c0d4 Mon Sep 17 00:00:00 2001 From: Brandon Kite Date: Wed, 29 Mar 2023 19:47:01 -0700 Subject: [PATCH 02/10] cargo lint --- bin/fuel-core/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/fuel-core/Cargo.toml b/bin/fuel-core/Cargo.toml index eaf860c391e..751c270b9e5 100644 --- a/bin/fuel-core/Cargo.toml +++ b/bin/fuel-core/Cargo.toml @@ -21,13 +21,13 @@ clap = { workspace = true, features = ["derive", "env"] } const_format = { version = "0.2", optional = true } dirs = "4.0" fuel-core = { workspace = true } -tracing-honeycomb = { version = "0.4", features = ["use_parking_lot"], optional = true } humantime = "2.1" lazy_static = { workspace = true } libhoney-rust = { version = "0.1.6", optional = true } serde_json = { workspace = true, features = ["raw_value"], optional = true } tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } tracing = { workspace = true } +tracing-honeycomb = { version = "0.4", features = ["use_parking_lot"], optional = true } tracing-subscriber = { workspace = true, features = [ "ansi", "env-filter", From df1e74a61fc53930788ae37651eaf9f610b54079 Mon Sep 17 00:00:00 2001 From: Brandon Kite Date: Thu, 30 Mar 2023 13:26:45 -0700 Subject: [PATCH 03/10] more feature flags --- bin/fuel-core/src/cli.rs | 37 ++++++++++++++++++++++++------------ bin/fuel-core/src/cli/run.rs | 3 ++- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/bin/fuel-core/src/cli.rs b/bin/fuel-core/src/cli.rs index ab988655ea5..33810889989 100644 --- a/bin/fuel-core/src/cli.rs +++ b/bin/fuel-core/src/cli.rs @@ -5,6 +5,7 @@ use std::{ str::FromStr, }; use tracing::log::warn; +#[cfg(feature = "honeycomb")] use tracing_honeycomb::{ self, new_honeycomb_telemetry_layer, @@ -66,18 +67,30 @@ pub async fn init_logging( let layer = tracing_subscriber::fmt::Layer::default().with_writer(std::io::stderr); - let telemetry_layer = honeycomb_key.map(|honeycomb_key| { - let service_name = format!("node-{}-{}", service_name, network_name); - let honeycomb_config = libhoney::Config { - options: libhoney::client::Options { - api_key: honeycomb_key, - dataset: service_name, - ..libhoney::client::Options::default() - }, - transmission_options: libhoney::transmission::Options::default(), - }; - new_honeycomb_telemetry_layer("fuel-core", honeycomb_config) - }); + #[allow(clippy::bind_instead_of_map)] + let telemetry_layer: Option + Send + Sync>> = honeycomb_key + .and_then(|honeycomb_key| { + #[cfg(feature = "honeycomb")] + { + let service_name = format!("node-{}-{}", service_name, network_name); + let honeycomb_config = libhoney::Config { + options: libhoney::client::Options { + api_key: honeycomb_key, + dataset: service_name, + ..libhoney::client::Options::default() + }, + transmission_options: libhoney::transmission::Options::default(), + }; + Some(new_honeycomb_telemetry_layer("fuel-core", honeycomb_config).boxed()) + } + #[cfg(not(feature = "honeycomb"))] + { + if !honeycomb_key.is_empty() { + warn!("honeycomb api key provided, but the compiler feature is disabled. {} {}", service_name, network_name) + } + None + } + }); let fmt = if human_logging { // use pretty logs diff --git a/bin/fuel-core/src/cli/run.rs b/bin/fuel-core/src/cli/run.rs index 549fbeb72f8..2c0cb33a74f 100644 --- a/bin/fuel-core/src/cli/run.rs +++ b/bin/fuel-core/src/cli/run.rs @@ -290,7 +290,8 @@ pub async fn exec(command: Command) -> anyhow::Result<()> { let network_name = { #[cfg(feature = "p2p")] { - config.p2p.unwrap().network_name + let config = config.p2p.as_ref().unwrap(); + config.network_name.clone() } #[cfg(not(feature = "p2p"))] "default_network".to_string() From bb5783160cebe22445d29d64d15d56768cb1c6c2 Mon Sep 17 00:00:00 2001 From: Brandon Kite Date: Thu, 30 Mar 2023 16:10:32 -0700 Subject: [PATCH 04/10] remove unwraps --- crates/fuel-core/src/graphql_api/honeycomb.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/crates/fuel-core/src/graphql_api/honeycomb.rs b/crates/fuel-core/src/graphql_api/honeycomb.rs index 5bb49543e8c..441ac1ba5cd 100644 --- a/crates/fuel-core/src/graphql_api/honeycomb.rs +++ b/crates/fuel-core/src/graphql_api/honeycomb.rs @@ -51,7 +51,7 @@ impl Extension for InternalHoneyTrace { next: NextRequest<'_>, ) -> Response { let response = self.inner_trace.request(ctx, next); - register_dist_tracing_root(TraceId::new(), None).unwrap(); + let _ = register_dist_tracing_root(TraceId::new(), None); response.await } @@ -63,7 +63,7 @@ impl Extension for InternalHoneyTrace { next: NextSubscribe<'_>, ) -> BoxStream<'s, Response> { let response = self.inner_trace.subscribe(ctx, stream, next); - register_dist_tracing_root(TraceId::new(), None).unwrap(); + let _ = register_dist_tracing_root(TraceId::new(), None); response } @@ -76,7 +76,7 @@ impl Extension for InternalHoneyTrace { next: NextParseQuery<'_>, ) -> ServerResult { let response = self.inner_trace.parse_query(ctx, query, variables, next); - register_dist_tracing_root(TraceId::new(), None).unwrap(); + let _ = register_dist_tracing_root(TraceId::new(), None); response.await } @@ -87,7 +87,7 @@ impl Extension for InternalHoneyTrace { next: NextValidation<'_>, ) -> Result> { let response = self.inner_trace.validation(ctx, next); - register_dist_tracing_root(TraceId::new(), None).unwrap(); + let _ = register_dist_tracing_root(TraceId::new(), None); response.await } @@ -99,7 +99,7 @@ impl Extension for InternalHoneyTrace { next: NextExecute<'_>, ) -> Response { let response = self.inner_trace.execute(ctx, operation_name, next); - register_dist_tracing_root(TraceId::new(), None).unwrap(); + let _ = register_dist_tracing_root(TraceId::new(), None); response.await } @@ -111,7 +111,7 @@ impl Extension for InternalHoneyTrace { next: NextResolve<'_>, ) -> ServerResult> { let response = self.inner_trace.resolve(ctx, info, next); - register_dist_tracing_root(TraceId::new(), None).unwrap(); + let _ = register_dist_tracing_root(TraceId::new(), None); response.await } } From 058b093eadefa8f2790b3f3d29051cd77cd16a43 Mon Sep 17 00:00:00 2001 From: Brandon Kite Date: Thu, 30 Mar 2023 16:33:00 -0700 Subject: [PATCH 05/10] remove honercomb feature flag (was making the code pretty ugly). Also updated the lockfile due to libp2p issues --- Cargo.lock | 632 +++++++++++-------- bin/fuel-core/Cargo.toml | 7 +- bin/fuel-core/src/cli.rs | 36 +- bin/fuel-core/src/cli/run.rs | 12 +- crates/fuel-core/Cargo.toml | 3 +- crates/fuel-core/src/graphql_api.rs | 2 +- crates/fuel-core/src/graphql_api/service.rs | 22 +- crates/fuel-core/src/service/config.rs | 2 + crates/fuel-core/src/service/sub_services.rs | 1 + 9 files changed, 419 insertions(+), 298 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 81a5df87de2..03053cde2a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -24,7 +24,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -33,7 +33,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "rand_core 0.6.4", ] @@ -44,7 +44,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c192eb8f11fc081b0fe4259ba5af04217d4e0faddd02417310a927911abd7c8" dependencies = [ "crypto-common", - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -175,17 +175,51 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" +[[package]] +name = "anstream" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-wincon", + "concolor-override", + "concolor-query", + "is-terminal", + "utf8parse", +] + [[package]] name = "anstyle" -version = "0.3.1" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80c697cc33851b02ab0c26b2e8a211684fbe627ff1cc506131f35026dd7686dd" +checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" + +[[package]] +name = "anstyle-parse" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-wincon" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +dependencies = [ + "anstyle", + "windows-sys 0.45.0", +] [[package]] name = "anyhow" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" [[package]] name = "arc-swap" @@ -195,9 +229,9 @@ checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] name = "arrayref" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" @@ -286,14 +320,14 @@ checksum = "e22d1f4b888c298a027c99dc9048015fac177587de20fc30232a057dfbe24a21" [[package]] name = "assert_cmd" -version = "2.0.9" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0dcbed38184f9219183fcf38beb4cdbf5df7163a6d7cd227c6ac89b7966d6fe" +checksum = "ec0b2340f55d9661d76793b2bfc2eb0e62689bd79d067a95707ea762afd5e9dd" dependencies = [ "anstyle", "bstr", "doc-comment", - "predicates 3.0.1", + "predicates 3.0.2", "predicates-core", "predicates-tree", "wait-timeout", @@ -380,22 +414,22 @@ dependencies = [ [[package]] name = "async-io" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ "async-lock", "autocfg", + "cfg-if 1.0.0", "concurrent-queue", "futures-lite", - "libc", "log", "parking", "polling", + "rustix", "slab", "socket2 0.4.9", "waker-fn", - "windows-sys 0.42.0", ] [[package]] @@ -431,13 +465,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.66" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84f9ebcc6c1f5b8cb160f6990096a5c127f423fcb6e1ccc46c370cbdfb75dfc" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.12", ] [[package]] @@ -544,7 +578,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "sync_wrapper", - "tokio 1.26.0", + "tokio 1.27.0", "tower", "tower-http", "tower-layer", @@ -715,7 +749,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -724,7 +758,7 @@ version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -766,9 +800,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bstr" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1" +checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" dependencies = [ "memchr", "once_cell", @@ -979,7 +1013,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -988,7 +1022,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -1003,9 +1037,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ed9a53e5d4d9c573ae844bfac6872b159cb1d1585a83b29e7a64b7eef7332a" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", @@ -1026,30 +1060,38 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.8" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5" +checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3" dependencies = [ - "bitflags", + "clap_builder", "clap_derive", - "clap_lex 0.3.2", - "is-terminal", "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" +dependencies = [ + "anstream", + "anstyle", + "bitflags", + "clap_lex 0.4.1", "strsim", - "termcolor", ] [[package]] name = "clap_derive" -version = "4.1.8" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bec8e5c9d09e439c4335b1af0abaab56dcf3b94999a936e1bb47b9134288f0" +checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.12", ] [[package]] @@ -1063,12 +1105,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.3.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "350b9cf31731f9957399229e9b2adc51eeabdfbe9d71d9a0552275fd12710d09" -dependencies = [ - "os_str_bytes", -] +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" [[package]] name = "cobs" @@ -1133,7 +1172,7 @@ dependencies = [ "bech32 0.7.3", "blake2", "digest 0.10.6", - "generic-array 0.14.6", + "generic-array 0.14.7", "hex", "ripemd", "serde", @@ -1156,6 +1195,21 @@ dependencies = [ "unreachable", ] +[[package]] +name = "concolor-override" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" + +[[package]] +name = "concolor-query" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" +dependencies = [ + "windows-sys 0.45.0", +] + [[package]] name = "concurrent-queue" version = "2.1.0" @@ -1281,9 +1335,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" dependencies = [ "libc", ] @@ -1409,7 +1463,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "rand_core 0.6.4", "subtle", "zeroize", @@ -1421,7 +1475,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "rand_core 0.6.4", "typenum", ] @@ -1432,7 +1486,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "subtle", ] @@ -1442,7 +1496,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "subtle", ] @@ -1544,7 +1598,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.11", + "syn 2.0.12", ] [[package]] @@ -1561,7 +1615,7 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.12", ] [[package]] @@ -1571,7 +1625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1afa0591b1021e427e548a1f0f147fe6168f6c7c7f7006bace77f28856051b8" dependencies = [ "cynic-proc-macros", - "reqwest 0.11.14", + "reqwest 0.11.16", "serde", "serde_json", "static_assertions", @@ -1815,7 +1869,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -1936,7 +1990,7 @@ dependencies = [ "der", "digest 0.10.6", "ff", - "generic-array 0.14.6", + "generic-array 0.14.7", "group", "hkdf", "pem-rfc7468", @@ -1996,13 +2050,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.2.8" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" dependencies = [ "errno-dragonfly", "libc", - "winapi 0.3.9", + "windows-sys 0.45.0", ] [[package]] @@ -2147,7 +2201,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "reqwest 0.11.14", + "reqwest 0.11.16", "serde", "serde_json", "syn 1.0.109", @@ -2184,7 +2238,7 @@ dependencies = [ "convert_case 0.6.0", "elliptic-curve", "ethabi", - "generic-array 0.14.6", + "generic-array 0.14.7", "hex", "k256", "once_cell", @@ -2210,7 +2264,7 @@ checksum = "a9713f525348e5dde025d09b0a4217429f8074e8ff22c886263cc191e87d8216" dependencies = [ "ethers-core", "getrandom 0.2.8", - "reqwest 0.11.14", + "reqwest 0.11.16", "semver", "serde", "serde-aux", @@ -2235,11 +2289,11 @@ dependencies = [ "futures-locks", "futures-util", "instant", - "reqwest 0.11.14", + "reqwest 0.11.16", "serde", "serde_json", "thiserror", - "tokio 1.26.0", + "tokio 1.27.0", "tracing", "tracing-futures", "url", @@ -2266,11 +2320,11 @@ dependencies = [ "once_cell", "parking_lot 0.11.2", "pin-project", - "reqwest 0.11.14", + "reqwest 0.11.16", "serde", "serde_json", "thiserror", - "tokio 1.26.0", + "tokio 1.27.0", "tokio-tungstenite", "tracing", "tracing-futures", @@ -2318,7 +2372,7 @@ dependencies = [ "hyper-timeout", "log", "pin-project", - "tokio 1.26.0", + "tokio 1.27.0", ] [[package]] @@ -2458,7 +2512,7 @@ dependencies = [ "async-graphql", "async-trait", "axum", - "clap 4.1.8", + "clap 4.2.1", "derive_more", "enum-iterator", "fuel-core-chain-config", @@ -2494,7 +2548,7 @@ dependencies = [ "tempfile", "test-case", "thiserror", - "tokio 1.26.0", + "tokio 1.27.0", "tokio-stream", "tower-http", "tracing", @@ -2506,7 +2560,7 @@ dependencies = [ name = "fuel-core-benches" version = "0.0.0" dependencies = [ - "clap 4.1.8", + "clap 4.2.1", "criterion", "ctrlc", "fuel-core", @@ -2524,7 +2578,7 @@ version = "0.17.6" dependencies = [ "anyhow", "parking_lot 0.12.1", - "tokio 1.26.0", + "tokio 1.27.0", ] [[package]] @@ -2532,7 +2586,7 @@ name = "fuel-core-bin" version = "0.17.6" dependencies = [ "anyhow", - "clap 4.1.8", + "clap 4.2.1", "const_format", "dirs", "fuel-core", @@ -2541,7 +2595,7 @@ dependencies = [ "libhoney-rust", "serde_json", "test-case", - "tokio 1.26.0", + "tokio 1.27.0", "tracing", "tracing-honeycomb", "tracing-subscriber", @@ -2581,7 +2635,7 @@ dependencies = [ "hyper-rustls 0.22.1", "insta", "itertools 0.10.5", - "reqwest 0.11.14", + "reqwest 0.11.16", "schemafy_lib", "serde", "serde_json", @@ -2594,11 +2648,11 @@ dependencies = [ name = "fuel-core-client-bin" version = "0.17.6" dependencies = [ - "clap 4.1.8", + "clap 4.2.1", "fuel-core-client", "fuel-core-types", "serde_json", - "tokio 1.26.0", + "tokio 1.27.0", ] [[package]] @@ -2610,7 +2664,7 @@ dependencies = [ "fuel-core-poa", "fuel-core-types", "test-case", - "tokio 1.26.0", + "tokio 1.27.0", ] [[package]] @@ -2641,7 +2695,7 @@ dependencies = [ "libtest-mimic", "serde", "tempfile", - "tokio 1.26.0", + "tokio 1.27.0", "toml", ] @@ -2667,7 +2721,7 @@ dependencies = [ "mockall", "test-case", "thiserror", - "tokio 1.26.0", + "tokio 1.27.0", "tracing", ] @@ -2676,7 +2730,7 @@ name = "fuel-core-keygen" version = "0.17.6" dependencies = [ "anyhow", - "clap 4.1.8", + "clap 4.2.1", "fuel-core-types", "libp2p-core 0.38.0", "serde_json", @@ -2727,7 +2781,7 @@ dependencies = [ "serde", "serde_with", "sha2 0.10.6", - "tokio 1.26.0", + "tokio 1.27.0", "tracing", "tracing-attributes", "tracing-subscriber", @@ -2746,7 +2800,7 @@ dependencies = [ "mockall", "rand 0.8.5", "test-case", - "tokio 1.26.0", + "tokio 1.27.0", "tokio-stream", "tracing", ] @@ -2763,7 +2817,7 @@ dependencies = [ "fuel-core-types", "rand 0.8.5", "thiserror", - "tokio 1.26.0", + "tokio 1.27.0", "tracing", ] @@ -2790,7 +2844,7 @@ dependencies = [ "serde_json", "test-case", "thiserror", - "tokio 1.26.0", + "tokio 1.27.0", "tracing", "url", ] @@ -2804,7 +2858,7 @@ dependencies = [ "futures", "mockall", "parking_lot 0.12.1", - "tokio 1.26.0", + "tokio 1.27.0", "tracing", ] @@ -2831,7 +2885,7 @@ dependencies = [ "futures", "mockall", "test-case", - "tokio 1.26.0", + "tokio 1.27.0", "tracing", ] @@ -2854,12 +2908,12 @@ dependencies = [ "insta", "itertools 0.10.5", "rand 0.8.5", - "reqwest 0.11.14", + "reqwest 0.11.16", "rstest", "serde_json", "tempfile", "test-case", - "tokio 1.26.0", + "tokio 1.27.0", ] [[package]] @@ -2889,7 +2943,7 @@ dependencies = [ "mockall", "parking_lot 0.12.1", "rstest", - "tokio 1.26.0", + "tokio 1.27.0", "tokio-stream", "tracing", ] @@ -3007,9 +3061,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -3022,9 +3076,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -3032,15 +3086,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -3050,9 +3104,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" @@ -3081,13 +3135,13 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.12", ] [[package]] @@ -3103,15 +3157,15 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-timer" @@ -3121,9 +3175,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -3157,9 +3211,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -3270,7 +3324,7 @@ dependencies = [ "http", "indexmap", "slab", - "tokio 1.26.0", + "tokio 1.27.0", "tokio-util 0.7.7", "tracing", ] @@ -3327,7 +3381,7 @@ dependencies = [ "hash32", "rustc_version", "serde", - "spin 0.9.6", + "spin 0.9.7", "stable_deref_trait", ] @@ -3421,7 +3475,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1" dependencies = [ "digest 0.9.0", - "generic-array 0.14.6", + "generic-array 0.14.7", "hmac 0.8.1", ] @@ -3550,7 +3604,7 @@ dependencies = [ "itoa 1.0.6", "pin-project-lite 0.2.9", "socket2 0.4.9", - "tokio 1.26.0", + "tokio 1.27.0", "tower-service", "tracing", "want", @@ -3584,7 +3638,7 @@ dependencies = [ "log", "rustls 0.19.1", "rustls-native-certs", - "tokio 1.26.0", + "tokio 1.27.0", "tokio-rustls 0.22.0", "webpki 0.21.4", "webpki-roots 0.21.1", @@ -3599,7 +3653,7 @@ dependencies = [ "http", "hyper 0.14.25", "rustls 0.20.8", - "tokio 1.26.0", + "tokio 1.27.0", "tokio-rustls 0.23.4", ] @@ -3611,22 +3665,22 @@ checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ "hyper 0.14.25", "pin-project-lite 0.2.9", - "tokio 1.26.0", + "tokio 1.27.0", "tokio-io-timeout", ] [[package]] name = "iana-time-zone" -version = "0.1.54" +version = "0.1.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c17cc76786e99f8d2f055c11159e7f0091c42474dcc3189fbab96072e873e6d" +checksum = "716f12fbcfac6ffab0a5e9ec51d0a0ff70503742bb2dc7b99396394c9dc323f0" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows 0.46.0", + "windows 0.47.0", ] [[package]] @@ -3678,9 +3732,9 @@ dependencies = [ [[package]] name = "if-watch" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba7abdbb86e485125dad06c2691e1e393bf3b08c7b743b43aa162a00fd39062e" +checksum = "a9465340214b296cd17a0009acdb890d6160010b8adf8f78a00d0d7ab270f79f" dependencies = [ "async-io", "core-foundation", @@ -3691,7 +3745,7 @@ dependencies = [ "log", "rtnetlink", "system-configuration", - "tokio 1.26.0", + "tokio 1.27.0", "windows 0.34.0", ] @@ -3741,9 +3795,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", @@ -3756,14 +3810,14 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] name = "insta" -version = "1.28.0" +version = "1.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea5b3894afe466b4bcf0388630fc15e11938a6074af0cd637c825ba2ec8a099" +checksum = "9a28d25139df397cbca21408bb742cf6837e04cdbebf1b07b760caf971d6a972" dependencies = [ "console", "lazy_static", @@ -3797,7 +3851,7 @@ dependencies = [ "rtcp", "rtp", "thiserror", - "tokio 1.26.0", + "tokio 1.27.0", "waitgroup", "webrtc-srtp", "webrtc-util", @@ -3805,10 +3859,11 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3" +checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" dependencies = [ + "hermit-abi 0.3.1", "libc", "windows-sys 0.45.0", ] @@ -3842,15 +3897,15 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" +checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" [[package]] name = "is-terminal" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" +checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8" dependencies = [ "hermit-abi 0.3.1", "io-lifetimes", @@ -4070,7 +4125,7 @@ dependencies = [ "instant", "libp2p-identity", "log", - "multiaddr 0.17.0", + "multiaddr 0.17.1", "multihash 0.17.0", "multistream-select", "once_cell", @@ -4152,17 +4207,16 @@ dependencies = [ [[package]] name = "libp2p-identity" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff6c9cb71e2333d31f18e7556b9a5f1d0a2e013effc9325e36f436be65fe7bd2" +checksum = "8a8ea433ae0cea7e3315354305237b9897afe45278b2118a7a57ca744e70fd27" dependencies = [ "bs58", "ed25519-dalek", "log", - "multiaddr 0.17.0", + "multiaddr 0.17.1", "multihash 0.17.0", "prost", - "prost-build", "quick-protobuf", "rand 0.8.5", "thiserror", @@ -4212,7 +4266,7 @@ dependencies = [ "rand 0.8.5", "smallvec", "socket2 0.4.9", - "tokio 1.26.0", + "tokio 1.27.0", "trust-dns-proto", "void", ] @@ -4314,7 +4368,7 @@ dependencies = [ "rand 0.8.5", "rustls 0.20.8", "thiserror", - "tokio 1.26.0", + "tokio 1.27.0", ] [[package]] @@ -4353,7 +4407,7 @@ dependencies = [ "rand 0.8.5", "smallvec", "thiserror", - "tokio 1.26.0", + "tokio 1.27.0", "void", ] @@ -4381,7 +4435,7 @@ dependencies = [ "libp2p-core 0.38.0", "log", "socket2 0.4.9", - "tokio 1.26.0", + "tokio 1.27.0", ] [[package]] @@ -4405,9 +4459,9 @@ dependencies = [ [[package]] name = "libp2p-webrtc" -version = "0.4.0-alpha.3" +version = "0.4.0-alpha.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffd0c3af5921e3bdd5fecdf3eef3be5a197def64c1d23cd3ea79abcadbd461f7" +checksum = "dba48592edbc2f60b4bc7c10d65445b0c3964c07df26fdf493b6880d33be36f8" dependencies = [ "async-trait", "asynchronous-codec", @@ -4429,7 +4483,7 @@ dependencies = [ "stun", "thiserror", "tinytemplate", - "tokio 1.26.0", + "tokio 1.27.0", "tokio-util 0.7.7", "webrtc", ] @@ -4536,7 +4590,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7b603516767d1ab23d0de09d023e62966c3322f7148297c35cf3d97aa8b37fa" dependencies = [ - "clap 4.1.8", + "clap 4.2.1", "termcolor", "threadpool", ] @@ -4569,9 +4623,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" [[package]] name = "lock_api" @@ -4672,9 +4726,9 @@ dependencies = [ [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" @@ -4746,9 +4800,9 @@ dependencies = [ [[package]] name = "mockall" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e4a1c770583dac7ab5e2f6c139153b783a53a1bbee9729613f193e59828326" +checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96" dependencies = [ "cfg-if 1.0.0", "downcast", @@ -4761,9 +4815,9 @@ dependencies = [ [[package]] name = "mockall_derive" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832663583d5fa284ca8810bf7015e46c9fff9622d3cf34bd1eea5003fec06dd0" +checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" dependencies = [ "cfg-if 1.0.0", "proc-macro2", @@ -4785,7 +4839,7 @@ dependencies = [ "log", "memchr", "mime", - "spin 0.9.6", + "spin 0.9.7", "version_check", ] @@ -4809,13 +4863,14 @@ dependencies = [ [[package]] name = "multiaddr" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b53e0cc5907a5c216ba6584bf74be8ab47d6d6289f72793b2dddbf15dc3bf8c" +checksum = "2b36f567c7099511fa8612bbbb52dda2419ce0bdbacf31714e3a5ffdb766d3bd" dependencies = [ "arrayref", "byteorder", "data-encoding", + "log", "multibase", "multihash 0.17.0", "percent-encoding", @@ -4957,7 +5012,7 @@ dependencies = [ "netlink-packet-core", "netlink-sys", "thiserror", - "tokio 1.26.0", + "tokio 1.27.0", ] [[package]] @@ -4970,7 +5025,7 @@ dependencies = [ "futures", "libc", "log", - "tokio 1.26.0", + "tokio 1.27.0", ] [[package]] @@ -5144,9 +5199,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "os_str_bytes" -version = "6.4.1" +version = "6.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" +checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" [[package]] name = "overload" @@ -5248,7 +5303,7 @@ dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", "winapi 0.3.9", ] @@ -5261,7 +5316,7 @@ checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", "windows-sys 0.45.0", ] @@ -5527,9 +5582,9 @@ dependencies = [ [[package]] name = "predicates" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba7d6ead3e3966038f68caa9fc1f860185d95a793180bbcfe0d0da47b3961ed" +checksum = "c575290b64d24745b6c57a12a31465f0a66f3a4799686a6921526a33b0797965" dependencies = [ "anstyle", "difflib", @@ -5613,9 +5668,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.52" +version = "1.0.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" +checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" dependencies = [ "unicode-ident", ] @@ -5767,9 +5822,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4ced82a24bb281af338b9e8f94429b6eca01b4e66d899f40031f074e74c9" +checksum = "67c10f662eee9c94ddd7135043e544f3c82fa839a1e7b865911331961b53186c" dependencies = [ "bytes 1.4.0", "rand 0.8.5", @@ -5931,6 +5986,15 @@ dependencies = [ "bitflags", ] +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags", +] + [[package]] name = "redox_users" version = "0.4.3" @@ -5938,15 +6002,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom 0.2.8", - "redox_syscall", + "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.7.1" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" dependencies = [ "aho-corasick", "memchr", @@ -5964,9 +6028,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "reqwest" @@ -6007,9 +6071,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.14" +version = "0.11.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" +checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" dependencies = [ "base64 0.21.0", "bytes 1.4.0", @@ -6035,7 +6099,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "tokio 1.26.0", + "tokio 1.27.0", "tokio-rustls 0.23.4", "tower-service", "url", @@ -6170,7 +6234,7 @@ dependencies = [ "netlink-proto", "nix 0.24.3", "thiserror", - "tokio 1.26.0", + "tokio 1.27.0", ] [[package]] @@ -6219,9 +6283,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.9" +version = "0.37.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" +checksum = "0e78cc525325c06b4a7ff02db283472f3c042b7ff0c391f96c6d5ac6f4f91b75" dependencies = [ "bitflags", "errno", @@ -6333,9 +6397,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.3.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "001cf62ece89779fd16105b5f515ad0e5cedcd5440d3dd806bb067978e7c3608" +checksum = "0cfdffd972d76b22f3d7f81c8be34b2296afd3a25e0a547bd9abe340a4dbbe97" dependencies = [ "cfg-if 1.0.0", "derive_more", @@ -6345,9 +6409,9 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.3.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "303959cf613a6f6efd19ed4b4ad5bf79966a13352716299ad532cfb115f4205c" +checksum = "61fa974aea2d63dd18a4ec3a49d59af9f34178c73a4f56d2f18205628d00681e" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -6454,7 +6518,7 @@ checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ "base16ct", "der", - "generic-array 0.14.6", + "generic-array 0.14.7", "pkcs8", "subtle", "zeroize", @@ -6472,9 +6536,9 @@ dependencies = [ [[package]] name = "secp256k1-sys" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642a62736682fdd8c71da0eb273e453c8ac74e33b9fb310e22ba5b03ec7651ff" +checksum = "70a129b9e9efbfb223753b9163c4ab3b13cff7fd9c7f010fbac25ab4099fa07e" dependencies = [ "cc", ] @@ -6528,9 +6592,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.156" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "314b5b092c0ade17c00142951e50ced110ec27cea304b1037c6969246c2469a4" +checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" dependencies = [ "serde_derive", ] @@ -6547,20 +6611,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.156" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7e29c4601e36bcec74a223228dce795f4cd3616341a4af93520ca1a837c087d" +checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.12", ] [[package]] name = "serde_json" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" +checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" dependencies = [ "itoa 1.0.6", "ryu", @@ -6812,9 +6876,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spin" -version = "0.9.6" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5d6e0250b93c8427a177b849d144a96d5acc57006149479403d7861ab721e34" +checksum = "c0959fd6f767df20b231736396e4f602171e00d95205676286e79d4a4eb67bef" dependencies = [ "lock_api", ] @@ -6883,7 +6947,7 @@ dependencies = [ "ring", "subtle", "thiserror", - "tokio 1.26.0", + "tokio 1.27.0", "url", "webrtc-util", ] @@ -6916,9 +6980,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.11" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e3787bb71465627110e7d87ed4faaa36c1f61042ee67badb9e2ef173accc40" +checksum = "79d9531f94112cfc3e4c8f5f02cb2b58f72c97b7efd85f70203cc6d8efda5927" dependencies = [ "proc-macro2", "quote", @@ -6981,15 +7045,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" dependencies = [ "cfg-if 1.0.0", "fastrand", - "redox_syscall", + "redox_syscall 0.3.5", "rustix", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -7037,22 +7101,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.12", ] [[package]] @@ -7176,14 +7240,13 @@ dependencies = [ [[package]] name = "tokio" -version = "1.26.0" +version = "1.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" +checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" dependencies = [ "autocfg", "bytes 1.4.0", "libc", - "memchr", "mio 0.8.6", "num_cpus", "parking_lot 0.12.1", @@ -7201,18 +7264,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" dependencies = [ "pin-project-lite 0.2.9", - "tokio 1.26.0", + "tokio 1.27.0", ] [[package]] name = "tokio-macros" -version = "1.8.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.12", ] [[package]] @@ -7234,7 +7297,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ "rustls 0.19.1", - "tokio 1.26.0", + "tokio 1.27.0", "webpki 0.21.4", ] @@ -7245,7 +7308,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ "rustls 0.20.8", - "tokio 1.26.0", + "tokio 1.27.0", "webpki 0.22.0", ] @@ -7257,7 +7320,7 @@ checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" dependencies = [ "futures-core", "pin-project-lite 0.2.9", - "tokio 1.26.0", + "tokio 1.27.0", "tokio-util 0.7.7", ] @@ -7270,7 +7333,7 @@ dependencies = [ "futures-util", "log", "rustls 0.20.8", - "tokio 1.26.0", + "tokio 1.27.0", "tokio-rustls 0.23.4", "tungstenite", "webpki 0.22.0", @@ -7302,7 +7365,7 @@ dependencies = [ "futures-io", "futures-sink", "pin-project-lite 0.2.9", - "tokio 1.26.0", + "tokio 1.27.0", "tracing", ] @@ -7325,7 +7388,7 @@ dependencies = [ "futures-util", "pin-project", "pin-project-lite 0.2.9", - "tokio 1.26.0", + "tokio 1.27.0", "tower-layer", "tower-service", "tracing", @@ -7515,7 +7578,7 @@ dependencies = [ "socket2 0.4.9", "thiserror", "tinyvec", - "tokio 1.26.0", + "tokio 1.27.0", "tracing", "url", ] @@ -7535,7 +7598,7 @@ dependencies = [ "resolv-conf", "smallvec", "thiserror", - "tokio 1.26.0", + "tokio 1.27.0", "tracing", "trust-dns-proto", ] @@ -7582,7 +7645,7 @@ dependencies = [ "ring", "stun", "thiserror", - "tokio 1.26.0", + "tokio 1.27.0", "webrtc-util", ] @@ -7621,9 +7684,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.11" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524b68aca1d05e03fdf03fcdce2c6c94b6daf6d16861ddaa7e4f2b6638a9052c" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" @@ -7664,7 +7727,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "subtle", ] @@ -7728,6 +7791,12 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "uuid" version = "0.8.2" @@ -7797,12 +7866,11 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi 0.3.9", "winapi-util", ] @@ -8001,7 +8069,7 @@ dependencies = [ "stun", "thiserror", "time 0.3.20", - "tokio 1.26.0", + "tokio 1.27.0", "turn", "url", "waitgroup", @@ -8025,7 +8093,7 @@ dependencies = [ "derive_builder", "log", "thiserror", - "tokio 1.26.0", + "tokio 1.27.0", "webrtc-sctp", "webrtc-util", ] @@ -8064,7 +8132,7 @@ dependencies = [ "signature", "subtle", "thiserror", - "tokio 1.26.0", + "tokio 1.27.0", "webpki 0.21.4", "webrtc-util", "x25519-dalek 2.0.0-pre.1", @@ -8086,7 +8154,7 @@ dependencies = [ "serde_json", "stun", "thiserror", - "tokio 1.26.0", + "tokio 1.27.0", "turn", "url", "uuid 1.3.0", @@ -8104,7 +8172,7 @@ dependencies = [ "log", "socket2 0.4.9", "thiserror", - "tokio 1.26.0", + "tokio 1.27.0", "webrtc-util", ] @@ -8137,7 +8205,7 @@ dependencies = [ "log", "rand 0.8.5", "thiserror", - "tokio 1.26.0", + "tokio 1.27.0", "webrtc-util", ] @@ -8161,7 +8229,7 @@ dependencies = [ "sha-1 0.9.8", "subtle", "thiserror", - "tokio 1.26.0", + "tokio 1.27.0", "webrtc-util", ] @@ -8182,7 +8250,7 @@ dependencies = [ "nix 0.24.3", "rand 0.8.5", "thiserror", - "tokio 1.26.0", + "tokio 1.27.0", "winapi 0.3.9", ] @@ -8261,11 +8329,11 @@ dependencies = [ [[package]] name = "windows" -version = "0.46.0" +version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +checksum = "2649ff315bee4c98757f15dac226efe3d81927adbb6e882084bb1ee3e0c330a7" dependencies = [ - "windows-targets", + "windows-targets 0.47.0", ] [[package]] @@ -8274,12 +8342,12 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_gnullvm", + "windows_aarch64_gnullvm 0.42.2", "windows_aarch64_msvc 0.42.2", "windows_i686_gnu 0.42.2", "windows_i686_msvc 0.42.2", "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm", + "windows_x86_64_gnullvm 0.42.2", "windows_x86_64_msvc 0.42.2", ] @@ -8289,7 +8357,7 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets", + "windows-targets 0.42.2", ] [[package]] @@ -8298,21 +8366,42 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm", + "windows_aarch64_gnullvm 0.42.2", "windows_aarch64_msvc 0.42.2", "windows_i686_gnu 0.42.2", "windows_i686_msvc 0.42.2", "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm", + "windows_x86_64_gnullvm 0.42.2", "windows_x86_64_msvc 0.42.2", ] +[[package]] +name = "windows-targets" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f8996d3f43b4b2d44327cd71b7b0efd1284ab60e6e9d0e8b630e18555d87d3e" +dependencies = [ + "windows_aarch64_gnullvm 0.47.0", + "windows_aarch64_msvc 0.47.0", + "windows_i686_gnu 0.47.0", + "windows_i686_msvc 0.47.0", + "windows_x86_64_gnu 0.47.0", + "windows_x86_64_gnullvm 0.47.0", + "windows_x86_64_msvc 0.47.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "831d567d53d4f3cb1db332b68e6e2b6260228eb4d99a777d8b2e8ed794027c90" + [[package]] name = "windows_aarch64_msvc" version = "0.34.0" @@ -8325,6 +8414,12 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +[[package]] +name = "windows_aarch64_msvc" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a42d54a417c60ce4f0e31661eed628f0fa5aca73448c093ec4d45fab4c51cdf" + [[package]] name = "windows_i686_gnu" version = "0.34.0" @@ -8337,6 +8432,12 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +[[package]] +name = "windows_i686_gnu" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1925beafdbb22201a53a483db861a5644123157c1c3cee83323a2ed565d71e3" + [[package]] name = "windows_i686_msvc" version = "0.34.0" @@ -8349,6 +8450,12 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +[[package]] +name = "windows_i686_msvc" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a8ef8f2f1711b223947d9b69b596cf5a4e452c930fb58b6fc3fdae7d0ec6b31" + [[package]] name = "windows_x86_64_gnu" version = "0.34.0" @@ -8361,12 +8468,24 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +[[package]] +name = "windows_x86_64_gnu" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7acaa0c2cf0d2ef99b61c308a0c3dbae430a51b7345dedec470bd8f53f5a3642" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5a0628f71be1d11e17ca4a0e9e15b3a5180f6fbf1c2d55e3ba3f850378052c1" + [[package]] name = "windows_x86_64_msvc" version = "0.34.0" @@ -8379,6 +8498,12 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +[[package]] +name = "windows_x86_64_msvc" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d6e62c256dc6d40b8c8707df17df8d774e60e39db723675241e7c15e910bce7" + [[package]] name = "winreg" version = "0.7.0" @@ -8498,7 +8623,7 @@ dependencies = [ name = "xtask" version = "0.0.0" dependencies = [ - "clap 4.1.8", + "clap 4.2.1", "fuel-core", ] @@ -8536,21 +8661,20 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.5.7" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.3.3" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" +checksum = "25588073e5216b50bca71d61cb8595cdb9745e87032a58c199730def2862c934" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", - "synstructure", + "syn 2.0.12", ] diff --git a/bin/fuel-core/Cargo.toml b/bin/fuel-core/Cargo.toml index 751c270b9e5..5b4dfa6a8a4 100644 --- a/bin/fuel-core/Cargo.toml +++ b/bin/fuel-core/Cargo.toml @@ -23,11 +23,11 @@ dirs = "4.0" fuel-core = { workspace = true } humantime = "2.1" lazy_static = { workspace = true } -libhoney-rust = { version = "0.1.6", optional = true } +libhoney-rust = { version = "0.1.6" } serde_json = { workspace = true, features = ["raw_value"], optional = true } tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } tracing = { workspace = true } -tracing-honeycomb = { version = "0.4", features = ["use_parking_lot"], optional = true } +tracing-honeycomb = { version = "0.4", features = ["use_parking_lot"] } tracing-subscriber = { workspace = true, features = [ "ansi", "env-filter", @@ -46,6 +46,5 @@ p2p = ["fuel-core/p2p", "const_format"] relayer = ["fuel-core/relayer", "dep:url", "dep:serde_json"] rocksdb = ["fuel-core/rocksdb"] rocksdb-production = ["fuel-core/rocksdb-production"] -honeycomb = ["dep:tracing-honeycomb", "dep:libhoney-rust", "fuel-core/honeycomb"] # features to enable in production, but increase build times -production = ["metrics", "relayer", "rocksdb-production", "p2p", "honeycomb"] +production = ["metrics", "relayer", "rocksdb-production", "p2p"] diff --git a/bin/fuel-core/src/cli.rs b/bin/fuel-core/src/cli.rs index 33810889989..e3a85d1106f 100644 --- a/bin/fuel-core/src/cli.rs +++ b/bin/fuel-core/src/cli.rs @@ -5,7 +5,6 @@ use std::{ str::FromStr, }; use tracing::log::warn; -#[cfg(feature = "honeycomb")] use tracing_honeycomb::{ self, new_honeycomb_telemetry_layer, @@ -67,29 +66,18 @@ pub async fn init_logging( let layer = tracing_subscriber::fmt::Layer::default().with_writer(std::io::stderr); - #[allow(clippy::bind_instead_of_map)] - let telemetry_layer: Option + Send + Sync>> = honeycomb_key - .and_then(|honeycomb_key| { - #[cfg(feature = "honeycomb")] - { - let service_name = format!("node-{}-{}", service_name, network_name); - let honeycomb_config = libhoney::Config { - options: libhoney::client::Options { - api_key: honeycomb_key, - dataset: service_name, - ..libhoney::client::Options::default() - }, - transmission_options: libhoney::transmission::Options::default(), - }; - Some(new_honeycomb_telemetry_layer("fuel-core", honeycomb_config).boxed()) - } - #[cfg(not(feature = "honeycomb"))] - { - if !honeycomb_key.is_empty() { - warn!("honeycomb api key provided, but the compiler feature is disabled. {} {}", service_name, network_name) - } - None - } + let telemetry_layer: Option + Send + Sync>> = + honeycomb_key.map(|honeycomb_key| { + let service_name = format!("node-{}-{}", service_name, network_name); + let honeycomb_config = libhoney::Config { + options: libhoney::client::Options { + api_key: honeycomb_key, + dataset: service_name, + ..libhoney::client::Options::default() + }, + transmission_options: libhoney::transmission::Options::default(), + }; + new_honeycomb_telemetry_layer("fuel-core", honeycomb_config).boxed() }); let fmt = if human_logging { diff --git a/bin/fuel-core/src/cli/run.rs b/bin/fuel-core/src/cli/run.rs index 2c0cb33a74f..0bbfa492fee 100644 --- a/bin/fuel-core/src/cli/run.rs +++ b/bin/fuel-core/src/cli/run.rs @@ -190,7 +190,7 @@ impl Command { max_da_lag, max_wait_time, tx_pool_ttl, - honeycomb_key: _, + honeycomb_key, } = self; let addr = net::SocketAddr::new(ip, port); @@ -279,13 +279,12 @@ impl Command { consensus_key, name, verifier, + honeycomb_api_key: honeycomb_key, }) } } pub async fn exec(command: Command) -> anyhow::Result<()> { - let service_name = command.service_name.clone(); - let honeycomb_api_key = command.honeycomb_key.clone(); let config = command.get_config()?; let network_name = { #[cfg(feature = "p2p")] @@ -296,7 +295,12 @@ pub async fn exec(command: Command) -> anyhow::Result<()> { #[cfg(not(feature = "p2p"))] "default_network".to_string() }; - init_logging(service_name, network_name, honeycomb_api_key).await?; + init_logging( + config.name.clone(), + network_name, + config.honeycomb_api_key.clone(), + ) + .await?; // log fuel-core version info!("Fuel Core version v{}", env!("CARGO_PKG_VERSION")); trace!("Initializing in TRACE mode."); diff --git a/crates/fuel-core/Cargo.toml b/crates/fuel-core/Cargo.toml index f41280a7183..6332faee67b 100644 --- a/crates/fuel-core/Cargo.toml +++ b/crates/fuel-core/Cargo.toml @@ -59,7 +59,7 @@ tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } tokio-stream = { workspace = true, features = ["sync"] } tower-http = { version = "0.3", features = ["set-header", "trace"] } tracing = { workspace = true } -tracing-honeycomb = { version = "0.4", features = ["use_parking_lot"], optional = true } +tracing-honeycomb = { version = "0.4", features = ["use_parking_lot"] } uuid = { version = "1.1", features = ["v4"] } [dev-dependencies] @@ -74,7 +74,6 @@ test-case = { workspace = true } [features] debug = ["fuel-core-types/debug"] default = ["debug", "metrics", "rocksdb"] -honeycomb = ["dep:tracing-honeycomb"] metrics = ["dep:fuel-core-metrics"] p2p = ["dep:fuel-core-p2p", "dep:fuel-core-sync"] relayer = ["dep:fuel-core-relayer"] diff --git a/crates/fuel-core/src/graphql_api.rs b/crates/fuel-core/src/graphql_api.rs index 7e3b25c87e2..4d7e8d9d848 100644 --- a/crates/fuel-core/src/graphql_api.rs +++ b/crates/fuel-core/src/graphql_api.rs @@ -9,7 +9,6 @@ use fuel_core_types::{ }; use std::net::SocketAddr; -#[cfg(feature = "honeycomb")] mod honeycomb; pub mod ports; pub mod service; @@ -25,6 +24,7 @@ pub struct Config { pub max_depth: usize, pub transaction_parameters: ConsensusParameters, pub consensus_key: Option>, + pub honeycomb_enabled: bool, } pub trait IntoApiResult { diff --git a/crates/fuel-core/src/graphql_api/service.rs b/crates/fuel-core/src/graphql_api/service.rs index ec0996efa2d..f343ad4eb75 100644 --- a/crates/fuel-core/src/graphql_api/service.rs +++ b/crates/fuel-core/src/graphql_api/service.rs @@ -1,5 +1,3 @@ -#[cfg(feature = "honeycomb")] -use crate::graphql_api::honeycomb::HoneyTrace; use crate::{ fuel_core_graphql_api::ports::{ BlockProducerPort, @@ -7,16 +5,18 @@ use crate::{ DatabasePort, TxPoolPort, }, - graphql_api::Config, + graphql_api::{ + honeycomb::HoneyTrace, + Config, + }, schema::{ CoreSchema, CoreSchemaBuilder, }, service::metrics::metrics, }; -#[cfg(not(feature = "honeycomb"))] -use async_graphql::extensions::Tracing; use async_graphql::{ + extensions::Tracing, http::{ playground_source, GraphQLPlaygroundConfig, @@ -156,16 +156,20 @@ pub fn new_service( ) -> anyhow::Result { let network_addr = config.addr; + let honeycomb_enabled = config.honeycomb_enabled; + let builder = schema .data(config) .data(database) .data(txpool) .data(producer) .data(consensus_module); - #[cfg(feature = "honeycomb")] - let builder = builder.extension(HoneyTrace); - #[cfg(not(feature = "honeycomb"))] - let builder = builder.extension(Tracing); + // use honeycomb tracing wrapper if api key is configured + let builder = if honeycomb_enabled { + builder.extension(HoneyTrace) + } else { + builder.extension(Tracing) + }; let schema = builder.finish(); let router = Router::new() diff --git a/crates/fuel-core/src/service/config.rs b/crates/fuel-core/src/service/config.rs index e2f376f25c9..4d908c79445 100644 --- a/crates/fuel-core/src/service/config.rs +++ b/crates/fuel-core/src/service/config.rs @@ -53,6 +53,7 @@ pub struct Config { pub consensus_key: Option>, pub name: String, pub verifier: fuel_core_consensus_module::RelayerVerifierConfig, + pub honeycomb_api_key: Option, } impl Config { @@ -91,6 +92,7 @@ impl Config { consensus_key: Some(Secret::new(default_consensus_dev_key().into())), name: String::default(), verifier: Default::default(), + honeycomb_api_key: None, } } } diff --git a/crates/fuel-core/src/service/sub_services.rs b/crates/fuel-core/src/service/sub_services.rs index a1b11e9e60f..305952c07ce 100644 --- a/crates/fuel-core/src/service/sub_services.rs +++ b/crates/fuel-core/src/service/sub_services.rs @@ -172,6 +172,7 @@ pub fn init_sub_services( max_depth: config.txpool.max_depth, transaction_parameters: config.chain_conf.transaction_parameters, consensus_key: config.consensus_key.clone(), + honeycomb_enabled: config.honeycomb_api_key.is_some(), }, schema, Box::new(database.clone()), From a43654926a7d7ae8cd190af8df204a0cac16e520 Mon Sep 17 00:00:00 2001 From: green Date: Fri, 31 Mar 2023 20:18:37 +0100 Subject: [PATCH 06/10] Propagate to helm chart --- deployment/charts/templates/fuel-core-deploy.yaml | 7 +++++++ deployment/charts/values.yaml | 1 + 2 files changed, 8 insertions(+) diff --git a/deployment/charts/templates/fuel-core-deploy.yaml b/deployment/charts/templates/fuel-core-deploy.yaml index d03e8999dc9..a0bc5b4885a 100644 --- a/deployment/charts/templates/fuel-core-deploy.yaml +++ b/deployment/charts/templates/fuel-core-deploy.yaml @@ -121,6 +121,9 @@ spec: - "/mnt/config/chainspec.json" - "--min-gas-price" - "{{ .Values.app.min_gas_price }}" + {{- if .Values.app.name }} + - "--service-name" + {{- end}} {{- if .Values.app.utxo_validation }} - "--utxo-validation" {{- end}} @@ -247,6 +250,10 @@ spec: - name: RUST_LOG value: {{ .Values.app.rust_log | quote }} {{- end }} + {{- if .Values.app.bootstrap_nodes }} + - name: HONEYCOMB_API_KEY + value: {{ .Values.app.honeycomb_api_key | quote }} + {{- end }} # TODO: do we need to do anything to make this more optional for non-consensus nodes? - name: CONSENSUS_KEY_SECRET valueFrom: diff --git a/deployment/charts/values.yaml b/deployment/charts/values.yaml index 7513e85361b..063e9fcc114 100644 --- a/deployment/charts/values.yaml +++ b/deployment/charts/values.yaml @@ -27,6 +27,7 @@ app: reserved_nodes_only_mode: ${fuel_core_reserved_only} reserved_nodes: ${fuel_core_reserved_nodes} bootstrap_nodes: ${fuel_core_bootstrap_nodes} + honeycomb_api_key: ${fuel_core_honeycomb_api_key} relayer: ${fuel_core_relayer} relayer_v2_listening_contracts: ${fuel_core_relayer_v2_listening_contracts} relayer_da_finalization: "${fuel_core_relayer_da_finalization}" From fc78ec2128bfc2a41220273c90a8992bd4b06e5c Mon Sep 17 00:00:00 2001 From: green Date: Sat, 1 Apr 2023 00:23:49 +0100 Subject: [PATCH 07/10] Pass name --- deployment/charts/templates/fuel-core-deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/deployment/charts/templates/fuel-core-deploy.yaml b/deployment/charts/templates/fuel-core-deploy.yaml index a0bc5b4885a..fa074add265 100644 --- a/deployment/charts/templates/fuel-core-deploy.yaml +++ b/deployment/charts/templates/fuel-core-deploy.yaml @@ -123,6 +123,7 @@ spec: - "{{ .Values.app.min_gas_price }}" {{- if .Values.app.name }} - "--service-name" + - "{{ .Values.app.name }}" {{- end}} {{- if .Values.app.utxo_validation }} - "--utxo-validation" From 584b5a13cbe28c42fd5077f6fdc93e1f462022d8 Mon Sep 17 00:00:00 2001 From: green Date: Sat, 1 Apr 2023 01:11:29 +0100 Subject: [PATCH 08/10] Fix honeycomb_api_key --- deployment/charts/templates/fuel-core-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/charts/templates/fuel-core-deploy.yaml b/deployment/charts/templates/fuel-core-deploy.yaml index fa074add265..47f555cf71d 100644 --- a/deployment/charts/templates/fuel-core-deploy.yaml +++ b/deployment/charts/templates/fuel-core-deploy.yaml @@ -251,7 +251,7 @@ spec: - name: RUST_LOG value: {{ .Values.app.rust_log | quote }} {{- end }} - {{- if .Values.app.bootstrap_nodes }} + {{- if .Values.app.honeycomb_api_key }} - name: HONEYCOMB_API_KEY value: {{ .Values.app.honeycomb_api_key | quote }} {{- end }} From 5baf675bb54616bf6f3f21baf7589a3f2e9f745a Mon Sep 17 00:00:00 2001 From: green Date: Sat, 1 Apr 2023 01:42:12 +0100 Subject: [PATCH 09/10] Fix env honeycomb_api_key --- deployment/charts/templates/fuel-core-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/charts/templates/fuel-core-deploy.yaml b/deployment/charts/templates/fuel-core-deploy.yaml index 47f555cf71d..c3922794807 100644 --- a/deployment/charts/templates/fuel-core-deploy.yaml +++ b/deployment/charts/templates/fuel-core-deploy.yaml @@ -252,7 +252,7 @@ spec: value: {{ .Values.app.rust_log | quote }} {{- end }} {{- if .Values.app.honeycomb_api_key }} - - name: HONEYCOMB_API_KEY + - name: HONEYCOMB_KEY value: {{ .Values.app.honeycomb_api_key | quote }} {{- end }} # TODO: do we need to do anything to make this more optional for non-consensus nodes? From 6a80395224d9082baa9cf4c28142f8a6fc13d08f Mon Sep 17 00:00:00 2001 From: green Date: Tue, 4 Apr 2023 18:47:58 +0100 Subject: [PATCH 10/10] Bump to `0.17.7` to be along with https://github.com/FuelLabs/fuel-core/pull/1094 --- Cargo.lock | 46 ++++++++++++++++++------------------ Cargo.toml | 46 ++++++++++++++++++------------------ deployment/charts/Chart.yaml | 2 +- 3 files changed, 47 insertions(+), 47 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 03053cde2a6..e5fb6286d25 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2505,7 +2505,7 @@ dependencies = [ [[package]] name = "fuel-core" -version = "0.17.6" +version = "0.17.7" dependencies = [ "anyhow", "assert_matches", @@ -2574,7 +2574,7 @@ dependencies = [ [[package]] name = "fuel-core-bft" -version = "0.17.6" +version = "0.17.7" dependencies = [ "anyhow", "parking_lot 0.12.1", @@ -2583,7 +2583,7 @@ dependencies = [ [[package]] name = "fuel-core-bin" -version = "0.17.6" +version = "0.17.7" dependencies = [ "anyhow", "clap 4.2.1", @@ -2604,7 +2604,7 @@ dependencies = [ [[package]] name = "fuel-core-chain-config" -version = "0.17.6" +version = "0.17.7" dependencies = [ "anyhow", "bech32 0.9.1", @@ -2623,7 +2623,7 @@ dependencies = [ [[package]] name = "fuel-core-client" -version = "0.17.6" +version = "0.17.7" dependencies = [ "anyhow", "cynic", @@ -2646,7 +2646,7 @@ dependencies = [ [[package]] name = "fuel-core-client-bin" -version = "0.17.6" +version = "0.17.7" dependencies = [ "clap 4.2.1", "fuel-core-client", @@ -2657,7 +2657,7 @@ dependencies = [ [[package]] name = "fuel-core-consensus-module" -version = "0.17.6" +version = "0.17.7" dependencies = [ "anyhow", "fuel-core-chain-config", @@ -2669,7 +2669,7 @@ dependencies = [ [[package]] name = "fuel-core-database" -version = "0.17.6" +version = "0.17.7" dependencies = [ "anyhow", "fuel-core-storage", @@ -2680,7 +2680,7 @@ dependencies = [ [[package]] name = "fuel-core-e2e-client" -version = "0.17.6" +version = "0.17.7" dependencies = [ "anyhow", "assert_cmd", @@ -2701,7 +2701,7 @@ dependencies = [ [[package]] name = "fuel-core-executor" -version = "0.17.6" +version = "0.17.7" dependencies = [ "anyhow", "fuel-core-chain-config", @@ -2712,7 +2712,7 @@ dependencies = [ [[package]] name = "fuel-core-importer" -version = "0.17.6" +version = "0.17.7" dependencies = [ "anyhow", "fuel-core-storage", @@ -2727,7 +2727,7 @@ dependencies = [ [[package]] name = "fuel-core-keygen" -version = "0.17.6" +version = "0.17.7" dependencies = [ "anyhow", "clap 4.2.1", @@ -2738,7 +2738,7 @@ dependencies = [ [[package]] name = "fuel-core-metrics" -version = "0.17.6" +version = "0.17.7" dependencies = [ "axum", "lazy_static", @@ -2748,7 +2748,7 @@ dependencies = [ [[package]] name = "fuel-core-p2p" -version = "0.17.6" +version = "0.17.7" dependencies = [ "anyhow", "async-trait", @@ -2789,7 +2789,7 @@ dependencies = [ [[package]] name = "fuel-core-poa" -version = "0.17.6" +version = "0.17.7" dependencies = [ "anyhow", "async-trait", @@ -2807,7 +2807,7 @@ dependencies = [ [[package]] name = "fuel-core-producer" -version = "0.17.6" +version = "0.17.7" dependencies = [ "anyhow", "async-trait", @@ -2823,7 +2823,7 @@ dependencies = [ [[package]] name = "fuel-core-relayer" -version = "0.17.6" +version = "0.17.7" dependencies = [ "anyhow", "async-trait", @@ -2851,7 +2851,7 @@ dependencies = [ [[package]] name = "fuel-core-services" -version = "0.17.6" +version = "0.17.7" dependencies = [ "anyhow", "async-trait", @@ -2864,7 +2864,7 @@ dependencies = [ [[package]] name = "fuel-core-storage" -version = "0.17.6" +version = "0.17.7" dependencies = [ "anyhow", "fuel-core-types", @@ -2875,7 +2875,7 @@ dependencies = [ [[package]] name = "fuel-core-sync" -version = "0.17.6" +version = "0.17.7" dependencies = [ "anyhow", "async-trait", @@ -2918,7 +2918,7 @@ dependencies = [ [[package]] name = "fuel-core-trace" -version = "0.17.6" +version = "0.17.7" dependencies = [ "ctor", "tracing", @@ -2928,7 +2928,7 @@ dependencies = [ [[package]] name = "fuel-core-txpool" -version = "0.17.6" +version = "0.17.7" dependencies = [ "anyhow", "async-trait", @@ -2950,7 +2950,7 @@ dependencies = [ [[package]] name = "fuel-core-types" -version = "0.17.6" +version = "0.17.7" dependencies = [ "anyhow", "derive_more", diff --git a/Cargo.toml b/Cargo.toml index 8b16a29d594..230e0c12499 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,32 +45,32 @@ homepage = "https://fuel.network/" keywords = ["blockchain", "cryptocurrencies", "fuel-vm", "vm"] license = "BUSL-1.1" repository = "https://github.com/FuelLabs/fuel-core" -version = "0.17.6" +version = "0.17.7" [workspace.dependencies] # Workspace members -fuel-core = { version = "0.17.6", path = "./crates/fuel-core", default-features = false } -fuel-core-client-bin = { version = "0.17.6", path = "./bin/client" } -fuel-core-bin = { version = "0.17.6", path = "./bin/fuel-core" } -fuel-core-keygen = { version = "0.17.6", path = "./bin/keygen" } -fuel-core-chain-config = { version = "0.17.6", path = "./crates/chain-config" } -fuel-core-client = { version = "0.17.6", path = "./crates/client" } -fuel-core-database = { version = "0.17.6", path = "./crates/database" } -fuel-core-metrics = { version = "0.17.6", path = "./crates/metrics" } -fuel-core-services = { version = "0.17.6", path = "./crates/services" } -fuel-core-consensus-module = { version = "0.17.6", path = "./crates/services/consensus_module" } -fuel-core-bft = { version = "0.17.6", path = "./crates/services/consensus_module/bft" } -fuel-core-poa = { version = "0.17.6", path = "./crates/services/consensus_module/poa" } -fuel-core-executor = { version = "0.17.6", path = "./crates/services/executor" } -fuel-core-importer = { version = "0.17.6", path = "./crates/services/importer" } -fuel-core-p2p = { version = "0.17.6", path = "./crates/services/p2p" } -fuel-core-producer = { version = "0.17.6", path = "./crates/services/producer" } -fuel-core-relayer = { version = "0.17.6", path = "./crates/services/relayer" } -fuel-core-sync = { version = "0.17.6", path = "./crates/services/sync" } -fuel-core-txpool = { version = "0.17.6", path = "./crates/services/txpool" } -fuel-core-storage = { version = "0.17.6", path = "./crates/storage" } -fuel-core-trace = { version = "0.17.6", path = "./crates/trace" } -fuel-core-types = { version = "0.17.6", path = "./crates/types", default-features = false } +fuel-core = { version = "0.17.7", path = "./crates/fuel-core", default-features = false } +fuel-core-client-bin = { version = "0.17.7", path = "./bin/client" } +fuel-core-bin = { version = "0.17.7", path = "./bin/fuel-core" } +fuel-core-keygen = { version = "0.17.7", path = "./bin/keygen" } +fuel-core-chain-config = { version = "0.17.7", path = "./crates/chain-config" } +fuel-core-client = { version = "0.17.7", path = "./crates/client" } +fuel-core-database = { version = "0.17.7", path = "./crates/database" } +fuel-core-metrics = { version = "0.17.7", path = "./crates/metrics" } +fuel-core-services = { version = "0.17.7", path = "./crates/services" } +fuel-core-consensus-module = { version = "0.17.7", path = "./crates/services/consensus_module" } +fuel-core-bft = { version = "0.17.7", path = "./crates/services/consensus_module/bft" } +fuel-core-poa = { version = "0.17.7", path = "./crates/services/consensus_module/poa" } +fuel-core-executor = { version = "0.17.7", path = "./crates/services/executor" } +fuel-core-importer = { version = "0.17.7", path = "./crates/services/importer" } +fuel-core-p2p = { version = "0.17.7", path = "./crates/services/p2p" } +fuel-core-producer = { version = "0.17.7", path = "./crates/services/producer" } +fuel-core-relayer = { version = "0.17.7", path = "./crates/services/relayer" } +fuel-core-sync = { version = "0.17.7", path = "./crates/services/sync" } +fuel-core-txpool = { version = "0.17.7", path = "./crates/services/txpool" } +fuel-core-storage = { version = "0.17.7", path = "./crates/storage" } +fuel-core-trace = { version = "0.17.7", path = "./crates/trace" } +fuel-core-types = { version = "0.17.7", path = "./crates/types", default-features = false } fuel-core-tests = { version = "0.0.0", path = "./tests" } fuel-core-xtask = { version = "0.0.0", path = "./xtask" } diff --git a/deployment/charts/Chart.yaml b/deployment/charts/Chart.yaml index cbbda7c3929..0e26f63d122 100644 --- a/deployment/charts/Chart.yaml +++ b/deployment/charts/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: ${fuel_core_service_name} description: ${fuel_core_service_name} Helm Chart type: application -appVersion: "0.17.6" +appVersion: "0.17.7" version: 0.1.0