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

EOY housekeeping

Missing features added, dependencies updated and a fix in dao/entrypoint
aggstam 3 лет назад
Родитель
Сommit
da40746ca5

+ 87 - 98
Cargo.lock

@@ -67,9 +67,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.66"
+version = "1.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
+checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
 
 [[package]]
 name = "arrayref"
@@ -264,9 +264,9 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524"
 
 [[package]]
 name = "async-trait"
-version = "0.1.59"
+version = "0.1.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364"
+checksum = "677d1d8ab452a3936018a687b20e6f7cf5363d713b732b8884001317b0e48aa3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -515,7 +515,7 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa"
 dependencies = [
  "camino",
  "cargo-platform",
- "semver 1.0.14",
+ "semver 1.0.16",
  "serde",
  "serde_json",
 ]
@@ -605,9 +605,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.0.29"
+version = "4.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d"
+checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39"
 dependencies = [
  "bitflags",
  "clap_derive",
@@ -687,16 +687,15 @@ dependencies = [
 
 [[package]]
 name = "console"
-version = "0.15.2"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c"
+checksum = "5556015fe3aad8b968e5d4124980fbe2f6aaee7aeec6b749de1faaa2ca5d0a4c"
 dependencies = [
  "encode_unicode 0.3.6",
  "lazy_static",
  "libc",
- "terminal_size",
  "unicode-width",
- "winapi",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -1070,9 +1069,9 @@ dependencies = [
 
 [[package]]
 name = "cxx"
-version = "1.0.83"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf"
+checksum = "5add3fc1717409d029b20c5b6903fc0c0b02fa6741d820054f4a2efa5e5816fd"
 dependencies = [
  "cc",
  "cxxbridge-flags",
@@ -1082,9 +1081,9 @@ dependencies = [
 
 [[package]]
 name = "cxx-build"
-version = "1.0.83"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39"
+checksum = "b4c87959ba14bc6fbc61df77c3fcfe180fc32b93538c4f1031dd802ccb5f2ff0"
 dependencies = [
  "cc",
  "codespan-reporting",
@@ -1097,15 +1096,15 @@ dependencies = [
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.83"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12"
+checksum = "69a3e162fde4e594ed2b07d0f83c6c67b745e7f28ce58c6df5e6b6bef99dfb59"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.83"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6"
+checksum = "3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1122,7 +1121,7 @@ dependencies = [
  "blake3",
  "bs58",
  "chrono",
- "clap 4.0.29",
+ "clap 4.0.32",
  "crypto_api_chachapoly",
  "darkfi-derive",
  "darkfi-derive-internal",
@@ -1549,7 +1548,7 @@ version = "0.3.0"
 dependencies = [
  "async-channel",
  "async-std",
- "clap 4.0.29",
+ "clap 4.0.32",
  "darkfi",
  "easy-parallel",
  "hex",
@@ -1579,7 +1578,7 @@ dependencies = [
  "anyhow",
  "async-std",
  "bs58",
- "clap 4.0.29",
+ "clap 4.0.32",
  "darkfi",
  "darkfi-money-contract",
  "darkfi-sdk",
@@ -1598,9 +1597,9 @@ dependencies = [
 
 [[package]]
 name = "dryoc"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c379d15d4e38e40b7a58aa961190e9a0d94aba6d331a1291a01be69335cf9f"
+checksum = "6f8ddb41c5ccec0f9de5e7d72d56112d6651963d2f596ea9a1e09844db58ec3f"
 dependencies = [
  "bitflags",
  "chacha20",
@@ -1950,7 +1949,7 @@ name = "fu"
 version = "0.3.0"
 dependencies = [
  "async-std",
- "clap 4.0.29",
+ "clap 4.0.32",
  "darkfi",
  "log",
  "serde_json",
@@ -2314,7 +2313,7 @@ checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
 dependencies = [
  "bytes",
  "fnv",
- "itoa 1.0.4",
+ "itoa 1.0.5",
 ]
 
 [[package]]
@@ -2461,7 +2460,7 @@ dependencies = [
  "async-trait",
  "bs58",
  "chrono",
- "clap 4.0.29",
+ "clap 4.0.32",
  "crypto_box",
  "ctrlc",
  "darkfi",
@@ -2492,7 +2491,7 @@ dependencies = [
  "async-trait",
  "bs58",
  "chrono",
- "clap 4.0.29",
+ "clap 4.0.32",
  "crypto_box",
  "ctrlc",
  "darkfi",
@@ -2517,9 +2516,9 @@ dependencies = [
 
 [[package]]
 name = "is-terminal"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330"
+checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
 dependencies = [
  "hermit-abi 0.2.6",
  "io-lifetimes",
@@ -2544,9 +2543,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
 
 [[package]]
 name = "itoa"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
+checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
 
 [[package]]
 name = "jpeg-decoder"
@@ -2586,9 +2585,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
 
 [[package]]
 name = "libc"
-version = "0.2.138"
+version = "0.2.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
+checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
 
 [[package]]
 name = "libloading"
@@ -2633,9 +2632,9 @@ dependencies = [
 
 [[package]]
 name = "link-cplusplus"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369"
+checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
 dependencies = [
  "cc",
 ]
@@ -2835,11 +2834,11 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
+checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
 dependencies = [
- "hermit-abi 0.1.19",
+ "hermit-abi 0.2.6",
  "libc",
 ]
 
@@ -2875,9 +2874,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
+checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
 
 [[package]]
 name = "opaque-debug"
@@ -2887,9 +2886,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssl"
-version = "0.10.44"
+version = "0.10.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29d971fd5722fec23977260f6e81aa67d2f22cadbdc2aa049f1022d9a3be1566"
+checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1"
 dependencies = [
  "bitflags",
  "cfg-if",
@@ -2919,9 +2918,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.79"
+version = "0.9.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5454462c0eced1e97f2ec09036abc8da362e66802f66fd20f86854d9d8cbcbc4"
+checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7"
 dependencies = [
  "autocfg",
  "cc",
@@ -3018,9 +3017,9 @@ dependencies = [
 
 [[package]]
 name = "paste"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1c2c742266c2f1041c914ba65355a83ae8747b05f208319784083583494b4b"
+checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
 
 [[package]]
 name = "pathfinder_geometry"
@@ -3058,9 +3057,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
 
 [[package]]
 name = "pest"
-version = "2.5.1"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc8bed3549e0f9b0a2a78bf7c0018237a2cdf085eecbbc048e52612438e4e9d0"
+checksum = "0f6e86fb9e7026527a0d46bc308b841d73170ef8f443e1807f6ef88526a816d4"
 dependencies = [
  "thiserror",
  "ucd-trie",
@@ -3200,9 +3199,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81bdd679d533107e090c2704a35982fc06302e30898e63ffa26a81155c012e92"
+checksum = "26f6a7b87c2e435a3241addceeeff740ff8b7e76b74c13bf9acb17fa454ea00b"
 
 [[package]]
 name = "ppv-lite86"
@@ -3212,13 +3211,13 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "prettytable-rs"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f375cb74c23b51d23937ffdeb48b1fbf5b6409d4b9979c1418c1de58bc8f801"
+checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a"
 dependencies = [
- "atty",
  "csv",
  "encode_unicode 1.0.0",
+ "is-terminal",
  "lazy_static",
  "term",
  "unicode-width",
@@ -3261,9 +3260,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.47"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
+checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"
 dependencies = [
  "unicode-ident",
 ]
@@ -3333,9 +3332,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
 [[package]]
 name = "quote"
-version = "1.0.21"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
 dependencies = [
  "proc-macro2",
 ]
@@ -3589,9 +3588,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.36.5"
+version = "0.36.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588"
+checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549"
 dependencies = [
  "bitflags",
  "errno",
@@ -3624,9 +3623,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.9"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8"
+checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70"
 
 [[package]]
 name = "rusty-fork"
@@ -3642,9 +3641,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
+checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
 
 [[package]]
 name = "salsa20"
@@ -3682,9 +3681,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "scratch"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
+checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
 
 [[package]]
 name = "sct"
@@ -3736,9 +3735,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.14"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"
+checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
 dependencies = [
  "serde",
 ]
@@ -3754,9 +3753,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.150"
+version = "1.0.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91"
+checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
 dependencies = [
  "serde_derive",
 ]
@@ -3774,9 +3773,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.150"
+version = "1.0.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e"
+checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3785,11 +3784,11 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.89"
+version = "1.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
+checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
 dependencies = [
- "itoa 1.0.4",
+ "itoa 1.0.5",
  "ryu",
  "serde",
 ]
@@ -4015,7 +4014,7 @@ dependencies = [
  "hashlink",
  "hex",
  "indexmap",
- "itoa 1.0.4",
+ "itoa 1.0.5",
  "libc",
  "libsqlite3-sys",
  "log",
@@ -4162,9 +4161,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "syn"
-version = "1.0.105"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
+checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4212,7 +4211,7 @@ version = "0.4.0"
 dependencies = [
  "async-std",
  "chrono",
- "clap 4.0.29",
+ "clap 4.0.32",
  "colored",
  "darkfi",
  "log",
@@ -4296,16 +4295,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "terminal_size"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "termion"
 version = "1.5.6"
@@ -4352,18 +4341,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
+checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
+checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4387,7 +4376,7 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
 dependencies = [
- "itoa 1.0.4",
+ "itoa 1.0.5",
  "libc",
  "num_threads",
  "serde",
@@ -4546,9 +4535,9 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
+checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
 
 [[package]]
 name = "unicode-linebreak"
@@ -4642,7 +4631,7 @@ name = "vanityaddr"
 version = "0.3.0"
 dependencies = [
  "bs58",
- "clap 4.0.29",
+ "clap 4.0.32",
  "ctrlc",
  "darkfi",
  "darkfi-sdk",
@@ -5286,6 +5275,6 @@ dependencies = [
 name = "zkas"
 version = "0.3.0"
 dependencies = [
- "clap 4.0.29",
+ "clap 4.0.32",
  "darkfi",
 ]

+ 6 - 6
Cargo.toml

@@ -51,13 +51,13 @@ members = [
 
 [dependencies]
 # Hard dependencies
-libc = "0.2.138"
+libc = "0.2.139"
 log = "0.4.17"
-thiserror = "1.0.37"
+thiserror = "1.0.38"
 
 # async-runtime
 async-std = {version = "1.12.0", features = ["attributes"], optional = true}
-async-trait = {version = "0.1.59", optional = true}
+async-trait = {version = "0.1.60", optional = true}
 futures = {version = "0.3.25", optional = true}
 smol = {version = "1.3.0", optional = true}
 
@@ -75,8 +75,8 @@ rustls-pemfile = {version = "1.0.1", optional = true}
 # Encoding
 bs58 = {version = "0.4.0", optional = true}
 hex = {version = "0.4.3", optional = true}
-serde_json = {version = "1.0.89", optional = true}
-serde = {version = "1.0.150", features = ["derive"], optional = true}
+serde_json = {version = "1.0.91", optional = true}
+serde = {version = "1.0.152", features = ["derive"], optional = true}
 structopt = {version= "0.3.26", optional = true}
 structopt-toml = {version= "0.5.1", optional = true}
 toml = {version = "0.5.10", optional = true}
@@ -127,7 +127,7 @@ sqlx = {version = "0.6.2", features = ["runtime-async-std-native-tls", "sqlite"]
 sled = {version = "0.34.7", optional = true}
 
 [dev-dependencies]
-clap = {version = "4.0.29", features = ["derive"]}
+clap = {version = "4.0.32", 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.4"

+ 9 - 9
bin/cashierd/Cargo.toml

@@ -17,7 +17,7 @@ features = ["wallet", "node", "rpc"]
 smol = "1.3.0"
 futures = "0.3.25"
 async-std = "1.12.0"
-async-trait = "0.1.59"
+async-trait = "0.1.60"
 async-channel = "1.8.0"
 async-executor = "1.5.0"
 easy-parallel = "3.2.0"
@@ -26,20 +26,20 @@ easy-parallel = "3.2.0"
 rand = "0.8.5"
 
 # Misc
-clap = {version = "4.0.29", features = ["derive"]}
+clap = {version = "4.0.32", features = ["derive"]}
 log = "0.4.17"
-num_cpus = "1.14.0"
+num_cpus = "1.15.0"
 simplelog = "0.12.0"
-thiserror = "1.0.37"
+thiserror = "1.0.38"
 url = "2.3.1"
 
 # Encoding and parsing
-serde = {version = "1.0.150", features = ["derive"]}
-serde_json = "1.0.89"
+serde = {version = "1.0.152", features = ["derive"]}
+serde_json = "1.0.91"
 
 # Bitcoin bridge dependencies
 bdk = {version = "0.25.0", optional = true}
-anyhow = {version = "1.0.66", optional = true}
+anyhow = {version = "1.0.68", optional = true}
 bitcoin = {version = "0.29.1", optional = true}
 secp256k1 = {version = "0.25.0", default-features = false, features = ["rand-std"], optional = true}
 
@@ -53,8 +53,8 @@ num-bigint = {version = "0.4.3", features = ["rand", "serde"], optional = true}
 # Solana bridge dependencies
 native-tls = {version = "0.2.11", optional = true}
 async-native-tls = {version = "0.4.0", optional = true}
-solana-client = {version = "1.14.10", optional = true}
-solana-sdk = {version = "1.14.10", optional = true}
+solana-client = {version = "1.14.11", optional = true}
+solana-sdk = {version = "1.14.11", optional = true}
 spl-associated-token-account = {version = "1.1.2", features = ["no-entrypoint"], optional = true}
 spl-token = {version = "3.5.0", features = ["no-entrypoint"], optional = true}
 tungstenite = {version = "0.18.0", optional = true}

+ 5 - 5
bin/dao/dao-cli/Cargo.toml

@@ -17,17 +17,17 @@ features = ["rpc"]
 smol = "1.3.0"
 futures = "0.3.25"
 async-std = {version = "1.12.0", features = ["attributes"]}
-async-trait = "0.1.59"
+async-trait = "0.1.60"
 async-channel = "1.8.0"
 async-executor = "1.5.0"
 
 # Misc
-clap = {version = "4.0.29", features = ["derive"]}
+clap = {version = "4.0.32", features = ["derive"]}
 log = "0.4.17"
-num_cpus = "1.14.0"
+num_cpus = "1.15.0"
 simplelog = "0.12.0"
 url = "2.3.1"
-prettytable-rs = "0.9.0"
+prettytable-rs = "0.10.0"
 
 # Encoding and parsing
-serde_json = "1.0.89"
+serde_json = "1.0.91"

+ 4 - 4
bin/dao/daod/Cargo.toml

@@ -17,16 +17,16 @@ darkfi-serial = {path = "../../../src/serial"}
 smol = "1.3.0"
 futures = "0.3.25"
 async-std = {version = "1.12.0", features = ["attributes"]}
-async-trait = "0.1.59"
+async-trait = "0.1.60"
 async-channel = "1.8.0"
 async-executor = "1.5.0"
 easy-parallel = "3.2.0"
 
 # Misc
 log = "0.4.17"
-num_cpus = "1.14.0"
+num_cpus = "1.15.0"
 simplelog = "0.12.0"
-thiserror = "1.0.37"
+thiserror = "1.0.38"
 
 # Crypto
 halo2_gadgets = "0.2.0"
@@ -37,7 +37,7 @@ pasta_curves = "0.4.1"
 incrementalmerkletree = "0.3.0"
 
 # Encoding and parsing
-serde_json = "1.0.89"
+serde_json = "1.0.91"
 bs58 = "0.4.0"
 
 # Utilities

+ 3 - 3
bin/darkfid/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2021"
 
 [dependencies]
 async-std = "1.12.0"
-async-trait = "0.1.59"
+async-trait = "0.1.60"
 blake3 = "1.3.3"
 bs58 = "0.4.0"
 ctrlc = { version = "3.2.4", features = ["termination"] }
@@ -19,7 +19,7 @@ darkfi-sdk = {path = "../../src/sdk"}
 darkfi-serial = {path = "../../src/serial"}
 easy-parallel = "3.2.0"
 log = "0.4.17"
-serde_json = "1.0.89"
+serde_json = "1.0.91"
 simplelog = "0.12.0"
 sled = "0.34.7"
 smol = "1.3.0"
@@ -27,6 +27,6 @@ sqlx = {version = "0.6.2", features = ["runtime-async-std-native-tls", "sqlite"]
 url = "2.3.1"
 
 # Argument parsing
-serde = {version = "1.0.150", features = ["derive"]}
+serde = {version = "1.0.152", features = ["derive"]}
 structopt = "0.3.26"
 structopt-toml = "0.5.1"

+ 3 - 3
bin/darkwiki/darkwiki-cli/Cargo.toml

@@ -14,7 +14,7 @@ darkfi = {path = "../../../", features = ["rpc"]}
 # Async
 smol = "1.3.0"
 async-std = {version = "1.12.0", features = ["attributes"]}
-async-trait = "0.1.59"
+async-trait = "0.1.60"
 async-channel = "1.8.0"
 futures = "0.3.25"
 
@@ -25,6 +25,6 @@ rand = "0.8.5"
 url = "2.3.1"
 
 # Encoding and parsing
-serde = {version = "1.0.150", features = ["derive"]}
-serde_json = "1.0.89"
+serde = {version = "1.0.152", features = ["derive"]}
+serde_json = "1.0.91"
 structopt = "0.3.26"

+ 5 - 5
bin/darkwiki/darkwikid/Cargo.toml

@@ -10,19 +10,19 @@ edition = "2021"
 
 [dependencies]
 async-std = "1.12.0"
-async-trait = "0.1.59"
+async-trait = "0.1.60"
 blake3 = "1.3.3"
 bs58 = "0.4.0"
 darkfi = {path = "../../../", features = ["raft", "rpc", "util"]}
 darkfi-serial = {path = "../../../src/serial"}
-dryoc = "0.4.2"
+dryoc = "0.4.3"
 easy-parallel = "3.2.0"
 futures = "0.3.25"
 lazy_static = "1.4.0"
 log = "0.4.17"
-serde = "1.0.150"
-serde_derive = "1.0.150"
-serde_json = "1.0.89"
+serde = "1.0.152"
+serde_derive = "1.0.152"
+serde_json = "1.0.91"
 signal-hook-async-std = "0.2.2"
 signal-hook = "0.3.14"
 simplelog = "0.12.0"

+ 5 - 5
bin/dnetview/Cargo.toml

@@ -24,15 +24,15 @@ easy-parallel = "3.2.0"
 async-channel = "1.8.0"
 
 # Misc
-clap = {version = "4.0.29", features = ["derive"]}
+clap = {version = "4.0.32", features = ["derive"]}
 rand = "0.8.5"
 simplelog = "0.12.0"
 log = "0.4.17"
-num_cpus = "1.14.0"
+num_cpus = "1.15.0"
 url = "2.3.1"
-thiserror = "1.0.37"
+thiserror = "1.0.38"
 
 # Encoding and parsing
-serde_json = "1.0.89"
-serde = {version = "1.0.150", features = ["derive"]}
+serde_json = "1.0.91"
+serde = {version = "1.0.152", features = ["derive"]}
 hex = "0.4.3"

+ 4 - 4
bin/drk/Cargo.toml

@@ -9,17 +9,17 @@ license = "AGPL-3.0-only"
 edition = "2021"
 
 [dependencies]
-anyhow = "1.0.66"
+anyhow = "1.0.68"
 async-std = {version = "1.12.0", features = ["attributes"]}
 bs58 = "0.4.0"
-clap = {version = "4.0.29", features = ["derive"]}
+clap = {version = "4.0.32", features = ["derive"]}
 darkfi = {path = "../../", features = ["blockchain", "rpc", "util", "wallet"]}
 darkfi-sdk = {path = "../../src/sdk"}
 darkfi-serial = {path = "../../src/serial", features = ["derive", "crypto"]}
 darkfi-money-contract = {path = "../../src/contract/money", features = ["no-entrypoint", "client"]}
-prettytable-rs = "0.9.0"
+prettytable-rs = "0.10.0"
 rand = "0.8.5"
-serde_json = "1.0.89"
+serde_json = "1.0.91"
 smol = "1.3.0"
 simplelog = "0.12.0"
 signal-hook-async-std = "0.2.2"

+ 3 - 3
bin/faucetd/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2021"
 
 [dependencies]
 async-std = "1.12.0"
-async-trait = "0.1.59"
+async-trait = "0.1.60"
 blake3 = "1.3.3"
 chrono = "0.4.23"
 ctrlc = { version = "3.2.4", features = ["termination"] }
@@ -21,7 +21,7 @@ darkfi-money-contract = {path = "../../src/contract/money", features = ["no-entr
 easy-parallel = "3.2.0"
 log = "0.4.17"
 rand = "0.8.5"
-serde_json = "1.0.89"
+serde_json = "1.0.91"
 simplelog = "0.12.0"
 sled = "0.34.7"
 smol = "1.3.0"
@@ -29,6 +29,6 @@ sqlx = {version = "0.6.2", features = ["runtime-async-std-native-tls", "sqlite"]
 url = "2.3.1"
 
 # Argument parsing
-serde = {version = "1.0.150", features = ["derive"]}
+serde = {version = "1.0.152", features = ["derive"]}
 structopt = "0.3.26"
 structopt-toml = "0.5.1"

+ 2 - 2
bin/fud/fu/Cargo.toml

@@ -15,8 +15,8 @@ darkfi = {path = "../../../", features = ["util", "rpc"]}
 async-std = {version = "1.12.0", features = ["attributes"]}
 
 # Misc
-clap = {version = "4.0.29", features = ["derive"]}
+clap = {version = "4.0.32", features = ["derive"]}
 log = "0.4.17"
-serde_json = "1.0.89"
+serde_json = "1.0.91"
 simplelog = "0.12.0"
 url = "2.3.1"

+ 3 - 3
bin/fud/fud/Cargo.toml

@@ -14,7 +14,7 @@ darkfi-serial = {path = "../../../src/serial"}
 
 # Async
 async-std = "1.12.0"
-async-trait = "0.1.59"
+async-trait = "0.1.60"
 ctrlc = { version = "3.2.4", features = ["termination"] }
 easy-parallel = "3.2.0"
 smol = "1.3.0"
@@ -22,11 +22,11 @@ smol = "1.3.0"
 # Misc
 blake3 = "1.3.3"
 log = "0.4.17"
-serde_json = "1.0.89"
+serde_json = "1.0.91"
 simplelog = "0.12.0"
 url = "2.3.1"
 
 # Argument parsing
-serde = {version = "1.0.150", features = ["derive"]}
+serde = {version = "1.0.152", features = ["derive"]}
 structopt = "0.3.26"
 structopt-toml = "0.5.1"

+ 4 - 4
bin/ircd/Cargo.toml

@@ -18,7 +18,7 @@ futures = "0.3.25"
 futures-rustls = "0.22.2"
 rustls-pemfile = "1.0.1"
 async-std = "1.12.0"
-async-trait = "0.1.59"
+async-trait = "0.1.60"
 easy-parallel = "3.2.0"
 async-recursion = "1.0.0"
 
@@ -27,7 +27,7 @@ crypto_box = "0.8.2"
 rand = "0.8.5"
 
 # Misc
-clap = {version = "4.0.29", features = ["derive"]}
+clap = {version = "4.0.32", features = ["derive"]}
 log = "0.4.17"
 simplelog = "0.12.0"
 ctrlc = { version = "3.2.4", features = ["termination"] }
@@ -36,8 +36,8 @@ chrono = "0.4.23"
 ripemd = "0.1.3"
 
 # Encoding and parsing
-serde_json = "1.0.89"
-serde = {version = "1.0.150", features = ["derive"]}
+serde_json = "1.0.91"
+serde = {version = "1.0.152", features = ["derive"]}
 structopt = "0.3.26"
 structopt-toml = "0.5.1"
 bs58 = "0.4.0"

+ 4 - 4
bin/ircd2/Cargo.toml

@@ -18,7 +18,7 @@ futures = "0.3.25"
 futures-rustls = "0.22.2"
 rustls-pemfile = "1.0.1"
 async-std = "1.12.0"
-async-trait = "0.1.59"
+async-trait = "0.1.60"
 easy-parallel = "3.2.0"
 
 # Crypto
@@ -26,7 +26,7 @@ crypto_box = "0.8.2"
 rand = "0.8.5"
 
 # Misc
-clap = {version = "4.0.29", features = ["derive"]}
+clap = {version = "4.0.32", features = ["derive"]}
 log = "0.4.17"
 simplelog = "0.12.0"
 ctrlc = { version = "3.2.4", features = ["termination"] }
@@ -35,8 +35,8 @@ chrono = "0.4.23"
 ripemd = "0.1.3"
 
 # Encoding and parsing
-serde_json = "1.0.89"
-serde = {version = "1.0.150", features = ["derive"]}
+serde_json = "1.0.91"
+serde = {version = "1.0.152", features = ["derive"]}
 structopt = "0.3.26"
 structopt-toml = "0.5.1"
 bs58 = "0.4.0"

+ 3 - 3
bin/lilith/Cargo.toml

@@ -13,19 +13,19 @@ darkfi = {path = "../../", features = ["net", "rpc"]}
 
 # Async
 async-std = "1.12.0"
-async-trait = "0.1.59"
+async-trait = "0.1.60"
 ctrlc = { version = "3.2.4", features = ["termination"] }
 easy-parallel = "3.2.0"
 smol = "1.3.0"
 
 # Misc
 log = "0.4.17"
-serde_json = "1.0.89"
+serde_json = "1.0.91"
 simplelog = "0.12.0"
 url = "2.3.1"
 
 # Argument parsing
-serde = {version = "1.0.150", features = ["derive"]}
+serde = {version = "1.0.152", features = ["derive"]}
 structopt = "0.3.26"
 structopt-toml = "0.5.1"
 toml = "0.5.10"

+ 4 - 4
bin/tau/tau-cli/Cargo.toml

@@ -11,13 +11,13 @@ repository = "https://github.com/darkrenaissance/darkfi"
 [dependencies]
 async-std = {version = "1.12.0", features = ["attributes"]}
 chrono = "0.4.23"
-clap = {version = "4.0.29", features = ["derive"]}
+clap = {version = "4.0.32", features = ["derive"]}
 colored = "2.0.0"
 darkfi = { path = "../../../", features = ["rpc"]}
 log = "0.4.17"
-prettytable-rs = "0.9.0"
-serde = {version = "1.0.150", features = ["derive"]}
-serde_json = "1.0.89"
+prettytable-rs = "0.10.0"
+serde = {version = "1.0.152", features = ["derive"]}
+serde_json = "1.0.91"
 simplelog = "0.12.0"
 term_grid = { git = "https://github.com/Dastan-glitch/rust-term-grid.git" }
 textwrap = "0.15.2"

+ 4 - 4
bin/tau/taud/Cargo.toml

@@ -15,7 +15,7 @@ darkfi-serial = { path = "../../../src/serial" }
 # Async
 smol = "1.3.0"
 async-std = {version = "1.12.0", features = ["attributes"]}
-async-trait = "0.1.59"
+async-trait = "0.1.60"
 easy-parallel = "3.2.0"
 futures = "0.3.25"
 
@@ -24,13 +24,13 @@ log = "0.4.17"
 simplelog = "0.12.0"
 rand = "0.8.5"
 chrono = "0.4.23"
-thiserror = "1.0.37"
+thiserror = "1.0.38"
 ctrlc = { version = "3.2.4", features = ["termination"] }
 url = "2.3.1"
 
 # Encoding and parsing
-serde = {version = "1.0.150", features = ["derive"]}
-serde_json = "1.0.89"
+serde = {version = "1.0.152", features = ["derive"]}
+serde_json = "1.0.91"
 structopt = "0.3.26"
 structopt-toml = "0.5.1"
 crypto_box = {version = "0.8.2", features = ["std"]}

+ 2 - 2
bin/vanityaddr/Cargo.toml

@@ -10,11 +10,11 @@ edition = "2021"
 
 [dependencies]
 bs58 = "0.4.0"
-clap = {version = "4.0.29", features = ["derive"]}
+clap = {version = "4.0.32", features = ["derive"]}
 ctrlc = "3.2.4"
 darkfi = {path = "../../"}
 darkfi-sdk = {path = "../../src/sdk"}
 indicatif = "0.17.2"
-num_cpus = "1.14.0"
+num_cpus = "1.15.0"
 rand = "0.8.5"
 rayon = "1.6.1"

+ 1 - 1
bin/zkas/Cargo.toml

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

+ 5 - 5
example/dao/Cargo.toml

@@ -14,16 +14,16 @@ darkfi-sdk = {path = "../../src/sdk"}
 smol = "1.3.0"
 futures = "0.3.25"
 async-std = {version = "1.12.0", features = ["attributes"]}
-async-trait = "0.1.59"
+async-trait = "0.1.60"
 async-channel = "1.8.0"
 async-executor = "1.5.0"
 easy-parallel = "3.2.0"
 
 # Misc
 log = "0.4.17"
-num_cpus = "1.14.0"
+num_cpus = "1.15.0"
 simplelog = "0.12.0"
-thiserror = "1.0.37"
+thiserror = "1.0.38"
 
 # Crypto
 incrementalmerkletree = "0.3.0"
@@ -32,10 +32,10 @@ halo2_gadgets = "0.2.0"
 halo2_proofs = "0.2.0"
 rand = "0.8.5"
 chacha20poly1305 = "0.10.1"
-group = "0.12.1"
+group = "0.13.0"
 
 # Encoding and parsing
-serde_json = "1.0.89"
+serde_json = "1.0.91"
 bs58 = "0.4.0"
 fxhash = "0.2.1"
 

+ 5 - 5
example/dao2/Cargo.toml

@@ -23,16 +23,16 @@ sled = "0.34.7"
 smol = "1.3.0"
 futures = "0.3.25"
 async-std = {version = "1.12.0", features = ["attributes"]}
-async-trait = "0.1.59"
+async-trait = "0.1.60"
 async-channel = "1.8.0"
 async-executor = "1.5.0"
 easy-parallel = "3.2.0"
 
 # Misc
 log = "0.4.17"
-num_cpus = "1.14.0"
+num_cpus = "1.15.0"
 simplelog = "0.12.0"
-thiserror = "1.0.37"
+thiserror = "1.0.38"
 
 # Crypto
 incrementalmerkletree = "0.3.0"
@@ -41,10 +41,10 @@ halo2_gadgets = "0.2.0"
 halo2_proofs = "0.2.0"
 rand = "0.8.5"
 chacha20poly1305 = "0.10.1"
-group = "0.12.1"
+group = "0.13.0"
 
 # Encoding and parsing
-serde_json = "1.0.89"
+serde_json = "1.0.91"
 bs58 = "0.4.0"
 fxhash = "0.2.1"
 

+ 4 - 4
example/dchat/Cargo.toml

@@ -16,16 +16,16 @@ darkfi-serial = {path = "../../src/serial"}
 
 # ANCHOR: dependencies
 async-std = "1.12.0"
-async-trait = "0.1.59"
+async-trait = "0.1.60"
 easy-parallel = "3.2.0"
 smol = "1.3.0"
-num_cpus = "1.14.0"
+num_cpus = "1.15.0"
 
 log = "0.4.17"
 simplelog = "0.12.0"
 url = "2.3.1"
 
-serde_json = "1.0.89"
-serde = {version = "1.0.150", features = ["derive"]}
+serde_json = "1.0.91"
+serde = {version = "1.0.152", features = ["derive"]}
 toml = "0.5.10"
 # ANCHOR_END: dependencies

+ 3 - 3
example/p2pdebug/Cargo.toml

@@ -15,7 +15,7 @@ darkfi = {path = "../../", features = ["net", "rpc"]}
 smol = "1.3.0"
 futures = "0.3.25"
 async-std = "1.12.0"
-async-trait = "0.1.59"
+async-trait = "0.1.60"
 async-channel = "1.8.0"
 async-executor = "1.5.0"
 easy-parallel = "3.2.0"
@@ -24,11 +24,11 @@ easy-parallel = "3.2.0"
 rand = "0.8.5"
 
 # Misc
-clap = {version = "4.0.29", features = ["derive"]}
+clap = {version = "4.0.32", features = ["derive"]}
 log = "0.4.17"
 simplelog = "0.12.0"
 fxhash = "0.2.1"
 url = "2.3.1"
 
 # Encoding and parsing
-serde_json = "1.0.89"
+serde_json = "1.0.91"

+ 4 - 4
script/research/dhtd/Cargo.toml

@@ -13,19 +13,19 @@ features = ["dht"]
 async-channel = "1.8.0"
 async-executor = "1.5.0"
 async-std = "1.12.0"
-async-trait = "0.1.59"
+async-trait = "0.1.60"
 blake3 = "1.3.3"
 ctrlc = { version = "3.2.4", features = ["termination"] }
 easy-parallel = "3.2.0"
 futures-lite = "1.12.0"
 log = "0.4.17"
-serde_json = "1.0.89"
+serde_json = "1.0.91"
 simplelog = "0.12.0"
 url = "2.3.1"
 
 # Argument parsing
-serde = "1.0.150"
-serde_derive = "1.0.150"
+serde = "1.0.152"
+serde_derive = "1.0.152"
 structopt = "0.3.26"
 structopt-toml = "0.5.1"
 

+ 1 - 1
script/research/nodes-tool/Cargo.toml

@@ -13,5 +13,5 @@ blake3 = "1.3.3"
 darkfi = {path = "../../../", features = ["blockchain", "wallet", "rpc"]}
 darkfi-sdk = {path = "../../../src/sdk"}
 darkfi-serial = {path = "../../../src/serial"}
-serde = "1.0.150"
+serde = "1.0.152"
 sled = "0.34.7"

+ 4 - 4
script/research/raft-diag/Cargo.toml

@@ -12,7 +12,7 @@ darkfi = {path = "../../../", features = ["raft"]}
 # Async
 smol = "1.3.0"
 async-std = {version = "1.12.0", features = ["attributes"]}
-async-trait = "0.1.59"
+async-trait = "0.1.60"
 async-channel = "1.8.0"
 async-executor = "1.5.0"
 easy-parallel = "3.2.0"
@@ -23,14 +23,14 @@ log = "0.4.17"
 simplelog = "0.12.0"
 rand = "0.8.5"
 chrono = "0.4.23"
-thiserror = "1.0.37"
+thiserror = "1.0.38"
 ctrlc = { version = "3.2.4", features = ["termination"] }
 url = "2.3.1"
 fxhash = "0.2.1"
 
 # Encoding and parsing
-serde = {version = "1.0.150", features = ["derive"]}
-serde_json = "1.0.89"
+serde = {version = "1.0.152", features = ["derive"]}
+serde_json = "1.0.91"
 structopt = "0.3.26"
 hex = "0.4.3"
 bs58 = "0.4.0"

+ 1 - 1
script/research/x3dh/Cargo.toml

@@ -9,7 +9,7 @@ edition = "2021"
 
 [dependencies]
 sha2 = "0.10.6"
-digest = "0.10.6"
+digest = "0.11.0-pre"
 rand = "0.8.5"
 aes-gcm-siv = "0.11.1"
 curve25519-dalek = {version = "4.0.0-pre.5", features = ["digest"]}

+ 2 - 2
src/contract/dao/Cargo.toml

@@ -11,12 +11,12 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 darkfi-sdk = { path = "../../sdk" }
 darkfi-serial = { path = "../../serial", features = ["derive", "crypto"] }
-darkfi-money-contract = { path = "../money", features = ["no-entrypoint"] }
+darkfi-money-contract = { path = "../money", features = ["client", "no-entrypoint"] }
 
 # The following dependencies are used for the client API and
 # probably shouldn't be in WASM
 chacha20poly1305 = { version = "0.10.1", optional = true }
-darkfi = { path = "../../../", features = ["zk", "rpc"], optional = true }
+darkfi = { path = "../../../", features = ["zk", "rpc", "blockchain"], optional = true }
 halo2_proofs = { version = "0.2.0", optional = true }
 log = { version = "0.4.17", optional = true }
 rand = { version = "0.8.5", optional = true }

+ 6 - 2
src/contract/dao/src/entrypoint.rs

@@ -16,6 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+use std::io::Cursor;
+
 use darkfi_sdk::{
     crypto::{
         contract_id::{DAO_CONTRACT_ID, MONEY_CONTRACT_ID},
@@ -33,7 +35,7 @@ use darkfi_sdk::{
     tx::ContractCall,
     util::set_return_data,
 };
-use darkfi_serial::{deserialize, serialize, Encodable, WriteExt};
+use darkfi_serial::{deserialize, serialize, Decodable, Encodable, WriteExt};
 
 use darkfi_money_contract::{
     state::MoneyTransferParams, MoneyFunction, MONEY_CONTRACT_COIN_ROOTS_TREE,
@@ -100,7 +102,9 @@ fn init_contract(cid: ContractId, _ix: &[u8]) -> ContractResult {
         Some(bytes) => {
             // We found some bytes, try to deserialize into a tree.
             // For now, if this doesn't work, we bail.
-            let _: MerkleTree = deserialize(&bytes)?;
+            let mut decoder = Cursor::new(&bytes);
+            <i32 as Decodable>::decode(&mut decoder)?;
+            <MerkleTree as Decodable>::decode(&mut decoder)?;
         }
         None => {
             // We didn't find a tree, so just make a new one.

+ 1 - 1
src/sdk/Cargo.toml

@@ -20,7 +20,7 @@ features = [
 
 [dependencies]
 # Error handling
-thiserror = "1.0.37"
+thiserror = "1.0.38"
 
 # Encoding
 bs58 = "0.4.0"

+ 3 - 3
src/serial/derive-internal/Cargo.toml

@@ -9,6 +9,6 @@ license = "AGPL-3.0-only"
 edition = "2021"
 
 [dependencies]
-proc-macro2 = "1.0.47"
-quote = "1.0.21"
-syn = {version = "1.0.105", features = ["full", "fold"]}
+proc-macro2 = "1.0.49"
+quote = "1.0.23"
+syn = {version = "1.0.107", features = ["full", "fold"]}

+ 2 - 2
src/serial/derive/Cargo.toml

@@ -13,7 +13,7 @@ proc-macro = true
 
 [dependencies]
 proc-macro-crate = "1.2.1"
-proc-macro2 = "1.0.47"
-syn = {version = "1.0.105", features = ["full", "fold"]}
+proc-macro2 = "1.0.49"
+syn = {version = "1.0.107", features = ["full", "fold"]}
 
 darkfi-derive-internal = {path = "../derive-internal"}