Skip to content

chore: update tonic #2540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
QuantumExplorer merged 5 commits into from
Apr 14, 2025
Merged

chore: update tonic #2540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a707837
update some dependencies
QuantumExplorer Apr 13, 2025
48adb34
updated grovedb
QuantumExplorer Apr 13, 2025
39c2389
build(deps): update rs-tenderdash-abci to 1.4.0
lklimek Apr 14, 2025
c3f1347
Merge branch 'v2.0-dev' into chore/updateTonic
QuantumExplorer Apr 14, 2025
29ca17d
updated some versions
QuantumExplorer Apr 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
474 changes: 324 additions & 150 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
21 changes: 13 additions & 8 deletions packages/dapi-grpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,27 @@ 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", version = "1.4.0", tag = "v1.4.0", 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" }
Expand All @@ -51,18 +57,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]

Expand Down
2 changes: 1 addition & 1 deletion packages/dashpay-contract/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion packages/data-contracts/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion packages/dpns-contract/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion packages/feature-flags-contract/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion packages/masternode-reward-shares-contract/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
8 changes: 4 additions & 4 deletions packages/rs-dapi-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }

Expand All @@ -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]
Expand Down
6 changes: 3 additions & 3 deletions packages/rs-dpp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand All @@ -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" }
Expand Down
11 changes: 7 additions & 4 deletions packages/rs-drive-abci/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Expand All @@ -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", version = "1.4.0", tag = "v1.4.0", features = [
"grpc",
] }

Expand Down Expand Up @@ -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)',
] }
10 changes: 4 additions & 6 deletions packages/rs-drive-proof-verifier/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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", version = "1.3.0", tag = "v1.3.0+1.3.0", 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.197", default-features = false, optional = true }
serde_json = { version = "1.0.103", features = [
"preserve_order",
], optional = true }
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" }
indexmap = { version = "2.6.0" }
derive_more = { version = "1.0", features = ["from"] }
16 changes: 8 additions & 8 deletions packages/rs-drive/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand All @@ -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",
Expand All @@ -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 = "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"
Expand Down
4 changes: 2 additions & 2 deletions packages/rs-json-schema-compatibility-validator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ authors = ["Ivan Shumkov <ivan@shumkov.ru>"]

[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]
Expand Down
4 changes: 2 additions & 2 deletions packages/rs-platform-value/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions packages/rs-platform-version/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "2109876271f35a7c167f91850768e46746a33fa1" }
once_cell = "1.19.0"

[features]
Expand Down
6 changes: 3 additions & 3 deletions packages/rs-sdk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand All @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion packages/rs-sdk/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/search-contract/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion packages/simple-signer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion packages/token-history-contract/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion packages/wallet-utils-contract/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
4 changes: 2 additions & 2 deletions packages/wasm-dpp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/wasm-sdk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Loading