chore: Update project dependencies.

Cargo.toml

@@ -20,7 +20,6 @@ doctest = false
 [workspace]
 members = [
     "bin/zkas",
-    #"bin/cashierd",
     "bin/darkfid",
     "bin/darkfid2",
     "bin/drk",
@@ -58,13 +57,13 @@ members = [
 
 [dependencies]
 # Hard dependencies
-libc = "0.2.144"
+libc = "0.2.147"
 log = "0.4.19"
-thiserror = "1.0.40"
+thiserror = "1.0.43"
 
 # async-runtime
 async-std = {version = "1.12.0", features = ["attributes"], optional = true}
-async-trait = {version = "0.1.68", optional = true}
+async-trait = {version = "0.1.71", optional = true}
 futures = {version = "0.3.28", optional = true}
 smol = {version = "1.3.0", optional = true}
 
@@ -78,18 +77,18 @@ tor-hscrypto = {version = "0.3.0", optional = true}
 
 # TLS cert utilities
 ed25519-compact = {version = "2.0.4", optional = true}
-rcgen = {version = "0.10.0", optional = true}
-rustls-pemfile = {version = "1.0.2", optional = true}
+rcgen = {version = "0.11.1", optional = true}
+rustls-pemfile = {version = "1.0.3", optional = true}
 x509-parser = {version = "0.15.0", features = ["validate", "verify"], optional = true}
 
 # Encoding
 bs58 = {version = "0.5.0", optional = true}
-serde_json = {version = "1.0.96", optional = true}
-serde = {version = "1.0.164", features = ["derive"], optional = true}
+serde_json = {version = "1.0.100", optional = true}
+serde = {version = "1.0.167", features = ["derive"], optional = true}
 semver = {version = "1.0.17", optional = true}
 structopt = {version= "0.3.26", optional = true}
 structopt-toml = {version= "0.5.1", optional = true}
-toml = {version = "0.7.4", optional = true}
+toml = {version = "0.7.6", optional = true}
 # Big float high precision arithmetics
 dashu = { version = "0.3.1", optional=true }
 
@@ -99,7 +98,7 @@ chrono = {version = "0.4.26", optional = true}
 darkfi-serial = {path = "src/serial", optional = true}
 darkfi-derive = {path = "src/serial/derive", optional = true}
 darkfi-derive-internal = {path = "src/serial/derive-internal", optional = true}
-itertools = {version = "0.10.5", optional = true}
+itertools = {version = "0.11.0", optional = true}
 lazy_static = {version = "1.4.0", optional = true}
 # TODO: Test without serde
 url = {version = "2.4.0", features = ["serde"], optional = true}
@@ -110,7 +109,7 @@ simplelog = {version = "0.12.1", optional = true}
 
 # Crypto
 rand = {version = "0.8.5", optional = true}
-blake3 = {version = "1.4.0", features = ["rayon"], optional = true}
+blake3 = {version = "1.4.1", features = ["rayon"], optional = true}
 crypto_api_chachapoly = {version = "0.5.0", optional = true}
 halo2_proofs = {version = "0.3.0", optional = true}
 halo2_gadgets = {version = "0.3.0", optional = true}
@@ -133,10 +132,10 @@ sled-overlay = {version = "0.0.7", optional = true}
 curve25519-dalek = {version = "=4.0.0-rc.2", default-features = false, optional = true}
 
 [dev-dependencies]
-clap = {version = "4.3.3", features = ["derive"]}
+clap = {version = "4.3.11", features = ["derive"]}
 halo2_proofs = {version = "0.3.0", features = ["dev-graph", "gadget-traces", "sanity-checks"]}
 halo2_gadgets = {version = "0.3.0", features = ["test-dev-graph", "test-dependencies"]}
-plotters = "0.3.4"
+plotters = "0.3.5"
 easy-parallel = "3.3.0"
 prettytable-rs = "0.10.0"
 
@@ -156,7 +155,6 @@ async-runtime = [
 blockchain = [
     "blake3",
     "bs58", # <-- TODO: remove after we get rid of json for notifications
-    "chrono",
     "crypto_api_chachapoly",
     "dashu",
     "halo2_proofs",
@@ -191,7 +189,6 @@ dht = [
 
 event-graph = [
     "blake3",
-    "chrono",
     "rand",
 
     "async-runtime",
@@ -226,17 +223,6 @@ net = [
     "p2p-transport-nym",
 ]
 
-raft = [
-    "chrono",
-    "rand",
-    "sled",
-
-    "async-runtime",
-    "darkfi-serial",
-    "net",
-    "util",
-]
-
 rpc = [
     "rand",
     "serde",
@@ -256,7 +242,6 @@ system = [
 
 tx = [
     "blake3",
-    "rand",
     
     "async-runtime",
     "darkfi-sdk",
@@ -265,19 +250,16 @@ tx = [
 ]
 
 util = [
-    "chrono",
     "simplelog",
     "serde",
     "serde_json",
     "toml",
-    "url",
 
     "darkfi-serial",
 ]
 
 wallet = [
     "async-std",
-    "rand",
     "rusqlite",
 
     "darkfi-serial",
@@ -327,3 +309,5 @@ required-features = ["zk"]
 [patch.crates-io]
 halo2_proofs = {git="https://github.com/parazyd/halo2", branch="v3"}
 halo2_gadgets = {git="https://github.com/parazyd/halo2", branch="v3"}
+arti-client = {git="https://gitlab.torproject.org/tpo/core/arti", rev="77b0dc2edc93c9ad09b833b176e0f7066f017dd1"}
+tor-hscrypto = {git="https://gitlab.torproject.org/tpo/core/arti", rev="77b0dc2edc93c9ad09b833b176e0f7066f017dd1"}

bin/darkfid/Cargo.toml

@@ -9,14 +9,14 @@ license = "AGPL-3.0-only"
 edition = "2021"
 
 [dependencies]
-async-trait = "0.1.68"
-blake3 = "1.4.0"
+async-trait = "0.1.71"
+blake3 = "1.4.1"
 bs58 = "0.5.0"
 darkfi = {path = "../../", features = ["blockchain", "wallet", "rpc", "net", "zkas"]}
 darkfi-sdk = {path = "../../src/sdk"}
 darkfi-serial = {path = "../../src/serial"}
 log = "0.4.19"
-serde_json = "1.0.96"
+serde_json = "1.0.100"
 sled = "0.34.7"
 url = "2.4.0"
 
@@ -29,6 +29,6 @@ simplelog = "0.12.1"
 smol = "1.3.0"
 
 # Argument parsing
-serde = {version = "1.0.164", features = ["derive"]}
+serde = {version = "1.0.167", features = ["derive"]}
 structopt = "0.3.26"
 structopt-toml = "0.5.1"

bin/darkfid2/Cargo.toml

@@ -24,6 +24,6 @@ simplelog = "0.12.1"
 smol = "1.3.0"
 
 # Argument parsing
-serde = {version = "1.0.164", features = ["derive"]}
+serde = {version = "1.0.167", features = ["derive"]}
 structopt = "0.3.26"
 structopt-toml = "0.5.1"

bin/darkirc/Cargo.toml

@@ -14,16 +14,16 @@ darkfi-serial = {path = "../../src/serial"}
 
 # Async
 async-rustls = "0.4.0"
-async-trait = "0.1.68"
+async-trait = "0.1.71"
 futures = "0.3.28"
-rustls-pemfile = "1.0.2"
+rustls-pemfile = "1.0.3"
 
 # Crypto
 crypto_box = "0.8.2"
 rand = "0.8.5"
 
 # Misc
-clap = {version = "4.3.3", features = ["derive"]}
+clap = {version = "4.3.11", features = ["derive"]}
 chrono = "0.4.26"
 libsqlite3-sys = {version = "0.26.0", features = ["bundled-sqlcipher-vendored-openssl"]}
 log = "0.4.19"
@@ -34,8 +34,8 @@ url = "2.4.0"
 # Encoding and parsing
 bs58 = "0.5.0"
 hex = "0.4.3"
-serde_json = "1.0.96"
-toml = "0.7.4"
+serde_json = "1.0.100"
+toml = "0.7.6"
 
 # Daemon
 async-std = "1.12.0"
@@ -46,6 +46,6 @@ simplelog = "0.12.1"
 smol = "1.3.0"
 
 # Argument parsing
-serde = {version = "1.0.164", features = ["derive"]}
+serde = {version = "1.0.167", features = ["derive"]}
 structopt = "0.3.26"
 structopt-toml = "0.5.1"

bin/darkwiki/darkwiki-cli/Cargo.toml

@@ -14,8 +14,8 @@ darkfi = {path = "../../../", features = ["rpc"]}
 # Async
 smol = "1.3.0"
 async-std = {version = "1.12.0", features = ["attributes"]}
-async-trait = "0.1.68"
-async-channel = "1.8.0"
+async-trait = "0.1.71"
+async-channel = "1.9.0"
 futures = "0.3.28"
 
 # Misc
@@ -25,6 +25,6 @@ rand = "0.8.5"
 url = "2.4.0"
 
 # Encoding and parsing
-serde = {version = "1.0.164", features = ["derive"]}
-serde_json = "1.0.96"
+serde = {version = "1.0.167", features = ["derive"]}
+serde_json = "1.0.100"
 structopt = "0.3.26"

bin/darkwiki/darkwikid/Cargo.toml

@@ -10,8 +10,8 @@ edition = "2021"
 
 [dependencies]
 async-std = "1.12.0"
-async-trait = "0.1.68"
-blake3 = "1.4.0"
+async-trait = "0.1.71"
+blake3 = "1.4.1"
 bs58 = "0.5.0"
 darkfi = {path = "../../../", features = ["raft", "rpc", "util"]}
 darkfi-serial = {path = "../../../src/serial"}
@@ -20,15 +20,15 @@ easy-parallel = "3.3.0"
 futures = "0.3.28"
 lazy_static = "1.4.0"
 log = "0.4.19"
-serde = "1.0.164"
-serde_derive = "1.0.164"
-serde_json = "1.0.96"
+serde = "1.0.167"
+serde_derive = "1.0.167"
+serde_json = "1.0.100"
 signal-hook-async-std = "0.2.2"
 signal-hook = "0.3.15"
 simplelog = "0.12.1"
 structopt = "0.3.26"
 structopt-toml = "0.5.1"
 smol = "1.3.0"
-toml = "0.7.4"
+toml = "0.7.6"
 unicode-segmentation = "1.10.1"
 url = "2.4.0"

bin/dhtd/dhtd/Cargo.toml

@@ -10,8 +10,8 @@ edition = "2021"
 
 [dependencies]
 async-std = {version = "1.12.0", features = ["attributes"]}
-async-trait = "0.1.68"
-blake3 = "1.4.0"
+async-trait = "0.1.71"
+blake3 = "1.4.1"
 darkfi = {path = "../../../", features = ["dht"]}
 darkfi-serial = {path = "../../../src/serial", features = ["derive", "crypto"]}
 easy-parallel = "3.3.0"

bin/dnetview/Cargo.toml

@@ -21,18 +21,18 @@ tui = {version = "0.19.0", features = ["termion"]}
 smol = "1.3.0"
 async-std = {version = "1.12.0", features = ["attributes"]}
 easy-parallel = "3.3.0"
-async-channel = "1.8.0"
+async-channel = "1.9.0"
 
 # Misc
-clap = {version = "4.3.3", features = ["derive"]}
+clap = {version = "4.3.11", features = ["derive"]}
 rand = "0.8.5"
 simplelog = "0.12.1"
 libsqlite3-sys = {version = "0.26.0", features = ["bundled-sqlcipher-vendored-openssl"]}
 log = "0.4.19"
 url = "2.4.0"
-thiserror = "1.0.40"
+thiserror = "1.0.43"
 
 # Encoding and parsing
-serde_json = "1.0.96"
-serde = {version = "1.0.164", features = ["derive"]}
+serde_json = "1.0.100"
+serde = {version = "1.0.167", features = ["derive"]}
 hex = "0.4.3"

bin/drk/Cargo.toml

@@ -11,10 +11,10 @@ edition = "2021"
 [dependencies]
 anyhow = "1.0.71"
 async-std = {version = "1.12.0", features = ["attributes"]}
-blake3 = "1.4.0"
+blake3 = "1.4.1"
 bs58 = "0.5.0"
-clap = {version = "4.3.3", features = ["derive"]}
-clap_complete = "4.3.1"
+clap = {version = "4.3.11", features = ["derive"]}
+clap_complete = "4.3.2"
 darkfi = {path = "../../", features = ["blockchain", "rpc", "util", "wallet"]}
 darkfi-sdk = {path = "../../src/sdk"}
 darkfi-serial = {path = "../../src/serial", features = ["derive", "crypto"]}
@@ -22,7 +22,7 @@ darkfi-money-contract = {path = "../../src/contract/money", features = ["no-entr
 darkfi-dao-contract = {path = "../../src/contract/dao", features = ["no-entrypoint", "client"]}
 prettytable-rs = "0.10.0"
 rand = "0.8.5"
-serde_json = "1.0.96"
+serde_json = "1.0.100"
 smol = "1.3.0"
 simplelog = "0.12.1"
 signal-hook-async-std = "0.2.2"

bin/faucetd/Cargo.toml

@@ -9,8 +9,8 @@ license = "AGPL-3.0-only"
 edition = "2021"
 
 [dependencies]
-async-trait = "0.1.68"
-blake3 = "1.4.0"
+async-trait = "0.1.71"
+blake3 = "1.4.1"
 chrono = "0.4.26"
 darkfi = {path = "../../", features = ["blockchain", "wallet", "rpc", "net", "zkas"]}
 darkfi-serial = {path = "../../src/serial"}
@@ -19,7 +19,7 @@ darkfi-money-contract = {path = "../../src/contract/money", features = ["no-entr
 log = "0.4.19"
 rand = "0.8.5"
 rusqlite = "0.29.0"
-serde_json = "1.0.96"
+serde_json = "1.0.100"
 sled = "0.34.7"
 url = "2.4.0"
 
@@ -32,6 +32,6 @@ simplelog = "0.12.1"
 smol = "1.3.0"
 
 # Argument parsing
-serde = {version = "1.0.164", features = ["derive"]}
+serde = {version = "1.0.167", features = ["derive"]}
 structopt = "0.3.26"
 structopt-toml = "0.5.1"

bin/fud/fu/Cargo.toml

@@ -15,9 +15,9 @@ darkfi = {path = "../../../", features = ["util", "rpc"]}
 async-std = {version = "1.12.0", features = ["attributes"]}
 
 # Misc
-clap = {version = "4.3.3", features = ["derive"]}
+clap = {version = "4.3.11", features = ["derive"]}
 libsqlite3-sys = {version = "0.26.0", features = ["bundled-sqlcipher-vendored-openssl"]}
 log = "0.4.19"
-serde_json = "1.0.96"
+serde_json = "1.0.100"
 simplelog = "0.12.1"
 url = "2.4.0"

bin/fud/fud/Cargo.toml

@@ -13,11 +13,11 @@ darkfi = {path = "../../../", features = ["dht", "rpc"]}
 darkfi-serial = {path = "../../../src/serial"}
 
 # Misc
-async-trait = "0.1.68"
-blake3 = "1.4.0"
+async-trait = "0.1.71"
+blake3 = "1.4.1"
 libsqlite3-sys = {version = "0.26.0", features = ["bundled-sqlcipher-vendored-openssl"]}
 log = "0.4.19"
-serde_json = "1.0.96"
+serde_json = "1.0.100"
 url = "2.4.0"
 
 # Daemon
@@ -29,6 +29,6 @@ simplelog = "0.12.1"
 smol = "1.3.0"
 
 # Argument parsing
-serde = {version = "1.0.164", features = ["derive"]}
+serde = {version = "1.0.167", features = ["derive"]}
 structopt = "0.3.26"
 structopt-toml = "0.5.1"

bin/genev/genev-cli/Cargo.toml

@@ -13,11 +13,11 @@ darkfi = {path = "../../../", features = ["event-graph", "rpc", "bs58"]}
 darkfi-serial = {path = "../../../src/serial"}
 
 async-std = {version = "1.12.0", features = ["attributes"]}
-clap = {version = "4.3.3", features = ["derive"]}
+clap = {version = "4.3.11", features = ["derive"]}
 libsqlite3-sys = {version = "0.26.0", features = ["bundled-sqlcipher-vendored-openssl"]}
 log = "0.4.19"
 simplelog = "0.12.1"
-serde = {version = "1.0.164", features = ["derive"]}
-serde_json = "1.0.96"
+serde = {version = "1.0.167", features = ["derive"]}
+serde_json = "1.0.100"
 url = "2.4.0"
 

bin/genev/genevd/Cargo.toml

@@ -13,10 +13,10 @@ darkfi = {path = "../../../", features = ["event-graph", "rpc", "bs58", "util"]}
 darkfi-serial = {path = "../../../src/serial"}
 
 # Misc
-async-trait = "0.1.68"
+async-trait = "0.1.71"
 libsqlite3-sys = {version = "0.26.0", features = ["bundled-sqlcipher-vendored-openssl"]}
 log = "0.4.19"
-serde_json = "1.0.96"
+serde_json = "1.0.100"
 url = "2.4.0"
 
 # Daemon
@@ -28,6 +28,6 @@ simplelog = "0.12.1"
 smol = "1.3.0"
 
 # Argument parsing
-serde = {version = "1.0.164", features = ["derive"]}
+serde = {version = "1.0.167", features = ["derive"]}
 structopt = "0.3.26"
 structopt-toml = "0.5.1"

bin/lilith/Cargo.toml

@@ -12,13 +12,13 @@ repository = "https://github.com/darkrenaissance/darkfi"
 darkfi = {path = "../../", features = ["net", "rpc"]}
 
 # Misc
-async-trait = "0.1.68"
+async-trait = "0.1.71"
 futures = "0.3.28"
 libsqlite3-sys = {version = "0.26.0", features = ["bundled-sqlcipher-vendored-openssl"]}
 log = "0.4.19"
 semver = "1.0.17"
-serde_json = "1.0.96"
-toml = "0.7.4"
+serde_json = "1.0.100"
+toml = "0.7.6"
 url = "2.4.0"
 
 # Daemon
@@ -30,6 +30,6 @@ simplelog = "0.12.1"
 smol = "1.3.0"
 
 # Argument parsing
-serde = {version = "1.0.164", features = ["derive"]}
+serde = {version = "1.0.167", features = ["derive"]}
 structopt = "0.3.26"
 structopt-toml = "0.5.1"

bin/tau/tau-cli/Cargo.toml

@@ -16,7 +16,7 @@ async-std = {version = "1.12.0", features = ["attributes"]}
 
 # Misc
 chrono = "0.4.26"
-colored = "2.0.0"
+colored = "2.0.4"
 libsqlite3-sys = {version = "0.26.0", features = ["bundled-sqlcipher-vendored-openssl"]}
 log = "0.4.19"
 prettytable-rs = "0.10.0"
@@ -26,6 +26,6 @@ textwrap = "0.16.0"
 url = "2.4.0"
 
 # Encoding and parsing
-clap = {version = "4.3.3", features = ["derive"]}
-serde = {version = "1.0.164", features = ["derive"]}
-serde_json = "1.0.96"
+clap = {version = "4.3.11", features = ["derive"]}
+serde = {version = "1.0.167", features = ["derive"]}
+serde_json = "1.0.100"

bin/tau/taud/Cargo.toml

@@ -13,19 +13,19 @@ darkfi = { path = "../../../", features = ["event-graph", "rpc", "bs58"]}
 darkfi-serial = { path = "../../../src/serial" }
 
 # Misc
-async-trait = "0.1.68"
+async-trait = "0.1.71"
 bs58 = "0.5.0"
 chrono = "0.4.26"
 crypto_box = {version = "0.8.2", features = ["std"]}
 futures = "0.3.28"
 hex = "0.4.3"
-libc = "0.2.144"
+libc = "0.2.147"
 libsqlite3-sys = {version = "0.26.0", features = ["bundled-sqlcipher-vendored-openssl"]}
 log = "0.4.19"
 rand = "0.8.5"
-serde_json = "1.0.96"
-thiserror = "1.0.40"
-toml = "0.7.4"
+serde_json = "1.0.100"
+thiserror = "1.0.43"
+toml = "0.7.6"
 url = "2.4.0"
 
 # Daemon
@@ -37,6 +37,6 @@ simplelog = "0.12.1"
 smol = "1.3.0"
 
 # Argument parsing
-serde = {version = "1.0.164", features = ["derive"]}
+serde = {version = "1.0.167", features = ["derive"]}
 structopt = "0.3.26"
 structopt-toml = "0.5.1"

bin/vanityaddr/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2021"
 
 [dependencies]
 bs58 = "0.5.0"
-clap = {version = "4.3.3", features = ["derive"]}
+clap = {version = "4.3.11", features = ["derive"]}
 ctrlc = "3.4.0"
 darkfi = {path = "../../", features = ["util"]}
 darkfi-sdk = {path = "../../src/sdk"}

bin/vanityaddr/src/main.rs

@@ -179,12 +179,6 @@ fn main() {
 
     // Something fancy
     let progress = Arc::new(ProgressInc::new());
-    /*
-    let progress = ProgressBar::new_spinner();
-    let template =
-        ProgressStyle::default_bar().template("[{elapsed_precise}] {pos} attempts").unwrap();
-    progress.set_style(template);
-    */
 
     // Fire off the threadpool
     let progress_ = progress.clone();

bin/zkas/Cargo.toml

@@ -9,5 +9,5 @@ license = "AGPL-3.0-only"
 edition = "2021"
 
 [dependencies]
-clap = {version = "4.3.3", features = ["derive"]}
+clap = {version = "4.3.11", features = ["derive"]}
 darkfi = {path = "../../", features = ["zkas"]}

bin/zktool/Cargo.toml

@@ -9,7 +9,7 @@ license = "AGPL-3.0-only"
 edition = "2021"
 
 [dependencies]
-clap = {version = "4.3.3", features = ["derive"]}
+clap = {version = "4.3.11", features = ["derive"]}
 darkfi = {path = "../../", features = ["zkas"]}
 darkfi-sdk = {path = "../../src/sdk"}
 

example/dchat/Cargo.toml

@@ -16,7 +16,7 @@ darkfi-serial = {path = "../../src/serial"}
 
 # ANCHOR: dependencies
 async-std = "1.12.0"
-async-trait = "0.1.68"
+async-trait = "0.1.71"
 easy-parallel = "3.3.0"
 smol = "1.3.0"
 
@@ -24,7 +24,7 @@ log = "0.4.19"
 simplelog = "0.12.1"
 url = "2.4.0"
 
-serde_json = "1.0.96"
-serde = {version = "1.0.164", features = ["derive"]}
-toml = "0.7.4"
+serde_json = "1.0.100"
+serde = {version = "1.0.167", features = ["derive"]}
+toml = "0.7.6"
 # ANCHOR_END: dependencies

example/p2pdebug/Cargo.toml

@@ -15,8 +15,8 @@ darkfi = {path = "../../", features = ["net", "rpc"]}
 smol = "1.3.0"
 futures = "0.3.28"
 async-std = "1.12.0"
-async-trait = "0.1.68"
-async-channel = "1.8.0"
+async-trait = "0.1.71"
+async-channel = "1.9.0"
 async-executor = "1.5.1"
 easy-parallel = "3.3.0"
 
@@ -24,11 +24,11 @@ easy-parallel = "3.3.0"
 rand = "0.8.5"
 
 # Misc
-clap = {version = "4.3.3", features = ["derive"]}
+clap = {version = "4.3.11", features = ["derive"]}
 log = "0.4.19"
 simplelog = "0.12.1"
 fxhash = "0.2.1"
 url = "2.4.0"
 
 # Encoding and parsing
-serde_json = "1.0.96"
+serde_json = "1.0.100"

script/research/blockchain-explorer/Cargo.toml

@@ -10,8 +10,8 @@ edition = "2021"
 [workspace]
 
 [dependencies]
-blake3 = "1.4.0"
-clap = {version = "4.3.3", features = ["derive"]}
+blake3 = "1.4.1"
+clap = {version = "4.3.11", features = ["derive"]}
 darkfi = {path = "../../../", features = ["blockchain", "wallet", "rpc"]}
 darkfi-sdk = {path = "../../../src/sdk"}
 sled = "0.34.7"

script/research/dhtd/Cargo.toml

@@ -10,22 +10,22 @@ path = "../../../"
 features = ["dht"]
 
 [dependencies]
-async-channel = "1.8.0"
+async-channel = "1.9.0"
 async-executor = "1.5.1"
 async-std = "1.12.0"
-async-trait = "0.1.68"
-blake3 = "1.4.0"
+async-trait = "0.1.71"
+blake3 = "1.4.1"
 ctrlc = { version = "3.4.0", features = ["termination"] }
 easy-parallel = "3.3.0"
 futures-lite = "1.13.0"
 log = "0.4.19"
-serde_json = "1.0.96"
+serde_json = "1.0.100"
 simplelog = "0.12.1"
 url = "2.4.0"
 
 # Argument parsing
-serde = "1.0.164"
-serde_derive = "1.0.164"
+serde = "1.0.167"
+serde_derive = "1.0.167"
 structopt = "0.3.26"
 structopt-toml = "0.5.1"
 

src/contract/consensus/Cargo.toml

@@ -9,11 +9,11 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-blake3 = "1.4.0"
+blake3 = "1.4.1"
 darkfi-sdk = { path = "../../sdk" }
 darkfi-serial = { path = "../../serial", features = ["derive", "crypto"] }
 darkfi-money-contract = { path = "../money", features = ["no-entrypoint"] }
-thiserror = "1.0.40"
+thiserror = "1.0.43"
 
 # The following dependencies are used for the client API and
 # probably shouldn't be in WASM

src/contract/dao/Cargo.toml

@@ -13,7 +13,7 @@ bs58 = "0.5.0"
 darkfi-sdk = { path = "../../sdk" }
 darkfi-serial = { path = "../../serial", features = ["derive", "crypto"] }
 darkfi-money-contract = { path = "../money", features = ["no-entrypoint"] }
-thiserror = "1.0.40"
+thiserror = "1.0.43"
 
 # The following dependencies are used for the client API and
 # probably shouldn't be in WASM

src/contract/deployooor/Cargo.toml

@@ -11,7 +11,7 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 darkfi-sdk = { path = "../../sdk" }
 darkfi-serial = { path = "../../serial", features = ["derive", "crypto"] }
-thiserror = "1.0.40"
+thiserror = "1.0.43"
 
 # We need to disable random using "custom" which makes the crate a noop
 # so the wasm32-unknown-unknown target is enabled.

src/contract/money/Cargo.toml

@@ -12,7 +12,7 @@ crate-type = ["cdylib", "rlib"]
 bs58 = "0.5.0"
 darkfi-sdk = { path = "../../sdk" }
 darkfi-serial = { path = "../../serial", features = ["derive", "crypto"] }
-thiserror = "1.0.40"
+thiserror = "1.0.43"
 
 # The following dependencies are used for the client API and
 # probably shouldn't be in WASM

src/contract/test-harness/Cargo.toml

@@ -14,7 +14,7 @@ darkfi-money-contract = {path = "../money", features = ["client", "no-entrypoint
 darkfi-consensus-contract = {path = "../consensus", features = ["client", "no-entrypoint"]}
 darkfi-deployooor-contract = {path = "../deployooor", features = ["no-entrypoint"]}
 
-blake3 = "1.4.0"
+blake3 = "1.4.1"
 bs58 = "0.5.0"
 log = "0.4.19"
 rand = "0.8.5"

src/dht/messages.rs

@@ -19,7 +19,7 @@
 use std::collections::{HashMap, HashSet};
 
 use darkfi_serial::{serialize, SerialDecodable, SerialEncodable};
-use rand::Rng;
+use rand::{rngs::OsRng, Rng};
 
 use crate::{impl_p2p_message, net::Message};
 
@@ -39,8 +39,7 @@ pub struct KeyRequest {
 impl KeyRequest {
     pub fn new(from: blake3::Hash, to: blake3::Hash, key: blake3::Hash) -> Self {
         // Generate a random id
-        let mut rng = rand::thread_rng();
-        let n: u16 = rng.gen();
+        let n: u16 = OsRng.gen();
         let id = blake3::hash(&serialize(&n));
         Self { id, from, to, key }
     }
@@ -65,8 +64,7 @@ pub struct KeyResponse {
 impl KeyResponse {
     pub fn new(from: blake3::Hash, to: blake3::Hash, key: blake3::Hash, value: Vec<u8>) -> Self {
         // Generate a random id
-        let mut rng = rand::thread_rng();
-        let n: u16 = rng.gen();
+        let n: u16 = OsRng.gen();
         let id = blake3::hash(&serialize(&n));
         Self { id, from, to, key, value }
     }
@@ -89,8 +87,7 @@ pub struct LookupRequest {
 impl LookupRequest {
     pub fn new(daemon: blake3::Hash, key: blake3::Hash, req_type: u8) -> Self {
         // Generate a random id
-        let mut rng = rand::thread_rng();
-        let n: u16 = rng.gen();
+        let n: u16 = OsRng.gen();
         let id = blake3::hash(&serialize(&n));
         Self { id, daemon, key, req_type }
     }
@@ -109,8 +106,7 @@ pub struct LookupMapRequest {
 impl LookupMapRequest {
     pub fn new(daemon: blake3::Hash) -> Self {
         // Generate a random id
-        let mut rng = rand::thread_rng();
-        let n: u16 = rng.gen();
+        let n: u16 = OsRng.gen();
         let id = blake3::hash(&serialize(&n));
         Self { id, daemon }
     }
@@ -129,8 +125,7 @@ pub struct LookupMapResponse {
 impl LookupMapResponse {
     pub fn new(lookup: HashMap<blake3::Hash, HashSet<blake3::Hash>>) -> Self {
         // Generate a random id
-        let mut rng = rand::thread_rng();
-        let n: u16 = rng.gen();
+        let n: u16 = OsRng.gen();
         let id = blake3::hash(&serialize(&n));
         Self { id, lookup }
     }

src/dht/mod.rs

@@ -23,7 +23,7 @@ use chrono::Utc;
 use darkfi_serial::serialize;
 use futures::{select, FutureExt};
 use log::{debug, error, warn};
-use rand::Rng;
+use rand::{rngs::OsRng, Rng};
 use smol::Executor;
 
 use crate::{
@@ -77,8 +77,7 @@ impl Dht {
         ex: Arc<Executor<'_>>,
     ) -> Result<DhtPtr> {
         // Generate a random id
-        let mut rng = rand::thread_rng();
-        let n: u16 = rng.gen();
+        let n: u16 = OsRng.gen();
         let id = blake3::hash(&serialize(&n));
         let map = HashMap::default();
         let lookup = match initial {

src/event_graph/mod.rs

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-use rand::{distributions::Alphanumeric, thread_rng, Rng};
+use rand::{distributions::Alphanumeric, rngs::OsRng, Rng};
 
 pub mod events_queue;
 pub mod model;
@@ -28,7 +28,7 @@ pub trait EventMsg {
 }
 
 pub fn gen_id(len: usize) -> String {
-    thread_rng().sample_iter(&Alphanumeric).take(len).map(char::from).collect()
+    OsRng.sample_iter(&Alphanumeric).take(len).map(char::from).collect()
 }
 
 #[cfg(test)]

src/rpc/clock_sync.rs

@@ -20,7 +20,7 @@
 use std::{net::UdpSocket, time::Duration};
 
 use log::debug;
-use rand::prelude::SliceRandom;
+use rand::{prelude::SliceRandom, rngs::OsRng};
 use serde_json::json;
 use url::Url;
 
@@ -37,7 +37,7 @@ const EPOCH: u32 = 2208988800; // 1900
 /// retrieve their current system clock.
 async fn peer_request(peers: &[Url]) -> Result<Option<Timestamp>> {
     // Select peer, None if vector is empty.
-    let peer = peers.choose(&mut rand::thread_rng());
+    let peer = peers.choose(&mut OsRng);
     match peer {
         None => Ok(None),
         Some(p) => {

src/rpc/jsonrpc.rs

@@ -20,7 +20,7 @@
 use std::fmt;
 
 use async_std::sync::Arc;
-use rand::Rng;
+use rand::{rngs::OsRng, Rng};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use serde_json::{json, Value};
 
@@ -121,11 +121,9 @@ pub struct JsonRequest {
 
 impl JsonRequest {
     pub fn new(method: &str, parameters: Value) -> Self {
-        let mut rng = rand::thread_rng();
-
         Self {
             jsonrpc: json!("2.0"),
-            id: json!(rng.gen::<u64>()),
+            id: json!(OsRng.gen::<u64>()),
             method: json!(method),
             params: parameters,
         }

src/sdk/Cargo.toml

@@ -13,7 +13,7 @@ doctest = false
 
 [dependencies]
 # Error handling
-thiserror = "1.0.40"
+thiserror = "1.0.43"
 
 # Serialization
 darkfi-serial = {version = "0.4.1", path = "../serial", features = ["derive", "crypto"]}
@@ -23,7 +23,7 @@ bs58 = "0.5.0"
 
 # Cryptography
 blake2b_simd = "1.0.1"
-blake3 = "1.4.0"
+blake3 = "1.4.1"
 chacha20poly1305 = "0.10.1"
 halo2_gadgets = "0.3.0"
 bridgetree = "0.3.0"
@@ -31,7 +31,7 @@ num-bigint = "0.4.3"
 num-traits = "0.2.15"
 pasta_curves = "0.5.1"
 rand_core = "0.6.4"
-sha2 = "0.10.6"
+sha2 = "0.10.7"
 
 # Misc
 lazy_static = "1.4.0"

src/sdk/python/Cargo.toml

@@ -17,5 +17,5 @@ crate-type = ["cdylib"]
 darkfi = { path = "../../../", features = ["zk", "zkas"] }
 darkfi-sdk = { path = "../" }
 halo2_gadgets = "0.3.0"
-pyo3 = "0.19.0"
+pyo3 = "0.19.1"
 rand = "0.8.5"

src/serial/Cargo.toml

@@ -13,7 +13,7 @@ darkfi-derive = {version = "0.4.1", path = "./derive", optional = true}
 futures-lite = {version = "1.13.0", optional = true}
 
 # Supported types for encoding
-blake3 = {version = "1.4.0", optional = true}
+blake3 = {version = "1.4.1", optional = true}
 bridgetree = {version = "0.3.0", optional = true}
 pasta_curves = {version = "0.5.1", optional = true}
 semver = {version = "1.0.17", optional = true}

src/serial/derive-internal/Cargo.toml

@@ -9,6 +9,6 @@ license = "AGPL-3.0-only"
 edition = "2021"
 
 [dependencies]
-proc-macro2 = "1.0.60"
-quote = "1.0.28"
+proc-macro2 = "1.0.63"
+quote = "1.0.29"
 syn = {version = "1.0.109", features = ["full", "fold"]}

src/serial/derive/Cargo.toml

@@ -13,7 +13,7 @@ proc-macro = true
 
 [dependencies]
 proc-macro-crate = "1.3.1"
-proc-macro2 = "1.0.60"
+proc-macro2 = "1.0.63"
 syn = {version = "1.0.109", features = ["full", "fold"]}
 
 darkfi-derive-internal = {version = "0.4.1", path = "../derive-internal"}

src/system/mod.rs

@@ -18,8 +18,6 @@
 
 pub mod stoppable_task;
 pub mod subscriber;
-pub mod types;
 
 pub use stoppable_task::{StoppableTask, StoppableTaskPtr};
 pub use subscriber::{Subscriber, SubscriberPtr, Subscription};
-pub use types::ExecutorPtr;

src/system/subscriber.rs

@@ -20,7 +20,7 @@ use std::collections::HashMap;
 
 use async_std::sync::{Arc, Mutex};
 use log::warn;
-use rand::Rng;
+use rand::{rngs::OsRng, Rng};
 
 pub type SubscriberPtr<T> = Arc<Subscriber<T>>;
 
@@ -67,8 +67,7 @@ impl<T: Clone> Subscriber<T> {
     }
 
     fn random_id() -> SubscriptionId {
-        let mut rng = rand::thread_rng();
-        rng.gen()
+        OsRng.gen()
     }
 
     pub async fn subscribe(self: Arc<Self>) -> Subscription<T> {

src/system/types.rs

@@ -1,22 +0,0 @@
-/* This file is part of DarkFi (https://dark.fi)
- *
- * Copyright (C) 2020-2023 Dyne.org foundation
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-use smol::Executor;
-use std::sync::Arc;
-
-pub type ExecutorPtr<'a> = Arc<Executor<'a>>;

src/wallet/walletdb.rs

@@ -26,16 +26,6 @@ use crate::Result;
 
 pub type WalletPtr = Arc<WalletDb>;
 
-/*
-/// Helper function to initialize `WalletPtr`
-pub async fn init_wallet(wallet_path: &str, wallet_pass: &str) -> Result<WalletPtr> {
-    let expanded = expand_path(wallet_path)?;
-    let wallet_path = format!("sqlite://{}", expanded.to_str().unwrap());
-    let wallet = WalletDb::new(&wallet_path, wallet_pass).await?;
-    Ok(wallet)
-}
-*/
-
 /// Types we want to allow to query from the SQL wallet
 #[repr(u8)]
 pub enum QueryType {