diff --git a/Cargo.lock b/Cargo.lock index 4d66d51e8..6d51f5754 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1175,18 +1175,15 @@ dependencies = [ name = "darkfi" version = "0.3.0" dependencies = [ - "arrayvec", "async-channel", "async-executor", "async-std", "async-trait", "async-tungstenite", "bincode", - "bitvec", "blake2b_simd", "blake3", "bs58", - "bytes", "chrono", "clap 3.2.22", "crypto_api_chachapoly", diff --git a/Cargo.toml b/Cargo.toml index 96f31973f..15a468506 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,104 +18,101 @@ name = "darkfi" [workspace] members = [ - "bin/zkas", - #"bin/cashierd", - "bin/darkfid", - "bin/darkotc", - "bin/drk", - "bin/faucetd", - "bin/ircd", - #"bin/irc-raft", - "bin/dnetview", - "bin/daod", - "bin/dao-cli", - "bin/tau/taud", - "bin/tau/tau-cli", - "bin/darkwiki/darkwikid", - "bin/darkwiki/darkwiki-cli", - "bin/vanityaddr", - "bin/lilith", - "src/sdk", - "src/serial/derive", - "src/serial/derive-internal", + "bin/zkas", + #"bin/cashierd", + "bin/darkfid", + "bin/darkotc", + "bin/drk", + "bin/faucetd", + "bin/ircd", + #"bin/irc-raft", + "bin/dnetview", + "bin/daod", + "bin/dao-cli", + "bin/tau/taud", + "bin/tau/tau-cli", + "bin/darkwiki/darkwikid", + "bin/darkwiki/darkwiki-cli", + "bin/vanityaddr", + "bin/lilith", + "src/sdk", + "src/serial/derive", + "src/serial/derive-internal", "example/dchat", ] [dependencies] # Hard dependencies -libc = "0.2.132" +libc = "0.2.133" log = "0.4.17" -thiserror = "1.0.34" +thiserror = "1.0.35" # async-runtime -smol = {version = "1.2.5", optional = true} -futures = {version = "0.3.24", optional = true} -async-std = {version = "1.12.0", features = ["attributes"], optional = true} -async-trait = {version = "0.1.57", optional = true} async-channel = {version = "1.7.1", optional = true} async-executor = {version = "1.4.1", optional = true} +async-std = {version = "1.12.0", features = ["attributes"], optional = true} +async-trait = {version = "0.1.57", optional = true} +futures = {version = "0.3.24", optional = true} +smol = {version = "1.2.5", optional = true} # Networking -socket2 = {version = "0.4.7", optional = true} futures-rustls = {version = "0.22.2", features = ["dangerous_configuration"], optional = true} +socket2 = {version = "0.4.7", optional = true} # TLS cert utilities -ed25519-compact = {version = "1.0.11", features = ["pem"], optional = true} +ed25519-compact = {version = "1.0.15", features = ["pem"], optional = true} rcgen = {version = "0.9.3", features = ["pem"], optional = true} rustls-pemfile = {version = "1.0.1", optional = true} # Encoding -hex = {version = "0.4.3", optional = true} -bs58 = {version = "0.4.0", optional = true} -toml = {version = "0.5.9", optional = true} -bytes = {version = "1.2.1", optional = true} bincode = {version = "2.0.0-rc.1", features = ["serde"], optional = true} +bs58 = {version = "0.4.0", optional = true} +hex = {version = "0.4.3", optional = true} serde_json = {version = "1.0.85", optional = true} -serde = {version = "1.0.144", features = ["derive"], optional = true} +serde = {version = "1.0.145", features = ["derive"], optional = true} structopt = {version= "0.3.26", optional = true} structopt-toml = {version= "0.5.1", optional = true} +toml = {version = "0.5.9", optional = true} # Utilities -url = {version = "2.2.2", features = ["serde"], optional = true} -dirs = {version = "4.0.0", optional = true} -subtle = {version = "2.4.1", optional = true} -lazy_static = {version = "1.4.0", optional = true} -lazy-init = {version = "0.5.1", optional = true} -fxhash = {version = "0.2.1", optional = true} -indexmap = {version = "1.9.1", optional = true} -itertools = {version = "0.10.3", optional = true} +chrono = {version = "0.4.22", optional = true} darkfi-derive = {path = "src/serial/derive", optional = true} darkfi-derive-internal = {path = "src/serial/derive-internal", optional = true} -chrono = {version = "0.4.22", optional = true} +dirs = {version = "4.0.0", optional = true} +fxhash = {version = "0.2.1", optional = true} +indexmap = {version = "1.9.1", optional = true} +itertools = {version = "0.10.5", optional = true} +lazy-init = {version = "0.5.1", optional = true} +lazy_static = {version = "1.4.0", optional = true} +subtle = {version = "2.4.1", optional = true} +url = {version = "2.3.1", features = ["serde"], optional = true} # Misc -termion = {version = "1.5.6", optional = true} +indicatif = {version = "0.17.1", optional = true} simplelog = {version = "0.12.0", optional = true} -indicatif = {version = "0.17.0", optional = true} +termion = {version = "1.5.6", optional = true} # Websockets -tungstenite = {version = "0.17.3", optional = true} async-tungstenite = {version = "0.17.2", optional = true} +tungstenite = {version = "0.17.3", optional = true} # socks5 fast-socks5 = {version = "0.4.3", optional = true} # Crypto -bitvec = {version = "1.0.1", optional = true} rand = {version = "0.8.5", optional = true} -blake3 = {version = "1.3.1", optional = true} -sha2 = {version = "0.10.5", optional = true} -group = {version = "0.12.0", optional = true} -arrayvec = {version = "0.7.2", optional = true} blake2b_simd = {version = "1.0.0", optional = true} -pasta_curves = {version = "0.4.0", optional = true} +blake3 = {version = "1.3.1", optional = true} crypto_api_chachapoly = {version = "0.5.0", optional = true} -incrementalmerkletree = {version = "0.3.0", optional = true} +group = {version = "0.12.0", optional = true} halo2_proofs = {version = "0.2.0", optional = true} halo2_gadgets = {version = "0.2.0", optional = true} +incrementalmerkletree = {version = "0.3.0", optional = true} num-bigint = {version = "0.4.3", optional = true} num-traits = {version = "0.2.15", optional = true} +pasta_curves = {version = "0.4.0", optional = true} +sha2 = {version = "0.10.6", optional = true} # Smart contract runtime drk-sdk = {path = "src/sdk", optional = true} @@ -124,8 +121,8 @@ wasmer-compiler-singlepass = {version = "2.3.0", optional = true} wasmer-middlewares = {version = "2.3.0", optional = true} # Wallet management -sqlx = {version = "0.6.1", features = ["runtime-async-std-native-tls", "sqlite"], optional = true} -libsqlite3-sys = {version = "0.24.1", features = ["bundled-sqlcipher"], optional = true } +libsqlite3-sys = {version = "0.24.2", features = ["bundled-sqlcipher"], optional = true } +sqlx = {version = "0.6.2", features = ["runtime-async-std-native-tls", "sqlite"], optional = true} # Blockchain store sled = {version = "0.34.7", optional = true} @@ -134,183 +131,211 @@ sled = {version = "0.34.7", optional = true} clap = {version = "3.2.20", features = ["derive"]} halo2_proofs = {version = "0.2.0", features = ["dev-graph", "gadget-traces", "sanity-checks"]} halo2_gadgets = {version = "0.2.0", features = ["dev-graph", "test-dependencies"]} -plotters = "0.3.3" +plotters = "0.3.4" +# -----BEGIN LIBRARY FEATURES----- [features] async-runtime = [ - "async-std", - "async-channel", - "async-executor", - "async-trait", - "futures", - "smol", + "async-std", + "async-channel", + "async-executor", + "async-trait", + "futures", + "smol", ] -websockets = [ - "async-tungstenite", - "tungstenite", - "futures-rustls", -] - -util = [ +blockchain = [ "blake3", - "bs58", - "hex", - "bincode", - "serde", - "toml", - "url", - "simplelog", - "serde_json", - "dirs", - "fxhash", "chrono", - "indicatif", - "termion", + "group", + "halo2_gadgets", + "halo2_proofs", + "incrementalmerkletree", + "lazy-init", + "lazy_static", + "pasta_curves", + "rand", + "sled", + "url", "async-runtime", + "crypto", + "net", + "serial", + "tx", + "node", + "util", +] + +crypto = [ + "blake2b_simd", + "blake3", + "bs58", + "crypto_api_chachapoly", + "fxhash", + "group", + "halo2_gadgets", + "halo2_proofs", + "hex", + "incrementalmerkletree", + "lazy_static", + "num-bigint", + "num-traits", + "pasta_curves", + "rand", + "serde", + "serde_json", + "sha2", + "subtle", + + "util", + "serial", + "zkas", +] + +dht = [ + "blake3", + "chrono", + "fxhash", + "rand", + + "async-runtime", + "net", "serial", ] -async-serial = [ - "futures", +net = [ + "fxhash", + "ed25519-compact", + "fast-socks5", + "futures-rustls", + "hex", + "structopt", + "structopt-toml", + "rand", + "rcgen", + "rustls-pemfile", + "serde", + "serde_json", + "socket2", + "url", + "async-runtime", + "serial", + "system", + "util", +] + +node = [ + "bs58", + "group", + "incrementalmerkletree", + "lazy-init", + + "async-runtime", + "blockchain", + "crypto", + "serial", + "tx", + "wallet", +] + +raft = [ + "chrono", + "fxhash", + "rand", + "sled", + + "async-runtime", + "net", + "serial", + "util", +] + +rpc = [ + "hex", + "rand", + "serde", + "serde_json", + "url", + + "async-runtime", + "net", "serial", ] serial = [ "darkfi-derive", - "darkfi-derive-internal", -] - -rpc = [ - "rand", - "url", - "fast-socks5", - - "async-runtime", - "net", -] - -blockchain = [ - "blake3", - "chrono", - "indexmap", - "sled", - - "crypto", - "tx", - "net", - "node", - "util", ] system = [ - "fxhash", - "rand", + "fxhash", + "rand", - "async-runtime", -] - -net = [ - "fxhash", - "socket2", - "futures-rustls", - "fast-socks5", - "ed25519-compact", - "rcgen", - "rustls-pemfile", - "structopt", - "structopt-toml", - - "async-serial", - "serial", - "system", - "util", -] - -crypto = [ - "bitvec", - "blake3", - "rand", - "pasta_curves", - "blake2b_simd", - "incrementalmerkletree", - "halo2_proofs", - "halo2_gadgets", - "num-bigint", - "num-traits", - "subtle", - "lazy_static", - "group", - "arrayvec", - "crypto_api_chachapoly", - "sha2", - "bs58", - - "util", - "serial", - "zkas", -] - -wallet = [ - "sqlx", - "libsqlite3-sys", - "async-std", - - "crypto", - "util", -] - -wasm-runtime = [ - "drk-sdk", - "wasmer", - "wasmer-compiler-singlepass", - "wasmer-middlewares", -] - -node = [ - "url", - "bytes", - "lazy-init", - - "async-runtime", - "blockchain", - "crypto", - "wallet", - "util", - "net", -] - -zkas = [ - "termion", - "indexmap", - "itertools", - - "serial", -] - -raft = [ - "blake3", - "sled", - - "util", - "net", - "rpc", + "async-runtime", ] tx = [ - "crypto", - "util", -] - -dht = [ + "group", + "incrementalmerkletree", "rand", - "net", + "serial", + "crypto", +] + +util = [ + "chrono", + "dirs", + "indicatif", + "rand", + "simplelog", + "serde", + "serde_json", + "termion", + "toml", + "url", + + "serial", +] + +wallet = [ + "async-std", + "bincode", + "bs58", + "group", + "rand", + "sqlx", + "incrementalmerkletree", + "libsqlite3-sys", + + "crypto", + "serial", "util", ] +wasm-runtime = [ + "wasmer", + "wasmer-compiler-singlepass", + "wasmer-middlewares", + + "drk-sdk", +] + +websockets = [ + "async-tungstenite", + "tungstenite", +] + +zkas = [ + "termion", + "indexmap", + "itertools", + + "serial", +] +# -----END LIBRARY FEATURES----- + [[example]] name = "net" path = "example/net.rs" diff --git a/bin/cashierd/Cargo.toml b/bin/cashierd/Cargo.toml index b6b80ba8b..4518c33f7 100644 --- a/bin/cashierd/Cargo.toml +++ b/bin/cashierd/Cargo.toml @@ -25,17 +25,17 @@ clap = {version = "3.2.20", features = ["derive"]} log = "0.4.17" num_cpus = "1.13.1" simplelog = "0.12.0" -thiserror = "1.0.34" -url = "2.2.2" +thiserror = "1.0.35" +url = "2.3.1" fxhash = "0.2.1" # Encoding and parsing -serde = {version = "1.0.144", features = ["derive"]} +serde = {version = "1.0.145", features = ["derive"]} serde_json = "1.0.85" # Bitcoin bridge dependencies -bdk = {version = "0.21.0", optional = true} -anyhow = {version = "1.0.64", optional = true} +bdk = {version = "0.22.0", optional = true} +anyhow = {version = "1.0.65", optional = true} bitcoin = {version = "0.29.1", optional = true} secp256k1 = {version = "0.24.0", default-features = false, features = ["rand-std"], optional = true} @@ -49,8 +49,8 @@ num-bigint = {version = "0.4.3", features = ["rand", "serde"], optional = true} # Solana bridge dependencies native-tls = {version = "0.2.10", optional = true} async-native-tls = {version = "0.4.0", optional = true} -solana-client = {version = "1.11.5", optional = true} -solana-sdk = {version = "1.11.5", optional = true} +solana-client = {version = "1.13.1", optional = true} +solana-sdk = {version = "1.13.1", optional = true} spl-associated-token-account = {version = "1.1.1", features = ["no-entrypoint"], optional = true} spl-token = {version = "3.5.0", features = ["no-entrypoint"], optional = true} tungstenite = {version = "0.17.3", optional = true} diff --git a/bin/dao-cli/Cargo.toml b/bin/dao-cli/Cargo.toml index 284acef97..200ffad25 100644 --- a/bin/dao-cli/Cargo.toml +++ b/bin/dao-cli/Cargo.toml @@ -21,7 +21,7 @@ clap = {version = "3.2.20", features = ["derive"]} log = "0.4.17" num_cpus = "1.13.1" simplelog = "0.12.0" -url = "2.2.2" +url = "2.3.1" # Encoding and parsing serde_json = "1.0.85" diff --git a/bin/daod/Cargo.toml b/bin/daod/Cargo.toml index bc23d9461..6c79f4ae4 100644 --- a/bin/daod/Cargo.toml +++ b/bin/daod/Cargo.toml @@ -21,7 +21,7 @@ easy-parallel = "3.2.0" log = "0.4.17" num_cpus = "1.13.1" simplelog = "0.12.0" -thiserror = "1.0.34" +thiserror = "1.0.35" # Crypto incrementalmerkletree = "0.3.0" @@ -37,4 +37,4 @@ serde_json = "1.0.85" # Utilities lazy_static = "1.4.0" -url = "2.2.2" +url = "2.3.1" diff --git a/bin/darkfid/Cargo.toml b/bin/darkfid/Cargo.toml index 857a5847f..37876d8bb 100644 --- a/bin/darkfid/Cargo.toml +++ b/bin/darkfid/Cargo.toml @@ -29,10 +29,10 @@ rand = "0.8.5" serde_json = "1.0.85" simplelog = "0.12.0" sled = "0.34.7" -url = "2.2.2" +url = "2.3.1" # Argument parsing -serde = "1.0.144" -serde_derive = "1.0.144" +serde = "1.0.145" +serde_derive = "1.0.145" structopt = "0.3.26" structopt-toml = "0.5.1" diff --git a/bin/darkotc/Cargo.toml b/bin/darkotc/Cargo.toml index 254ea64b0..10d9617fb 100644 --- a/bin/darkotc/Cargo.toml +++ b/bin/darkotc/Cargo.toml @@ -17,4 +17,4 @@ halo2_proofs = "0.2.0" halo2_gadgets = "0.2.0" rand = "0.8.5" serde_json = "1.0.85" -url = "2.2.2" +url = "2.3.1" diff --git a/bin/darkwiki/darkwiki-cli/Cargo.toml b/bin/darkwiki/darkwiki-cli/Cargo.toml index 2a443dce2..63764d72b 100644 --- a/bin/darkwiki/darkwiki-cli/Cargo.toml +++ b/bin/darkwiki/darkwiki-cli/Cargo.toml @@ -29,10 +29,10 @@ futures = "0.3.24" log = "0.4.17" simplelog = "0.12.0" rand = "0.8.5" -url = "2.2.2" +url = "2.3.1" # Encoding and parsing -serde = {version = "1.0.144", features = ["derive"]} +serde = {version = "1.0.145", features = ["derive"]} serde_json = "1.0.85" structopt = "0.3.26" diff --git a/bin/darkwiki/darkwikid/Cargo.toml b/bin/darkwiki/darkwikid/Cargo.toml index d3b6fce1e..f00ee6c48 100644 --- a/bin/darkwiki/darkwikid/Cargo.toml +++ b/bin/darkwiki/darkwikid/Cargo.toml @@ -13,7 +13,7 @@ categories = [] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -darkfi = {path = "../../../", features = ["raft", "net", "rpc"]} +darkfi = {path = "../../../", features = ["raft", "net", "rpc", "bs58"]} # Async @@ -30,21 +30,21 @@ log = "0.4.17" simplelog = "0.12.0" rand = "0.8.5" chrono = "0.4.22" -thiserror = "1.0.34" +thiserror = "1.0.35" ctrlc = { version = "3.2.3", features = ["termination"] } -url = "2.2.2" +url = "2.3.1" fxhash = "0.2.1" colored = "2.0.0" # Encoding and parsing -serde = {version = "1.0.144", features = ["derive"]} +serde = {version = "1.0.145", features = ["derive"]} serde_json = "1.0.85" structopt = "0.3.26" structopt-toml = "0.5.1" -unicode-segmentation = "1.9.0" +unicode-segmentation = "1.10.0" crypto_box = {version = "0.8.1", features = ["std"]} hex = "0.4.3" bs58 = "0.4.0" -sha2 = "0.10.5" +sha2 = "0.10.6" diff --git a/bin/dnetview/Cargo.toml b/bin/dnetview/Cargo.toml index 957578bec..6a5dfb01f 100644 --- a/bin/dnetview/Cargo.toml +++ b/bin/dnetview/Cargo.toml @@ -29,11 +29,11 @@ rand = "0.8.5" simplelog = "0.12.0" log = "0.4.17" num_cpus = "1.13.1" -url = "2.2.2" +url = "2.3.1" fxhash = "0.2.1" -thiserror = "1.0.34" +thiserror = "1.0.35" # Encoding and parsing serde_json = "1.0.85" -serde = {version = "1.0.144", features = ["derive"]} +serde = {version = "1.0.145", features = ["derive"]} hex = "0.4.3" diff --git a/bin/drk/Cargo.toml b/bin/drk/Cargo.toml index 57eeb8b91..9c18680cd 100644 --- a/bin/drk/Cargo.toml +++ b/bin/drk/Cargo.toml @@ -16,4 +16,4 @@ log = "0.4.17" prettytable-rs = "0.9.0" serde_json = "1.0.85" simplelog = "0.12.0" -url = "2.2.2" +url = "2.3.1" diff --git a/bin/faucetd/Cargo.toml b/bin/faucetd/Cargo.toml index 24029883b..482307aad 100644 --- a/bin/faucetd/Cargo.toml +++ b/bin/faucetd/Cargo.toml @@ -27,10 +27,10 @@ rand = "0.8.5" serde_json = "1.0.85" simplelog = "0.12.0" sled = "0.34.7" -url = "2.2.2" +url = "2.3.1" # Argument parsing -serde = "1.0.144" -serde_derive = "1.0.144" +serde = "1.0.145" +serde_derive = "1.0.145" structopt = "0.3.26" structopt-toml = "0.5.1" diff --git a/bin/irc-raft/Cargo.toml b/bin/irc-raft/Cargo.toml index a4f08e016..b60efade4 100644 --- a/bin/irc-raft/Cargo.toml +++ b/bin/irc-raft/Cargo.toml @@ -30,11 +30,11 @@ log = "0.4.17" simplelog = "0.12.0" fxhash = "0.2.1" ctrlc = { version = "3.2.3", features = ["termination"] } -url = "2.2.2" +url = "2.3.1" # Encoding and parsing serde_json = "1.0.85" -serde = {version = "1.0.144", features = ["derive"]} +serde = {version = "1.0.145", features = ["derive"]} structopt = "0.3.26" structopt-toml = "0.5.1" bs58 = "0.4.0" diff --git a/bin/ircd/Cargo.toml b/bin/ircd/Cargo.toml index 9811b1039..f19aa1803 100644 --- a/bin/ircd/Cargo.toml +++ b/bin/ircd/Cargo.toml @@ -11,7 +11,7 @@ keywords = [] categories = [] [dependencies] -darkfi = {path = "../../", features = ["net", "rpc"]} +darkfi = {path = "../../", features = ["net", "rpc", "bs58"]} # Async smol = "1.2.5" @@ -36,13 +36,13 @@ log = "0.4.17" simplelog = "0.12.0" fxhash = "0.2.1" ctrlc = { version = "3.2.3", features = ["termination"] } -url = "2.2.2" +url = "2.3.1" chrono = "0.4.22" -ripemd = "0.1.1" +ripemd = "0.1.3" # Encoding and parsing serde_json = "1.0.85" -serde = {version = "1.0.144", features = ["derive"]} +serde = {version = "1.0.145", features = ["derive"]} structopt = "0.3.26" structopt-toml = "0.5.1" bs58 = "0.4.0" diff --git a/bin/lilith/Cargo.toml b/bin/lilith/Cargo.toml index c0a5d07ea..0cbf9d8f1 100644 --- a/bin/lilith/Cargo.toml +++ b/bin/lilith/Cargo.toml @@ -27,11 +27,11 @@ fxhash = "0.2.1" log = "0.4.17" serde_json = "1.0.85" simplelog = "0.12.0" -url = "2.2.2" +url = "2.3.1" # Argument parsing -serde = "1.0.144" -serde_derive = "1.0.144" +serde = "1.0.145" +serde_derive = "1.0.145" structopt = "0.3.26" structopt-toml = "0.5.1" toml = "0.5.9" diff --git a/bin/tau/tau-cli/Cargo.toml b/bin/tau/tau-cli/Cargo.toml index 226caba31..7c8f69469 100644 --- a/bin/tau/tau-cli/Cargo.toml +++ b/bin/tau/tau-cli/Cargo.toml @@ -19,9 +19,9 @@ darkfi = { path = "../../../", features = ["rpc"]} fxhash = "0.2.1" log = "0.4.17" prettytable-rs = "0.9.0" -serde = {version = "1.0.144", features = ["derive"]} +serde = {version = "1.0.145", features = ["derive"]} serde_json = "1.0.85" simplelog = "0.12.0" term_grid = { git = "https://github.com/Dastan-glitch/rust-term-grid.git" } -textwrap = "0.15.0" -url = "2.2.2" +textwrap = "0.15.1" +url = "2.3.1" diff --git a/bin/tau/taud/Cargo.toml b/bin/tau/taud/Cargo.toml index efad54bc8..fbcfc417c 100644 --- a/bin/tau/taud/Cargo.toml +++ b/bin/tau/taud/Cargo.toml @@ -11,7 +11,7 @@ keywords = [] categories = [] [dependencies] -darkfi = { path = "../../../", features = ["rpc", "raft", "net"]} +darkfi = { path = "../../../", features = ["rpc", "raft", "net", "bs58"]} # Async smol = "1.2.5" @@ -27,13 +27,13 @@ log = "0.4.17" simplelog = "0.12.0" rand = "0.8.5" chrono = "0.4.22" -thiserror = "1.0.34" +thiserror = "1.0.35" ctrlc = { version = "3.2.3", features = ["termination"] } -url = "2.2.2" +url = "2.3.1" fxhash = "0.2.1" # Encoding and parsing -serde = {version = "1.0.144", features = ["derive"]} +serde = {version = "1.0.145", features = ["derive"]} serde_json = "1.0.85" structopt = "0.3.26" structopt-toml = "0.5.1" diff --git a/bin/vanityaddr/Cargo.toml b/bin/vanityaddr/Cargo.toml index 2c5157072..60cc52520 100644 --- a/bin/vanityaddr/Cargo.toml +++ b/bin/vanityaddr/Cargo.toml @@ -13,7 +13,7 @@ bs58 = "0.4.0" clap = {version = "3.2.20", features = ["derive"]} ctrlc = "3.2.3" darkfi = {path = "../../", features = ["crypto"]} -indicatif = "0.17.0" +indicatif = "0.17.1" num_cpus = "1.13.1" rand = "0.8.5" rayon = "1.5.3" diff --git a/example/dchat/Cargo.toml b/example/dchat/Cargo.toml index 0bc650fa3..c783cdcf2 100644 --- a/example/dchat/Cargo.toml +++ b/example/dchat/Cargo.toml @@ -19,11 +19,11 @@ num_cpus = "1.13.1" # Misc log = "0.4.17" simplelog = "0.12.0" -url = "2.2.2" +url = "2.3.1" # Encoding and parsing serde_json = "1.0.85" -serde = {version = "1.0.144", features = ["derive"]} +serde = {version = "1.0.145", features = ["derive"]} toml = "0.5.9" diff --git a/example/p2pdebug/Cargo.toml b/example/p2pdebug/Cargo.toml index ff2019830..bf4440209 100644 --- a/example/p2pdebug/Cargo.toml +++ b/example/p2pdebug/Cargo.toml @@ -27,7 +27,7 @@ clap = {version = "3.2.20", features = ["derive"]} log = "0.4.17" simplelog = "0.12.0" fxhash = "0.2.1" -url = "2.2.2" +url = "2.3.1" # Encoding and parsing serde_json = "1.0.85" diff --git a/script/research/dhtd/Cargo.toml b/script/research/dhtd/Cargo.toml index b10fedf72..387a20b1a 100644 --- a/script/research/dhtd/Cargo.toml +++ b/script/research/dhtd/Cargo.toml @@ -19,11 +19,11 @@ futures-lite = "1.12.0" log = "0.4.17" serde_json = "1.0.85" simplelog = "0.12.0" -url = "2.2.2" +url = "2.3.1" # Argument parsing -serde = "1.0.144" -serde_derive = "1.0.144" +serde = "1.0.145" +serde_derive = "1.0.145" structopt = "0.3.26" structopt-toml = "0.5.1" diff --git a/script/research/fud/fu/Cargo.toml b/script/research/fud/fu/Cargo.toml index f36d497b7..2ac493de2 100644 --- a/script/research/fud/fu/Cargo.toml +++ b/script/research/fud/fu/Cargo.toml @@ -15,6 +15,6 @@ darkfi = {path = "../../../../", features = ["util"]} log = "0.4.17" serde_json = "1.0.85" simplelog = "0.12.0" -url = "2.2.2" +url = "2.3.1" [workspace] diff --git a/script/research/fud/fud/Cargo.toml b/script/research/fud/fud/Cargo.toml index c1df19b00..d172c2133 100644 --- a/script/research/fud/fud/Cargo.toml +++ b/script/research/fud/fud/Cargo.toml @@ -21,11 +21,11 @@ futures-lite = "1.12.0" log = "0.4.17" serde_json = "1.0.85" simplelog = "0.12.0" -url = "2.2.2" +url = "2.3.1" # Argument parsing -serde = "1.0.144" -serde_derive = "1.0.144" +serde = "1.0.145" +serde_derive = "1.0.145" structopt = "0.3.26" structopt-toml = "0.5.1" diff --git a/script/research/nodes-tool/Cargo.toml b/script/research/nodes-tool/Cargo.toml index 2122296f0..be14f9297 100644 --- a/script/research/nodes-tool/Cargo.toml +++ b/script/research/nodes-tool/Cargo.toml @@ -11,7 +11,7 @@ features = ["blockchain", "node", "wallet"] async-std = "1.12.0" blake3 = "1.3.1" -serde = "1.0.144" +serde = "1.0.145" sled = "0.34.7" [workspace] diff --git a/script/research/raft-diag/Cargo.toml b/script/research/raft-diag/Cargo.toml index 8fcb2b913..e94078a11 100644 --- a/script/research/raft-diag/Cargo.toml +++ b/script/research/raft-diag/Cargo.toml @@ -22,13 +22,13 @@ log = "0.4.17" simplelog = "0.12.0" rand = "0.8.5" chrono = "0.4.22" -thiserror = "1.0.34" +thiserror = "1.0.35" ctrlc = { version = "3.2.3", features = ["termination"] } -url = "2.2.2" +url = "2.3.1" fxhash = "0.2.1" # Encoding and parsing -serde = {version = "1.0.144", features = ["derive"]} +serde = {version = "1.0.145", features = ["derive"]} serde_json = "1.0.85" structopt = "0.3.26" hex = "0.4.3" diff --git a/script/research/state_usage_analyser/Cargo.toml b/script/research/state_usage_analyser/Cargo.toml index d0d68bd52..8a1989a62 100644 --- a/script/research/state_usage_analyser/Cargo.toml +++ b/script/research/state_usage_analyser/Cargo.toml @@ -12,7 +12,7 @@ lazy-init = "0.5.1" log = "0.4.17" pasta_curves = "0.4.0" rand = "0.8.5" -serde = {version = "1.0.144", features = ["derive"]} +serde = {version = "1.0.145", features = ["derive"]} sled = "0.34.7" [workspace] diff --git a/src/node/client.rs b/src/node/client.rs index 5691b7e8c..c74fbdceb 100644 --- a/src/node/client.rs +++ b/src/node/client.rs @@ -1,8 +1,8 @@ use async_std::sync::{Arc, Mutex}; +use group::ff::PrimeField; use incrementalmerkletree::{bridgetree::BridgeTree, Tree}; use lazy_init::Lazy; use log::{debug, error, info}; -use pasta_curves::group::ff::PrimeField; use super::state::{state_transition, State}; use crate::{ diff --git a/src/sdk/Cargo.toml b/src/sdk/Cargo.toml index 15ebe6147..6d46d2bb1 100644 --- a/src/sdk/Cargo.toml +++ b/src/sdk/Cargo.toml @@ -5,5 +5,5 @@ edition = "2021" [dependencies] borsh = "0.9.3" -thiserror = "1.0.34" +thiserror = "1.0.35" wee_alloc = "0.4.5" diff --git a/src/serial/derive-internal/Cargo.toml b/src/serial/derive-internal/Cargo.toml index 32f6e05df..0ad3f0898 100644 --- a/src/serial/derive-internal/Cargo.toml +++ b/src/serial/derive-internal/Cargo.toml @@ -11,4 +11,4 @@ edition = "2021" [dependencies] proc-macro2 = "1.0.43" quote = "1.0.21" -syn = {version = "1.0.99", features = ["full", "fold"]} +syn = {version = "1.0.100", features = ["full", "fold"]} diff --git a/src/serial/derive/Cargo.toml b/src/serial/derive/Cargo.toml index 11db89421..4bb8bbbb0 100644 --- a/src/serial/derive/Cargo.toml +++ b/src/serial/derive/Cargo.toml @@ -14,6 +14,6 @@ proc-macro = true [dependencies] proc-macro-crate = "1.2.1" proc-macro2 = "1.0.43" -syn = {version = "1.0.99", features = ["full", "fold"]} +syn = {version = "1.0.100", features = ["full", "fold"]} darkfi-derive-internal = {path = "../derive-internal"} diff --git a/src/serial/mod.rs b/src/serial/mod.rs index 52723dd3e..2096f42ae 100644 --- a/src/serial/mod.rs +++ b/src/serial/mod.rs @@ -2,7 +2,7 @@ use std::io::{Cursor, Error, ErrorKind, Read, Write}; pub use darkfi_derive::{SerialDecodable, SerialEncodable}; -#[cfg(feature = "async-serial")] +#[cfg(feature = "async-runtime")] mod async_serial; mod encoding_types; diff --git a/src/tx/builder.rs b/src/tx/builder.rs index 2135d8768..3285ec234 100644 --- a/src/tx/builder.rs +++ b/src/tx/builder.rs @@ -1,4 +1,4 @@ -use pasta_curves::group::ff::Field; +use group::ff::Field; use rand::rngs::OsRng; use super::{ diff --git a/src/tx/mod.rs b/src/tx/mod.rs index 4f28e1718..7ef525244 100644 --- a/src/tx/mod.rs +++ b/src/tx/mod.rs @@ -1,7 +1,8 @@ -use log::error; -use pasta_curves::group::Group; use std::io; +use group::Group; +use log::error; + use crate::{ crypto::{ burn_proof::verify_burn_proof, diff --git a/src/util/cli.rs b/src/util/cli.rs index 6427a20a6..23c3cfe74 100644 --- a/src/util/cli.rs +++ b/src/util/cli.rs @@ -141,6 +141,7 @@ pub fn get_log_config() -> simplelog::Config { /// Ok(()) /// } /// ``` +#[cfg(feature = "async-runtime")] #[macro_export] macro_rules! async_daemonize { ($realmain:ident) => { diff --git a/src/util/mod.rs b/src/util/mod.rs index 8967b8c97..462261b54 100644 --- a/src/util/mod.rs +++ b/src/util/mod.rs @@ -1,3 +1,4 @@ +#[cfg(feature = "async-runtime")] /// async utility functions pub mod async_util;