diff --git a/Cargo.lock b/Cargo.lock index 6ad349eae7..2b0a50c68b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -801,7 +801,7 @@ dependencies = [ "clap_lex 0.2.4", "indexmap 1.9.3", "once_cell", - "strsim", + "strsim 0.10.0", "termcolor", "textwrap 0.16.0", ] @@ -825,7 +825,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex 0.6.0", - "strsim", + "strsim 0.10.0", "terminal_size", ] @@ -1418,8 +1418,18 @@ version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.14.4", + "darling_macro 0.14.4", +] + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core 0.20.10", + "darling_macro 0.20.10", ] [[package]] @@ -1432,21 +1442,46 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn 1.0.109", ] +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.11.1", + "syn 2.0.74", +] + [[package]] name = "darling_macro" version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ - "darling_core", + "darling_core 0.14.4", "quote", "syn 1.0.109", ] +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core 0.20.10", + "quote", + "syn 2.0.74", +] + [[package]] name = "data-encoding" version = "2.4.0" @@ -1526,7 +1561,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" dependencies = [ - "darling", + "darling 0.14.4", "proc-macro2", "quote", "syn 1.0.109", @@ -1597,9 +1632,9 @@ dependencies = [ [[package]] name = "diesel" -version = "2.1.3" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2268a214a6f118fce1838edba3d1561cf0e78d8de785475957a580a7f8c69d33" +checksum = "158fe8e2e68695bd615d7e4f3227c0727b151330d3e253b525086c348d055d5e" dependencies = [ "bigdecimal", "chrono", @@ -1615,11 +1650,12 @@ dependencies = [ [[package]] name = "diesel_derives" -version = "2.1.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8337737574f55a468005a83499da720f20c65586241ffea339db9ecdfd2b44" +checksum = "e7f2c3de51e2ba6bf2a648285696137aaf0f5f487bcbea93972fe8a364e131a4" dependencies = [ "diesel_table_macro_syntax", + "dsl_auto_type", "proc-macro2", "quote", "syn 2.0.74", @@ -1627,9 +1663,9 @@ dependencies = [ [[package]] name = "diesel_migrations" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6036b3f0120c5961381b570ee20a02432d7e2d27ea60de9578799cf9156914ac" +checksum = "8a73ce704bad4231f001bff3314d91dce4aba0770cee8b233991859abc15c1f6" dependencies = [ "diesel", "migrations_internals", @@ -1638,9 +1674,9 @@ dependencies = [ [[package]] name = "diesel_table_macro_syntax" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" +checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25" dependencies = [ "syn 2.0.74", ] @@ -1718,6 +1754,20 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "669a445ee724c5c69b1b06fe0b63e70a1c84bc9bb7d9696cd4f4e3ec45050408" +[[package]] +name = "dsl_auto_type" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5d9abe6314103864cc2d8901b7ae224e0ab1a103a0a416661b4097b0779b607" +dependencies = [ + "darling 0.20.10", + "either", + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.74", +] + [[package]] name = "dtoa" version = "1.0.9" @@ -2366,6 +2416,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -3172,19 +3228,19 @@ dependencies = [ [[package]] name = "migrations_internals" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f23f71580015254b020e856feac3df5878c2c7a8812297edd6c0a485ac9dada" +checksum = "fd01039851e82f8799046eabbb354056283fb265c8ec0996af940f4e85a380ff" dependencies = [ "serde", - "toml 0.7.8", + "toml 0.8.8", ] [[package]] name = "migrations_macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce3325ac70e67bbab5bd837a31cae01f1a6db64e0e744a33cb03a543469ef08" +checksum = "ffb161cc72176cb37aa47f1fc520d3ef02263d67d661f44f05d05a079e1237fd" dependencies = [ "migrations_internals", "proc-macro2", @@ -5777,6 +5833,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "structopt" version = "0.3.26" @@ -6887,18 +6949,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.19.15", -] - [[package]] name = "toml" version = "0.8.8" @@ -6920,19 +6970,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.1.0", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - [[package]] name = "toml_edit" version = "0.20.7" diff --git a/base_layer/contacts/Cargo.toml b/base_layer/contacts/Cargo.toml index e3dc80a174..752f6e8baf 100644 --- a/base_layer/contacts/Cargo.toml +++ b/base_layer/contacts/Cargo.toml @@ -20,8 +20,8 @@ tari_shutdown = { path = "../../infrastructure/shutdown", version = "1.4.2-pre. tari_utilities = { version = "0.7" } chrono = { version = "0.4.19", default-features = false, features = ["serde"] } -diesel = { version = "2.0.3", features = ["sqlite", "serde_json", "chrono", "64-column-tables"] } -diesel_migrations = "2.0.0" +diesel = { version = "2.2.4", features = ["sqlite", "serde_json", "chrono", "64-column-tables"] } +diesel_migrations = "2.2" futures = { version = "^0.3.1", features = ["compat", "std"] } log = "0.4.6" num-derive = "0.4.2" diff --git a/base_layer/contacts/src/chat_client/Cargo.toml b/base_layer/contacts/src/chat_client/Cargo.toml index aebeb9407d..a30a66834b 100644 --- a/base_layer/contacts/src/chat_client/Cargo.toml +++ b/base_layer/contacts/src/chat_client/Cargo.toml @@ -24,7 +24,7 @@ tari_storage = { path = "../../../../infrastructure/storage" } anyhow = "1.0.41" async-trait = "0.1.52" config = { version = "0.14.0" } -diesel = { version = "2.0.3", features = ["sqlite", "r2d2", "serde_json", "chrono", "64-column-tables"] } +diesel = { version = "2.2.4", features = ["sqlite", "r2d2", "serde_json", "chrono", "64-column-tables"] } lmdb-zero = "0.4.4" log = "0.4.17" rand = "0.8" diff --git a/base_layer/key_manager/Cargo.toml b/base_layer/key_manager/Cargo.toml index 85878c49b7..23b0ec063e 100644 --- a/base_layer/key_manager/Cargo.toml +++ b/base_layer/key_manager/Cargo.toml @@ -23,8 +23,8 @@ chacha20poly1305 = "0.10.1" tokio = { version = "1.36", features = ["sync", "macros"] } futures = { version = "^0.3.1", features = ["compat", "std"] } log = { version = "0.4.6" } -diesel = { version = "2.0.3", features = ["sqlite", "serde_json", "chrono", "64-column-tables"] } -diesel_migrations = { version = "2.0.0" } +diesel = { version = "2.2.4", features = ["sqlite", "serde_json", "chrono", "64-column-tables"] } +diesel_migrations = { version = "2.2" } argon2 = { version = "0.4.1", features = ["std", "alloc"] } blake2 = "0.10" chacha20 = "0.7.1" diff --git a/base_layer/wallet/Cargo.toml b/base_layer/wallet/Cargo.toml index 33de4e8e79..0c3a350dce 100644 --- a/base_layer/wallet/Cargo.toml +++ b/base_layer/wallet/Cargo.toml @@ -37,8 +37,8 @@ borsh = "1.2" sha2 = "0.10" chrono = { version = "0.4.19", default-features = false, features = ["serde"] } derivative = "2.2.0" -diesel = { version = "2.0.3", features = ["sqlite", "serde_json", "chrono", "64-column-tables"] } -diesel_migrations = "2.0.0" +diesel = { version = "2.2.4", features = ["sqlite", "serde_json", "chrono", "64-column-tables"] } +diesel_migrations = "2.2" digest = "0.10" fs2 = "0.4.0" futures = { version = "^0.3.1", features = ["compat", "std"] } diff --git a/common_sqlite/Cargo.toml b/common_sqlite/Cargo.toml index a0332941fb..a83eb7413b 100644 --- a/common_sqlite/Cargo.toml +++ b/common_sqlite/Cargo.toml @@ -11,8 +11,8 @@ edition = "2018" [dependencies] tari_utilities = { version = "0.7" } -diesel = { version = "2.0.3", features = ["sqlite", "r2d2", "serde_json", "chrono", "64-column-tables"] } -diesel_migrations = "2.0.0" +diesel = { version = "2.2.4", features = ["sqlite", "r2d2", "serde_json", "chrono", "64-column-tables"] } +diesel_migrations = "2.2" log = "0.4.6" serde = "1.0.90" thiserror = "1.0.26" diff --git a/comms/dht/Cargo.toml b/comms/dht/Cargo.toml index a2f014ed60..c1b521d4dd 100644 --- a/comms/dht/Cargo.toml +++ b/comms/dht/Cargo.toml @@ -25,8 +25,8 @@ blake2 = "0.10" chacha20 = "0.7.1" chacha20poly1305 = "0.10.1" chrono = { version = "0.4.19", default-features = false } -diesel = { version = "2.0.3", features = ["sqlite", "serde_json", "chrono", "numeric"] } -diesel_migrations = "2.0.0" +diesel = { version = "2.2.4", features = ["sqlite", "serde_json", "chrono", "numeric"] } +diesel_migrations = "2.2.0" digest = "0.10" futures = "^0.3.1" log = "0.4.8"