Skip to content
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

Jump to bottom

Use bollard crate directly, upgrade serde to 1.0.152 #10546

Merged
merged 1 commit into from
Oct 17, 2023
Merged

Use bollard crate directly, upgrade serde to 1.0.152 #10546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
66 changes: 43 additions & 23 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 3 additions & 6 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,10 +446,7 @@ bitvec = "1.0.1"
blake2 = "0.10.4"
blake2-rfc = "0.2.18"
blst = "0.3.7"
# We use a version of bollard where it relies on a lower version of serde_with.
# Otherwise it imposes that we use serde 1.0.157, which we can't due to this issue:
# https://github.com/aptos-labs/aptos-core/issues/10424
bollard = { git = "https://github.com/banool/bollard.git", rev = "0bf0b43f736040bb3d4aacb20125fd2b4021733d" }
bollard = "0.15"
bulletproofs = { version = "4.0.0" }
byteorder = "1.4.3"
bytes = { version = "1.4.0", features = ["serde"] }
Expand Down Expand Up @@ -596,9 +593,9 @@ sha2 = "0.9.3"
sha2_0_10_6 = { package = "sha2", version = "0.10.6" }
sha3 = "0.9.1"
siphasher = "0.3.10"
# For more information about why we are pinned to 1.0.149, see this issue:
# For more information about why we are pinned to 1.0.152, see this issue:
# https://github.com/aptos-labs/aptos-core/issues/10424
serde = { version = "=1.0.149", features = ["derive", "rc"] }
serde = { version = "=1.0.152", features = ["derive", "rc"] }
serde_bytes = "0.11.6"
serde_json = { version = "1.0.81", features = ["preserve_order", "arbitrary_precision"] } # Note: arbitrary_precision is required to parse u256 in JSON
serde_repr = "0.1"
Expand Down