Skip to content

Conversation

@sanket1729
Copy link
Member

No description provided.

@sanket1729 sanket1729 force-pushed the msrv branch 2 times, most recently from 5f15aa9 to 1a62635 Compare July 18, 2023 07:30
@sanket1729 sanket1729 changed the title Update MSRV to 1.48 Update MSRV to 1.48. Fixes CI Jul 18, 2023
@sanket1729 sanket1729 force-pushed the msrv branch 2 times, most recently from f953605 to 1baa550 Compare July 18, 2023 08:03
@apoelstra
Copy link
Member

Can you update the fuzzer rustc to 1.64 from 1.58, and also update generate-files.sh to reflect the regex = "=1.4.0" thing (if that is still necessary)?

@sanket1729
Copy link
Member Author

Nice. Found a new fuzz failure

Copy link
Member

@tcharding tcharding left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, glad to see you worked out the pinning, I tried and failed yesterday. (FWIW I used LGTM instead of ACK because I'm assuming you are going to squash the fix! commits.)

@sanket1729
Copy link
Member Author

After a lot of iteration on fuzzer, this is finally ready for review.

.gitconfig Outdated
@@ -0,0 +1,3 @@
[remote "upstream"]
fetch = +refs/pull/*:refs/remotes/pr/*
fetch = +refs/merge-requests/*:refs/remotes/pr/* No newline at end of file
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In 3ecd2fb:

You should not have committed this file

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's deleted in the next commit, but could still cause weird things to happen during bisection.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed

/// Helper function to compile different types of binary fragments.
/// `sat_prob` and `dissat_prob` represent the sat and dissat probabilities of
/// root or. `weights` represent the odds for taking each sub branch
#[allow(clippy::too_many_arguments)]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In e491308:

I think this is fine, but FYI both this and the "too many arguments" lint thresholds can be set globally in clippy.toml.

if !ch.is_ascii() {
return Err(Error::Unprintable(ch));
}
// TODO: Avoid linear search overhead by using OnceCell to cache this in a BTreeMap.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In 13950fd:

Since all our allowed characters are 127 or less, we could just make a static 128-entry array of bool rather than a BTreeMap. But the linear search is fine for now.

apoelstra
apoelstra previously approved these changes Jul 19, 2023
Copy link
Member

@apoelstra apoelstra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 13950fd

@apoelstra
Copy link
Member

Oh, actually, I'd like you to remove the spurious file before merging.

Caught by fuzz tests. We directly assumed that the internal key is a
valid string if it was between '(' and ')' and did not contain any ','
This results in fuzzer crash when trying compute the checksum in
`Display` implemenation of Descriptor
Also improves the efficiency of descriptor checksum code.
@sanket1729
Copy link
Member Author

sanket1729 commented Jul 19, 2023

Added another commit that adds a static vector for character lookups

Copy link
Member

@apoelstra apoelstra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 60fde9e

Copy link
Member

@apoelstra apoelstra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 6b76997

@apoelstra apoelstra merged commit d3af6d9 into rust-bitcoin:master Jul 19, 2023
@apoelstra apoelstra mentioned this pull request Jul 4, 2025
apoelstra added a commit to apoelstra/rust-miniscript that referenced this pull request Jul 4, 2025
This results in fuzzer crash when trying compute the checksum in
`Display` implemenation of Descriptor

Backport of 60fde9e from rust-bitcoin#569.
apoelstra added a commit to apoelstra/rust-miniscript that referenced this pull request Jul 5, 2025
This results in fuzzer crash when trying compute the checksum in
`Display` implemenation of Descriptor

Backport of 60fde9e from rust-bitcoin#569.
apoelstra added a commit to apoelstra/rust-miniscript that referenced this pull request Jul 5, 2025
This results in fuzzer crash when trying compute the checksum in
`Display` implemenation of Descriptor

Backport of 60fde9e from rust-bitcoin#569.
apoelstra added a commit to apoelstra/rust-miniscript that referenced this pull request Jul 5, 2025
This results in fuzzer crash when trying compute the checksum in
`Display` implemenation of Descriptor

Backport of 60fde9e from rust-bitcoin#569.
heap-coder added a commit to heap-coder/rust-miniscript that referenced this pull request Sep 27, 2025
6b76997b14fd606b6ceba884012512c06200a4a4 Use a static map to lookup which characters are allowed (sanket1729)
60fde9e9519125d3b1ecccea302a0a6e6ce484fa Check that we only accept INPUT_CHARSET in from_str (sanket1729)
a3966059fa38e64800f86306fb9312e67ba7f1dc Fix taproot internal key parsing (sanket1729)
68c7c49d9a5c53de346cd1c562bd0a1250c112a4 clippy warnings (sanket1729)
b238366492a320ce58a01b5549cd2459abd9465f Update MSRV to 1.48 (sanket1729)

Pull request description:

ACKs for top commit:
  apoelstra:
    ACK 6b76997b14fd606b6ceba884012512c06200a4a4

Tree-SHA512: 5b42b3a1d8156c5a7aa5924bfbc5d79f8196173b4f9a2b502480edbfa4d2f9e2cd74dd34839de76e12a74ad0ccfc335f816890db1b4b6705bdbb2e7bc81fcebc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants