Update simplicity

.github/workflows/test.yml

@@ -21,7 +21,10 @@ jobs:
 
   test-stable:
     name: Test - stable toolchain
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
 
     steps:
     - name: Checkout

Cargo.toml

@@ -7,7 +7,7 @@ homepage = "https://github.com/BlockstreamResearch/simfony/"
 repository = "https://github.com/BlockstreamResearch/simfony/"
 description = "Rust-like language that compiles to Simplicity bytecode."
 edition = "2021"
-rust-version = "1.63.0"
+rust-version = "1.78.0"
 
 [lib]
 name = "simfony"
@@ -22,12 +22,11 @@ serde = ["dep:serde", "dep:serde_json"]
 
 [dependencies]
 base64 = "0.21.2"
-hex-conservative = "0.1.1"
 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 = "ca0c0ebee295937ab021ad018acc44a5aaa12649" }
+simplicity-lang = { git = "https://github.com/BlockstreamResearch/rust-simplicity", rev = "2f52e22483079ace09e76754222220b5c230a9d0" }
 miniscript = "12.2.0"
 either = "1.12.0"
 itertools = "0.13.0"

README.md

@@ -20,7 +20,7 @@ Take a look at the [example programs](https://github.com/BlockstreamResearch/sim
 
 ## MSRV
 
-This crate should compile with any feature combination on **Rust 1.63.0** or higher.
+This crate should compile with any feature combination on **Rust 1.78.0** or higher.
 
 ## Simplicity's need for a high-level language
 

clippy.toml

@@ -1 +1 @@
-msrv = "1.63.0"
+msrv = "1.78.0"

codegen/Cargo.toml

@@ -2,7 +2,6 @@
 name = "codegen"
 version = "0.1.0"
 edition = "2021"
-rust-version = "1.63.0"
 description = "Generator of Rust code as interface between Simfony and Rust."
 publish = false
 

flake.nix

@@ -14,11 +14,8 @@
   , rust-overlay
   , ...
   }:
