Bitcoin 0.32.2 upgrade #3239
Merged
Bitcoin 0.32.2 upgrade #3239
Conversation
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
arik-so
force-pushed
the
bitcoin-0.32.2-upgrade
branch
from
2bf94c4 to
db61c59
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3239 +/- ##
==========================================
+ Coverage 89.75% 90.39% +0.63%
==========================================
Files 123 124 +1
Lines 102158 107249 +5091
Branches 102158 107249 +5091
==========================================
+ Hits 91695 96947 +5252
+ Misses 7773 7717 -56
+ Partials 2690 2585 -105 ☔ View full report in Codecov by Sentry. |
arik-so
force-pushed
the
bitcoin-0.32.2-upgrade
branch
12 times, most recently
from
458d5cf to
9d5a386
Compare
arik-so
force-pushed
the
bitcoin-0.32.2-upgrade
branch
from
4c829f4 to
203803c
Compare
TheBlueMatt
reviewed
Aug 14, 2024
lightning/src/lib.rs
Outdated
| @@ -144,7 +299,7 @@ pub mod io_extras { | |||
| Ok(count) | |||
| } | |||
|
|
|||
| pub fn read_to_end<D: io::Read>(mut d: D) -> Result<alloc::vec::Vec<u8>, io::Error> { | |||
| pub fn read_to_end<D: Read>(mut d: &mut D) -> Result<alloc::vec::Vec<u8>, io::Error> { | |||
There was a problem hiding this comment.
Can this be dropped in favor of read_to_limit?
There was a problem hiding this comment.
It can be, but would probably be better in a followup because it does produce some errors.
|
We'll probably end up with a handful of followups to upstream stuff to |
TheBlueMatt
reviewed
Aug 14, 2024
arik-so
force-pushed
the
bitcoin-0.32.2-upgrade
branch
7 times, most recently
from
48bb54e to
07e0600
Compare
TheBlueMatt
reviewed
Aug 15, 2024
TheBlueMatt
reviewed
Aug 15, 2024
arik-so
force-pushed
the
bitcoin-0.32.2-upgrade
branch
2 times, most recently
from
215b556 to
df9aa8f
Compare
arik-so
force-pushed
the
bitcoin-0.32.2-upgrade
branch
2 times, most recently
from
c6a34da to
b72b5e9
Compare
TheBlueMatt
reviewed
Aug 15, 2024
arik-so
force-pushed
the
bitcoin-0.32.2-upgrade
branch
2 times, most recently
from
4b824f5 to
768c040
Compare
arik-so
force-pushed
the
bitcoin-0.32.2-upgrade
branch
2 times, most recently
from
ebb80e6 to
7462995
Compare
tnull
reviewed
Aug 16, 2024
There was a problem hiding this comment.
Did a first pass. Already looks pretty good.
AFAICT, you can (and should) drop most to almost all (?) changes related to lightning-transaction-sync if you'd simply bump rust-esplora-client and rust-electrum-client to their latest versions which have already been upgraded to rust-bitcoin 0.32.
In anticipation of the rust-bitcoin upgrade, which incorporates its own `io::Read` implementation, we need to make our usage compatible with dropping `std::io` and `core2::io`. Notably, in version 0.32.2, `bitcoin::io`'s `Read` is no longer implemented for `&mut R where R: Read + ?Sized`, which results in errors anytime `&mut &mut Readable` is passed instead of `&mut Readable`. This commit fixes those instances.
In lieu of using `Seek` and `SeekFrom`, we will instead rely exclusively on the `io::Cursor` type.
The rust-bitcoin upgrade will introduce `bitcoin::io` module, which will be missing a necessary subset of traits. To accommodate those traits' future implementations, we move the `lightning::io` module to its own file, where we will be able to implement the missing trait subset in the next commit.
The `bitcoin::io` Cursor will miss a bunch of functionality that we were using that we will reimplement here, most critically `set_position`.
arik-so
force-pushed
the
bitcoin-0.32.2-upgrade
branch
from
7462995 to
e07cccb
Compare
TheBlueMatt
reviewed
Aug 16, 2024
| impl<'a, R: Read> Read for BufReader<'a, R> { | ||
| #[inline] | ||
| fn read(&mut self, output: &mut [u8]) -> io::Result<usize> { | ||
| let input = self.fill_buf()?; |
There was a problem hiding this comment.
Technically if we want to get fancy we can ignore the whole buffer nonsense here and actually just do a straight read, but I'm also hoping this code never makes it into a release at all (ie rust-bitcoin updates fast enough) so its not worth worrying about too much.
Taproot is not yet being actively used, and this commit suppresses the noisy warning generation.
Version 0.32.2 of `rust-bitcoin` deprecates a number of methods that are commonly used in this project, most visibly `txid()`, which is now called `compute_txid()`. This resulted in a lot of warnings, and this commit is part of a series that seeks to address that.
Version 0.32.2 of `rust-bitcoin` deprecates a number of methods that are commonly used in this project, most visibly `txid()`, which is now called `compute_txid()`. This resulted in a lot of warnings, and this commit is part of a series that seeks to address that.
Version 0.32.2 of `rust-bitcoin` deprecates a number of methods that are commonly used in this project, most visibly `txid()`, which is now called `compute_txid()`. This resulted in a lot of warnings, and this commit is part of a series that seeks to address that.
Version 0.32.2 of `rust-bitcoin` deprecates a number of methods that are commonly used in this project, most visibly `txid()`, which is now called `compute_txid()`. This resulted in a lot of warnings, and this commit is part of a series that seeks to address that.
Version 0.32.2 of `rust-bitcoin` deprecates a number of methods that are commonly used in this project, most visibly `txid()`, which is now called `compute_txid()`. This resulted in a lot of warnings, and this commit is part of a series that seeks to address that.
arik-so
force-pushed
the
bitcoin-0.32.2-upgrade
branch
from
e07cccb to
36b484a
Compare
TheBlueMatt
approved these changes
Aug 16, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
As the title suggests, but still unfortunately a work in progress.