From a70783791cbbfd48dd4120a0cb0fcc719067e822 Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Sun, 13 Apr 2025 15:41:30 +0700 Subject: [PATCH 1/4] update some dependencies --- Cargo.lock | 460 ++++++++++++------ Cargo.toml | 5 - packages/dapi-grpc/Cargo.toml | 15 +- packages/dashpay-contract/Cargo.toml | 2 +- packages/data-contracts/Cargo.toml | 2 +- packages/dpns-contract/Cargo.toml | 2 +- packages/feature-flags-contract/Cargo.toml | 2 +- .../Cargo.toml | 2 +- packages/rs-dapi-client/Cargo.toml | 6 +- packages/rs-dpp/Cargo.toml | 6 +- packages/rs-drive-abci/Cargo.toml | 6 +- packages/rs-drive-proof-verifier/Cargo.toml | 8 +- packages/rs-drive/Cargo.toml | 16 +- .../Cargo.toml | 4 +- packages/rs-platform-value/Cargo.toml | 4 +- packages/rs-platform-version/Cargo.toml | 4 +- packages/rs-sdk/Cargo.toml | 6 +- packages/rs-sdk/src/error.rs | 2 +- packages/search-contract/Cargo.toml | 2 +- packages/simple-signer/Cargo.toml | 2 +- packages/token-history-contract/Cargo.toml | 2 +- packages/wallet-utils-contract/Cargo.toml | 2 +- packages/wasm-dpp/Cargo.toml | 4 +- packages/wasm-sdk/Cargo.toml | 2 +- packages/withdrawals-contract/Cargo.toml | 4 +- 25 files changed, 369 insertions(+), 201 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0fb070fb49d..1dd2f7cd44e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -40,7 +40,7 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ - "getrandom", + "getrandom 0.2.15", "once_cell", "version_check", ] @@ -52,7 +52,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", - "getrandom", + "getrandom 0.2.15", "once_cell", "serde", "version_check", @@ -246,7 +246,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", - "axum-core", + "axum-core 0.4.3", "axum-macros", "bytes", "futures-util", @@ -256,7 +256,7 @@ dependencies = [ "hyper", "hyper-util", "itoa", - "matchit", + "matchit 0.7.3", "memchr", "mime", "percent-encoding", @@ -268,12 +268,38 @@ dependencies = [ "serde_urlencoded", "sync_wrapper 1.0.1", "tokio", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", "tracing", ] +[[package]] +name = "axum" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de45108900e1f9b9242f7f2e254aa3e2c029c921c258fe9e6b4217eeebd54288" +dependencies = [ + "axum-core 0.5.2", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "itoa", + "matchit 0.8.4", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper 1.0.1", + "tower 0.5.2", + "tower-layer", + "tower-service", +] + [[package]] name = "axum-core" version = "0.4.3" @@ -295,6 +321,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "axum-core" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68464cd0412f486726fb3373129ef5d2993f90c34bc2bc1c1e9943b2f4fc7ca6" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 1.0.1", + "tower-layer", + "tower-service", +] + [[package]] name = "axum-macros" version = "0.4.1" @@ -425,7 +470,7 @@ version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "cexpr", "clang-sys", "itertools 0.12.1", @@ -488,9 +533,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" [[package]] name = "bitvec" @@ -506,9 +551,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.5" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e" +checksum = "389a099b34312839e16420d499a9cad9650541715937ffbdd40d36f49e77eeb3" dependencies = [ "arrayref", "arrayvec", @@ -588,7 +633,7 @@ dependencies = [ "sha2", "sha3", "subtle", - "thiserror 2.0.11", + "thiserror 2.0.12", "uint-zigzag", "vsss-rs", "zeroize", @@ -908,7 +953,7 @@ dependencies = [ "futures-core", "prost", "prost-types", - "tonic", + "tonic 0.12.3", "tracing-core", ] @@ -932,7 +977,7 @@ dependencies = [ "thread_local", "tokio", "tokio-stream", - "tonic", + "tonic 0.12.3", "tracing", "tracing-core", "tracing-subscriber", @@ -1140,14 +1185,14 @@ version = "2.0.0-dev.1" dependencies = [ "dapi-grpc-macros", "futures-core", - "getrandom", + "getrandom 0.2.15", "platform-version", "prost", "serde", "serde_bytes", "serde_json", "tenderdash-proto", - "tonic", + "tonic 0.13.0", "tonic-build", ] @@ -1229,7 +1274,7 @@ dependencies = [ "serde", "serde_json", "test-case", - "thiserror 1.0.64", + "thiserror 2.0.12", "tokio", "tokio-test", "tokio-util", @@ -1240,13 +1285,13 @@ dependencies = [ [[package]] name = "dashcore" -version = "0.38.0" -source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.38.0#fcc7c2266df12a8fb4878e60d1e1b6f49990f5ed" +version = "0.39.3" +source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.39.3#cbe12c1ebff0e693f29e2b7ac18a8935475b4924" dependencies = [ "anyhow", "base64-compat", "bech32", - "bitflags 2.6.0", + "bitflags 2.9.0", "blake3", "bls-signatures 1.2.5 (git+https://github.com/dashpay/bls-signatures?rev=0bb5c5b03249c463debb5cef5f7e52ee66f3aaab)", "blsful", @@ -1255,24 +1300,21 @@ dependencies = [ "ed25519-dalek", "hex", "hex_lit", - "lazy_static", "rustversion", "secp256k1", "serde", - "serde_repr", - "strum", - "thiserror 1.0.64", + "thiserror 2.0.12", ] [[package]] name = "dashcore-private" -version = "0.38.0" -source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.38.0#fcc7c2266df12a8fb4878e60d1e1b6f49990f5ed" +version = "0.39.3" +source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.39.3#cbe12c1ebff0e693f29e2b7ac18a8935475b4924" [[package]] name = "dashcore-rpc" -version = "0.38.0" -source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.38.0#fcc7c2266df12a8fb4878e60d1e1b6f49990f5ed" +version = "0.39.3" +source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.39.3#cbe12c1ebff0e693f29e2b7ac18a8935475b4924" dependencies = [ "dashcore-rpc-json", "hex", @@ -1284,8 +1326,8 @@ dependencies = [ [[package]] name = "dashcore-rpc-json" -version = "0.38.0" -source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.38.0#fcc7c2266df12a8fb4878e60d1e1b6f49990f5ed" +version = "0.39.3" +source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.39.3#cbe12c1ebff0e693f29e2b7ac18a8935475b4924" dependencies = [ "bincode", "dashcore", @@ -1298,8 +1340,8 @@ dependencies = [ [[package]] name = "dashcore_hashes" -version = "0.38.0" -source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.38.0#fcc7c2266df12a8fb4878e60d1e1b6f49990f5ed" +version = "0.39.3" +source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.39.3#cbe12c1ebff0e693f29e2b7ac18a8935475b4924" dependencies = [ "dashcore-private", "secp256k1", @@ -1313,7 +1355,7 @@ dependencies = [ "platform-value", "platform-version", "serde_json", - "thiserror 1.0.64", + "thiserror 2.0.12", ] [[package]] @@ -1327,7 +1369,7 @@ dependencies = [ "platform-value", "platform-version", "serde_json", - "thiserror 1.0.64", + "thiserror 2.0.12", "token-history-contract", "wallet-utils-contract", "withdrawals-contract", @@ -1469,7 +1511,7 @@ dependencies = [ "platform-value", "platform-version", "serde_json", - "thiserror 1.0.64", + "thiserror 2.0.12", ] [[package]] @@ -1491,7 +1533,7 @@ dependencies = [ "derive_more 1.0.0", "dpp", "env_logger", - "getrandom", + "getrandom 0.2.15", "hex", "indexmap 2.7.0", "integer-encoding", @@ -1517,9 +1559,9 @@ dependencies = [ "serde_json", "serde_repr", "sha2", - "strum", + "strum 0.26.3", "test-case", - "thiserror 1.0.64", + "thiserror 2.0.12", "tokio", ] @@ -1560,7 +1602,7 @@ dependencies = [ "serde_json", "sqlparser", "tempfile", - "thiserror 1.0.64", + "thiserror 2.0.12", "tracing", ] @@ -1635,7 +1677,7 @@ dependencies = [ "serde", "serde_json", "tenderdash-abci", - "thiserror 1.0.64", + "thiserror 2.0.12", "tracing", ] @@ -1837,9 +1879,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "feature-flags-contract" @@ -1848,7 +1890,7 @@ dependencies = [ "platform-value", "platform-version", "serde_json", - "thiserror 1.0.64", + "thiserror 2.0.12", ] [[package]] @@ -2086,10 +2128,22 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "wasm-bindgen", ] +[[package]] +name = "getrandom" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasi 0.14.2+wasi-0.2.4", +] + [[package]] name = "gimli" version = "0.29.0" @@ -2130,9 +2184,9 @@ dependencies = [ [[package]] name = "grovedb" version = "3.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=f89e03e4e0ac12aa2feea5c94b38c09f4909facc#f89e03e4e0ac12aa2feea5c94b38c09f4909facc" +source = "git+https://github.com/dashpay/grovedb?rev=93def978e499500051486eb3bd23f0ae4c1246c6#93def978e499500051486eb3bd23f0ae4c1246c6" dependencies = [ - "axum", + "axum 0.7.5", "bincode", "blake3", "grovedb-costs", @@ -2151,7 +2205,7 @@ dependencies = [ "reqwest", "sha2", "tempfile", - "thiserror 2.0.11", + "thiserror 2.0.12", "tokio", "tokio-util", "tower-http", @@ -2161,29 +2215,29 @@ dependencies = [ [[package]] name = "grovedb-costs" version = "3.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=f89e03e4e0ac12aa2feea5c94b38c09f4909facc#f89e03e4e0ac12aa2feea5c94b38c09f4909facc" +source = "git+https://github.com/dashpay/grovedb?rev=93def978e499500051486eb3bd23f0ae4c1246c6#93def978e499500051486eb3bd23f0ae4c1246c6" dependencies = [ "integer-encoding", "intmap", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] name = "grovedb-epoch-based-storage-flags" version = "3.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=f89e03e4e0ac12aa2feea5c94b38c09f4909facc#f89e03e4e0ac12aa2feea5c94b38c09f4909facc" +source = "git+https://github.com/dashpay/grovedb?rev=93def978e499500051486eb3bd23f0ae4c1246c6#93def978e499500051486eb3bd23f0ae4c1246c6" dependencies = [ "grovedb-costs", "hex", "integer-encoding", "intmap", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] name = "grovedb-merk" version = "3.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=f89e03e4e0ac12aa2feea5c94b38c09f4909facc#f89e03e4e0ac12aa2feea5c94b38c09f4909facc" +source = "git+https://github.com/dashpay/grovedb?rev=93def978e499500051486eb3bd23f0ae4c1246c6#93def978e499500051486eb3bd23f0ae4c1246c6" dependencies = [ "bincode", "blake3", @@ -2200,13 +2254,13 @@ dependencies = [ "integer-encoding", "num_cpus", "rand", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] name = "grovedb-path" version = "3.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=f89e03e4e0ac12aa2feea5c94b38c09f4909facc#f89e03e4e0ac12aa2feea5c94b38c09f4909facc" +source = "git+https://github.com/dashpay/grovedb?rev=93def978e499500051486eb3bd23f0ae4c1246c6#93def978e499500051486eb3bd23f0ae4c1246c6" dependencies = [ "hex", ] @@ -2214,7 +2268,7 @@ dependencies = [ [[package]] name = "grovedb-storage" version = "3.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=f89e03e4e0ac12aa2feea5c94b38c09f4909facc#f89e03e4e0ac12aa2feea5c94b38c09f4909facc" +source = "git+https://github.com/dashpay/grovedb?rev=93def978e499500051486eb3bd23f0ae4c1246c6#93def978e499500051486eb3bd23f0ae4c1246c6" dependencies = [ "blake3", "grovedb-costs", @@ -2225,24 +2279,24 @@ dependencies = [ "lazy_static", "num_cpus", "rocksdb", - "strum", + "strum 0.27.1", "tempfile", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] name = "grovedb-version" version = "3.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=f89e03e4e0ac12aa2feea5c94b38c09f4909facc#f89e03e4e0ac12aa2feea5c94b38c09f4909facc" +source = "git+https://github.com/dashpay/grovedb?rev=93def978e499500051486eb3bd23f0ae4c1246c6#93def978e499500051486eb3bd23f0ae4c1246c6" dependencies = [ - "thiserror 2.0.11", + "thiserror 2.0.12", "versioned-feature-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "grovedb-visualize" version = "3.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=f89e03e4e0ac12aa2feea5c94b38c09f4909facc#f89e03e4e0ac12aa2feea5c94b38c09f4909facc" +source = "git+https://github.com/dashpay/grovedb?rev=93def978e499500051486eb3bd23f0ae4c1246c6#93def978e499500051486eb3bd23f0ae4c1246c6" dependencies = [ "hex", "itertools 0.14.0", @@ -2251,7 +2305,7 @@ dependencies = [ [[package]] name = "grovedbg-types" version = "3.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=f89e03e4e0ac12aa2feea5c94b38c09f4909facc#f89e03e4e0ac12aa2feea5c94b38c09f4909facc" +source = "git+https://github.com/dashpay/grovedb?rev=93def978e499500051486eb3bd23f0ae4c1246c6#93def978e499500051486eb3bd23f0ae4c1246c6" dependencies = [ "serde", "serde_with 3.9.0", @@ -2579,7 +2633,7 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", - "tower", + "tower 0.4.13", "tower-service", "tracing", ] @@ -2782,7 +2836,7 @@ dependencies = [ "json-schema-compatibility-validator", "once_cell", "serde_json", - "thiserror 1.0.64", + "thiserror 2.0.12", ] [[package]] @@ -2807,7 +2861,7 @@ dependencies = [ "bytecount", "fancy-regex", "fraction", - "getrandom", + "getrandom 0.2.15", "iso8601", "itoa", "memchr", @@ -2852,9 +2906,9 @@ checksum = "744a4c881f502e98c2241d2e5f50040ac73b30194d64452bb6260393b53f0dc9" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" [[package]] name = "libloading" @@ -2898,6 +2952,12 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +[[package]] +name = "linux-raw-sys" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" + [[package]] name = "lock_api" version = "0.4.12" @@ -2956,7 +3016,7 @@ dependencies = [ "platform-value", "platform-version", "serde_json", - "thiserror 1.0.64", + "thiserror 2.0.12", ] [[package]] @@ -2974,6 +3034,12 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +[[package]] +name = "matchit" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" + [[package]] name = "memchr" version = "2.7.4" @@ -3084,7 +3150,7 @@ checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ "hermit-abi 0.3.9", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", ] @@ -3386,7 +3452,7 @@ version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "cfg-if", "foreign-types", "libc", @@ -3587,7 +3653,7 @@ dependencies = [ "rand", "serde", "serde_json", - "thiserror 1.0.64", + "thiserror 2.0.12", "treediff", ] @@ -3606,7 +3672,7 @@ dependencies = [ "bincode", "grovedb-version", "once_cell", - "thiserror 1.0.64", + "thiserror 2.0.12", "versioned-feature-core 1.0.0 (git+https://github.com/dashpay/versioned-feature-core)", ] @@ -3848,7 +3914,7 @@ dependencies = [ "libc", "once_cell", "raw-cpuid", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "web-sys", "winapi", ] @@ -3862,6 +3928,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" + [[package]] name = "radium" version = "0.7.0" @@ -3895,7 +3967,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.15", ] [[package]] @@ -3913,7 +3985,7 @@ version = "11.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", ] [[package]] @@ -3942,7 +4014,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", ] [[package]] @@ -4059,7 +4131,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", "cfg-if", - "getrandom", + "getrandom 0.2.15", "libc", "spin", "untrusted", @@ -4113,7 +4185,7 @@ dependencies = [ "chrono", "dapi-grpc", "futures", - "getrandom", + "getrandom 0.2.15", "gloo-timers", "hex", "http", @@ -4123,7 +4195,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "thiserror 1.0.64", + "thiserror 2.0.12", "tokio", "tonic-web-wasm-client", "tracing", @@ -4183,18 +4255,31 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "errno", "libc", - "linux-raw-sys", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] +[[package]] +name = "rustix" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf" +dependencies = [ + "bitflags 2.9.0", + "errno", + "libc", + "linux-raw-sys 0.9.4", + "windows-sys 0.59.0", +] + [[package]] name = "rustls" -version = "0.23.19" +version = "0.23.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" +checksum = "df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0" dependencies = [ "log", "once_cell", @@ -4230,15 +4315,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" +checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" [[package]] name = "rustls-webpki" -version = "0.102.8" +version = "0.103.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03" dependencies = [ "ring", "rustls-pki-types", @@ -4247,9 +4332,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" [[package]] name = "ryu" @@ -4337,7 +4422,7 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "core-foundation", "core-foundation-sys", "libc", @@ -4362,9 +4447,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.208" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] @@ -4399,9 +4484,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.208" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", @@ -4410,9 +4495,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.126" +version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3b863381a05ffefbc82571a2d893edf47b27fb0ebedbf582c39640e51abebef" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ "indexmap 2.7.0", "itoa", @@ -4724,7 +4809,16 @@ version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ - "strum_macros", + "strum_macros 0.26.4", +] + +[[package]] +name = "strum" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32" +dependencies = [ + "strum_macros 0.27.1", ] [[package]] @@ -4740,6 +4834,19 @@ dependencies = [ "syn 2.0.96", ] +[[package]] +name = "strum_macros" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.96", +] + [[package]] name = "subtle" version = "2.6.1" @@ -4810,7 +4917,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "core-foundation", "system-configuration-sys", ] @@ -4839,21 +4946,21 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.12.0" +version = "3.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf" dependencies = [ - "cfg-if", "fastrand", + "getrandom 0.3.2", "once_cell", - "rustix", + "rustix 1.0.5", "windows-sys 0.59.0", ] [[package]] name = "tenderdash-abci" -version = "1.3.0+1.3.0" -source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.3.0%2B1.3.0#cdd40c47ac2ed52a4fa0a72b2efb86af9b87a878" +version = "1.3.1" +source = "git+https://github.com/dashpay/rs-tenderdash-abci?rev=8d26acb3f8ae17ddb89c87119148dbb98aeeea29#8d26acb3f8ae17ddb89c87119148dbb98aeeea29" dependencies = [ "bytes", "futures", @@ -4861,7 +4968,7 @@ dependencies = [ "lhash", "semver", "tenderdash-proto", - "thiserror 2.0.11", + "thiserror 2.0.12", "tokio", "tokio-util", "tracing", @@ -4872,8 +4979,8 @@ dependencies = [ [[package]] name = "tenderdash-proto" -version = "1.3.0+1.3.0" -source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.3.0%2B1.3.0#cdd40c47ac2ed52a4fa0a72b2efb86af9b87a878" +version = "1.3.1" +source = "git+https://github.com/dashpay/rs-tenderdash-abci?rev=8d26acb3f8ae17ddb89c87119148dbb98aeeea29#8d26acb3f8ae17ddb89c87119148dbb98aeeea29" dependencies = [ "bytes", "chrono", @@ -4886,13 +4993,13 @@ dependencies = [ "subtle-encoding", "tenderdash-proto-compiler", "time", - "tonic", + "tonic 0.13.0", ] [[package]] name = "tenderdash-proto-compiler" -version = "1.3.0+1.3.0" -source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.3.0%2B1.3.0#cdd40c47ac2ed52a4fa0a72b2efb86af9b87a878" +version = "1.3.1" +source = "git+https://github.com/dashpay/rs-tenderdash-abci?rev=8d26acb3f8ae17ddb89c87119148dbb98aeeea29#8d26acb3f8ae17ddb89c87119148dbb98aeeea29" dependencies = [ "fs_extra", "prost-build", @@ -4954,11 +5061,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.11" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" dependencies = [ - "thiserror-impl 2.0.11", + "thiserror-impl 2.0.12", ] [[package]] @@ -4974,9 +5081,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.11" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" dependencies = [ "proc-macro2", "quote", @@ -5065,14 +5172,14 @@ dependencies = [ "platform-value", "platform-version", "serde_json", - "thiserror 1.0.64", + "thiserror 2.0.12", ] [[package]] name = "tokio" -version = "1.40.0" +version = "1.44.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48" dependencies = [ "backtrace", "bytes", @@ -5089,9 +5196,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", @@ -5110,12 +5217,11 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" dependencies = [ "rustls", - "rustls-pki-types", "tokio", ] @@ -5145,9 +5251,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.12" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +checksum = "6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034" dependencies = [ "bytes", "futures-core", @@ -5220,7 +5326,36 @@ checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" dependencies = [ "async-stream", "async-trait", - "axum", + "axum 0.7.5", + "base64 0.22.1", + "bytes", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-timeout", + "hyper-util", + "percent-encoding", + "pin-project", + "prost", + "socket2", + "tokio", + "tokio-stream", + "tower 0.4.13", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tonic" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85839f0b32fd242bb3209262371d07feda6d780d16ee9d2bc88581b89da1549b" +dependencies = [ + "async-trait", + "axum 0.8.3", "base64 0.22.1", "bytes", "h2", @@ -5234,12 +5369,11 @@ dependencies = [ "pin-project", "prost", "rustls-native-certs", - "rustls-pemfile", "socket2", "tokio", "tokio-rustls", "tokio-stream", - "tower", + "tower 0.5.2", "tower-layer", "tower-service", "tracing", @@ -5248,9 +5382,9 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.12.3" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9557ce109ea773b399c9b9e5dca39294110b74f1f342cb347a80d1fce8c26a11" +checksum = "d85f0383fadd15609306383a90e85eaed44169f931a5d2be1b42c76ceff1825e" dependencies = [ "prettyplease", "proc-macro2", @@ -5277,7 +5411,7 @@ dependencies = [ "js-sys", "pin-project", "thiserror 1.0.64", - "tonic", + "tonic 0.12.3", "tower-service", "wasm-bindgen", "wasm-bindgen-futures", @@ -5288,11 +5422,12 @@ dependencies = [ [[package]] name = "tower" version = "0.4.13" -source = "git+https://github.com/QuantumExplorer/tower?branch=fix%2FindexMap2OnV0413#5286f8c605d10f48d51254f2434c5ab3fc5d7779" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", - "indexmap 2.7.0", + "indexmap 1.9.3", "pin-project", "pin-project-lite", "rand", @@ -5305,12 +5440,31 @@ dependencies = [ ] [[package]] -name = "tower-http" +name = "tower" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ - "bitflags 2.6.0", + "futures-core", + "futures-util", + "indexmap 2.7.0", + "pin-project-lite", + "slab", + "sync_wrapper 1.0.1", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697" +dependencies = [ + "bitflags 2.9.0", "bytes", "futures-util", "http", @@ -5331,13 +5485,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" -source = "git+https://github.com/QuantumExplorer/tower?branch=fix%2FindexMap2OnV0413#5286f8c605d10f48d51254f2434c5ab3fc5d7779" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" -source = "git+https://github.com/QuantumExplorer/tower?branch=fix%2FindexMap2OnV0413#5286f8c605d10f48d51254f2434c5ab3fc5d7779" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -5549,7 +5705,7 @@ version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ - "getrandom", + "getrandom 0.2.15", "rand", ] @@ -5630,7 +5786,7 @@ dependencies = [ "platform-value", "platform-version", "serde_json", - "thiserror 1.0.64", + "thiserror 2.0.12", ] [[package]] @@ -5648,6 +5804,15 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasi" +version = "0.14.2+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ + "wit-bindgen-rt", +] + [[package]] name = "wasm-bindgen" version = "0.2.100" @@ -5736,7 +5901,7 @@ dependencies = [ "serde", "serde-wasm-bindgen", "serde_json", - "thiserror 1.0.64", + "thiserror 2.0.12", "wasm-bindgen", "wasm-bindgen-futures", "wasm-logger", @@ -5795,7 +5960,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix", + "rustix 0.38.34", ] [[package]] @@ -5968,6 +6133,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "wit-bindgen-rt" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +dependencies = [ + "bitflags 2.9.0", +] + [[package]] name = "withdrawals-contract" version = "2.0.0-dev.1" @@ -5978,7 +6152,7 @@ dependencies = [ "serde", "serde_json", "serde_repr", - "thiserror 1.0.64", + "thiserror 2.0.12", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 1dd2d2ecdbf..9923e07d4f2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,8 +37,3 @@ exclude = ["packages/wasm-sdk"] # This one is experimental and not ready for use [workspace.package] rust-version = "1.85" - -[patch.crates-io] -tower-service = { git = "https://github.com/QuantumExplorer/tower", branch = "fix/indexMap2OnV0413" } -tower-layer = { git = "https://github.com/QuantumExplorer/tower", branch = "fix/indexMap2OnV0413" } -tower = { git = "https://github.com/QuantumExplorer/tower", branch = "fix/indexMap2OnV0413" } diff --git a/packages/dapi-grpc/Cargo.toml b/packages/dapi-grpc/Cargo.toml index b225efc9ad7..a9783ec9e92 100644 --- a/packages/dapi-grpc/Cargo.toml +++ b/packages/dapi-grpc/Cargo.toml @@ -27,21 +27,21 @@ tenderdash-proto = [] client = ["platform"] # Build tonic server code. Includes all client features and adds server-specific dependencies. -server = ["platform", "tenderdash-proto/server", "client", "drive"] +server = ["platform", "tenderdash-proto/server", "client", "drive", "tonic/router"] serde = ["dep:serde", "dep:serde_bytes", "tenderdash-proto/serde"] mocks = ["serde", "dep:serde_json"] [dependencies] -tenderdash-proto = { git = "https://github.com/dashpay/rs-tenderdash-abci", version = "1.3.0", tag = "v1.3.0+1.3.0", default-features = false } +tenderdash-proto = { git = "https://github.com/dashpay/rs-tenderdash-abci", rev = "8d26acb3f8ae17ddb89c87119148dbb98aeeea29", default-features = false } prost = { version = "0.13" } futures-core = "0.3.30" -tonic = { version = "0.12.3", features = [ +tonic = { version = "0.13.0", features = [ "codegen", "prost", ], default-features = false } -serde = { version = "1.0.197", optional = true, features = ["derive"] } +serde = { version = "1.0.219", optional = true, features = ["derive"] } serde_bytes = { version = "0.11.12", optional = true } serde_json = { version = "1.0", optional = true } dapi-grpc-macros = { path = "../rs-dapi-grpc-macros" } @@ -51,18 +51,17 @@ platform-version = { path = "../rs-platform-version" } getrandom = { version = "0.2", features = ["js"] } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -tonic = { version = "0.12.3", features = [ +tonic = { version = "0.13.0", features = [ "codegen", "prost", "channel", "transport", - "tls", - "tls-roots", + "tls-native-roots", "tls-webpki-roots", ], default-features = false } [build-dependencies] -tonic-build = { version = "0.12.3" } +tonic-build = { version = "0.13.0" } [lib] diff --git a/packages/dashpay-contract/Cargo.toml b/packages/dashpay-contract/Cargo.toml index 073c656ad0d..8c7c4fb0b52 100644 --- a/packages/dashpay-contract/Cargo.toml +++ b/packages/dashpay-contract/Cargo.toml @@ -8,6 +8,6 @@ license = "MIT" [dependencies] platform-version = { path = "../rs-platform-version" } -thiserror = "1.0.64" +thiserror = "2.0.12" serde_json = { version = "1.0" } platform-value = { path = "../rs-platform-value" } diff --git a/packages/data-contracts/Cargo.toml b/packages/data-contracts/Cargo.toml index f10d5785838..4e4ba137834 100644 --- a/packages/data-contracts/Cargo.toml +++ b/packages/data-contracts/Cargo.toml @@ -7,7 +7,7 @@ rust-version.workspace = true license = "MIT" [dependencies] -thiserror = "1.0.64" +thiserror = "2.0.12" platform-version = { path = "../rs-platform-version" } serde_json = { version = "1.0" } withdrawals-contract = { path = "../withdrawals-contract" } diff --git a/packages/dpns-contract/Cargo.toml b/packages/dpns-contract/Cargo.toml index 09c58e2afbf..b598ad28d05 100644 --- a/packages/dpns-contract/Cargo.toml +++ b/packages/dpns-contract/Cargo.toml @@ -7,7 +7,7 @@ rust-version.workspace = true license = "MIT" [dependencies] -thiserror = "1.0.64" +thiserror = "2.0.12" platform-version = { path = "../rs-platform-version" } serde_json = { version = "1.0" } platform-value = { path = "../rs-platform-value" } diff --git a/packages/feature-flags-contract/Cargo.toml b/packages/feature-flags-contract/Cargo.toml index 049d26f52f3..8f9ca0af26e 100644 --- a/packages/feature-flags-contract/Cargo.toml +++ b/packages/feature-flags-contract/Cargo.toml @@ -7,7 +7,7 @@ rust-version.workspace = true license = "MIT" [dependencies] -thiserror = "1.0.64" +thiserror = "2.0.12" platform-version = { path = "../rs-platform-version" } serde_json = { version = "1.0" } platform-value = { path = "../rs-platform-value" } diff --git a/packages/masternode-reward-shares-contract/Cargo.toml b/packages/masternode-reward-shares-contract/Cargo.toml index c1fe284e523..b17d58bb8bf 100644 --- a/packages/masternode-reward-shares-contract/Cargo.toml +++ b/packages/masternode-reward-shares-contract/Cargo.toml @@ -7,7 +7,7 @@ rust-version.workspace = true license = "MIT" [dependencies] -thiserror = "1.0.64" +thiserror = "2.0.12" platform-version = { path = "../rs-platform-version" } serde_json = { version = "1.0" } platform-value = { path = "../rs-platform-value" } diff --git a/packages/rs-dapi-client/Cargo.toml b/packages/rs-dapi-client/Cargo.toml index e801975f4d8..15851e4340d 100644 --- a/packages/rs-dapi-client/Cargo.toml +++ b/packages/rs-dapi-client/Cargo.toml @@ -48,14 +48,14 @@ rand = { version = "0.8.5", features = [ "small_rng", "getrandom", ], default-features = false } -thiserror = "1.0.64" +thiserror = "2.0.12" tracing = "0.1.40" tokio = { version = "1.40", default-features = false } sha2 = { version = "0.10", optional = true } hex = { version = "0.4.3", optional = true } lru = { version = "0.12.3" } -serde = { version = "1.0.197", optional = true, features = ["derive"] } -serde_json = { version = "1.0.120", optional = true } +serde = { version = "1.0.219", optional = true, features = ["derive"] } +serde_json = { version = "1.0.140", optional = true } chrono = { version = "0.4.38", features = ["serde"] } [dev-dependencies] diff --git a/packages/rs-dpp/Cargo.toml b/packages/rs-dpp/Cargo.toml index 3a33517a4b8..b7ff42680f5 100644 --- a/packages/rs-dpp/Cargo.toml +++ b/packages/rs-dpp/Cargo.toml @@ -28,7 +28,7 @@ dashcore = { git = "https://github.com/dashpay/rust-dashcore", features = [ "rand", "signer", "serde", -], default-features = false, tag = "v0.38.0" } +], default-features = false, tag = "v0.39.3" } env_logger = { version = "0.11" } getrandom = { version = "0.2", features = ["js"] } hex = { version = "0.4" } @@ -43,11 +43,11 @@ bincode = { version = "=2.0.0-rc.3", features = ["serde"] } bincode_derive = { version = "=2.0.0-rc.3" } rand = { version = "0.8.5", features = ["small_rng"] } regex = { version = "1.10.4" } -serde = { version = "1.0.197", features = ["derive"] } +serde = { version = "1.0.219", features = ["derive"] } serde_json = { version = "1.0", features = ["preserve_order"] } serde_repr = { version = "0.1.7" } sha2 = { version = "0.10" } -thiserror = { version = "1.0" } +thiserror = { version = "2.0.12" } data-contracts = { path = "../data-contracts", optional = true } platform-value = { path = "../rs-platform-value" } platform-version = { path = "../rs-platform-version" } diff --git a/packages/rs-drive-abci/Cargo.toml b/packages/rs-drive-abci/Cargo.toml index 33ade76e797..31a68051765 100644 --- a/packages/rs-drive-abci/Cargo.toml +++ b/packages/rs-drive-abci/Cargo.toml @@ -17,7 +17,7 @@ arc-swap = "1.7.0" bincode = { version = "=2.0.0-rc.3", features = ["serde"] } ciborium = { version = "0.2.2" } chrono = "0.4.35" -serde = { version = "1.0.197", features = ["derive"] } +serde = { version = "1.0.219", features = ["derive"] } serde_json = { version = "1.0", features = ["preserve_order"] } drive = { path = "../rs-drive", default-features = false, features = [ "server", @@ -28,7 +28,7 @@ rand = "0.8.5" tempfile = "3.3.0" hex = "0.4.3" indexmap = { version = "2.2.6", features = ["serde"] } -dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", tag = "v0.38.0" } +dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", tag = "v0.39.3" } dpp = { path = "../rs-dpp", features = ["abci"] } simple-signer = { path = "../simple-signer" } rust_decimal = "1.2.5" @@ -52,7 +52,7 @@ tracing-subscriber = { version = "0.3.16", default-features = false, features = "registry", "tracing-log", ], optional = false } -tenderdash-abci = { git = "https://github.com/dashpay/rs-tenderdash-abci", version = "1.3.0", tag = "v1.3.0+1.3.0", features = [ +tenderdash-abci = { git = "https://github.com/dashpay/rs-tenderdash-abci", rev = "8d26acb3f8ae17ddb89c87119148dbb98aeeea29", features = [ "grpc", ] } diff --git a/packages/rs-drive-proof-verifier/Cargo.toml b/packages/rs-drive-proof-verifier/Cargo.toml index f2b1fe0310d..f0faf3ed731 100644 --- a/packages/rs-drive-proof-verifier/Cargo.toml +++ b/packages/rs-drive-proof-verifier/Cargo.toml @@ -17,7 +17,7 @@ mocks = [ [dependencies] -thiserror = { version = "1.0.63" } +thiserror = { version = "2.0.12" } dapi-grpc = { path = "../dapi-grpc", default-features = false, features = [ "platform", "client", @@ -35,12 +35,12 @@ dpp = { path = "../rs-dpp", features = [ bincode = { version = "=2.0.0-rc.3", features = ["serde"] } platform-serialization-derive = { path = "../rs-platform-serialization-derive", optional = true } platform-serialization = { path = "../rs-platform-serialization" } -tenderdash-abci = { git = "https://github.com/dashpay/rs-tenderdash-abci", version = "1.3.0", tag = "v1.3.0+1.3.0", features = [ +tenderdash-abci = { git = "https://github.com/dashpay/rs-tenderdash-abci", rev = "8d26acb3f8ae17ddb89c87119148dbb98aeeea29", features = [ "crypto", ], default-features = false } tracing = { version = "0.1.37" } -serde = { version = "1.0.197", default-features = false, optional = true } -serde_json = { version = "1.0.103", features = [ +serde = { version = "1.0.219", default-features = false, optional = true } +serde_json = { version = "1.0", features = [ "preserve_order", ], optional = true } hex = { version = "0.4.3" } diff --git a/packages/rs-drive/Cargo.toml b/packages/rs-drive/Cargo.toml index b6908320de0..bf35ba022d1 100644 --- a/packages/rs-drive/Cargo.toml +++ b/packages/rs-drive/Cargo.toml @@ -29,7 +29,7 @@ nohash-hasher = { version = "0.2.0" } dpp = { package = "dpp", path = "../rs-dpp", features = [ "state-transitions", ], default-features = false, optional = true } -thiserror = { version = "1.0.63" } +thiserror = { version = "2.0.12" } tracing = { version = "0.1.37", default-features = false, features = [] } derive_more = { version = "1.0", features = ["from"] } hex = { version = "0.4.3" } @@ -38,7 +38,7 @@ hex = { version = "0.4.3" } parking_lot = { version = "0.12.1", optional = true } ciborium = { version = "0.2.2", optional = true } arc-swap = { version = "1.7.0", optional = true } -serde = { version = "1.0.197", features = ["derive"], optional = true } +serde = { version = "1.0.219", features = ["derive"], optional = true } rand = { version = "0.8.4", features = ["small_rng"], optional = true } moka = { version = "0.12", features = [ "future", @@ -52,12 +52,12 @@ enum-map = { version = "2.0.3", optional = true } intmap = { version = "3.0.1", features = ["serde"], optional = true } chrono = { version = "0.4.35", optional = true } itertools = { version = "0.13", optional = true } -grovedb = { git = "https://github.com/dashpay/grovedb", rev = "f89e03e4e0ac12aa2feea5c94b38c09f4909facc", optional = true, default-features = false } -grovedb-costs = { git = "https://github.com/dashpay/grovedb", rev = "f89e03e4e0ac12aa2feea5c94b38c09f4909facc", optional = true } -grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "f89e03e4e0ac12aa2feea5c94b38c09f4909facc" } -grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "f89e03e4e0ac12aa2feea5c94b38c09f4909facc", optional = true } -grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "f89e03e4e0ac12aa2feea5c94b38c09f4909facc" } -grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "f89e03e4e0ac12aa2feea5c94b38c09f4909facc" } +grovedb = { git = "https://github.com/dashpay/grovedb", rev = "93def978e499500051486eb3bd23f0ae4c1246c6", optional = true, default-features = false } +grovedb-costs = { git = "https://github.com/dashpay/grovedb", rev = "93def978e499500051486eb3bd23f0ae4c1246c6", optional = true } +grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "93def978e499500051486eb3bd23f0ae4c1246c6" } +grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "93def978e499500051486eb3bd23f0ae4c1246c6", optional = true } +grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "93def978e499500051486eb3bd23f0ae4c1246c6" } +grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "93def978e499500051486eb3bd23f0ae4c1246c6" } [dev-dependencies] criterion = "0.5" diff --git a/packages/rs-json-schema-compatibility-validator/Cargo.toml b/packages/rs-json-schema-compatibility-validator/Cargo.toml index acf668620dc..6d4ebff372a 100644 --- a/packages/rs-json-schema-compatibility-validator/Cargo.toml +++ b/packages/rs-json-schema-compatibility-validator/Cargo.toml @@ -7,8 +7,8 @@ authors = ["Ivan Shumkov "] [dependencies] json-patch = "1.4" -serde_json = "1.0.115" -thiserror = "1.0.64" +serde_json = "1.0" +thiserror = "2.0.12" once_cell = "1.19.0" [dev-dependencies] diff --git a/packages/rs-platform-value/Cargo.toml b/packages/rs-platform-value/Cargo.toml index 32e62cb1e0b..0c233630275 100644 --- a/packages/rs-platform-value/Cargo.toml +++ b/packages/rs-platform-value/Cargo.toml @@ -10,11 +10,11 @@ license = "MIT" [dependencies] bincode = { version = "=2.0.0-rc.3", features = ["serde"] } ciborium = { version = "0.2.2", optional = true } -thiserror = "1.0.64" +thiserror = "2.0.12" bs58 = "0.5.1" base64 = "0.22.1" hex = "0.4.3" -serde = { version = "1.0.197", features = ["derive"] } +serde = { version = "1.0.219", features = ["derive"] } serde_json = { version = "1.0", features = ["preserve_order"], optional = true } rand = { version = "0.8.4", features = ["small_rng"] } treediff = "5.0.0" diff --git a/packages/rs-platform-version/Cargo.toml b/packages/rs-platform-version/Cargo.toml index 6692c09e017..0771712d15d 100644 --- a/packages/rs-platform-version/Cargo.toml +++ b/packages/rs-platform-version/Cargo.toml @@ -8,10 +8,10 @@ rust-version.workspace = true license = "MIT" [dependencies] -thiserror = { version = "1.0.63" } +thiserror = { version = "2.0.12" } bincode = { version = "=2.0.0-rc.3" } versioned-feature-core = { git = "https://github.com/dashpay/versioned-feature-core", version = "1.0.0" } -grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "f89e03e4e0ac12aa2feea5c94b38c09f4909facc" } +grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "93def978e499500051486eb3bd23f0ae4c1246c6" } once_cell = "1.19.0" [features] diff --git a/packages/rs-sdk/Cargo.toml b/packages/rs-sdk/Cargo.toml index ead1a010182..19e957e3985 100644 --- a/packages/rs-sdk/Cargo.toml +++ b/packages/rs-sdk/Cargo.toml @@ -22,12 +22,12 @@ drive-proof-verifier = { path = "../rs-drive-proof-verifier", default-features = dapi-grpc-macros = { path = "../rs-dapi-grpc-macros" } http = { version = "1.1" } rustls-pemfile = { version = "2.0.0" } -thiserror = "1.0.64" +thiserror = "2.0.12" tokio = { version = "1.40", features = ["macros", "time"] } tokio-util = { version = "0.7.12" } async-trait = { version = "0.1.83" } ciborium = { version = "0.2.2" } -serde = { version = "1.0.197", default-features = false, features = [ +serde = { version = "1.0.219", default-features = false, features = [ "rc", ], optional = true } serde_json = { version = "1.0", features = ["preserve_order"], optional = true } @@ -38,7 +38,7 @@ envy = { version = "0.4.2", optional = true } futures = { version = "0.3.30" } derive_more = { version = "1.0", features = ["from"] } # dashcore-rpc is only needed for core rpc; TODO remove once we have correct core rpc impl -dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", tag = "v0.38.0" } +dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", tag = "v0.39.3" } lru = { version = "0.12.5", optional = true } bip37-bloom-filter = { git = "https://github.com/dashpay/rs-bip37-bloom-filter", branch = "develop" } zeroize = { version = "1.8", features = ["derive"] } diff --git a/packages/rs-sdk/src/error.rs b/packages/rs-sdk/src/error.rs index e95b85775c4..b338b79c97c 100644 --- a/packages/rs-sdk/src/error.rs +++ b/packages/rs-sdk/src/error.rs @@ -56,7 +56,7 @@ pub enum Error { #[error("No epoch found on Platform; it should never happen")] EpochNotFound, /// SDK operation timeout reached error - #[error("SDK operation timeout {} secs reached: {1}", .0.as_secs())] + #[error("SDK operation timeout {} secs reached: {}", .0.as_secs(), .1)] TimeoutReached(Duration, String), /// Returned when an attempt is made to create an object that already exists in the system diff --git a/packages/search-contract/Cargo.toml b/packages/search-contract/Cargo.toml index 675a039cc3d..ee1b25e2bc7 100644 --- a/packages/search-contract/Cargo.toml +++ b/packages/search-contract/Cargo.toml @@ -7,7 +7,7 @@ rust-version.workspace = true license = "MIT" [dependencies] -thiserror = "1.0.64" +thiserror = "2.0.12" platform-version = { path = "../rs-platform-version" } serde_json = { version = "1.0" } platform-value = { path = "../rs-platform-value" } diff --git a/packages/simple-signer/Cargo.toml b/packages/simple-signer/Cargo.toml index 8d57b031ddb..36f09e633b1 100644 --- a/packages/simple-signer/Cargo.toml +++ b/packages/simple-signer/Cargo.toml @@ -8,6 +8,6 @@ rust-version.workspace = true [dependencies] bincode = { version = "=2.0.0-rc.3", features = ["serde"] } -dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", tag = "v0.38.0" } +dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", tag = "v0.39.3" } dpp = { path = "../rs-dpp", features = ["abci"] } base64 = { version = "0.22.1" } diff --git a/packages/token-history-contract/Cargo.toml b/packages/token-history-contract/Cargo.toml index 5b96b0c1dbc..69c96ab3d88 100644 --- a/packages/token-history-contract/Cargo.toml +++ b/packages/token-history-contract/Cargo.toml @@ -7,7 +7,7 @@ rust-version.workspace = true license = "MIT" [dependencies] -thiserror = "1.0.64" +thiserror = "2.0.12" platform-version = { path = "../rs-platform-version" } serde_json = { version = "1.0" } platform-value = { path = "../rs-platform-value" } diff --git a/packages/wallet-utils-contract/Cargo.toml b/packages/wallet-utils-contract/Cargo.toml index fa20d39ef81..4da4b85d644 100644 --- a/packages/wallet-utils-contract/Cargo.toml +++ b/packages/wallet-utils-contract/Cargo.toml @@ -7,7 +7,7 @@ rust-version.workspace = true license = "MIT" [dependencies] -thiserror = "1.0.64" +thiserror = "2.0.12" platform-version = { path = "../rs-platform-version" } serde_json = { version = "1.0" } platform-value = { path = "../rs-platform-value" } diff --git a/packages/wasm-dpp/Cargo.toml b/packages/wasm-dpp/Cargo.toml index 43407d7e66e..2032a7c53c5 100644 --- a/packages/wasm-dpp/Cargo.toml +++ b/packages/wasm-dpp/Cargo.toml @@ -12,7 +12,7 @@ crate-type = ["cdylib", "rlib"] dead_code = "allow" [dependencies] -serde = { version = "1.0.197", features = ["derive"] } +serde = { version = "1.0.219", features = ["derive"] } serde_json = { version = "1.0", features = ["preserve_order"] } # TODO: Build wasm with build.rs # Meantime if you want to update wasm-bindgen you also need to update version in: @@ -21,7 +21,7 @@ serde_json = { version = "1.0", features = ["preserve_order"] } wasm-bindgen = { version = "=0.2.100" } js-sys = "0.3.53" web-sys = { version = "0.3.6", features = ["console"] } -thiserror = { version = "1.0.63" } +thiserror = { version = "2.0.12" } serde-wasm-bindgen = { git = "https://github.com/QuantumExplorer/serde-wasm-bindgen", branch = "feat/not_human_readable" } dpp = { path = "../rs-dpp", default-features = false, features = [ "state-transition-serde-conversion", diff --git a/packages/wasm-sdk/Cargo.toml b/packages/wasm-sdk/Cargo.toml index 5418ff2e5d6..086b8d9502c 100644 --- a/packages/wasm-sdk/Cargo.toml +++ b/packages/wasm-sdk/Cargo.toml @@ -9,7 +9,7 @@ crate-type = ["cdylib"] [dependencies] dash-sdk = { path = "../rs-sdk", default-features = false } console_error_panic_hook = { version = "0.1.6" } -thiserror = { version = "2.0.9" } +thiserror = { version = "2.0.12" } web-sys = { version = "0.3.4", features = [ 'console', 'Document', diff --git a/packages/withdrawals-contract/Cargo.toml b/packages/withdrawals-contract/Cargo.toml index d5c9cfaf696..316e3767d02 100644 --- a/packages/withdrawals-contract/Cargo.toml +++ b/packages/withdrawals-contract/Cargo.toml @@ -7,12 +7,12 @@ rust-version.workspace = true license = "MIT" [dependencies] -thiserror = "1.0.64" +thiserror = "2.0.12" platform-version = { path = "../rs-platform-version" } platform-value = { path = "../rs-platform-value" } num_enum = "0.5.7" # serde is required, `cargo machete` false positive -serde = { version = "1.0.197", features = ["derive"] } +serde = { version = "1.0.219", features = ["derive"] } serde_json = "1.0" serde_repr = "0.1.7" From 48adb341b35f5a1bcc7bc10bba87dfbba2245cb1 Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Sun, 13 Apr 2025 16:51:12 +0700 Subject: [PATCH 2/4] updated grovedb --- Cargo.lock | 18 +++++++++--------- packages/rs-drive/Cargo.toml | 12 ++++++------ packages/rs-platform-version/Cargo.toml | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1dd2f7cd44e..d3d0ddae248 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2184,7 +2184,7 @@ dependencies = [ [[package]] name = "grovedb" version = "3.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=93def978e499500051486eb3bd23f0ae4c1246c6#93def978e499500051486eb3bd23f0ae4c1246c6" +source = "git+https://github.com/dashpay/grovedb?rev=2109876271f35a7c167f91850768e46746a33fa1#2109876271f35a7c167f91850768e46746a33fa1" dependencies = [ "axum 0.7.5", "bincode", @@ -2215,7 +2215,7 @@ dependencies = [ [[package]] name = "grovedb-costs" version = "3.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=93def978e499500051486eb3bd23f0ae4c1246c6#93def978e499500051486eb3bd23f0ae4c1246c6" +source = "git+https://github.com/dashpay/grovedb?rev=2109876271f35a7c167f91850768e46746a33fa1#2109876271f35a7c167f91850768e46746a33fa1" dependencies = [ "integer-encoding", "intmap", @@ -2225,7 +2225,7 @@ dependencies = [ [[package]] name = "grovedb-epoch-based-storage-flags" version = "3.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=93def978e499500051486eb3bd23f0ae4c1246c6#93def978e499500051486eb3bd23f0ae4c1246c6" +source = "git+https://github.com/dashpay/grovedb?rev=2109876271f35a7c167f91850768e46746a33fa1#2109876271f35a7c167f91850768e46746a33fa1" dependencies = [ "grovedb-costs", "hex", @@ -2237,7 +2237,7 @@ dependencies = [ [[package]] name = "grovedb-merk" version = "3.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=93def978e499500051486eb3bd23f0ae4c1246c6#93def978e499500051486eb3bd23f0ae4c1246c6" +source = "git+https://github.com/dashpay/grovedb?rev=2109876271f35a7c167f91850768e46746a33fa1#2109876271f35a7c167f91850768e46746a33fa1" dependencies = [ "bincode", "blake3", @@ -2260,7 +2260,7 @@ dependencies = [ [[package]] name = "grovedb-path" version = "3.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=93def978e499500051486eb3bd23f0ae4c1246c6#93def978e499500051486eb3bd23f0ae4c1246c6" +source = "git+https://github.com/dashpay/grovedb?rev=2109876271f35a7c167f91850768e46746a33fa1#2109876271f35a7c167f91850768e46746a33fa1" dependencies = [ "hex", ] @@ -2268,7 +2268,7 @@ dependencies = [ [[package]] name = "grovedb-storage" version = "3.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=93def978e499500051486eb3bd23f0ae4c1246c6#93def978e499500051486eb3bd23f0ae4c1246c6" +source = "git+https://github.com/dashpay/grovedb?rev=2109876271f35a7c167f91850768e46746a33fa1#2109876271f35a7c167f91850768e46746a33fa1" dependencies = [ "blake3", "grovedb-costs", @@ -2287,7 +2287,7 @@ dependencies = [ [[package]] name = "grovedb-version" version = "3.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=93def978e499500051486eb3bd23f0ae4c1246c6#93def978e499500051486eb3bd23f0ae4c1246c6" +source = "git+https://github.com/dashpay/grovedb?rev=2109876271f35a7c167f91850768e46746a33fa1#2109876271f35a7c167f91850768e46746a33fa1" dependencies = [ "thiserror 2.0.12", "versioned-feature-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2296,7 +2296,7 @@ dependencies = [ [[package]] name = "grovedb-visualize" version = "3.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=93def978e499500051486eb3bd23f0ae4c1246c6#93def978e499500051486eb3bd23f0ae4c1246c6" +source = "git+https://github.com/dashpay/grovedb?rev=2109876271f35a7c167f91850768e46746a33fa1#2109876271f35a7c167f91850768e46746a33fa1" dependencies = [ "hex", "itertools 0.14.0", @@ -2305,7 +2305,7 @@ dependencies = [ [[package]] name = "grovedbg-types" version = "3.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=93def978e499500051486eb3bd23f0ae4c1246c6#93def978e499500051486eb3bd23f0ae4c1246c6" +source = "git+https://github.com/dashpay/grovedb?rev=2109876271f35a7c167f91850768e46746a33fa1#2109876271f35a7c167f91850768e46746a33fa1" dependencies = [ "serde", "serde_with 3.9.0", diff --git a/packages/rs-drive/Cargo.toml b/packages/rs-drive/Cargo.toml index bf35ba022d1..77cee4ec230 100644 --- a/packages/rs-drive/Cargo.toml +++ b/packages/rs-drive/Cargo.toml @@ -52,12 +52,12 @@ enum-map = { version = "2.0.3", optional = true } intmap = { version = "3.0.1", features = ["serde"], optional = true } chrono = { version = "0.4.35", optional = true } itertools = { version = "0.13", optional = true } -grovedb = { git = "https://github.com/dashpay/grovedb", rev = "93def978e499500051486eb3bd23f0ae4c1246c6", optional = true, default-features = false } -grovedb-costs = { git = "https://github.com/dashpay/grovedb", rev = "93def978e499500051486eb3bd23f0ae4c1246c6", optional = true } -grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "93def978e499500051486eb3bd23f0ae4c1246c6" } -grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "93def978e499500051486eb3bd23f0ae4c1246c6", optional = true } -grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "93def978e499500051486eb3bd23f0ae4c1246c6" } -grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "93def978e499500051486eb3bd23f0ae4c1246c6" } +grovedb = { git = "https://github.com/dashpay/grovedb", rev = "2109876271f35a7c167f91850768e46746a33fa1", optional = true, default-features = false } +grovedb-costs = { git = "https://github.com/dashpay/grovedb", rev = "2109876271f35a7c167f91850768e46746a33fa1", optional = true } +grovedb-path = { git = "https://github.com/dashpay/grovedb", rev = "2109876271f35a7c167f91850768e46746a33fa1" } +grovedb-storage = { git = "https://github.com/dashpay/grovedb", rev = "2109876271f35a7c167f91850768e46746a33fa1", optional = true } +grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "2109876271f35a7c167f91850768e46746a33fa1" } +grovedb-epoch-based-storage-flags = { git = "https://github.com/dashpay/grovedb", rev = "2109876271f35a7c167f91850768e46746a33fa1" } [dev-dependencies] criterion = "0.5" diff --git a/packages/rs-platform-version/Cargo.toml b/packages/rs-platform-version/Cargo.toml index 0771712d15d..76f6279576c 100644 --- a/packages/rs-platform-version/Cargo.toml +++ b/packages/rs-platform-version/Cargo.toml @@ -11,7 +11,7 @@ license = "MIT" thiserror = { version = "2.0.12" } bincode = { version = "=2.0.0-rc.3" } versioned-feature-core = { git = "https://github.com/dashpay/versioned-feature-core", version = "1.0.0" } -grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "93def978e499500051486eb3bd23f0ae4c1246c6" } +grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "2109876271f35a7c167f91850768e46746a33fa1" } once_cell = "1.19.0" [features] From 39c2389bf222d439e153ca3ec0b007f99a3328af Mon Sep 17 00:00:00 2001 From: Lukasz Klimek <842586+lklimek@users.noreply.github.com> Date: Mon, 14 Apr 2025 10:47:34 +0200 Subject: [PATCH 3/4] build(deps): update rs-tenderdash-abci to 1.4.0 --- Cargo.lock | 12 ++++++------ packages/dapi-grpc/Cargo.toml | 10 ++++++++-- packages/rs-drive-abci/Cargo.toml | 7 +++++-- packages/rs-drive-proof-verifier/Cargo.toml | 6 ++---- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d3d0ddae248..64636e81d13 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4959,8 +4959,8 @@ dependencies = [ [[package]] name = "tenderdash-abci" -version = "1.3.1" -source = "git+https://github.com/dashpay/rs-tenderdash-abci?rev=8d26acb3f8ae17ddb89c87119148dbb98aeeea29#8d26acb3f8ae17ddb89c87119148dbb98aeeea29" +version = "1.4.0" +source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.4.0#e2dd15f39246081e7d569e585ab78ff5340116ac" dependencies = [ "bytes", "futures", @@ -4979,8 +4979,8 @@ dependencies = [ [[package]] name = "tenderdash-proto" -version = "1.3.1" -source = "git+https://github.com/dashpay/rs-tenderdash-abci?rev=8d26acb3f8ae17ddb89c87119148dbb98aeeea29#8d26acb3f8ae17ddb89c87119148dbb98aeeea29" +version = "1.4.0" +source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.4.0#e2dd15f39246081e7d569e585ab78ff5340116ac" dependencies = [ "bytes", "chrono", @@ -4998,8 +4998,8 @@ dependencies = [ [[package]] name = "tenderdash-proto-compiler" -version = "1.3.1" -source = "git+https://github.com/dashpay/rs-tenderdash-abci?rev=8d26acb3f8ae17ddb89c87119148dbb98aeeea29#8d26acb3f8ae17ddb89c87119148dbb98aeeea29" +version = "1.4.0" +source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.4.0#e2dd15f39246081e7d569e585ab78ff5340116ac" dependencies = [ "fs_extra", "prost-build", diff --git a/packages/dapi-grpc/Cargo.toml b/packages/dapi-grpc/Cargo.toml index a9783ec9e92..110c3cdd936 100644 --- a/packages/dapi-grpc/Cargo.toml +++ b/packages/dapi-grpc/Cargo.toml @@ -27,13 +27,19 @@ tenderdash-proto = [] client = ["platform"] # Build tonic server code. Includes all client features and adds server-specific dependencies. -server = ["platform", "tenderdash-proto/server", "client", "drive", "tonic/router"] +server = [ + "platform", + "tenderdash-proto/server", + "client", + "drive", + "tonic/router", +] serde = ["dep:serde", "dep:serde_bytes", "tenderdash-proto/serde"] mocks = ["serde", "dep:serde_json"] [dependencies] -tenderdash-proto = { git = "https://github.com/dashpay/rs-tenderdash-abci", rev = "8d26acb3f8ae17ddb89c87119148dbb98aeeea29", default-features = false } +tenderdash-proto = { git = "https://github.com/dashpay/rs-tenderdash-abci", version = "1.4.0", tag = "v1.4.0", default-features = false } prost = { version = "0.13" } futures-core = "0.3.30" diff --git a/packages/rs-drive-abci/Cargo.toml b/packages/rs-drive-abci/Cargo.toml index 31a68051765..9696eab8838 100644 --- a/packages/rs-drive-abci/Cargo.toml +++ b/packages/rs-drive-abci/Cargo.toml @@ -52,7 +52,7 @@ tracing-subscriber = { version = "0.3.16", default-features = false, features = "registry", "tracing-log", ], optional = false } -tenderdash-abci = { git = "https://github.com/dashpay/rs-tenderdash-abci", rev = "8d26acb3f8ae17ddb89c87119148dbb98aeeea29", features = [ +tenderdash-abci = { git = "https://github.com/dashpay/rs-tenderdash-abci", version = "1.4.0", tag = "v1.4.0", features = [ "grpc", ] } @@ -120,4 +120,7 @@ name = "drive-abci" path = "src/main.rs" [lints.rust] -unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tokio_unstable)', 'cfg(create_sdk_test_data)'] } +unexpected_cfgs = { level = "warn", check-cfg = [ + 'cfg(tokio_unstable)', + 'cfg(create_sdk_test_data)', +] } diff --git a/packages/rs-drive-proof-verifier/Cargo.toml b/packages/rs-drive-proof-verifier/Cargo.toml index f0faf3ed731..4e13058e850 100644 --- a/packages/rs-drive-proof-verifier/Cargo.toml +++ b/packages/rs-drive-proof-verifier/Cargo.toml @@ -35,14 +35,12 @@ dpp = { path = "../rs-dpp", features = [ bincode = { version = "=2.0.0-rc.3", features = ["serde"] } platform-serialization-derive = { path = "../rs-platform-serialization-derive", optional = true } platform-serialization = { path = "../rs-platform-serialization" } -tenderdash-abci = { git = "https://github.com/dashpay/rs-tenderdash-abci", rev = "8d26acb3f8ae17ddb89c87119148dbb98aeeea29", features = [ +tenderdash-abci = { git = "https://github.com/dashpay/rs-tenderdash-abci", version = "1.4.0", tag = "v1.4.0", features = [ "crypto", ], default-features = false } tracing = { version = "0.1.37" } serde = { version = "1.0.219", default-features = false, optional = true } -serde_json = { version = "1.0", features = [ - "preserve_order", -], optional = true } +serde_json = { version = "1.0", features = ["preserve_order"], optional = true } hex = { version = "0.4.3" } indexmap = { version = "2.6.0" } derive_more = { version = "1.0", features = ["from"] } From 29ca17d59779a306f1829da34eef3280e06da3c0 Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Mon, 14 Apr 2025 16:02:27 +0700 Subject: [PATCH 4/4] updated some versions --- Cargo.lock | 16 ++++++++-------- packages/rs-dapi-client/Cargo.toml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 64636e81d13..fc5ee9e0bfd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -946,9 +946,9 @@ dependencies = [ [[package]] name = "console-api" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ed14aa9c9f927213c6e4f3ef75faaad3406134efe84ba2cb7983431d5f0931" +checksum = "8030735ecb0d128428b64cd379809817e620a40e5001c54465b99ec5feec2857" dependencies = [ "futures-core", "prost", @@ -959,9 +959,9 @@ dependencies = [ [[package]] name = "console-subscriber" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e3a111a37f3333946ebf9da370ba5c5577b18eb342ec683eb488dd21980302" +checksum = "6539aa9c6a4cd31f4b1c040f860a1eac9aa80e7df6b05d506a6e7179936d6a01" dependencies = [ "console-api", "crossbeam-channel", @@ -5396,9 +5396,9 @@ dependencies = [ [[package]] name = "tonic-web-wasm-client" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5ca6e7bdd0042c440d36b6df97c1436f1d45871ce18298091f114004b1beb4" +checksum = "12abe1160d2a9a3e4bf578e2e37fd8b4f65c5e64fca6037d6f1ed6c0e02a78ac" dependencies = [ "base64 0.22.1", "byteorder", @@ -5410,8 +5410,8 @@ dependencies = [ "httparse", "js-sys", "pin-project", - "thiserror 1.0.64", - "tonic 0.12.3", + "thiserror 2.0.12", + "tonic 0.13.0", "tower-service", "wasm-bindgen", "wasm-bindgen-futures", diff --git a/packages/rs-dapi-client/Cargo.toml b/packages/rs-dapi-client/Cargo.toml index 15851e4340d..0bac3bdee02 100644 --- a/packages/rs-dapi-client/Cargo.toml +++ b/packages/rs-dapi-client/Cargo.toml @@ -28,7 +28,7 @@ backon = { version = "1.3", default-features = false, features = [ [target.'cfg(target_arch = "wasm32")'.dependencies] gloo-timers = { version = "0.3.0", features = ["futures"] } -tonic-web-wasm-client = { version = "0.6.0" } +tonic-web-wasm-client = { version = "0.7.0" } wasm-bindgen-futures = { version = "0.4.49" } getrandom = { version = "0.2", features = ["js"] }