Просмотр исходного кода

Mop up dependencies and features.

Luther Blissett 3 лет назад
Родитель
Сommit
6fc5b43d54

+ 0 - 3
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",

+ 204 - 179
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}
+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}
 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}
-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}
+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,182 +131,210 @@ 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",
+blockchain = [
+    "blake3",
+    "chrono",
+    "group",
+    "halo2_gadgets",
+    "halo2_proofs",
+    "incrementalmerkletree",
+    "lazy-init",
+    "lazy_static",
+    "pasta_curves",
+    "rand",
+    "sled",
+    "url",
+
+    "async-runtime",
+    "crypto",
+    "net",
+    "serial",
+    "tx",
+    "node",
+    "util",
 ]
 
-util = [
+crypto = [
+    "blake2b_simd",
     "blake3",
     "bs58",
+    "crypto_api_chachapoly",
+    "fxhash",
+    "group",
+    "halo2_gadgets",
+    "halo2_proofs",
     "hex",
-    "bincode",
+    "incrementalmerkletree",
+    "lazy_static",
+    "num-bigint",
+    "num-traits",
+    "pasta_curves",
+    "rand",
     "serde",
-    "toml",
-    "url",
-    "simplelog",
     "serde_json",
-    "dirs",
-    "fxhash",
-    "chrono",
-    "indicatif",
-    "termion",
+    "sha2",
+    "subtle",
 
-    "async-runtime",
+    "util",
     "serial",
+    "zkas",
 ]
 
-async-serial = [
-    "futures",
+dht = [
+    "blake3",
+    "chrono",
+    "fxhash",
+    "rand",
 
+    "async-runtime",
+    "net",
     "serial",
 ]
 
-serial = [
-    "darkfi-derive",
-    "darkfi-derive-internal",
+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",
 ]
 
-rpc = [
-	"rand",
-	"url",
-	"fast-socks5",
+node = [
+    "bs58",
+    "group",
+    "incrementalmerkletree",
+    "lazy-init",
 
-	"async-runtime",
-	"net",
+    "async-runtime",
+    "blockchain",
+    "crypto",
+    "serial",
+    "tx",
+    "wallet",
 ]
 
-blockchain = [
-	"blake3",
-	"chrono",
-	"indexmap",
-	"sled",
-
-	"crypto",
-	"tx",
-	"net",
-	"node",
-	"util",
+raft = [
+    "chrono",
+    "fxhash",
+    "rand",
+    "sled",
+
+    "async-runtime",
+    "net",
+    "serial",
+    "util",
 ]
 
-system = [
-	"fxhash",
-	"rand",
+rpc = [
+    "hex",
+    "rand",
+    "serde",
+    "serde_json",
+    "url",
 
-	"async-runtime",
+    "async-runtime",
+    "net",
+    "serial",
 ]
 
-net = [
-	"fxhash",
-	"socket2",
-	"futures-rustls",
-	"fast-socks5",
-	"ed25519-compact",
-	"rcgen",
-	"rustls-pemfile",
-	"structopt",
-	"structopt-toml",
-
-	"async-serial",
-	"serial",
-	"system",
-	"util",
+serial = [
+    "darkfi-derive",
 ]
 
-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",
+system = [
+    "fxhash",
+    "rand",
+
+    "async-runtime",
 ]
 
-wallet = [
-	"sqlx",
-	"libsqlite3-sys",
-	"async-std",
+tx = [
+    "group",
+    "incrementalmerkletree",
+    "rand",
 
-	"crypto",
-	"util",
+    "serial",
+    "crypto",
 ]
 
-wasm-runtime = [
-	"drk-sdk",
-	"wasmer",
-	"wasmer-compiler-singlepass",
-	"wasmer-middlewares",
-]
+util = [
+    "chrono",
+    "dirs",
+    "indicatif",
+    "rand",
+    "simplelog",
+    "serde",
+    "serde_json",
+    "termion",
+    "toml",
+    "url",
 
-node = [
-	"url",
-	"bytes",
-	"lazy-init",
-
-	"async-runtime",
-	"blockchain",
-	"crypto",
-	"wallet",
-	"util",
-	"net",
+    "serial",
 ]
 
-zkas = [
-	"termion",
-	"indexmap",
-	"itertools",
+wallet = [
+    "async-std",
+    "bincode",
+    "bs58",
+    "group",
+    "rand",
+    "sqlx",
+    "incrementalmerkletree",
+    "libsqlite3-sys",
 
-	"serial",
+    "crypto",
+    "serial",
+    "util",
 ]
 
-raft = [
-	"blake3",
-	"sled",
+wasm-runtime = [
+    "wasmer",
+    "wasmer-compiler-singlepass",
+    "wasmer-middlewares",
 
-	"util",
-	"net",
-	"rpc",
+    "drk-sdk",
 ]
 
-tx = [
-	"crypto",
-	"util",
+websockets = [
+    "async-tungstenite",
+    "tungstenite",
 ]
 
-dht = [
-    "rand",
+zkas = [
+    "termion",
+    "indexmap",
+    "itertools",
 
-    "net",
-    "util",
+    "serial",
 ]
+# -----END LIBRARY FEATURES-----
 
 [[example]]
 name = "net"

+ 7 - 7
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}

+ 1 - 1
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"

+ 2 - 2
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"

+ 3 - 3
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"

+ 1 - 1
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"

+ 2 - 2
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"
 

+ 6 - 6
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"
 
 

+ 3 - 3
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"

+ 1 - 1
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"

+ 3 - 3
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"

+ 2 - 2
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"

+ 4 - 4
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"

+ 3 - 3
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"

+ 3 - 3
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"

+ 4 - 4
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"

+ 1 - 1
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"

+ 2 - 2
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"
 
 

+ 1 - 1
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"

+ 3 - 3
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"
 

+ 1 - 1
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]

+ 3 - 3
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"
 

+ 1 - 1
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]

+ 3 - 3
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"

+ 1 - 1
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]

+ 1 - 1
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::{

+ 1 - 1
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"

+ 1 - 1
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"]}

+ 1 - 1
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"}

+ 1 - 1
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;

+ 1 - 1
src/tx/builder.rs

@@ -1,4 +1,4 @@
-use pasta_curves::group::ff::Field;
+use group::ff::Field;
 use rand::rngs::OsRng;
 
 use super::{

+ 3 - 2
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,

+ 1 - 0
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) => {

+ 1 - 0
src/util/mod.rs

@@ -1,3 +1,4 @@
+#[cfg(feature = "async-runtime")]
 /// async utility functions
 pub mod async_util;