From 53086bc23211a5e1aae813ed9e1939c16d62159a Mon Sep 17 00:00:00 2001 From: pauldelucia Date: Thu, 17 Apr 2025 19:18:22 +0700 Subject: [PATCH 1/2] chore(platform): bump rust dashcore version --- Cargo.lock | 26 ++++++++++++++------------ packages/rs-dpp/Cargo.toml | 2 +- packages/rs-drive-abci/Cargo.toml | 2 +- packages/rs-sdk/Cargo.toml | 2 +- packages/simple-signer/Cargo.toml | 2 +- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 35af7043497..5eabc1e507d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1285,12 +1285,13 @@ dependencies = [ [[package]] name = "dashcore" -version = "0.39.4" -source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.39.5#8a87e75a31a40c3bf7a42d1c9a4197bc0a79ea12" +version = "0.39.6" +source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.39.6#51df58f5d5d499f5ee80ab17076ff70b5347c7db" dependencies = [ "anyhow", "base64-compat", "bech32", + "bincode", "bitflags 2.9.0", "blake3", "bls-signatures 1.2.5 (git+https://github.com/dashpay/bls-signatures?rev=0bb5c5b03249c463debb5cef5f7e52ee66f3aaab)", @@ -1308,13 +1309,13 @@ dependencies = [ [[package]] name = "dashcore-private" -version = "0.39.4" -source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.39.5#8a87e75a31a40c3bf7a42d1c9a4197bc0a79ea12" +version = "0.39.6" +source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.39.6#51df58f5d5d499f5ee80ab17076ff70b5347c7db" [[package]] name = "dashcore-rpc" -version = "0.39.4" -source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.39.5#8a87e75a31a40c3bf7a42d1c9a4197bc0a79ea12" +version = "0.39.6" +source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.39.6#51df58f5d5d499f5ee80ab17076ff70b5347c7db" dependencies = [ "dashcore-rpc-json", "hex", @@ -1326,8 +1327,8 @@ dependencies = [ [[package]] name = "dashcore-rpc-json" -version = "0.39.4" -source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.39.5#8a87e75a31a40c3bf7a42d1c9a4197bc0a79ea12" +version = "0.39.6" +source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.39.6#51df58f5d5d499f5ee80ab17076ff70b5347c7db" dependencies = [ "bincode", "dashcore", @@ -1340,9 +1341,10 @@ dependencies = [ [[package]] name = "dashcore_hashes" -version = "0.39.4" -source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.39.5#8a87e75a31a40c3bf7a42d1c9a4197bc0a79ea12" +version = "0.39.6" +source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.39.6#51df58f5d5d499f5ee80ab17076ff70b5347c7db" dependencies = [ + "bincode", "dashcore-private", "secp256k1", "serde", @@ -1623,7 +1625,7 @@ dependencies = [ "clap", "console-subscriber", "dapi-grpc", - "dashcore-rpc", + "dashcore", "delegate", "derive_more 1.0.0", "dotenvy", @@ -4710,7 +4712,7 @@ version = "2.0.0-dev.1" dependencies = [ "base64 0.22.1", "bincode", - "dashcore-rpc", + "dashcore", "dpp", ] diff --git a/packages/rs-dpp/Cargo.toml b/packages/rs-dpp/Cargo.toml index b0c45198e5d..e8a3eb746f6 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.39.5" } +], default-features = false, tag = "v0.39.6" } env_logger = { version = "0.11" } getrandom = { version = "0.2", features = ["js"] } hex = { version = "0.4" } diff --git a/packages/rs-drive-abci/Cargo.toml b/packages/rs-drive-abci/Cargo.toml index ad21fe57ae3..8a68c071050 100644 --- a/packages/rs-drive-abci/Cargo.toml +++ b/packages/rs-drive-abci/Cargo.toml @@ -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.39.5" } +dashcore = { git = "https://github.com/dashpay/rust-dashcore", tag = "v0.39.6" } dpp = { path = "../rs-dpp", features = ["abci"] } simple-signer = { path = "../simple-signer" } rust_decimal = "1.2.5" diff --git a/packages/rs-sdk/Cargo.toml b/packages/rs-sdk/Cargo.toml index c11f5577258..c18ea61d675 100644 --- a/packages/rs-sdk/Cargo.toml +++ b/packages/rs-sdk/Cargo.toml @@ -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.39.5" } +dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", tag = "v0.39.6" } 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/simple-signer/Cargo.toml b/packages/simple-signer/Cargo.toml index f1a222cd117..3bb28f045e3 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.39.5" } +dashcore = { git = "https://github.com/dashpay/rust-dashcore", tag = "v0.39.6" } dpp = { path = "../rs-dpp", features = ["abci"] } base64 = { version = "0.22.1" } From b589447de7cb10d4e31de443be9f375125f95925 Mon Sep 17 00:00:00 2001 From: pauldelucia Date: Thu, 17 Apr 2025 19:21:19 +0700 Subject: [PATCH 2/2] fix --- Cargo.lock | 6 ++---- packages/rs-drive-abci/Cargo.toml | 2 +- packages/simple-signer/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5eabc1e507d..efa07cbcc35 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1291,7 +1291,6 @@ dependencies = [ "anyhow", "base64-compat", "bech32", - "bincode", "bitflags 2.9.0", "blake3", "bls-signatures 1.2.5 (git+https://github.com/dashpay/bls-signatures?rev=0bb5c5b03249c463debb5cef5f7e52ee66f3aaab)", @@ -1344,7 +1343,6 @@ name = "dashcore_hashes" version = "0.39.6" source = "git+https://github.com/dashpay/rust-dashcore?tag=v0.39.6#51df58f5d5d499f5ee80ab17076ff70b5347c7db" dependencies = [ - "bincode", "dashcore-private", "secp256k1", "serde", @@ -1625,7 +1623,7 @@ dependencies = [ "clap", "console-subscriber", "dapi-grpc", - "dashcore", + "dashcore-rpc", "delegate", "derive_more 1.0.0", "dotenvy", @@ -4712,7 +4710,7 @@ version = "2.0.0-dev.1" dependencies = [ "base64 0.22.1", "bincode", - "dashcore", + "dashcore-rpc", "dpp", ] diff --git a/packages/rs-drive-abci/Cargo.toml b/packages/rs-drive-abci/Cargo.toml index 8a68c071050..538fe4c336b 100644 --- a/packages/rs-drive-abci/Cargo.toml +++ b/packages/rs-drive-abci/Cargo.toml @@ -28,7 +28,7 @@ rand = "0.8.5" tempfile = "3.3.0" hex = "0.4.3" indexmap = { version = "2.2.6", features = ["serde"] } -dashcore = { git = "https://github.com/dashpay/rust-dashcore", tag = "v0.39.6" } +dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", tag = "v0.39.6" } dpp = { path = "../rs-dpp", features = ["abci"] } simple-signer = { path = "../simple-signer" } rust_decimal = "1.2.5" diff --git a/packages/simple-signer/Cargo.toml b/packages/simple-signer/Cargo.toml index 3bb28f045e3..76dc1b7eeb2 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 = { git = "https://github.com/dashpay/rust-dashcore", tag = "v0.39.6" } +dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", tag = "v0.39.6" } dpp = { path = "../rs-dpp", features = ["abci"] } base64 = { version = "0.22.1" }