diff --git a/Cargo.lock b/Cargo.lock index 16b3d58381a..0fb070fb49d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1481,6 +1481,7 @@ dependencies = [ "async-trait", "base64 0.22.1", "bincode", + "bincode_derive", "bs58", "byteorder", "chrono", diff --git a/packages/rs-dpp/Cargo.toml b/packages/rs-dpp/Cargo.toml index 31fc771deee..3a33517a4b8 100644 --- a/packages/rs-dpp/Cargo.toml +++ b/packages/rs-dpp/Cargo.toml @@ -39,7 +39,8 @@ jsonschema = { git = "https://github.com/dashpay/jsonschema-rs", branch = "confi ], optional = true } lazy_static = { version = "1.4" } num_enum = "0.7" -bincode = { version = "2.0.0-rc.3", features = ["serde"] } +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"] } @@ -298,3 +299,7 @@ extended-document = [ factories = [] client = ["factories", "state-transitions"] + +[package.metadata.cargo-machete] +# bincode_derive is referenced here to ensure that we use correct version =2.0.0-rc.3; otherwise it gets updated to 2.0.1 +ignored = ["bincode_derive"] diff --git a/packages/rs-drive-abci/Cargo.toml b/packages/rs-drive-abci/Cargo.toml index e931deaa49f..a3636465167 100644 --- a/packages/rs-drive-abci/Cargo.toml +++ b/packages/rs-drive-abci/Cargo.toml @@ -14,7 +14,7 @@ license = "MIT" [dependencies] arc-swap = "1.7.0" -bincode = { version = "2.0.0-rc.3", features = ["serde"] } +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"] } diff --git a/packages/rs-drive-proof-verifier/Cargo.toml b/packages/rs-drive-proof-verifier/Cargo.toml index 8e9134ad6bf..f2b1fe0310d 100644 --- a/packages/rs-drive-proof-verifier/Cargo.toml +++ b/packages/rs-drive-proof-verifier/Cargo.toml @@ -12,14 +12,15 @@ mocks = [ "dep:platform-serialization-derive", "dpp/document-serde-conversion", "indexmap/serde", - "dpp/data-contract-serde-conversion" + "dpp/data-contract-serde-conversion", ] [dependencies] thiserror = { version = "1.0.63" } dapi-grpc = { path = "../dapi-grpc", default-features = false, features = [ - "platform", "client" + "platform", + "client", ] } drive = { path = "../rs-drive", default-features = false, features = [ @@ -31,7 +32,7 @@ dpp = { path = "../rs-dpp", features = [ # "extended-document", "core-types-serialization", ], default-features = false } -bincode = { version = "2.0.0-rc.3", features = ["serde"] } +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 = [ diff --git a/packages/rs-drive/Cargo.toml b/packages/rs-drive/Cargo.toml index ff2d86357d4..b6908320de0 100644 --- a/packages/rs-drive/Cargo.toml +++ b/packages/rs-drive/Cargo.toml @@ -14,7 +14,7 @@ license = "MIT" resolver = "2" [dependencies] -bincode = { version = "2.0.0-rc.3", features = ["serde"] } +bincode = { version = "=2.0.0-rc.3", features = ["serde"] } platform-version = { path = "../rs-platform-version" } # used to convert integers to bytes, needed in verifier integer-encoding = { version = "4.0.0" } @@ -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 = "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" } [dev-dependencies] criterion = "0.5" @@ -117,4 +117,9 @@ server = [ full = ["server", "ciborium", "serde", "bs58", "tempfile", "base64", "chrono"] cbor_query = ["ciborium", "dpp/platform-value-cbor", "dpp/cbor"] grovedb_operations_logging = [] -verify = ["grovedb/verify", "grovedb-costs", "dpp/state-transitions", "dpp/system_contracts"] +verify = [ + "grovedb/verify", + "grovedb-costs", + "dpp/state-transitions", + "dpp/system_contracts", +] diff --git a/packages/rs-platform-serialization/Cargo.toml b/packages/rs-platform-serialization/Cargo.toml index 163c60f03b9..74bb8ef4c24 100644 --- a/packages/rs-platform-serialization/Cargo.toml +++ b/packages/rs-platform-serialization/Cargo.toml @@ -8,5 +8,5 @@ rust-version.workspace = true license = "MIT" [dependencies] -bincode = { version = "2.0.0-rc.3", features = ["serde"] } +bincode = { version = "=2.0.0-rc.3", features = ["serde"] } platform-version = { path = "../rs-platform-version" } diff --git a/packages/rs-platform-value/Cargo.toml b/packages/rs-platform-value/Cargo.toml index 358a60e334d..32e62cb1e0b 100644 --- a/packages/rs-platform-value/Cargo.toml +++ b/packages/rs-platform-value/Cargo.toml @@ -8,7 +8,7 @@ rust-version.workspace = true license = "MIT" [dependencies] -bincode = { version = "2.0.0-rc.3", features = ["serde"] } +bincode = { version = "=2.0.0-rc.3", features = ["serde"] } ciborium = { version = "0.2.2", optional = true } thiserror = "1.0.64" bs58 = "0.5.1" diff --git a/packages/rs-platform-version/Cargo.toml b/packages/rs-platform-version/Cargo.toml index a00c9f92057..6692c09e017 100644 --- a/packages/rs-platform-version/Cargo.toml +++ b/packages/rs-platform-version/Cargo.toml @@ -9,9 +9,9 @@ license = "MIT" [dependencies] thiserror = { version = "1.0.63" } -bincode = { version = "2.0.0-rc.3" } +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 = "f89e03e4e0ac12aa2feea5c94b38c09f4909facc" } once_cell = "1.19.0" [features] diff --git a/packages/simple-signer/Cargo.toml b/packages/simple-signer/Cargo.toml index 3628098b200..8d57b031ddb 100644 --- a/packages/simple-signer/Cargo.toml +++ b/packages/simple-signer/Cargo.toml @@ -7,7 +7,7 @@ rust-version.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bincode = { version = "2.0.0-rc.3", features = ["serde"] } +bincode = { version = "=2.0.0-rc.3", features = ["serde"] } dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", tag = "v0.38.0" } dpp = { path = "../rs-dpp", features = ["abci"] } base64 = { version = "0.22.1" } diff --git a/packages/strategy-tests/Cargo.toml b/packages/strategy-tests/Cargo.toml index cade4d223ac..f7f70e3c461 100644 --- a/packages/strategy-tests/Cargo.toml +++ b/packages/strategy-tests/Cargo.toml @@ -13,7 +13,7 @@ license = "MIT" [dependencies] tracing = "0.1.4" futures = "0.3" -bincode = { version = "2.0.0-rc.3", features = ["serde"] } +bincode = { version = "=2.0.0-rc.3", features = ["serde"] } drive = { path = "../rs-drive", default-features = false, features = [ "verify", ] } diff --git a/packages/wasm-dpp/Cargo.toml b/packages/wasm-dpp/Cargo.toml index c3f34c02254..af22e67df82 100644 --- a/packages/wasm-dpp/Cargo.toml +++ b/packages/wasm-dpp/Cargo.toml @@ -52,7 +52,7 @@ anyhow = { version = "1.0.75" } # required, cargo-machete false positive wasm-bindgen-futures = "0.4.49" async-trait = "0.1.59" -bincode = "2.0.0-rc.3" +bincode = { version = "=2.0.0-rc.3" } [profile.release] lto = true opt-level = 'z'