-  flake-utils.lib.eachSystem [
-    "x86_64-linux"
-    "aarch64-linux"
-    "x86_64-darwin"
-  ] (system:
+  flake-utils.lib.eachDefaultSystem
+  (system:
     let
       overlays = [
         (import rust-overlay)
@@ -35,23 +32,24 @@
       CC_wasm32_unknown_unknown = "${pkgs.llvmPackages_16.clang-unwrapped}/bin/clang-16";
       AR_wasm32_unknown_unknown = "${pkgs.llvmPackages_16.libllvm}/bin/llvm-ar";
       CFLAGS_wasm32_unknown_unknown = "-I ${pkgs.llvmPackages_16.libclang.lib}/lib/clang/16/include/";
+      gdbSupported = !(pkgs.stdenv.isDarwin && pkgs.stdenv.isAarch64);
       default_shell = with_elements: pkgs.mkShell {
           buildInputs = [
             defaultRust
             pkgs.just
-            pkgs.gdb
             pkgs.cargo-hack
             pkgs.mdbook
           ] ++ (
             if with_elements then [ elementsd-simplicity ] else []
+          ) ++ (
+            if gdbSupported then [ pkgs.gdb ] else []
           );
           inherit CC_wasm32_unknown_unknown;
           inherit AR_wasm32_unknown_unknown;
           inherit CFLAGS_wasm32_unknown_unknown;
           # Constants for IDE
           RUST_TOOLCHAIN = "${defaultRust}/bin";
           RUST_STDLIB = "${defaultRust}/lib/rustlib/src/rust";
-          DEBUGGER = "${pkgs.gdb}";
       };
     in
     {
@@ -68,7 +66,7 @@
         };
         msrv = pkgs.mkShell {
           buildInputs = [
-            (mkRust "stable" "1.63.0" "minimal" [] [])
+            (mkRust "stable" "1.78.0" "minimal" [] [])
             pkgs.just
           ];
         };

src/lib.rs

@@ -249,8 +249,6 @@ pub trait ArbitraryOfType: Sized {
 mod tests {
     use base64::display::Base64Display;
     use base64::engine::general_purpose::STANDARD;
-    #[cfg(feature = "serde")]
-    use elements::LockTime;
     use simplicity::BitMachine;
     use std::borrow::Cow;
     use std::path::Path;
@@ -392,9 +390,11 @@ mod tests {
         }
 
         fn run(self) -> Result<(), simplicity::bit_machine::ExecutionError> {
-            let mut mac = BitMachine::for_program(self.program.redeem());
             let env = dummy_env::dummy_with(self.lock_time, self.sequence, self.include_fee_output);
-            mac.exec(self.program.redeem(), &env).map(|_| ())
+            let pruned = self.program.redeem().prune(&env)?;
+            let mut mac = BitMachine::for_program(&pruned)
+                .expect("program should be within reasonable bounds");
+            mac.exec(&pruned, &env).map(|_| ())
         }
 
         pub fn assert_run_success(self) {
@@ -425,7 +425,7 @@ mod tests {
         let mut t = TestCase::program_file("./examples/non_interactive_fee_bump.simf")
             .with_witness_file("./examples/non_interactive_fee_bump.wit");
         t.sequence = elements::Sequence::ENABLE_LOCKTIME_NO_RBF;
-        t.lock_time = LockTime::from_time(1734967235 + 600).unwrap();
+        t.lock_time = elements::LockTime::from_time(1734967235 + 600).unwrap();
         t.include_fee_output = true;
         t.assert_run_success();
     }
@@ -613,8 +613,22 @@ fn main() {
 fn main() {
     let x: MyAlias = 32;
     assert!(jet::eq_32(x, 32));
-}
-"#;
+}"#;
+        TestCase::program_text(Cow::Borrowed(prog_text))
+            .with_witness_values(WitnessValues::default())
+            .assert_run_success();
+    }
+
+    #[test]
+    fn type_error_regression() {
+        let prog_text = r#"fn main() {
+    let (a, b): (u32, u32) = (0, 1);
+    assert!(jet::eq_32(a, 0));
+
+    let (c, d): (u32, u32) = (2, 3);
+    assert!(jet::eq_32(c, 2));
+    assert!(jet::eq_32(d, 3));
+}"#;
         TestCase::program_text(Cow::Borrowed(prog_text))
             .with_witness_values(WitnessValues::default())
             .assert_run_success();

src/named.rs

@@ -3,12 +3,12 @@ use std::sync::Arc;
 use simplicity::dag::{InternalSharing, PostOrderIterItem};
 use simplicity::jet::{Elements, Jet};
 use simplicity::node::{
-    self, CommitData, Constructible, Converter, CoreConstructible, Inner, JetConstructible,
-    NoDisconnect, NoWitness, Node, WitnessConstructible, WitnessData,
+    self, CommitData, ConstructData as WitnessData, Constructible, Converter, CoreConstructible,
+    Inner, JetConstructible, NoDisconnect, NoWitness, Node, WitnessConstructible,
 };
 use simplicity::types::arrow::Arrow;
 use simplicity::{types, CommitNode, FailEntropy};
-use simplicity::{Cmr, WitnessNode};
+use simplicity::{Cmr, ConstructNode as WitnessNode};
 
 use crate::str::WitnessName;
 use crate::value::StructuralValue;
@@ -105,7 +105,7 @@ pub fn to_witness_node(node: &ConstructNode, values: WitnessValues) -> Arc<Witne
         inference_context: types::Context,
     }
 
-    impl<J: Jet> Converter<Construct<J>, node::Witness<J>> for Populator {
+    impl<J: Jet> Converter<Construct<J>, node::Construct<J>> for Populator {
         type Error = ();
 
         fn convert_witness(