diff --git a/Cargo.lock b/Cargo.lock index 67ee5f8..1baeddf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -329,6 +329,17 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" +[[package]] +name = "bigdecimal" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aaf33151a6429fe9211d1b276eafdf70cdff28b071e76c0b0e1503221ea3744" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + [[package]] name = "binascii" version = "0.1.4" @@ -535,14 +546,11 @@ version = "3.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" dependencies = [ - "atty", "bitflags", "clap_derive", "clap_lex 0.2.4", "indexmap", "once_cell", - "strsim", - "termcolor", "textwrap", ] @@ -650,21 +658,6 @@ dependencies = [ "libc", ] -[[package]] -name = "crc" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53757d12b596c16c78b83458d732a5d1a17ab3f53f2f7412f6fb57cc8a140ab3" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" - [[package]] name = "crc32fast" version = "1.3.2" @@ -2202,6 +2195,7 @@ dependencies = [ "serial_test", "thiserror", "tokio", + "uuid", "validator", ] @@ -2720,15 +2714,15 @@ dependencies = [ [[package]] name = "sea-orm" -version = "0.10.7" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88694d01b528a94f90ad87f8d2f546d060d070eee180315c67d158cb69476034" +checksum = "e7a0e3ec90718d849c73b167df7a476672b64c7ee5f3c582179069e63b2451e1" dependencies = [ "async-stream", "async-trait", + "bigdecimal", "chrono", "futures", - "futures-util", "log", "ouroboros", "rust_decimal", @@ -2748,9 +2742,9 @@ dependencies = [ [[package]] name = "sea-orm-cli" -version = "0.10.7" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ebe1f820fe8949cf6a57272ba9ebd0be766e47c9b85c04b3cabea40ab9459b3" +checksum = "992bc003ed84e736daa19d1b562bd80fa2de09d7bca70cb1745adec3f3b54064" dependencies = [ "chrono", "clap 3.2.23", @@ -2764,9 +2758,9 @@ dependencies = [ [[package]] name = "sea-orm-macros" -version = "0.10.7" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7216195de9c6b2474fd0efab486173dccd0eff21f28cc54aa4c0205d52fb3af0" +checksum = "5d89f7d4d2533c178e08a9e1990619c391e9ca7b402851d02a605938b15e03d9" dependencies = [ "bae", "heck 0.3.3", @@ -2777,13 +2771,14 @@ dependencies = [ [[package]] name = "sea-orm-migration" -version = "0.10.7" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed3cdfa669e4c385922f902b9a58e0c2128782a4d0fe79c6c34f3b927565e5b" +checksum = "355b1e2763e73d36de6f4539b04fc5d01b232e5c97785e0d08c4becbc2accad3" dependencies = [ "async-trait", "clap 3.2.23", "dotenvy", + "futures", "sea-orm", "sea-orm-cli", "sea-schema", @@ -2813,10 +2808,11 @@ dependencies = [ [[package]] name = "sea-query" -version = "0.27.2" +version = "0.28.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4f0fc4d8e44e1d51c739a68d336252a18bc59553778075d5e32649be6ec92ed" +checksum = "d2fbe015dbdaa7d8829d71c1e14fb6289e928ac256b93dfda543c85cd89d6f03" dependencies = [ + "bigdecimal", "chrono", "rust_decimal", "sea-query-derive", @@ -2827,10 +2823,11 @@ dependencies = [ [[package]] name = "sea-query-binder" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2585b89c985cfacfe0ec9fc9e7bb055b776c1a2581c4e3c6185af2b8bf8865" +checksum = "03548c63aec07afd4fd190923e0160d2f2fc92def27470b54154cf232da6203b" dependencies = [ + "bigdecimal", "chrono", "rust_decimal", "sea-query", @@ -2842,11 +2839,11 @@ dependencies = [ [[package]] name = "sea-query-derive" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34cdc022b4f606353fe5dc85b09713a04e433323b70163e81513b141c6ae6eb5" +checksum = "63f62030c60f3a691f5fe251713b4e220b306e50a71e1d6f9cce1f24bb781978" dependencies = [ - "heck 0.3.3", + "heck 0.4.0", "proc-macro2", "quote", "syn", @@ -2855,9 +2852,9 @@ dependencies = [ [[package]] name = "sea-schema" -version = "0.10.3" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d5fda574d980e9352b6c7abd6fc75697436fe0078cac2b548559b52643ad3b" +checksum = "eeb2940bb5a10bc6cd05b450ce6cd3993e27fddd7eface2becb97fc5af3a040e" dependencies = [ "futures", "sea-query", @@ -3102,11 +3099,11 @@ dependencies = [ "ahash", "atoi", "base64 0.13.1", + "bigdecimal", "bitflags", "byteorder", "bytes", "chrono", - "crc", "crossbeam-queue", "dirs", "dotenvy", @@ -3164,7 +3161,6 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "sha2", "sqlx-core", "sqlx-rt", "syn", @@ -3368,9 +3364,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.24.2" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb" +checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" dependencies = [ "autocfg", "bytes", @@ -3636,9 +3632,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" +checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" dependencies = [ "getrandom 0.2.8", "serde", @@ -3646,9 +3642,9 @@ dependencies = [ [[package]] name = "validator" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f07b0a1390e01c0fc35ebb26b28ced33c9a3808f7f9fbe94d3cc01e233bfeed5" +checksum = "32ad5bf234c7d3ad1042e5252b7eddb2c4669ee23f32c7dd0e9b7705f07ef591" dependencies = [ "idna 0.2.3", "lazy_static", @@ -3662,9 +3658,9 @@ dependencies = [ [[package]] name = "validator_derive" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea7ed5e8cf2b6bdd64a6c4ce851da25388a89327b17b88424ceced6bd5017923" +checksum = "bc44ca3088bb3ba384d9aecf40c6a23a676ce23e09bdaca2073d99c207f864af" dependencies = [ "if_chain", "lazy_static", @@ -3678,9 +3674,9 @@ dependencies = [ [[package]] name = "validator_types" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ddf34293296847abfc1493b15c6e2f5d3cd19f57ad7d22673bf4c6278da329" +checksum = "111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3" dependencies = [ "proc-macro2", "syn", diff --git a/api/Cargo.toml b/api/Cargo.toml index e37aa74..16beadd 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -11,7 +11,7 @@ rocket = { version = "^0.5.0-rc.2", features = [ ] } async-trait = { version = "^0.1" } -tokio = "^1.24" +tokio = "^1.25" dotenv = "^0.15" @@ -32,4 +32,4 @@ version = "^0.5" [dev-dependencies] -once_cell = "^1.17" \ No newline at end of file +once_cell = "^1.17" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 025d3f1..d79af9f 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -12,14 +12,14 @@ portfolio-entity = { path = "../entity" } portfolio-core = { path = "../core" } [dependencies.tokio] -version = "^1.24" +version = "^1.25" features = [ "process", "macros", ] [dependencies.sea-orm] -version = "^0.10" +version = "^0.11" features = [ "sqlx-sqlite", # TODO: Migrate to rustls for better compatibility with various OS diff --git a/core/Cargo.toml b/core/Cargo.toml index b90efc3..b3ab5ee 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -13,7 +13,7 @@ portfolio-entity = { path = "../entity" } serde = { version = "^1.0", features = ["derive"] } serde_json = "1.0" -validator = { version = "^0.15", features = ["derive"] } +validator = { version = "^0.16", features = ["derive"] } # csv csv = "^1.1" @@ -27,7 +27,7 @@ thiserror = "^1.0" dotenv = "^0.15" # async -tokio = "^1.24" +tokio = "^1.25" futures = "^0.3" async-compat = "^0.2" @@ -43,13 +43,14 @@ argon2 = { version = "^0.4", features = ["std"] } age = { version = "^0.9", features = ["async"] } secrecy = { version = "^0.8" } base64 = "^0.21" +uuid = { version = "^1.3", features = ["v4"] } # logging log = "^0.4" fern = "^0.6" [dependencies.sea-orm] -version = "^0.10" +version = "^0.11" features = [ "runtime-tokio-native-tls", "sqlx-postgres", @@ -57,7 +58,7 @@ features = [ ] [dev-dependencies] -tokio = { version = "^1.24", features = ["macros"] } +tokio = { version = "^1.25", features = ["macros"] } async-tempfile = "^0.2" serial_test = "^1.0" -once_cell = "^1.17" \ No newline at end of file +once_cell = "^1.17" diff --git a/entity/Cargo.toml b/entity/Cargo.toml index 0d30070..90f0b94 100644 --- a/entity/Cargo.toml +++ b/entity/Cargo.toml @@ -13,4 +13,4 @@ chrono = "^0.4" async-trait = "^0.1" [dependencies.sea-orm] -version = "^0.10" +version = "^0.11" diff --git a/migration/Cargo.toml b/migration/Cargo.toml index f3ca028..a7a619b 100644 --- a/migration/Cargo.toml +++ b/migration/Cargo.toml @@ -9,12 +9,12 @@ name = "migration" path = "src/lib.rs" [dependencies] -tokio = { version = "^1.24", features = ["macros"] } +tokio = { version = "^1.25", features = ["macros"] } serde = { version = "^1.0", features = ["derive"] } chrono = "^0.4" portfolio-entity = { path = "../entity" } [dependencies.sea-orm-migration] -version = "^0.10" -features = [ "runtime-tokio-native-tls", "sqlx-postgres", "sqlx-sqlite"] \ No newline at end of file +version = "^0.11" +features = [ "runtime-tokio-native-tls", "sqlx-postgres", "sqlx-sqlite"]