Merge branch 'v1.4-dev' into chore/DocumentQueryPartialEq

dashpay · Oct 17, 2024 · f53ae2c · f53ae2c
2 parents ed83ee3 + 1c81d68
commit f53ae2c
Show file tree

Hide file tree

Showing 16 changed files with 231 additions and 138 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/rs-dpp/Cargo.toml b/packages/rs-dpp/Cargo.toml
@@ -29,7 +29,7 @@ dashcore = { git = "https://github.com/dashpay/rust-dashcore", features = [
   "rand",
   "signer",
   "serde",
-], default-features = false, branch = "master" }
+], default-features = false, tag = "0.31.0" }
 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
@@ -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-rpc", tag = "v0.15.4" }
+dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore-rpc", tag = "v0.15.7" }
 dpp = { path = "../rs-dpp", features = ["abci"] }
 simple-signer = { path = "../simple-signer" }
 rust_decimal = "1.2.5"

diff --git a/packages/rs-drive-proof-verifier/Cargo.toml b/packages/rs-drive-proof-verifier/Cargo.toml
@@ -15,6 +15,7 @@ mocks = [
   "dep:platform-serialization-derive",
   "dep:platform-serialization",
   "dpp/document-serde-conversion",
+  "indexmap/serde",
 ]
 
 [dependencies]
@@ -42,4 +43,5 @@ serde_json = { version = "1.0.103", features = [
   "preserve_order",
 ], optional = true }
 hex = { version = "0.4.3" }
+indexmap = { version = "2.6.0" }
 derive_more = { version = "1.0", features = ["from"] }