diff --git a/Cargo.lock b/Cargo.lock index 557249925..a1ddf925d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,15 +17,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "aead" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" -dependencies = [ - "generic-array", -] - [[package]] name = "aead" version = "0.5.2" @@ -38,25 +29,24 @@ dependencies = [ [[package]] name = "aes" -version = "0.7.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ "cfg-if", - "cipher 0.3.0", + "cipher", "cpufeatures", - "opaque-debug", ] [[package]] name = "aes-gcm" -version = "0.9.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc3be92e19a7ef47457b8e6f90707e12b6ac5d20c6f3866584fa3be0787d839f" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" dependencies = [ - "aead 0.4.3", + "aead", "aes", - "cipher 0.3.0", + "cipher", "ctr", "ghash", "subtle", @@ -598,6 +588,12 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "cache-padded" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "981520c98f422fcc584dc1a95c334e6953900b9106bc47a9839b81790009eb21" + [[package]] name = "castaway" version = "0.1.2" @@ -606,11 +602,10 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "0f8e7c90afad890484a21653d08b6e209ae34770fb5ee298f9c699fcc1e5c856" dependencies = [ - "jobserver", "libc", ] @@ -629,18 +624,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "chacha20" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" -dependencies = [ - "cfg-if", - "cipher 0.3.0", - "cpufeatures", - "zeroize", -] - [[package]] name = "chacha20" version = "0.9.1" @@ -648,33 +631,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ "cfg-if", - "cipher 0.4.4", + "cipher", "cpufeatures", ] -[[package]] -name = "chacha20poly1305" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" -dependencies = [ - "aead 0.4.3", - "chacha20 0.8.2", - "cipher 0.3.0", - "poly1305 0.7.2", - "zeroize", -] - [[package]] name = "chacha20poly1305" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ - "aead 0.5.2", - "chacha20 0.9.1", - "cipher 0.4.4", - "poly1305 0.8.0", + "aead", + "chacha20", + "cipher", + "poly1305", "zeroize", ] @@ -694,15 +664,6 @@ dependencies = [ "windows-targets", ] -[[package]] -name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array", -] - [[package]] name = "cipher" version = "0.4.4" @@ -727,9 +688,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.7" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" dependencies = [ "clap_builder", "clap_derive", @@ -737,9 +698,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.7" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" dependencies = [ "anstream", "anstyle", @@ -1055,11 +1016,11 @@ dependencies = [ [[package]] name = "ctr" -version = "0.7.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a232f92a03f37dd7d7dd2adc67166c77e9cd88de5b019b9a9eecfaeaf7bfd481" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ - "cipher 0.3.0", + "cipher", ] [[package]] @@ -1440,9 +1401,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" dependencies = [ "libc", "windows-sys 0.48.0", @@ -1495,11 +1456,13 @@ dependencies = [ "bs58", "clap", "either", + "fastrand 2.0.1", "freenet", "freenet-stdlib", "futures", "glob", "pico-args", + "rand 0.8.5", "semver", "serde", "serde_json", @@ -1507,7 +1470,7 @@ dependencies = [ "tar", "thiserror", "tokio", - "toml 0.8.6", + "toml 0.8.8", "tracing", "tracing-subscriber", "xz2", @@ -1515,9 +1478,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a481586acf778f1b1455424c343f71124b048ffa5f4fc3f8f6ae9dc432dcb3c7" +checksum = "f69037fe1b785e84986b4f2cbcf647381876a00671d25ceef715d7812dd7e1dd" [[package]] name = "filetime" @@ -1587,7 +1550,8 @@ dependencies = [ "bs58", "byteorder", "bytes", - "chacha20poly1305 0.10.1", + "cache-padded", + "chacha20poly1305", "chrono", "clap", "config", @@ -1598,6 +1562,7 @@ dependencies = [ "delegate", "directories", "either", + "fastrand 2.0.1", "freenet-stdlib", "fs4", "futures", @@ -1681,7 +1646,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29f9df8a11882c4e3335eb2d18a0137c505d9ca927470b0cac9c6f0ae07d28f7" dependencies = [ - "rustix 0.38.21", + "rustix 0.38.22", "windows-sys 0.48.0", ] @@ -1869,9 +1834,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "js-sys", @@ -1882,9 +1847,9 @@ dependencies = [ [[package]] name = "ghash" -version = "0.4.4" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" +checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" dependencies = [ "opaque-debug", "polyval", @@ -2045,9 +2010,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -2340,15 +2305,6 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" -[[package]] -name = "jobserver" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" -dependencies = [ - "libc", -] - [[package]] name = "js-sys" version = "0.3.65" @@ -2578,19 +2534,19 @@ dependencies = [ [[package]] name = "libp2p-identity" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdd6317441f361babc74c2989c6484eb0726045399b6648de039e1805ea96972" +checksum = "999ec70441b2fb35355076726a6bc466c932e9bdc66f6a11c6c0aa17c7ab9be0" dependencies = [ "bs58", "ed25519-dalek", "hkdf", - "log", "multihash", "quick-protobuf", "rand 0.8.5", "sha2", "thiserror", + "tracing", "zeroize", ] @@ -2879,9 +2835,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] name = "lock_api" @@ -3077,9 +3033,9 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" [[package]] name = "multiaddr" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92a651988b3ed3ad1bc8c87d016bb92f6f395b84ed1db9b926b32b1fc5a2c8b5" +checksum = "8b852bc02a2da5feed68cd14fa50d0774b92790a5bdbfa932a813926c8472070" dependencies = [ "arrayref", "byteorder", @@ -3486,9 +3442,9 @@ dependencies = [ [[package]] name = "opentelemetry_sdk" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5b3ce3f5705e2ae493be467a0b23be4bc563c193cdb7713e55372c89a906b34" +checksum = "968ba3f2ca03e90e5187f5e4f46c791ef7f2c163ae87789c8ce5f5ca3b7b7de5" dependencies = [ "async-trait", "crossbeam-channel", @@ -3768,17 +3724,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "poly1305" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" -dependencies = [ - "cpufeatures", - "opaque-debug", - "universal-hash 0.4.0", -] - [[package]] name = "poly1305" version = "0.8.0" @@ -3787,19 +3732,19 @@ checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ "cpufeatures", "opaque-debug", - "universal-hash 0.5.1", + "universal-hash", ] [[package]] name = "polyval" -version = "0.5.3" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" +checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" dependencies = [ "cfg-if", "cpufeatures", "opaque-debug", - "universal-hash 0.4.0", + "universal-hash", ] [[package]] @@ -3959,9 +3904,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c78e758510582acc40acb90458401172d41f1016f8c9dde89e49677afb7eec1" +checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" dependencies = [ "bytes", "rand 0.8.5", @@ -4482,14 +4427,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.21" +version = "0.38.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +checksum = "80109a168d9bc0c7f483083244543a6eb0dba02295d33ca268145e6190d6df0c" dependencies = [ "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.10", + "linux-raw-sys 0.4.11", "windows-sys 0.48.0", ] @@ -4507,9 +4452,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ "base64 0.21.5", ] @@ -4598,9 +4543,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "self_cell" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c309e515543e67811222dbc9e3dd7e1056279b782e1dacffe4242b718734fb6" +checksum = "e388332cd64eb80cd595a00941baf513caffae8dce9cfd0467fc9c66397dade6" [[package]] name = "semver" @@ -4613,9 +4558,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.190" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] @@ -4653,9 +4598,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.190" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" dependencies = [ "proc-macro2", "quote", @@ -4781,9 +4726,9 @@ dependencies = [ [[package]] name = "signature" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest", "rand_core 0.6.4", @@ -4836,22 +4781,22 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "snow" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9d1425eb528a21de2755c75af4c9b5d57f50a0d4c3b7f1828a4cd03f8ba155" +checksum = "58021967fd0a5eeeb23b08df6cc244a4d4a5b4aec1d27c9e02fad1a58b4cd74e" dependencies = [ "aes-gcm", "blake2", - "chacha20poly1305 0.9.1", + "chacha20poly1305", "curve25519-dalek", "rand_core 0.6.4", - "ring 0.16.20", + "ring 0.17.5", "rustc_version", "sha2", "subtle", @@ -5272,7 +5217,7 @@ dependencies = [ "cfg-if", "fastrand 2.0.1", "redox_syscall 0.4.1", - "rustix 0.38.21", + "rustix 0.38.22", "windows-sys 0.48.0", ] @@ -5374,9 +5319,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.33.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" dependencies = [ "backtrace", "bytes", @@ -5393,9 +5338,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", @@ -5450,9 +5395,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "indexmap 2.1.0", "serde", @@ -5472,9 +5417,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.20.7" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ "indexmap 2.1.0", "serde", @@ -5579,17 +5524,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tracing-log" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - [[package]] name = "tracing-log" version = "0.2.0" @@ -5614,16 +5548,16 @@ dependencies = [ "smallvec", "tracing", "tracing-core", - "tracing-log 0.2.0", + "tracing-log", "tracing-subscriber", "web-time", ] [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -5634,7 +5568,7 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log 0.1.4", + "tracing-log", ] [[package]] @@ -5812,16 +5746,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" -[[package]] -name = "universal-hash" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402" -dependencies = [ - "generic-array", - "subtle", -] - [[package]] name = "universal-hash" version = "0.5.1" diff --git a/Cargo.toml b/Cargo.toml index 940caf6eb..c9ebab582 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,12 +4,14 @@ members = ["crates/*"] [workspace.dependencies] arrayvec = { version = "0.7", features = ["serde"] } -bs58 = "0.5" blake3 = { version = "1", features = ["std", "traits-preview"] } -clap = "4" +bs58 = "0.5" chacha20poly1305 = "0.10" chrono = { version = "0.4", default-features = true } +clap = "4" +ctrlc = { version = "3.4" } either = "1.8" +fastrand = "2" futures = "0.3" rand = { version = "0.8" } semver = { version = "1.0.14", features = ["serde"] } @@ -21,8 +23,8 @@ tracing = "0.1" tracing-subscriber = "0.3" wasmer = "4.2.0" -freenet-stdlib = { path = "./stdlib/rust/", version = "0.0.8", features = ["unstable"] } -# freenet-stdlib = { version = "0.0.7" } +freenet-stdlib = { path = "./stdlib/rust/", features = ["unstable"] } +# freenet-stdlib = { version = "0.0.8" } [profile.dev.package."*"] opt-level = 3 diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index ca22381a7..2ff32ec94 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -16,90 +16,78 @@ path = "src/bin/freenet.rs" anyhow = "1" asynchronous-codec = "0.6" async-trait = "0.1" -axum = { version = "0.6", default-features = false, features = ["ws", "tower-log", "matched-path", "headers", "query", "http1"] } +axum = { default-features = false, features = ["headers", "http1", "matched-path", "query", "tower-log", "ws"], version = "0.6" } bincode = "1" blake3 = { workspace = true } +bs58 = "0.5" byteorder = "1" bytes = "1" -bs58 = "0.5" +cache-padded = "1.1.1" chacha20poly1305 = { workspace = true } -clap = { workspace = true, features = ["derive", "env"] } +chrono = { workspace = true } +clap = { features = ["derive", "env"], workspace = true } +config = { features = ["toml"], version = "0.13.0" } cookie = "0.17" -config = { version = "0.13.0", features = [ "toml" ] } crossbeam = "0.8.2" -ctrlc = { version = "3.4", features = ["termination"] } +ctrlc = { features = ["termination"], workspace = true } dashmap = "^5.5" delegate = "0.10" directories = "5" -either = { workspace = true , features = ["serde"] } +either = { features = ["serde"], workspace = true } +fastrand = { workspace = true } fs4 = "0.7" futures = "0.3.21" -libp2p = { version = "0.52.3", features = [ - "autonat", - "dns", - "identify", - "noise", - "ping", - "tcp", - "tokio", - "yamux", - "macros", - "ed25519" -], default-features = false } -libp2p-identity = { version = "0.2.7", features = ["ed25519", "rand"]} +itertools = "0.11" +libp2p = { default-features = false, features = ["autonat", "dns", "ed25519", "identify", "macros", "noise", "ping", "tcp", "tokio", "yamux"], version = "0.52.3" } +libp2p-identity = { features = ["ed25519", "rand"], version = "0.2.7" } +notify = "6" once_cell = "1" +ordered-float = "4.1.1" +pav_regression = "0.4.0" parking_lot = "0.12.0" -rand = { workspace = true, features = ["small_rng"] } -serde = { workspace = true, features = ["rc", "derive"] } +rand = { features = ["small_rng"], workspace = true } +rocksdb = { default-features = false, optional = true, version = "0.21.0" } +serde = { features = ["derive", "rc"], workspace = true } serde_json = { workspace = true } serde_with = { workspace = true } -stretto = { version = "0.8", features = ["async", "sync"] } +sqlx = { features = ["runtime-tokio-rustls", "sqlite"], optional = true, version = "0.7" } +stretto = { features = ["async", "sync"], version = "0.8" } +tar = { version = "0.4.38" } thiserror = "1" -tokio = { version = "1", features = ["rt-multi-thread", "sync", "macros", "fs"] } -tower-http = { version = "0.4", features = ["trace", "fs"] } +tokio = { features = ["fs", "macros", "rt-multi-thread", "sync"], version = "1" } +tower-http = { features = ["fs", "trace"], version = "0.4" } +ulid = { features = ["serde"], version = "0.4" } unsigned-varint = "0.7" -# uuid = { version = "1", features = ["serde", "v4", "v1"] } -ulid = { version = "0.4", features = ["serde"] } -sqlx = { version = "0.7", features = ["sqlite", "runtime-tokio-rustls"], optional = true } -# TODO(kakoc): clang should be installed for rocksdb; write about that in prerequisites/dev guide -rocksdb = { version = "0.21.0", default-features = false, optional = true } -pav_regression = "0.4.0" -itertools = "0.11" -ordered-float = "4.1.1" -notify = "6" -wasmer = { workspace = true, features = [ "sys"] } -chrono = { workspace = true } -tar = { version = "0.4.38" } +wasmer = { features = ["sys"], workspace = true } xz2 = { version = "0.1" } # Tracing deps -tracing = { version = "0.1" } opentelemetry = "0.21.0" -opentelemetry-jaeger = { version = "0.20.0", features = ["rt-tokio","collector_client", "isahc"], optional = true } -tracing-opentelemetry = { version = "0.22.0", optional = true } -tracing-subscriber = { version = "0.3.16", optional = true } +opentelemetry-jaeger = { features = ["collector_client", "isahc", "rt-tokio"], optional = true, version = "0.20.0" } +tracing = { version = "0.1" } +tracing-opentelemetry = { optional = true, version = "0.22.0" } +tracing-subscriber = { optional = true, version = "0.3.16" } # internal deps -freenet-stdlib = { workspace = true, features = ["net"] } +freenet-stdlib = { features = ["net"], workspace = true } [dev-dependencies] -tracing = "0.1" -arbitrary = { version = "1", features = ["derive"] } +arbitrary = { features = ["derive"], version = "1" } +chrono = { features = ["arbitrary"], workspace = true } +freenet-stdlib = { features = ["net", "testing"], workspace = true } itertools = "0.11" +pav_regression = "0.4.0" pico-args = "0.5" statrs = "0.16.0" -freenet-stdlib = { workspace = true, features = ["testing", "net"] } -chrono = { workspace = true, features = ["arbitrary"] } tempfile = "3.8" +tracing = "0.1" [features] -default = ["trace", "websocket", "sqlite"] -rocks_db = ["rocksdb"] -sqlite = ["sqlx"] -websocket = ["axum/ws"] +default = ["sqlite", "trace", "websocket"] local-mode = [] network-mode = [] - -# trace features +rocks_db = ["rocksdb"] +sqlite = ["sqlx"] trace = ["tracing-subscriber"] -trace-ot = ["trace", "opentelemetry-jaeger", "tracing-opentelemetry"] +trace-ot = ["opentelemetry-jaeger", "trace", "tracing-opentelemetry"] +websocket = ["axum/ws"] diff --git a/crates/fdev/Cargo.toml b/crates/fdev/Cargo.toml index 54ffc8b47..c6a1c21a8 100644 --- a/crates/fdev/Cargo.toml +++ b/crates/fdev/Cargo.toml @@ -10,26 +10,27 @@ repository = "https://github.com/freenet/freenet" [dependencies] anyhow = "1" +bincode = "1" bs58 = { workspace = true } -# byteorder = "1" clap = { workspace = true, features = ["derive", "env"] } either = { workspace = true } +fastrand = { workspace = true } futures = { workspace = true } glob = "0.3" -thiserror = "1" -tracing = { workspace = true } -tracing-subscriber = { workspace = true, features = ["env-filter", "fmt"] } -tokio = { version = "1", features = ["rt-multi-thread", "sync", "macros", "signal", "parking_lot"] } pico-args = "0.5" -semver = { workspace = true } +rand = { workspace = true } serde = "1" serde_json = "1" serde_with = { workspace = true } -bincode = "1" +semver = { workspace = true } tar = "0.4" +thiserror = "1" +tokio = { version = "1", features = ["rt-multi-thread", "sync", "macros", "signal", "parking_lot"] } toml = { version = "0.8", features = ["default", "preserve_order"] } +tracing = { workspace = true } +tracing-subscriber = { workspace = true, features = ["env-filter", "fmt"] } xz2 = "0.1" # internal -freenet = { path = "../core", version = "0.0.6" } +freenet = { path = "../core" } freenet-stdlib = { workspace = true }