0.32.xxx: Bump consensus_encoding to 1.1 and use prefixed encoders#6550
Draft
mpbagot wants to merge 5 commits into
Draft
0.32.xxx: Bump consensus_encoding to 1.1 and use prefixed encoders#6550mpbagot wants to merge 5 commits into
0.32.xxx: Bump consensus_encoding to 1.1 and use prefixed encoders#6550mpbagot wants to merge 5 commits into
Conversation
Contributor
Author
|
Oh, this lockfile is going to be a pain to fix. |
Contributor
|
It looks like what is needed to get the lockfiles to resolve is 1. update the rest of the optional With that said, pulling in the new optional deps of 1.1 definitely causes some dependency changes in the lockfile. I haven't fully thought them through. 06:04:30 ~/grd/rust-bitcoin > jj diff --git --context 1
diff --git a/bitcoin/Cargo.toml b/bitcoin/Cargo.toml
index a632aabb3e..2cfd440df4 100644
--- a/bitcoin/Cargo.toml
+++ b/bitcoin/Cargo.toml
@@ -52,3 +52,3 @@
# Do NOT use this as a feature! Use the `serde` feature instead.
-actual-serde = { package = "serde", version = "1.0.130", default-features = false, features = [ "derive", "alloc" ], optional = true }
+actual-serde = { package = "serde", version = "1.0.195", default-features = false, features = [ "derive", "alloc" ], optional = true }
diff --git a/hashes/Cargo.toml b/hashes/Cargo.toml
index e117bbf264..a9b7ab35f4 100644
--- a/hashes/Cargo.toml
+++ b/hashes/Cargo.toml
@@ -38,3 +38,3 @@
actual-schemars = { package = "schemars", version = "0.8.3", default-features = false, optional = true }
-serde = { version = "1.0.130", default-features = false, optional = true }
+serde = { version = "1.0.195", default-features = false, optional = true }
diff --git a/hashes/extended_tests/schemars/Cargo.toml b/hashes/extended_tests/schemars/Cargo.toml
index aab48ea589..e4391f8ba8 100644
--- a/hashes/extended_tests/schemars/Cargo.toml
+++ b/hashes/extended_tests/schemars/Cargo.toml
@@ -16,3 +16,3 @@
jsonschema-valid = "0.4.0"
-serde = { version = "1.0", default-features = false}
+serde = { version = "1.0.195", default-features = false}
schemars = "0.8.3"
diff --git a/io/Cargo.toml b/io/Cargo.toml
index 80cf1f96bf..0a2f7ab0be 100644
--- a/io/Cargo.toml
+++ b/io/Cargo.toml
@@ -24,3 +24,3 @@
[dependencies]
-encoding = { package = "bitcoin-consensus-encoding", version = "1.0", default-features = false, optional = true }
+encoding = { package = "bitcoin-consensus-encoding", version = "1.1", default-features = false, optional = true }
diff --git a/units/Cargo.toml b/units/Cargo.toml
index b409605a6c..7b1e7abb00 100644
--- a/units/Cargo.toml
+++ b/units/Cargo.toml
@@ -28,4 +28,4 @@
arbitrary = { version = "1.0.1", optional = true }
-encoding = { package = "bitcoin-consensus-encoding", version = "1.0", default-features = false, optional = true }
-serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true }
+encoding = { package = "bitcoin-consensus-encoding", version = "1.1", default-features = false, optional = true }
+serde = { version = "1.0.195", default-features = false, features = ["derive"], optional = true } |
Contributor
|
We discussed the |
0a64cd0 to
6e8a095
Compare
Now that we have bumped the MSRV we can update `serde`. Found while trying to add a dependency on one of the soon-to-be-stable crates.
With the release of consensus_encoding 1.1.0, the prefixed encoders change can now be backported to 0.32.xxx, as it is on master. First, the version needs to be bumped in the manifest. Bump consensus_encoding dep version to 1.1 in bitcoin.
Throughout the code, there are myriad instances of Encoder2<CompactSizeEncoder, Bytes/SliceEncoder> used to encode a length prefixed element vector or byte slice. With the new prefixed encoders these can all be replaced with the PrefixedBytes/SliceEncoder types. Replace uses of Encoder2<CompactSizeEncoder, Bytes/SliceEncoder> with the corresponding PrefixedBytes/SliceEncoder type.
6e8a095 to
295b94c
Compare
Contributor
Author
Contributor
|
Ooof, I didn't check the MSRVs due to the bumps. I'll poke around a bit there. EDIT: have a proposal for the MSRV issue: #6552 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
With the release of consensus_encoding 1.1.0, the prefixed encoders changes on master can now be backported. As some of the types are not present on 0.32.xxx, this is a subset of the master changes, paired with a bump to the consensus_encoding dep version.