WIP: Upgrade rust-miniscript / rust-bitcoin to latest version #1228
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
pythcoiner
reviewed
Aug 24, 2024
| _ => None, | ||
| } | ||
| .ok_or(LianaPolicyError::IncompatibleDesc)?; | ||
| SemanticPolicy::Thresh(thresh) if thresh.is_or() && thresh.n() > 1 => { |
There was a problem hiding this comment.
shouldn't we check thresh.k() == 1?
Suggested change
| SemanticPolicy::Thresh(thresh) if thresh.is_or() && thresh.n() > 1 => { | |
| SemanticPolicy::Thresh(thresh) if thresh.is_or() && thresh.n() > 1 && threshk() == 1 => { |
There was a problem hiding this comment.
I think this is already checked by thresh.is_or().
There was a problem hiding this comment.
I think it makes sense to keep this thresh.n() > 1 condition here, but perhaps this is not strictly necessary as the previous version didn't have subs.len() > 1 and we already ensure further below that the primary path and recovery paths are not empty.
|
Yes. In general i don't think the code here is correct. I need to go through the descriptor core logic one more time. |
|
also not from these PR, but here if assert fail we will panic shouldn'nt we error instead? |
jp1ac4
reviewed
Jan 10, 2025
| @@ -185,11 +187,14 @@ impl PathInfo { | |||
| ) -> Result<PathInfo, LianaPolicyError> { | |||
| match policy { | |||
| SemanticPolicy::Key(key) => Ok(PathInfo::Single(key)), | |||
| SemanticPolicy::Threshold(k, subs) => { | |||
| let keys: Result<_, LianaPolicyError> = subs | |||
| SemanticPolicy::Thresh(thresh) if thresh.k() > 0 && thresh.n() >= thresh.k() => { | |||
There was a problem hiding this comment.
Is the if condition required here if these checks are already performed in the Threshold constructor?
| SemanticPolicy::Threshold(k, subs) => { | ||
| let keys: Result<_, LianaPolicyError> = subs | ||
| SemanticPolicy::Thresh(thresh) if thresh.k() > 0 && thresh.n() >= thresh.k() => { | ||
| // FIXME |
There was a problem hiding this comment.
Is this FIXME still required? The code seems OK 🤔
jp1ac4
added a commit
to jp1ac4/liana
that referenced
this pull request
Jan 23, 2025
This upgrades bitcoin to 0.32 and related dependencies accordingly. The changes to the liana and lianad crates are taken from darosior's commit 20ee8b1 in draft PR wizardsardine#1228.
jp1ac4
added a commit
to jp1ac4/liana
that referenced
this pull request
Jan 23, 2025
This upgrades bitcoin to 0.32 and related dependencies accordingly. The changes to the liana and lianad crates are taken from darosior's commit 20ee8b1 in draft PR wizardsardine#1228.
jp1ac4
added a commit
to jp1ac4/liana
that referenced
this pull request
Jan 23, 2025
This upgrades bitcoin to 0.32 and related dependencies accordingly. The changes to the liana and lianad crates are taken from darosior's commit 20ee8b1 in draft PR wizardsardine#1228.
jp1ac4
added a commit
to jp1ac4/liana
that referenced
this pull request
Jan 24, 2025
This upgrades bitcoin to 0.32 and related dependencies accordingly. The changes to the liana and lianad crates are taken from darosior's commit 20ee8b1 in draft PR wizardsardine#1228.
jp1ac4
added a commit
to jp1ac4/liana
that referenced
this pull request
Jan 24, 2025
This upgrades bitcoin to 0.32 and related dependencies accordingly. The changes to the liana and lianad crates are taken from darosior's commit 20ee8b1 in draft PR wizardsardine#1228.
jp1ac4
added a commit
to jp1ac4/liana
that referenced
this pull request
Jan 24, 2025
This upgrades bitcoin to 0.32 and related dependencies accordingly. Note that the bdk_electrum crate is not upgraded to the most recent version available due to a degradation in Electrum sync performance in relation to the fetching and validation of Merkle proofs. Once that issue has been resolved, we can further upgrade BDK dependencies. Non-BDK changes to the liana and lianad crates are taken from darosior's commit 20ee8b1 in draft PR wizardsardine#1228.
jp1ac4
added a commit
to jp1ac4/liana
that referenced
this pull request
Jan 24, 2025
This upgrades bitcoin to 0.32 and related dependencies accordingly. Note that the bdk_electrum crate is not upgraded to the most recent version available due to a degradation in Electrum sync performance in relation to the fetching and validation of Merkle proofs. Once that issue has been resolved, we can further upgrade BDK dependencies. Non-BDK changes to the liana and lianad crates are taken from darosior's commit 20ee8b1 in draft PR wizardsardine#1228.
jp1ac4
added a commit
to jp1ac4/liana
that referenced
this pull request
Jan 24, 2025
This upgrades bitcoin to 0.32 and related dependencies accordingly. Note that the bdk_electrum crate is not upgraded to the most recent version available due to a degradation in Electrum sync performance in relation to the fetching and validation of Merkle proofs. Once that issue has been resolved, we can further upgrade BDK dependencies. Non-BDK changes to the liana and lianad crates are taken from darosior's commit 20ee8b1 in draft PR wizardsardine#1228.
jp1ac4
added a commit
to jp1ac4/liana
that referenced
this pull request
Jan 24, 2025
This upgrades bitcoin to 0.32 and related dependencies accordingly. Note that the bdk_electrum crate has not been upgraded to the most recent version available as the Electrum syncing there takes much longer due to the fetching and validation of Merkle proofs. There are ongoing BDK changes in relation to that and so we can further upgrade this dependency once those changes have been completed. Non-BDK changes to the liana and lianad crates are taken from darosior's commit 20ee8b1 in draft PR wizardsardine#1228.
jp1ac4
added a commit
to jp1ac4/liana
that referenced
this pull request
Jan 24, 2025
This upgrades bitcoin to 0.32 and related dependencies accordingly. Note that the bdk_electrum crate has not been upgraded to the most recent version available as the Electrum syncing there takes much longer due to the fetching and validation of Merkle proofs. There are ongoing BDK changes in relation to that and so we can further upgrade this dependency once those changes have been completed. Non-BDK changes to the liana and lianad crates are taken from darosior's commit 20ee8b1 in draft PR wizardsardine#1228.
jp1ac4
added a commit
to jp1ac4/liana
that referenced
this pull request
Jan 27, 2025
This upgrades bitcoin to 0.32 and related dependencies accordingly. Note that the bdk_electrum crate has not been upgraded to the most recent version available as the Electrum syncing there takes much longer due to the fetching and validation of Merkle proofs. There are ongoing BDK changes in relation to that and so we can further upgrade this dependency once those changes have been completed. Non-BDK changes to the liana and lianad crates are taken from darosior's commit 20ee8b1 in draft PR wizardsardine#1228.
edouardparis
added a commit
that referenced
this pull request
Jan 27, 2025
c5f5284 upgrade bitcoin to 0.32 and related (Michael Mallan) Pull request description: This is to upgrade bitcoin to 0.32 and related dependencies accordingly. Note that the bdk_electrum crate has not been upgraded to the most recent version available as the Electrum syncing there takes much longer due to the fetching and validation of Merkle proofs. There are ongoing changes in relation to that (https://github.com/bitcoindevkit/bdk/issues/1699) and so we can further upgrade this dependency once those changes have been completed. Non-BDK changes to the liana and lianad crates are taken from commit 20ee8b1 in draft PR #1228, which this replaces. (Once this PR has been tested and approved, we can release a new version of the async_hwi crate and point to that.) ACKs for top commit: edouardparis: ACK c5f5284 Tree-SHA512: 3cb1a2060ecc4c6b9631df0eadf5692ad35495b9303edbb80a437aca60ae062a7227f20ddeb5eb722cf57dd80bfa752372a14d26b8f306844237bfdb5f41e51a
|
Replaced by #1555. |
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.
I need to go over the changes again, and this introduces a massive performance hit. From quick profiling i think it's from upstream changes in the miniscript policy compiler.
Running
cargo test descriptorsbefore:After:
Fixes #1224.