Skip to content

Commit 4fafddc

Browse files
committed
Merge #52: Update rust-simplicity
6d352e8 Update rust-simplicity (Christian Lewe) Pull request description: Use a fixed rust-simplicity commit on the main repo instead of a branch on my local repo. ACKs for top commit: sanket1729: utACK 6d352e8 Tree-SHA512: 9157b4e79ece20eebbd44287c0b75c8f7f1adcb14c74ed287e562b7b1f11bb48e72dbd6749c09324cfc4377c7aa5f052a005e111a9e18692bd98171a148c1730
2 parents f887126 + 6d352e8 commit 4fafddc

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ base64 = ["bitcoin/base64"]
2222
bitcoin = "0.30.0"
2323
elements = "0.22.0"
2424
bitcoin-miniscript = { package = "miniscript", version = "10.0" }
25-
simplicity = { git = "https://github.com/uncomputable/rust-simplicity", branch = "policy-fixes" }
25+
simplicity = { git = "https://github.com/BlockstreamResearch/rust-simplicity", rev = "8ed4d4e0caf550148f1e17784af7665bad74b384" }
2626

2727
# Do NOT use this as a feature! Use the `serde` feature instead.
2828
actual-serde = { package = "serde", version = "1.0", optional = true }

src/descriptor/tr.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -512,8 +512,7 @@ impl<'a, Pk: ToPublicKey, Ext: ParseableExt> TapLeafScript<'a, Pk, Ext> {
512512
match self {
513513
TapLeafScript::Miniscript(ms) => ms.encode(),
514514
TapLeafScript::Simplicity(sim) => {
515-
let commit = sim.serialize_no_witness();
516-
Script::from(commit.cmr().as_ref().to_vec())
515+
Script::from(sim.cmr().as_ref().to_vec())
517516
}
518517
}
519518
}

0 commit comments

Comments
 (0)