Skip to content

Commit 98ea9df

Browse files
committed
miniscript: fix string serialization of and_n
We are incorrectly serializing and_n as "and_b". In master this is fixed by #722 which rewrites the Display impl completely.
1 parent 8f54b5e commit 98ea9df

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# # 12.3.0 - August 31, 2024
2+
3+
- Fix incorrect string serialization of `and_b` [#735](https://github.com/rust-bitcoin/rust-miniscript/pull/735)
4+
15
# # 12.2.0 - July 20, 2024
26

37
- Fix panics while decoding large miniscripts from script [#712](https://github.com/rust-bitcoin/rust-miniscript/pull/712)

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "miniscript"
3-
version = "12.2.0"
3+
version = "12.3.0"
44
authors = ["Andrew Poelstra <[email protected]>, Sanket Kanjalkar <[email protected]>"]
55
license = "CC0-1.0"
66
homepage = "https://github.com/rust-bitcoin/rust-miniscript/"

src/miniscript/astelem.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> Terminal<Pk, Ctx> {
6262
Terminal::AndB(ref l, ref r) => fmt_2(f, "and_b(", l, r, is_debug),
6363
Terminal::AndOr(ref a, ref b, ref c) => {
6464
if c.node == Terminal::False {
65-
fmt_2(f, "and_b(", a, b, is_debug)
65+
fmt_2(f, "and_n(", a, b, is_debug)
6666
} else {
6767
f.write_str("andor(")?;
6868
conditional_fmt(f, a, is_debug)?;

0 commit comments

Comments
 (0)