Merge #111: Update simplicity

d528401 chore: Update rust-simplicity (Christian Lewe)
5752dfc chore: Update flake (Christian Lewe)
c175f6f fix: Make integration tests run (Christian Lewe)

Pull request description:

  Update rust-simplicity for pruning support. Update the nix flake.

ACKs for top commit:
  apoelstra:
    ACK d528401; successfully ran local tests; did not check the flake in any way

Tree-SHA512: e4fa6f3d0884ec8d957ba0672a57738fdc4faeb1ad0e02c8bc211fa542666bd592af20b63843b4c1ca9716a763e8da604ee34abda9479250f3f1b3cf5f5137a3

Author: uncomputable

Cargo.lock

@@ -27,7 +27,7 @@ pest = "2.1.3"
 pest_derive = "2.7.1"
 serde = { version = "1.0.188", features = ["derive"], optional = true }
 serde_json = { version = "1.0.105", optional = true }
-simplicity-lang = { git = "https://github.com/BlockstreamResearch/rust-simplicity", rev = "fbe88d6f703c2f3b74f52eb3eebf60411606ed42" }
+simplicity-lang = { git = "https://github.com/BlockstreamResearch/rust-simplicity", rev = "ca0c0ebee295937ab021ad018acc44a5aaa12649" }
 miniscript = "12.2.0"
 either = "1.12.0"
 itertools = "0.13.0"

Cargo.toml

@@ -79,19 +79,15 @@ fn hodl_vault(sighash_all: [u8; 32]) -> simfony::WitnessValues {
 fn p2pk_args() -> simfony::Arguments {
     simfony::Arguments::from(HashMap::from([(
         WitnessName::from_str_unchecked("ALICE_PUBLIC_KEY"),
-        Value::byte_array(util::xonly_public_key(0).to_byte_array()),
+        Value::u256(util::xonly_public_key(1)),
     )]))
 }
 
 fn p2pk(sighash_all: [u8; 32]) -> simfony::WitnessValues {
-    let mut witness_values = HashMap::new();
-    witness_values
-        .insert(
-            WitnessName::from_str_unchecked("SIG"),
-            Value::byte_array(util::sign_schnorr(1, sighash_all)),
-        )
-        .unwrap();
-    simfony::WitnessValues::from(witness_values)
+    simfony::WitnessValues::from(HashMap::from([(
+        WitnessName::from_str_unchecked("ALICE_SIGNATURE"),
+        Value::byte_array(util::sign_schnorr(1, sighash_all)),
+    )]))
 }
 
 fn p2pkh(sighash_all: [u8; 32]) -> simfony::WitnessValues {

bitcoind-tests/Cargo.lock

@@ -2,7 +2,7 @@
   description = "Simfony";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
     flake-utils.url = "github:numtide/flake-utils";
     rust-overlay.url = "github:oxalica/rust-overlay";
   };

bitcoind-tests/tests/spend_utxo.rs

@@ -49,6 +49,10 @@ build_fuzz:
 build_integration:
     cargo test --no-run --manifest-path ./bitcoind-tests/Cargo.toml
 
+# Run integration tests (requires custom elementsd)
+check_integration:
+    cargo test --manifest-path ./bitcoind-tests/Cargo.toml
+
 # Build code for the WASM target
 build_wasm:
     cargo check --target wasm32-unknown-unknown

flake.lock

@@ -137,7 +137,9 @@ impl CompiledProgram {
             .is_consistent(&self.witness_types)
             .map_err(|e| e.to_string())?;
         let simplicity_witness = named::to_witness_node(&self.simplicity, witness_values);
-        let simplicity_redeem = simplicity_witness.finalize().map_err(|e| e.to_string())?;
+        let simplicity_redeem = simplicity_witness
+            .finalize_unpruned()
+            .map_err(|e| e.to_string())?;
         Ok(SatisfiedProgram {
             simplicity: simplicity_redeem,
             debug_symbols: self.debug_symbols.clone(),