From ac0365cc6058be715aa9bd0a1819f7d7b7c3c94d Mon Sep 17 00:00:00 2001 From: oars Date: Wed, 9 Jul 2025 16:57:16 +0300 Subject: [PATCH] Cargo.toml, Cargo.lock: change dependencies used for logging - replace log crate with tracing, - replace simple-log crate with tracing-subscriber and tracing-appender - add nu-ansi-term crate as a dependency which is itself tracing-subscriber's dependency, inorder to write colored outputs to the terminal since we override formatting provided by tracing-subscriber --- Cargo.lock | 117 ++++++++++-------- Cargo.toml | 12 +- bin/darkfid/Cargo.toml | 5 +- bin/darkirc/Cargo.toml | 5 +- bin/drk/Cargo.toml | 5 +- bin/explorer/explorerd/Cargo.toml | 5 +- bin/fud/fu/Cargo.toml | 4 +- bin/fud/fud/Cargo.toml | 5 +- bin/genev/genev-cli/Cargo.toml | 4 +- bin/genev/genevd/Cargo.toml | 5 +- bin/lilith/Cargo.toml | 5 +- bin/minerd/Cargo.toml | 5 +- bin/tau/taud/Cargo.toml | 5 +- example/dchat/dchatd/Cargo.toml | 5 +- script/evgrd/Cargo.toml | 8 +- .../blockchain-storage-metrics/Cargo.toml | 5 +- script/research/dam/dam-cli/Cargo.toml | 4 +- script/research/dam/damd/Cargo.toml | 5 +- script/research/generic-node/Cargo.toml | 5 +- script/research/rlnd/rlnd/Cargo.toml | 5 +- src/contract/dao/Cargo.toml | 4 +- src/contract/deployooor/Cargo.toml | 4 +- src/contract/money/Cargo.toml | 4 +- src/contract/test-harness/Cargo.toml | 4 +- 24 files changed, 134 insertions(+), 101 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ddf8341f2..ba5866457 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1575,6 +1575,15 @@ dependencies = [ "itertools 0.13.0", ] +[[package]] +name = "crossbeam-channel" +version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-deque" version = "0.8.6" @@ -1782,8 +1791,8 @@ dependencies = [ "httparse", "lazy_static", "libc", - "log", "monero", + "nu-ansi-term", "num-bigint", "pin-project-lite", "plotters", @@ -1795,7 +1804,6 @@ dependencies = [ "rustls-pemfile", "semver", "serde", - "simplelog", "sled-overlay", "smol", "socket2", @@ -1811,6 +1819,9 @@ dependencies = [ "tor-hsservice", "tor-proto", "tor-rtcompat", + "tracing", + "tracing-appender", + "tracing-subscriber", "url", "wasmer", "wasmer-compiler-singlepass", @@ -1829,11 +1840,11 @@ dependencies = [ "darkfi_dao_contract", "darkfi_deployooor_contract", "darkfi_money_contract", - "log", "num-bigint", "rand 0.8.5", - "simplelog", "sled-overlay", + "tracing", + "tracing-subscriber", ] [[package]] @@ -1929,10 +1940,10 @@ dependencies = [ "darkfi_money_contract", "getrandom 0.2.16", "halo2_proofs", - "log", "rand 0.8.5", "smol", "thiserror 2.0.12", + "tracing", ] [[package]] @@ -1944,10 +1955,10 @@ dependencies = [ "darkfi-sdk", "darkfi-serial", "getrandom 0.2.16", - "log", "rand 0.8.5", "smol", "thiserror 2.0.12", + "tracing", "wasmparser 0.236.0", ] @@ -1965,10 +1976,10 @@ dependencies = [ "getrandom 0.2.16", "halo2_proofs", "lazy_static", - "log", "rand 0.8.5", "smol", "thiserror 2.0.12", + "tracing", ] [[package]] @@ -1984,19 +1995,20 @@ dependencies = [ "darkfi-serial", "darkfi_money_contract", "easy-parallel", - "log", "num-bigint", "rand 0.8.5", "serde", "signal-hook", "signal-hook-async-std", - "simplelog", "sled-overlay", "smol", "structopt", "structopt-toml", "tinyjson", "toml 0.9.5", + "tracing", + "tracing-appender", + "tracing-subscriber", "url", ] @@ -2016,7 +2028,6 @@ dependencies = [ "futures", "futures-rustls", "libc", - "log", "openssl", "rand 0.8.5", "rusqlite", @@ -2025,12 +2036,14 @@ dependencies = [ "serde", "signal-hook", "signal-hook-async-std", - "simplelog", "sled-overlay", "smol", "structopt", "structopt-toml", "toml 0.9.5", + "tracing", + "tracing-appender", + "tracing-subscriber", "url", ] @@ -2173,14 +2186,15 @@ dependencies = [ "darkfi", "darkfi-serial", "easy-parallel", - "log", "serde", "signal-hook", "signal-hook-async-std", - "simplelog", "smol", "structopt", "structopt-toml", + "tracing", + "tracing-appender", + "tracing-subscriber", "url", ] @@ -2471,7 +2485,6 @@ dependencies = [ "lazy_static", "libc", "linenoise-rs", - "log", "num-bigint", "prettytable-rs", "rand 0.8.5", @@ -2480,12 +2493,14 @@ dependencies = [ "serde", "signal-hook", "signal-hook-async-std", - "simplelog", "sled-overlay", "smol", "structopt", "structopt-toml", "toml 0.9.5", + "tracing", + "tracing-appender", + "tracing-subscriber", "url", ] @@ -2763,11 +2778,9 @@ dependencies = [ "darkfi-serial", "easy-parallel", "lazy_static", - "log", "serde", "signal-hook", "signal-hook-async-std", - "simplelog", "sled-overlay", "smol", "structopt", @@ -2777,6 +2790,9 @@ dependencies = [ "thiserror 2.0.12", "tinyjson", "toml 0.9.5", + "tracing", + "tracing-appender", + "tracing-subscriber", "url", ] @@ -3050,10 +3066,10 @@ dependencies = [ "clap 4.5.42", "darkfi", "fud", - "log", - "simplelog", "smol", "termcolor", + "tracing", + "tracing-subscriber", "url", ] @@ -3077,19 +3093,20 @@ dependencies = [ "easy-parallel", "equix", "futures", - "log", "num-bigint", "rand 0.8.5", "serde", "sha2", "signal-hook", "signal-hook-async-std", - "simplelog", "sled-overlay", "smol", "structopt", "structopt-toml", "tinyjson", + "tracing", + "tracing-appender", + "tracing-subscriber", "url", ] @@ -3240,10 +3257,10 @@ dependencies = [ "darkfi", "darkfi-serial", "genevd", - "log", - "simplelog", "smol", "tinyjson", + "tracing", + "tracing-subscriber", "url", ] @@ -3256,16 +3273,17 @@ dependencies = [ "darkfi", "darkfi-serial", "easy-parallel", - "log", "serde", "signal-hook", "signal-hook-async-std", - "simplelog", "sled-overlay", "smol", "structopt", "structopt-toml", "tinyjson", + "tracing", + "tracing-appender", + "tracing-subscriber", "url", ] @@ -4087,17 +4105,18 @@ dependencies = [ "darkfi", "easy-parallel", "futures", - "log", "semver", "serde", "signal-hook", "signal-hook-async-std", - "simplelog", "smol", "structopt", "structopt-toml", "tinyjson", "toml 0.9.5", + "tracing", + "tracing-appender", + "tracing-subscriber", "url", ] @@ -4234,16 +4253,17 @@ dependencies = [ "darkfi-sdk", "darkfi-serial", "easy-parallel", - "log", "num-bigint", "serde", "signal-hook", "signal-hook-async-std", - "simplelog", "smol", "structopt", "structopt-toml", "tinyjson", + "tracing", + "tracing-appender", + "tracing-subscriber", "url", ] @@ -4551,15 +4571,6 @@ dependencies = [ "syn 2.0.104", ] -[[package]] -name = "num_threads" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" -dependencies = [ - "libc", -] - [[package]] name = "object" version = "0.32.2" @@ -6320,17 +6331,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" -[[package]] -name = "simplelog" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0" -dependencies = [ - "log", - "termcolor", - "time", -] - [[package]] name = "sinsemilla" version = "0.1.0" @@ -6728,12 +6728,10 @@ dependencies = [ "easy-parallel", "futures", "libc", - "log", "rand 0.8.5", "serde", "signal-hook", "signal-hook-async-std", - "simplelog", "sled-overlay", "smol", "structopt", @@ -6741,6 +6739,9 @@ dependencies = [ "thiserror 2.0.12", "tinyjson", "toml 0.9.5", + "tracing", + "tracing-appender", + "tracing-subscriber", "url", ] @@ -6853,9 +6854,7 @@ checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" dependencies = [ "deranged", "itoa", - "libc", "num-conv", - "num_threads", "powerfmt", "serde", "time-core", @@ -8018,6 +8017,18 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-appender" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" +dependencies = [ + "crossbeam-channel", + "thiserror 1.0.69", + "time", + "tracing-subscriber", +] + [[package]] name = "tracing-attributes" version = "0.1.30" diff --git a/Cargo.toml b/Cargo.toml index 7776f91d2..61e272e9c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,8 +53,8 @@ members = [ [dependencies] # Hard dependencies libc = "0.2.174" -log = "0.4.27" thiserror = "2.0.12" +tracing = "0.1.41" # async-runtime async-recursion = {version = "1.1.1", optional = true} @@ -105,8 +105,11 @@ num-bigint = {version = "0.4.6", optional = true} url = {version = "2.5.4", features = ["serde"], optional = true} # Misc -simplelog = {version = "0.12.2", optional = true} regex = {version = "1.11.1", optional = true} +tracing-subscriber = { version = "0.3.19", default-features = false, features = ["fmt"], optional = true } +tracing-appender = {version = "0.2.3", optional = true } +nu-ansi-term = {version = "0.46.0", optional = true} + # Crypto rand = {version = "0.8.5", optional = true} @@ -266,7 +269,10 @@ tx = [ ] util = [ - "simplelog", + "tracing-subscriber", + "tracing-appender", + "nu-ansi-term", + "tinyjson", "darkfi-serial", diff --git a/bin/darkfid/Cargo.toml b/bin/darkfid/Cargo.toml index c366a12ec..248c6e6f7 100644 --- a/bin/darkfid/Cargo.toml +++ b/bin/darkfid/Cargo.toml @@ -19,7 +19,7 @@ darkfi-serial = "0.5.0" # Misc blake3 = "1.8.2" bs58 = "0.5.1" -log = "0.4.27" +tracing = "0.1.41" num-bigint = "0.4.6" rand = "0.8.5" sled-overlay = "0.1.10" @@ -34,7 +34,8 @@ url = "2.5.4" easy-parallel = "3.3.1" signal-hook-async-std = "0.3.0" signal-hook = "0.3.18" -simplelog = "0.12.2" +tracing-subscriber = { version = "0.3.19", default-features = false, features = ["fmt"] } +tracing-appender = "0.2.3" smol = "2.0.2" # Argument parsing diff --git a/bin/darkirc/Cargo.toml b/bin/darkirc/Cargo.toml index b551dce2d..f4ffb7d62 100644 --- a/bin/darkirc/Cargo.toml +++ b/bin/darkirc/Cargo.toml @@ -39,7 +39,7 @@ crypto_box = {version = "0.9.1", features = ["std", "chacha20"]} rand = "0.8.5" # Misc -log = "0.4.27" +tracing = "0.1.41" url = "2.5.4" # Encoding and parsing @@ -51,7 +51,8 @@ semver = "1.0.26" easy-parallel = "3.3.1" signal-hook-async-std = "0.3.0" signal-hook = "0.3.18" -simplelog = "0.12.2" +tracing-subscriber = { version = "0.3.19", default-features = false, features = ["fmt"] } +tracing-appender = "0.2.3" smol = "2.0.2" # Argument parsing diff --git a/bin/drk/Cargo.toml b/bin/drk/Cargo.toml index 716af9b76..d803e8d52 100644 --- a/bin/drk/Cargo.toml +++ b/bin/drk/Cargo.toml @@ -24,7 +24,6 @@ futures = "0.3.31" lazy_static = "1.5.0" libc = "0.2" linenoise-rs = "0.1.1" -log = "0.4.27" num-bigint = "0.4.6" prettytable-rs = "0.10.0" rand = "0.8.5" @@ -32,13 +31,15 @@ rodio = {version = "0.20.1", default-features = false, features = ["minimp3"]} rusqlite = {version = "0.36.0", features = ["sqlcipher"]} sled-overlay = "0.1.10" toml = "0.9.5" +tracing = "0.1.41" url = "2.5.4" # Daemon easy-parallel = "3.3.1" signal-hook-async-std = "0.3.0" signal-hook = "0.3.18" -simplelog = "0.12.2" +tracing-subscriber = { version = "0.3.19", default-features = false, features = ["fmt"] } +tracing-appender = "0.2.3" smol = "2.0.2" # Argument parsing diff --git a/bin/explorer/explorerd/Cargo.toml b/bin/explorer/explorerd/Cargo.toml index 866656bea..7285f6b00 100644 --- a/bin/explorer/explorerd/Cargo.toml +++ b/bin/explorer/explorerd/Cargo.toml @@ -22,7 +22,8 @@ url = "2.5.4" easy-parallel = "3.3.1" signal-hook-async-std = "0.3.0" signal-hook = "0.3.18" -simplelog = "0.12.2" +tracing-subscriber = { version = "0.3.19", default-features = false, features = ["fmt"] } +tracing-appender = "0.2.3" smol = "2.0.2" # Argument parsing @@ -35,7 +36,7 @@ sled-overlay = "0.1.10" # Misc blake3 = "1.8.2" -log = "0.4.27" +tracing = "0.1.41" lazy_static = "1.5.0" tar = "0.4.44" toml = "0.9.5" diff --git a/bin/fud/fu/Cargo.toml b/bin/fud/fu/Cargo.toml index d6ba566df..f8c40ee1c 100644 --- a/bin/fud/fu/Cargo.toml +++ b/bin/fud/fu/Cargo.toml @@ -17,8 +17,8 @@ smol = "2.0.2" # Misc clap = {version = "4.4.11", features = ["derive"]} -log = "0.4.27" -simplelog = "0.12.2" +tracing = "0.1.41" +tracing-subscriber = { version = "0.3.19", default-features = false, features = ["fmt"] } url = "2.5.4" termcolor = "1.4.1" diff --git a/bin/fud/fud/Cargo.toml b/bin/fud/fud/Cargo.toml index 3fa8a17d7..178ea5fde 100644 --- a/bin/fud/fud/Cargo.toml +++ b/bin/fud/fud/Cargo.toml @@ -29,7 +29,7 @@ sha2 = "0.10.9" async-trait = "0.1.88" blake3 = "1.8.2" rand = "0.8.5" -log = "0.4.27" +tracing = "0.1.41" tinyjson = "2.5.1" url = "2.5.4" num-bigint = "0.4.6" @@ -39,7 +39,8 @@ easy-parallel = "3.3.1" futures = "0.3.31" signal-hook-async-std = "0.3.0" signal-hook = "0.3.18" -simplelog = "0.12.2" +tracing-subscriber = { version = "0.3.19", default-features = false, features = ["fmt"] } +tracing-appender = "0.2.3" smol = "2.0.2" # Equi-X diff --git a/bin/genev/genev-cli/Cargo.toml b/bin/genev/genev-cli/Cargo.toml index 0d3f2c63a..d6f78324f 100644 --- a/bin/genev/genev-cli/Cargo.toml +++ b/bin/genev/genev-cli/Cargo.toml @@ -16,8 +16,8 @@ darkfi-serial = "0.5.0" smol = "2.0.2" clap = {version = "4.4.11", features = ["derive"]} -log = "0.4.27" -simplelog = "0.12.2" +tracing = "0.1.41" +tracing-subscriber = { version = "0.3.19", default-features = false, features = ["fmt"] } tinyjson = "2.5.1" url = "2.5.4" diff --git a/bin/genev/genevd/Cargo.toml b/bin/genev/genevd/Cargo.toml index 9c1b6ad37..3ee556624 100644 --- a/bin/genev/genevd/Cargo.toml +++ b/bin/genev/genevd/Cargo.toml @@ -32,7 +32,7 @@ sled-overlay = "0.1.10" # Misc async-trait = "0.1.88" -log = "0.4.27" +tracing = "0.1.41" tinyjson = "2.5.1" url = "2.5.4" @@ -40,7 +40,8 @@ url = "2.5.4" easy-parallel = "3.3.1" signal-hook-async-std = "0.3.0" signal-hook = "0.3.18" -simplelog = "0.12.2" +tracing-subscriber = { version = "0.3.19", default-features = false, features = ["fmt"] } +tracing-appender = "0.2.3" smol = "2.0.2" # Argument parsing diff --git a/bin/lilith/Cargo.toml b/bin/lilith/Cargo.toml index f2fa2e1d0..5e5dc8a3f 100644 --- a/bin/lilith/Cargo.toml +++ b/bin/lilith/Cargo.toml @@ -14,7 +14,7 @@ darkfi = {path = "../../", features = ["toml", "async-daemonize", "rpc"]} # Misc async-trait = "0.1.88" futures = "0.3.31" -log = "0.4.27" +tracing = "0.1.41" semver = "1.0.26" tinyjson = "2.5.1" toml = "0.9.5" @@ -24,7 +24,8 @@ url = "2.5.4" easy-parallel = "3.3.1" signal-hook-async-std = "0.3.0" signal-hook = "0.3.18" -simplelog = "0.12.2" +tracing-subscriber = { version = "0.3.19", default-features = false, features = ["fmt"] } +tracing-appender = "0.2.3" smol = "2.0.2" # Argument parsing diff --git a/bin/minerd/Cargo.toml b/bin/minerd/Cargo.toml index c15270ad0..2cdb1926e 100644 --- a/bin/minerd/Cargo.toml +++ b/bin/minerd/Cargo.toml @@ -15,7 +15,7 @@ darkfi-sdk = {path = "../../src/sdk"} darkfi-serial = {version = "0.5.0", features = ["async"]} # Misc -log = "0.4.27" +tracing = "0.1.41" num-bigint = "0.4.6" # JSON-RPC @@ -26,7 +26,8 @@ url = "2.5.4" easy-parallel = "3.3.1" signal-hook-async-std = "0.3.0" signal-hook = "0.3.18" -simplelog = "0.12.2" +tracing-subscriber = { version = "0.3.19", default-features = false, features = ["fmt"] } +tracing-appender = "0.2.3" smol = "2.0.2" # Argument parsing diff --git a/bin/tau/taud/Cargo.toml b/bin/tau/taud/Cargo.toml index 7de6ef923..1aad4e40b 100644 --- a/bin/tau/taud/Cargo.toml +++ b/bin/tau/taud/Cargo.toml @@ -44,7 +44,7 @@ async-trait = "0.1.88" chrono = "0.4.41" futures = "0.3.31" libc = "0.2.174" -log = "0.4.27" +tracing = "0.1.41" thiserror = "2.0.12" tinyjson = "2.5.1" url = "2.5.4" @@ -53,7 +53,8 @@ url = "2.5.4" easy-parallel = "3.3.1" signal-hook-async-std = "0.3.0" signal-hook = "0.3.18" -simplelog = "0.12.2" +tracing-subscriber = { version = "0.3.19", default-features = false, features = ["fmt"] } +tracing-appender = "0.2.3" smol = "2.0.2" # Argument parsing diff --git a/example/dchat/dchatd/Cargo.toml b/example/dchat/dchatd/Cargo.toml index 513fb678c..43b412463 100644 --- a/example/dchat/dchatd/Cargo.toml +++ b/example/dchat/dchatd/Cargo.toml @@ -19,7 +19,8 @@ darkfi-serial = "0.5.0" easy-parallel = "3.3.1" signal-hook-async-std = "0.3.0" signal-hook = "0.3.18" -simplelog = "0.12.2" +tracing-subscriber = { version = "0.3.19", default-features = false, features = ["fmt"] } +tracing-appender = "0.2.3" smol = "2.0.2" # arg parsing @@ -29,7 +30,7 @@ structopt-toml = "0.5.1" # misc async-trait = "0.1.88" -log = "0.4.27" +tracing = "0.1.41" url = "2.5.4" # ANCHOR_END: dependencies diff --git a/script/evgrd/Cargo.toml b/script/evgrd/Cargo.toml index e9ebef719..d7db9f2bc 100644 --- a/script/evgrd/Cargo.toml +++ b/script/evgrd/Cargo.toml @@ -32,7 +32,7 @@ sled-overlay = "0.1.10" blake3 = "1.8.2" # Misc -log = "0.4.27" +tracing = "0.1.41" url = "2.5.4" # Daemon @@ -45,7 +45,8 @@ semver = {version = "1.0.26", optional = true} easy-parallel = {version = "3.3.1", optional = true} signal-hook-async-std = {version = "0.3.0", optional = true} signal-hook = {version = "0.3.18", optional = true} -simplelog = {version = "0.12.2", optional = true} +tracing-subscriber = { version = "0.3.19", default-features = false, features = ["fmt"], optional = true } +tracing-appender = { version = "0.2.3", optional = true } serde = {version = "1.0.219", features = ["derive"], optional = true} structopt = {version = "0.3.26", optional = true} structopt-toml = {version = "0.5.1", optional = true} @@ -59,10 +60,11 @@ build-daemon = [ "easy-parallel", "signal-hook-async-std", "signal-hook", - "simplelog", "serde", "structopt", "structopt-toml", + "tracing-subscriber", + "tracing-appender" ] #[lints] diff --git a/script/research/blockchain-storage-metrics/Cargo.toml b/script/research/blockchain-storage-metrics/Cargo.toml index 4dd32b7f7..345c9c826 100644 --- a/script/research/blockchain-storage-metrics/Cargo.toml +++ b/script/research/blockchain-storage-metrics/Cargo.toml @@ -15,7 +15,7 @@ darkfi = {path = "../../../", features = ["async-daemonize", "validator", "rpc"] darkfi-serial = "0.5.0" # Misc -log = "0.4.27" +tracing = "0.1.41" # JSON-RPC async-trait = "0.1.88" @@ -26,7 +26,8 @@ url = "2.5.4" easy-parallel = "3.3.1" signal-hook-async-std = "0.3.0" signal-hook = "0.3.18" -simplelog = "0.12.2" +tracing-subscriber = { version = "0.3.19", default-features = false, features = ["fmt"] } +tracing-appender = "0.2.3" smol = "2.0.2" # Argument parsing diff --git a/script/research/dam/dam-cli/Cargo.toml b/script/research/dam/dam-cli/Cargo.toml index 78b043eaf..76d7c846e 100644 --- a/script/research/dam/dam-cli/Cargo.toml +++ b/script/research/dam/dam-cli/Cargo.toml @@ -16,7 +16,7 @@ darkfi-serial = "0.5.0" # Misc clap = {version = "4.4.11", features = ["derive"]} -log = "0.4.27" -simplelog = "0.12.2" +tracing = "0.1.41" +tracing-subscriber = { version = "0.3.19", default-features = false, features = ["fmt"] } smol = "2.0.2" url = "2.5.4" diff --git a/script/research/dam/damd/Cargo.toml b/script/research/dam/damd/Cargo.toml index 41db2b1ae..2a1845e24 100644 --- a/script/research/dam/damd/Cargo.toml +++ b/script/research/dam/damd/Cargo.toml @@ -15,7 +15,7 @@ darkfi = {path = "../../../../", features = ["async-daemonize", "rpc"]} darkfi-serial = "0.5.0" # Misc -log = "0.4.27" +tracing = "0.1.41" # JSON-RPC async-trait = "0.1.88" @@ -27,7 +27,8 @@ async-std = {version = "1.13.1", features = ["attributes"]} easy-parallel = "3.3.1" signal-hook-async-std = "0.3.0" signal-hook = "0.3.18" -simplelog = "0.12.2" +tracing-subscriber = { version = "0.3.19", default-features = false, features = ["fmt"] } +tracing-appender = "0.2.3" smol = "2.0.2" # Argument parsing diff --git a/script/research/generic-node/Cargo.toml b/script/research/generic-node/Cargo.toml index 834c2abb2..bbe8e19e8 100644 --- a/script/research/generic-node/Cargo.toml +++ b/script/research/generic-node/Cargo.toml @@ -16,10 +16,11 @@ rand = "0.8.5" # Daemon easy-parallel = "3.3.1" -log = "0.4.27" +tracing = "0.1.41" +tracing-subscriber = { version = "0.3.19", default-features = false, features = ["fmt"] } +tracing-appender = "0.2.3" signal-hook-async-std = "0.3.0" signal-hook = "0.3.18" -simplelog = "0.12.2" smol = "2.0.2" # Argument parsing diff --git a/script/research/rlnd/rlnd/Cargo.toml b/script/research/rlnd/rlnd/Cargo.toml index db7a38ff9..5f9f155a8 100644 --- a/script/research/rlnd/rlnd/Cargo.toml +++ b/script/research/rlnd/rlnd/Cargo.toml @@ -17,8 +17,8 @@ darkfi-serial = "0.5.0" # Misc bs58 = "0.5.1" -log = "0.4.27" sled-overlay = "0.1.10" +tracing = "0.1.41" # JSON-RPC async-trait = "0.1.88" @@ -30,7 +30,8 @@ async-std = {version = "1.13.1", features = ["attributes"]} easy-parallel = "3.3.1" signal-hook-async-std = "0.3.0" signal-hook = "0.3.18" -simplelog = "0.12.2" +tracing-subscriber = { version = "0.3.19", default-features = false, features = ["fmt"] } +tracing-appender = "0.2.3" smol = "2.0.2" # Argument parsing diff --git a/src/contract/dao/Cargo.toml b/src/contract/dao/Cargo.toml index bf1e7dd69..327bdb3f3 100644 --- a/src/contract/dao/Cargo.toml +++ b/src/contract/dao/Cargo.toml @@ -21,7 +21,7 @@ thiserror = "2.0.12" chacha20poly1305 = { version = "0.10.1", optional = true } darkfi = { path = "../../../", features = ["zk", "rpc", "blockchain"], optional = true } halo2_proofs = { version = "0.3.1", optional = true } -log = { version = "0.4.27", optional = true } +tracing = { version = "0.1.41", optional = true } rand = { version = "0.8.5", optional = true } # These are used just for the integration tests @@ -46,7 +46,7 @@ client = [ "rand", "chacha20poly1305", - "log", + "tracing", "halo2_proofs", ] diff --git a/src/contract/deployooor/Cargo.toml b/src/contract/deployooor/Cargo.toml index b20a1c4ee..ee3d447fb 100644 --- a/src/contract/deployooor/Cargo.toml +++ b/src/contract/deployooor/Cargo.toml @@ -17,7 +17,7 @@ wasmparser = "0.236.0" # The following dependencies are used for the client API and # probably shouldn't be in WASM darkfi = { path = "../../../", features = ["zk"], optional = true } -log = { version = "0.4.27", optional = true } +tracing = { version = "0.1.41", optional = true } rand = { version = "0.8.5", optional = true } # These are used for integration tests @@ -39,7 +39,7 @@ client = [ "darkfi-sdk/async", "darkfi-serial/async", - "log", + "tracing", "rand", ] diff --git a/src/contract/money/Cargo.toml b/src/contract/money/Cargo.toml index 6b8b0939d..f6eb50938 100644 --- a/src/contract/money/Cargo.toml +++ b/src/contract/money/Cargo.toml @@ -20,7 +20,7 @@ thiserror = "2.0.12" darkfi = { path = "../../../", features = ["zk"], optional = true } chacha20poly1305 = { version = "0.10.1", optional = true } halo2_proofs = { version = "0.3.1", optional = true } -log = { version = "0.4.27", optional = true } +tracing = { version = "0.1.41", optional = true } rand = { version = "0.8.5", optional = true } # Misc @@ -46,7 +46,7 @@ client = [ "rand", "chacha20poly1305", - "log", + "tracing", "halo2_proofs", ] diff --git a/src/contract/test-harness/Cargo.toml b/src/contract/test-harness/Cargo.toml index 4c29b48d0..a1e97d744 100644 --- a/src/contract/test-harness/Cargo.toml +++ b/src/contract/test-harness/Cargo.toml @@ -16,9 +16,9 @@ darkfi_deployooor_contract = {path = "../deployooor", features = ["client", "no- num-bigint = "0.4.6" blake3 = "1.8.2" -log = "0.4.27" +tracing = "0.1.41" +tracing-subscriber = { version = "0.3.19", default-features = false, features = ["fmt"] } rand = "0.8.5" -simplelog = "0.12.2" sled-overlay = "0.1.10" [lints]