Merge #251: Remove serde dependency

905bf9b chore: Remove serde dependency (Christian Lewe) c85c6f1 chore: Update libsimplicity (Christian Lewe) Pull request description: Remove the `serde_json` dependency when the `serde` feature is disabled. Update libsimplicity. ACKs for top commit: apoelstra: ACK 905bf9b successfully ran local tests Tree-SHA512: e9ca8cd051da7d8c6469305b8c77431e28378654b717083a4b0419d00ac5d878be5adc9a0e9057ea45c794437a11be1c50d72271348d31aba8e515f9dedc4d0d
BlockstreamResearch · Oct 10, 2024 · 4ec0aba · 4ec0aba
2 parents 9eed013 + 905bf9b
commit 4ec0aba
Show file tree

Hide file tree

Showing 38 changed files with 3,889 additions and 3,876 deletions.
diff --git a/Cargo-recent.lock b/Cargo-recent.lock
@@ -127,7 +127,6 @@ dependencies = [
  "bitcoin",
  "secp256k1-zkp",
  "serde",
- "serde_json",
 ]
 
 [[package]]
@@ -175,12 +174,6 @@ dependencies = [
  "rustc_version",
 ]
 
-[[package]]
-name = "itoa"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
-
 [[package]]
 name = "js-sys"
 version = "0.3.70"
@@ -208,12 +201,6 @@ version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
-[[package]]
-name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
 [[package]]
 name = "memmap2"
 version = "0.9.5"
@@ -320,12 +307,6 @@ dependencies = [
  "semver",
 ]
 
-[[package]]
-name = "ryu"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
-
 [[package]]
 name = "santiago"
 version = "1.3.1"
@@ -405,18 +386,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "serde_json"
-version = "1.0.128"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
-dependencies = [
- "itoa",
- "memchr",
- "ryu",
- "serde",
-]
-
 [[package]]
 name = "simpcli"
 version = "0.3.0"

diff --git a/Cargo.toml b/Cargo.toml
@@ -24,7 +24,7 @@ path = "src/lib.rs"
 bitcoin = { version = "0.32.0", optional = true }
 bitcoin-miniscript = { package = "miniscript", version = "12.0.0" }
 byteorder = "1.3"
-elements = { version = "0.25.0", optional = true }
+elements = { version = "0.25.0", optional = true, default-features = false }
 hashes = { package = "bitcoin_hashes", version = "0.14" }
 hex = { package = "hex-conservative", version = "0.1.1" }
 santiago = "1.3"

diff --git a/jets-bench/src/input.rs b/jets-bench/src/input.rs
@@ -1297,7 +1297,7 @@ impl InputSample for CheckSigSignature {
             let xpk = bitcoin::key::XOnlyPublicKey::from_keypair(&keypair);
 
             let msg = [0xab; 64];
-            let hashed_msg = tagged_hash(b"Simplicity-Draft\x1fSignature", msg);
+            let hashed_msg = tagged_hash(b"Simplicity\x1fSignature", msg);
             let hashed_msg = bitcoin::secp256k1::Message::from_digest(hashed_msg.to_byte_array());
             let sig = secp_ctx.sign_schnorr(&hashed_msg, &keypair);
 

diff --git a/simplicity-sys/build.rs b/simplicity-sys/build.rs
@@ -15,7 +15,7 @@ fn main() {
         "sha256.c",
         "primitive/elements/env.c",
         "primitive/elements/ops.c",
-        "primitive/elements/jets.c",
+        "primitive/elements/elementsJets.c",
     ]
     .into_iter()
     .map(|x| simplicity_path.join(x))

diff --git a/simplicity-sys/depend/jets_wrapper.c b/simplicity-sys/depend/jets_wrapper.c
@@ -1,6 +1,6 @@
 /* This file has been automatically generated. */
 
-#include "simplicity/primitive/elements/jets.h"
+#include "simplicity/primitive/elements/elementsJets.h"
 #include "simplicity/simplicity_assert.h"
 #include "wrapper.h"
 

diff --git a/simplicity-sys/depend/simplicity-HEAD-revision.txt b/simplicity-sys/depend/simplicity-HEAD-revision.txt
@@ -1,2 +1,2 @@
 # This file has been automatically generated.
-472b2105eacf00eedda0d9cc7c97c9c5edd9e9da
+bdc0b1fceb9109c98e228aa14c7d50c90edb3748
diff --git a/simplicity-sys/depend/simplicity/Makefile b/simplicity-sys/depend/simplicity/Makefile
@@ -1,4 +1,4 @@
-OBJS := bitstream.o cmr.o dag.o deserialize.o eval.o frame.o jets.o jets-secp256k1.o rsort.o sha256.o type.o typeInference.o primitive/elements/env.o primitive/elements/exec.o primitive/elements/ops.o primitive/elements/jets.o primitive/elements/primitive.o
+OBJS := bitstream.o cmr.o dag.o deserialize.o eval.o frame.o jets.o jets-secp256k1.o rsort.o sha256.o type.o typeInference.o primitive/elements/env.o primitive/elements/exec.o primitive/elements/ops.o primitive/elements/elementsJets.o primitive/elements/primitive.o
 TEST_OBJS := test.o ctx8Pruned.o ctx8Unpruned.o hashBlock.o regression4.o schnorr0.o schnorr6.o typeSkipTest.o primitive/elements/checkSigHashAllTx1.o
 
 # From https://fastcompression.blogspot.com/2019/01/compiler-warnings.html
@@ -14,7 +14,7 @@ CFLAGS := $(CFLAGS) -I include
 jets-secp256k1.o: jets-secp256k1.c
 	$(CC) -c $(CFLAGS) $(CWARN) -Wno-conversion $(CPPFLAGS) -o $@ $<
 
-primitive/elements/jets.o: primitive/elements/jets.c
+primitive/elements/elementsJets.o: primitive/elements/elementsJets.c
 	$(CC) -c $(CFLAGS) $(CWARN) -Wno-switch-enum -Wswitch $(CPPFLAGS) -o $@ $<
 
 sha256.o: sha256.c

diff --git a/simplicity-sys/depend/simplicity/ctx8Pruned.c b/simplicity-sys/depend/simplicity/ctx8Pruned.c
@@ -36,14 +36,14 @@ const unsigned char ctx8Pruned[] = {
   0x0a, 0x05, 0x88, 0xa2, 0x72, 0x74, 0x30, 0x0d, 0x63, 0xf0, 0x23, 0x71, 0xd0, 0xa0, 0xa0, 0xe2, 0x07, 0x04, 0x03, 0x90,
   0x04, 0x18, 0x60, 0xb0, 0x1f, 0x03, 0x72, 0xb0, 0x50, 0x7e, 0x57, 0x14, 0x92, 0x09, 0x09, 0x45, 0x02, 0xc0, 0x2c, 0xc5,
   0x20, 0x80, 0xd0, 0x37, 0x0f, 0xc1, 0x4d, 0xc9, 0xb1, 0x41, 0x41, 0xc4, 0x0e, 0x0e, 0x07, 0x28, 0x48, 0x30, 0xc1, 0x60,
-  0x3e, 0x06, 0xe0, 0x02, 0x83, 0xf0, 0x22, 0x92, 0x41, 0x21, 0x29, 0x30, 0x14, 0x0b, 0x00, 0xb2, 0x0b, 0x48, 0xa6, 0xcc,
-  0x9e, 0xfa, 0x1e, 0x4b, 0x5a, 0x5e, 0x86, 0x7d, 0x1b, 0x11, 0x1b, 0xf2, 0x47, 0x69, 0x7d, 0x91, 0xf4, 0xe1, 0x61, 0xdd,
-  0x81, 0x4d, 0xeb, 0xf9, 0x09, 0x2b, 0x07, 0x34, 0xd3, 0x3c, 0xa8, 0x0c, 0x03, 0x78, 0xfc, 0x18, 0xdc, 0xbd, 0x14, 0x14,
-  0x1c, 0x40, 0xe1, 0x00, 0x73, 0x06, 0x41, 0x86, 0x0b, 0x03, 0x38, 0xfd, 0xc8, 0x56, 0xd6, 0x5d, 0xa2, 0x4b, 0x89, 0xd0,
-  0xaf, 0xbc, 0x74, 0xbc, 0x4b, 0x84, 0x97, 0xdc, 0xd0, 0xb6, 0x6c, 0xf4, 0x2f, 0x92, 0xa9, 0x79, 0xa4, 0xe3, 0xcb, 0x27,
-  0x38, 0xff, 0x1f, 0x13, 0x73, 0x1c, 0x28, 0x28, 0x38, 0x81, 0x98, 0x1c, 0xca, 0x10, 0x71, 0x82, 0xc0, 0xc0, 0x27, 0x68,
-  0x1c, 0x64, 0x4e, 0xaf, 0xb0, 0xbf, 0x46, 0xd9, 0x04, 0x6e, 0x09, 0x29, 0x79, 0xf6, 0x17, 0x64, 0x26, 0xf6, 0x39, 0x2f,
-  0x9b, 0x80, 0x77, 0xca, 0x03, 0x6b, 0xcf, 0x00, 0xf6, 0x81, 0x73, 0x66, 0x6e, 0x6c, 0x8e, 0x48, 0xba, 0x11, 0xfa, 0x1b,
+  0x3e, 0x06, 0xe0, 0x02, 0x83, 0xf0, 0x22, 0x92, 0x41, 0x21, 0x29, 0x30, 0x14, 0x0b, 0x00, 0xb2, 0x0b, 0x48, 0xa6, 0xca,
+  0xad, 0x50, 0x85, 0x14, 0xbd, 0x6d, 0x6d, 0xad, 0x37, 0xa5, 0x07, 0xba, 0x95, 0x2c, 0xf8, 0x91, 0x3f, 0x0f, 0x42, 0xdb,
+  0x25, 0xb0, 0x76, 0x43, 0x02, 0xb2, 0xae, 0xaf, 0x27, 0x59, 0x4a, 0x0c, 0x03, 0x78, 0xfc, 0x18, 0xdc, 0xbd, 0x14, 0x14,
+  0x1c, 0x40, 0xe1, 0x00, 0x73, 0x06, 0x41, 0x86, 0x0b, 0x03, 0x0f, 0x76, 0x12, 0x30, 0xd0, 0xcd, 0xd8, 0x6d, 0x5b, 0x74,
+  0x5e, 0x53, 0x67, 0xcc, 0xca, 0x74, 0xe2, 0xea, 0x56, 0xe6, 0x45, 0x35, 0x9b, 0x25, 0xd0, 0x89, 0x73, 0xa7, 0x91, 0xc4,
+  0xa6, 0x59, 0x1f, 0x13, 0x73, 0x1c, 0x28, 0x28, 0x38, 0x81, 0x98, 0x1c, 0xca, 0x10, 0x71, 0x82, 0xc0, 0xd9, 0x8d, 0x82,
+  0xc2, 0x75, 0x1d, 0x9f, 0x26, 0xee, 0x14, 0x13, 0x63, 0x40, 0x32, 0x54, 0x75, 0xc1, 0xad, 0xd6, 0xdd, 0x32, 0xda, 0x3d,
+  0xcf, 0x22, 0x69, 0xba, 0x1c, 0xe5, 0x60, 0x30, 0xb7, 0xc1, 0x73, 0x66, 0x6e, 0x6c, 0x8e, 0x48, 0xba, 0x11, 0xfa, 0x1b,
   0x85, 0xd0, 0x26, 0x13, 0xa0, 0x4c, 0x4e, 0x81, 0x30, 0x62, 0x16, 0x64, 0x90, 0x27, 0x21, 0x4d, 0xc3, 0x92, 0x28, 0x3f,
   0x43, 0xc9, 0xfa, 0x1f, 0x43, 0x00, 0xc0, 0x7e, 0x71, 0x52, 0x2e, 0x27, 0x01, 0x89, 0x87, 0x82, 0x83, 0x0f, 0x05, 0x06,
   0x1e, 0x0a, 0x0c, 0x3c, 0x14, 0x18, 0x78, 0x28, 0x30, 0xf0, 0x50, 0x0e, 0x0c, 0x17, 0x3b, 0x63, 0x85, 0xc2, 0x86, 0xe7,
@@ -62,26 +62,26 @@ const unsigned char ctx8Pruned[] = {
   0x8f, 0xa0, 0xdd, 0x0e, 0x62, 0x81, 0x60, 0x06, 0x40, 0x6e, 0x03, 0x99, 0xa0, 0xb9, 0xa1, 0x1f, 0xa1, 0xfc, 0xe3, 0xf3,
   0x1c, 0x6e, 0x88, 0x71, 0x40, 0x1a, 0x05, 0x88, 0xfc, 0xc9, 0x9f, 0x41, 0xba, 0x22, 0x05, 0x02, 0xc0, 0x0c, 0x80, 0xdc,
   0x48, 0xb9, 0xa6, 0x01, 0xce, 0x89, 0xfa, 0x25, 0x45, 0x00, 0xc8, 0x0e, 0x6e, 0x80, 0xe7, 0x70, 0x07, 0x35, 0xa0, 0xe7,
-  0x84, 0x27, 0x3d, 0x0c, 0x4e, 0xda, 0x0d, 0x40, 0xda, 0x55, 0x6d, 0xfc, 0x74, 0x67, 0xbc, 0x8d, 0x00, 0x5b, 0xdc, 0x1c,
-  0xe9, 0xd5, 0x8c, 0xf2, 0xa9, 0x61, 0x3c, 0x55, 0x7c, 0x94, 0xb4, 0x3b, 0x4c, 0x5f, 0x9f, 0x96, 0x83, 0x03, 0x40, 0xc4,
+  0x84, 0x27, 0x3d, 0x0c, 0xe8, 0x86, 0x73, 0x90, 0xb3, 0xcf, 0xfe, 0xdf, 0x1a, 0x67, 0xf3, 0x5f, 0x4e, 0x6e, 0x69, 0xc3,
+  0x92, 0x10, 0xd0, 0x9f, 0xdd, 0xb9, 0x18, 0x9a, 0x14, 0xc2, 0x25, 0xa7, 0x7e, 0x6c, 0x26, 0x2e, 0x83, 0x03, 0x40, 0xc4,
   0x27, 0x45, 0x21, 0xfa, 0x29, 0x41, 0x00, 0xe7, 0xd0, 0x0e, 0x7d, 0xc0, 0xe8, 0x95, 0x1f, 0x9a, 0xf1, 0x40, 0x18, 0x03,
   0xa2, 0x78, 0x7e, 0x6f, 0x85, 0x00, 0x60, 0x0e, 0x8a, 0x71, 0xf9, 0xcd, 0x14, 0x01, 0x80, 0x3a, 0x2c, 0x07, 0xe7, 0xbc,
   0x50, 0x06, 0x00, 0xe0, 0xdd, 0x21, 0x14, 0x1c, 0x70, 0xb0, 0x0b, 0xa2, 0xa0, 0x2e, 0x80, 0x8e, 0x90, 0xd0, 0x9d, 0x21,
-  0xa1, 0x3a, 0x43, 0x40, 0xe8, 0x0c, 0x0b, 0x12, 0x45, 0xd1, 0x2e, 0x37, 0x48, 0x81, 0xa6, 0xe6, 0xa0, 0x2c, 0xec, 0x54,
-  0xf2, 0xee, 0x4d, 0xae, 0xb0, 0x46, 0xb5, 0x4f, 0x7e, 0xb7, 0xcc, 0xe1, 0xb8, 0xb0, 0x86, 0xf0, 0x14, 0x8c, 0xce, 0x9a,
-  0xab, 0x2e, 0x14, 0x7e, 0x7f, 0xc2, 0x43, 0x00, 0xc0, 0x70, 0xba, 0x24, 0x46, 0xe9, 0x13, 0x0b, 0xa2, 0x34, 0xdb, 0x7f,
-  0xdf, 0x9f, 0x8e, 0xf2, 0xd5, 0x9f, 0x90, 0xd6, 0x86, 0xb8, 0x3f, 0x03, 0xdb, 0x14, 0x2c, 0xbb, 0x56, 0x4c, 0x93, 0xb8,
-  0x91, 0x61, 0xe6, 0xbf, 0x06, 0x4c, 0x8f, 0x0d, 0x1f, 0x6b, 0xc1, 0x80, 0x62, 0x38, 0x5d, 0x10, 0x23, 0x74, 0x8b, 0x05,
-  0xd0, 0xfa, 0x0b, 0x30, 0x60, 0x38, 0x5d, 0x0d, 0xc6, 0x6e, 0x10, 0x85, 0x97, 0xc4, 0x56, 0x5c, 0x4d, 0x18, 0x13, 0x1c,
-  0xe5, 0x26, 0x16, 0x49, 0x62, 0x61, 0xc0, 0x0c, 0xa8, 0xd4, 0xfc, 0x3d, 0xe2, 0x36, 0x8f, 0x28, 0x32, 0x43, 0x32, 0x89,
-  0x72, 0x0b, 0xa1, 0x80, 0x14, 0x70, 0xba, 0x15, 0xcd, 0x05, 0x9c, 0x35, 0x5b, 0x67, 0xbe, 0x86, 0xb9, 0xb6, 0x9d, 0x4f,
-  0xad, 0x48, 0x3c, 0x7b, 0x45, 0xe5, 0x89, 0xeb, 0x5a, 0xa1, 0x0b, 0x1f, 0x76, 0x67, 0x7f, 0x4c, 0xed, 0x48, 0x2d, 0xe8,
-  0x88, 0x17, 0x12, 0x82, 0x8e, 0x17, 0x41, 0xf8, 0xfc, 0x52, 0x2e, 0x91, 0xe7, 0x48, 0xf0, 0x41, 0x82, 0xc0, 0x17, 0x0a,
-  0x06, 0x63, 0x04, 0xe2, 0xf0, 0x71, 0xc0, 0x1c, 0x54, 0x49, 0x02, 0x0d, 0xd2, 0xaa, 0x60, 0x71, 0x37, 0xf6, 0xbe, 0xf8,
-  0xec, 0xc7, 0x24, 0xe2, 0x56, 0xcf, 0x23, 0xec, 0xd5, 0xa4, 0x46, 0x08, 0x7e, 0x06, 0x08, 0x3e, 0xa7, 0x20, 0xd0, 0x37,
-  0x78, 0x87, 0x33, 0x43, 0xcb, 0x62, 0x10, 0xc0, 0x3a, 0x0a, 0xc6, 0x24, 0x5d, 0x0e, 0x46, 0xb9, 0x16, 0x7f, 0xc3, 0x6a,
-  0x48, 0xf4, 0xa6, 0xd3, 0xc2, 0x07, 0x47, 0x05, 0xc5, 0x5d, 0x00, 0x23, 0x09, 0x95, 0x59, 0xaa, 0x4e, 0x1a, 0x15, 0x9c,
-  0x45, 0x12, 0xe6, 0x6c, 0xe2, 0x05, 0x12, 0x2f, 0x41, 0xe1, 0x81, 0xa0, 0x62, 0x30, 0xe1, 0x6a, 0x0b, 0x80, 0x12, 0x2e,
+  0xa1, 0x3a, 0x43, 0x40, 0xe8, 0x0c, 0x0b, 0x12, 0x45, 0xd1, 0x2e, 0x37, 0x48, 0x81, 0x9f, 0x0d, 0x87, 0x1b, 0x6e, 0x13,
+  0xeb, 0xe9, 0x84, 0x31, 0x41, 0x77, 0xfd, 0x15, 0xb1, 0xe7, 0xfa, 0x6e, 0x78, 0x95, 0x30, 0x7a, 0x23, 0x00, 0xba, 0x5d,
+  0x0b, 0xea, 0x69, 0xb8, 0x62, 0xe6, 0x03, 0x00, 0xc0, 0x70, 0xba, 0x24, 0x46, 0xe9, 0x13, 0x0b, 0xa2, 0x34, 0xca, 0x83,
+  0x43, 0x4d, 0x37, 0xa9, 0x79, 0x7b, 0x4f, 0xe6, 0x86, 0x21, 0xc6, 0x0f, 0x1e, 0xe4, 0xc8, 0x86, 0x24, 0x5f, 0x79, 0x83,
+  0x96, 0xa6, 0xc1, 0x8f, 0x0c, 0x9d, 0x81, 0xa6, 0x47, 0x58, 0x01, 0x80, 0x62, 0x38, 0x5d, 0x10, 0x23, 0x74, 0x8b, 0x05,
+  0xd0, 0xfa, 0x0b, 0x30, 0x60, 0x38, 0x5d, 0x0d, 0xc6, 0x71, 0xfa, 0x14, 0xba, 0x34, 0x32, 0x6b, 0x1e, 0x91, 0x86, 0xae,
+  0x9b, 0x3a, 0x19, 0x02, 0xdf, 0x58, 0xa1, 0x2d, 0xd9, 0x14, 0x70, 0xfc, 0x94, 0x47, 0x07, 0x8b, 0x87, 0xea, 0xc9, 0xa2,
+  0x86, 0x0b, 0xa1, 0x80, 0x14, 0x70, 0xba, 0x15, 0xcc, 0x64, 0x0e, 0x5c, 0x36, 0x1d, 0x88, 0x6c, 0x0b, 0x2b, 0xdc, 0xee,
+  0x38, 0x18, 0xae, 0xe8, 0xd6, 0xca, 0x39, 0x18, 0x15, 0x60, 0x8e, 0xe5, 0x36, 0x0c, 0xb2, 0xd1, 0x0a, 0x53, 0x24, 0x32,
+  0x7c, 0x17, 0x12, 0x82, 0x8e, 0x17, 0x41, 0xf8, 0xfc, 0x52, 0x2e, 0x91, 0xe7, 0x48, 0xf0, 0x41, 0x82, 0xc0, 0x17, 0x0a,
+  0x06, 0x63, 0x04, 0xe2, 0xf0, 0x71, 0xc0, 0x1c, 0x54, 0x49, 0x02, 0x0d, 0xd2, 0xaa, 0x64, 0x71, 0x50, 0xab, 0xa3, 0x18,
+  0x7c, 0x56, 0x9e, 0x23, 0x69, 0xde, 0xf6, 0x19, 0x8d, 0x77, 0x9a, 0xd8, 0xe0, 0x86, 0x77, 0xf7, 0x5d, 0xa0, 0x9d, 0x47,
+  0xc8, 0xba, 0x7f, 0x6c, 0x27, 0x59, 0xc0, 0xc0, 0x3a, 0x0a, 0xc6, 0x24, 0x5d, 0x0e, 0x46, 0x60, 0x42, 0x24, 0xce, 0x38,
+  0xf2, 0x26, 0xe2, 0xae, 0x17, 0x27, 0x8e, 0xf8, 0x0d, 0xc1, 0x09, 0xc7, 0xfd, 0xeb, 0xe4, 0x23, 0x85, 0xe3, 0x0c, 0x83,
+  0xff, 0x8e, 0x9e, 0xf7, 0x4c, 0x39, 0xc9, 0x2f, 0x41, 0xe1, 0x81, 0xa0, 0x62, 0x30, 0xe1, 0x6a, 0x0b, 0x80, 0x12, 0x2e,
   0x89, 0x90, 0x78, 0x17, 0x01, 0x04, 0x18, 0x91, 0x74, 0x5b, 0x83, 0xc1, 0xf8, 0x30, 0x20, 0xc3, 0x85, 0x99, 0x22, 0xe8,
   0xd5, 0x07, 0x87, 0x70, 0xd0, 0x41, 0x81, 0xe2, 0x1e, 0x20, 0x07, 0x23, 0x87, 0x0b, 0x01, 0xc7, 0x0b, 0x60, 0xe3, 0x85,
   0xc2, 0xc6, 0x24, 0x0e, 0x93, 0xc8, 0x81, 0x02, 0xbd, 0x21, 0x01, 0x50, 0xa8, 0x1a, 0x09, 0x03, 0xa5, 0xbc, 0x2e, 0x91,
@@ -248,11 +248,11 @@ const unsigned char ctx8Pruned[] = {
   0x9f, 0xa4, 0xbc, 0x28, 0x03, 0xa7, 0xee, 0x2c, 0x46, 0xe9, 0x1e, 0x9f, 0xa4, 0x7c, 0x28, 0x03, 0xa7, 0xf8, 0x2e, 0x92,
   0xe7, 0x49, 0x54, 0x0e, 0x9f, 0xf0, 0xa8, 0x5a, 0x02, 0xe0, 0x40, 0x71, 0x28, 0x1d, 0x41, 0xb8, 0x1d, 0x42, 0x50, 0x1d,
   0x4e, 0xd8, 0x1d, 0x5c, 0xa8, 0x5d, 0x5f, 0xd8, 0xdd, 0x42, 0x40, 0x9d, 0x42, 0x41, 0xba, 0xb9, 0x51, 0x3a, 0x84, 0x73,
-  0x75, 0x3f, 0x42, 0xea, 0x9c, 0x89, 0x29, 0xaf, 0x43, 0x33, 0xa4, 0xf9, 0xc4, 0xe8, 0xab, 0xa5, 0x86, 0xfe, 0x47, 0x1f,
-  0x44, 0x4f, 0xb6, 0xc1, 0x9c, 0x71, 0xe1, 0xa7, 0x1c, 0x89, 0x44, 0xd9, 0x1a, 0x0a, 0xb2, 0x25, 0xdf, 0xab, 0x79, 0xc3,
-  0x00, 0xc4, 0x1b, 0x80, 0x33, 0x06, 0x81, 0xd5, 0x43, 0x04, 0xea, 0xa0, 0x5b, 0x43, 0xae, 0xfc, 0x5f, 0xe5, 0x58, 0x73,
-  0x06, 0xc0, 0x45, 0x80, 0xd8, 0x6a, 0x63, 0x73, 0x69, 0xae, 0xa4, 0x4a, 0x63, 0x49, 0xef, 0xf8, 0x16, 0xa9, 0x4e, 0xd2,
-  0xa1, 0xe1, 0x9e, 0x9b, 0x74, 0xf8, 0x06, 0x01, 0x80, 0x1d, 0x54, 0xc0, 0x4e, 0xaa, 0x4c, 0xf4, 0x39, 0x81, 0x40, 0xea,
+  0x75, 0x3f, 0x42, 0xea, 0x9c, 0x89, 0x29, 0xa2, 0x20, 0x6b, 0xfd, 0x45, 0x83, 0x30, 0x32, 0x7e, 0x3b, 0x3a, 0xb6, 0x2d,
+  0x00, 0x7e, 0xa5, 0xfb, 0xbd, 0x7f, 0x18, 0x1d, 0x4b, 0xa6, 0x34, 0x91, 0xd5, 0x86, 0x93, 0x69, 0xb3, 0xa5, 0x97, 0x83,
+  0x00, 0xc4, 0x1b, 0x80, 0x33, 0x06, 0x81, 0xd5, 0x43, 0x04, 0xea, 0xa0, 0x58, 0x47, 0xb8, 0xe2, 0x3c, 0x48, 0x98, 0x86,
+  0xff, 0xdf, 0xbf, 0x88, 0x0d, 0xc1, 0xd1, 0xe5, 0x6a, 0x80, 0x96, 0xf0, 0xbf, 0x90, 0x6f, 0xcc, 0xe9, 0x7c, 0x79, 0xa7,
+  0x1c, 0x46, 0x79, 0xe4, 0x74, 0xf8, 0x06, 0x01, 0x80, 0x1d, 0x54, 0xc0, 0x4e, 0xaa, 0x4c, 0xf4, 0x39, 0x81, 0x40, 0xea,
   0xaa, 0x82, 0x75, 0x54, 0xa7, 0xa1, 0xd8, 0x05, 0x03, 0xaa, 0xbc, 0x09, 0xd5, 0x5b, 0x9e, 0x87, 0x80, 0x81, 0x40, 0xea,
   0xb3, 0x02, 0x75, 0x58, 0xe7, 0xa1, 0xe0, 0xc0, 0x50, 0x3a, 0xad, 0xb0, 0x9d, 0x56, 0xb9, 0xe8, 0x78, 0x58, 0x14, 0x0e,
   0x2a, 0x0b, 0xa5, 0x47, 0xd2, 0x9d, 0x14, 0x1f, 0x00, 0xf1, 0x08, 0x14, 0x0e, 0x32, 0x1f, 0xab, 0x50, 0x30, 0xf0, 0x50,
@@ -267,17 +267,17 @@ const size_t sizeof_ctx8Pruned_witness = 0;
 
 /* The commitment Merkle root of the above ctx8Pruned Simplicity expression. */
 const uint32_t ctx8Pruned_cmr[] = {
-  0x78f493f7u, 0x2b4e1e9bu, 0x2c85fccdu, 0xaf4141cfu, 0x95e12313u, 0x5c799804u, 0xbe70342fu, 0x1751e4b4u
+  0x7f11746fu, 0xb68fdaedu, 0x3cadda80u, 0xc7cd0245u, 0xa341b927u, 0xe98e60f8u, 0x745dc441u, 0xe11ce1a3u
 };
 
 /* The identity Merkle root of the above ctx8Pruned Simplicity expression. */
 const uint32_t ctx8Pruned_imr[] = {
-  0xc40acde5u, 0x5d44db2du, 0x624b2bf8u, 0x296d15eau, 0xef374d2du, 0xcc86a256u, 0x757e5af7u, 0xfd7c27c8u
+  0x8e8742acu, 0x27f42d29u, 0xd87f5229u, 0x02bc0ae2u, 0xbcfc1298u, 0x1641a2ddu, 0x77091830u, 0xb79bf12du
 };
 
 /* The annotated Merkle root of the above ctx8Pruned Simplicity expression. */
 const uint32_t ctx8Pruned_amr[] = {
-  0x1e45ed6du, 0x87f0a9cfu, 0x2875284au, 0x4c9f08cbu, 0x305ac379u, 0x1b86ae18u, 0x00a4f2b2u, 0x256d1299u
+  0x6ee37b0cu, 0x66d30684u, 0x7f3c8290u, 0xbbd9e65fu, 0x30576a3au, 0x904cae07u, 0x932c3790u, 0x92a8310du
 };
 
 /* The cost of the above ctx8Pruned Simplicity expression in milli weight units. */

diff --git a/simplicity-sys/depend/simplicity/ctx8Unpruned.c b/simplicity-sys/depend/simplicity/ctx8Unpruned.c
@@ -55,9 +55,9 @@ const unsigned char ctx8Unpruned[] = {
   0xf4, 0x1b, 0xa1, 0x58, 0x50, 0x2c, 0x00, 0xc8, 0x0d, 0xc0, 0x73, 0x0a, 0x17, 0x31, 0x83, 0xf4, 0x31, 0x1c, 0x7e, 0x5b,
   0x9b, 0xa1, 0xa8, 0x50, 0x06, 0x81, 0x62, 0x3f, 0x2f, 0x0f, 0xa0, 0xdd, 0x0d, 0x62, 0x81, 0x60, 0x06, 0x40, 0x6e, 0x03,
   0x99, 0xf0, 0xb9, 0xa7, 0x1f, 0xa1, 0xdc, 0xe3, 0xf3, 0x28, 0x6e, 0x87, 0xf1, 0x40, 0x1a, 0x05, 0x88, 0xfc, 0xcc, 0x9f,
-  0x41, 0xba, 0x20, 0x05, 0x02, 0xc0, 0x0c, 0x80, 0xdc, 0x07, 0x37, 0x40, 0x73, 0x84, 0x31, 0x89, 0xdb, 0x41, 0xa8, 0x1b,
-  0x4a, 0xad, 0xbf, 0x8e, 0x8c, 0xf7, 0x91, 0xa0, 0x0b, 0x7b, 0x83, 0x9d, 0x3a, 0xb1, 0x9e, 0x55, 0x2c, 0x27, 0x8a, 0xaf,
-  0x92, 0x96, 0x87, 0x69, 0x8b, 0xf3, 0xf2, 0xc3, 0xd0, 0x40, 0x05, 0x1c, 0x7e, 0x7e, 0xce, 0x37, 0x3b, 0xa2, 0x83, 0x73,
+  0x41, 0xba, 0x20, 0x05, 0x02, 0xc0, 0x0c, 0x80, 0xdc, 0x07, 0x37, 0x40, 0x73, 0x84, 0x31, 0x9d, 0x10, 0xce, 0x72, 0x16,
+  0x79, 0xff, 0xdb, 0xe3, 0x4c, 0xfe, 0x6b, 0xe9, 0xcd, 0xcd, 0x38, 0x72, 0x42, 0x1a, 0x13, 0xfb, 0xb7, 0x23, 0x13, 0x42,
+  0x98, 0x44, 0xb4, 0xef, 0xcd, 0x84, 0xc5, 0xc3, 0xd0, 0x40, 0x05, 0x1c, 0x7e, 0x7e, 0xce, 0x37, 0x3b, 0xa2, 0x83, 0x73,
   0xfe, 0x92, 0x0b, 0x05, 0x02, 0xb4, 0x50, 0x2c, 0x31, 0x15, 0x0a, 0x85, 0x71, 0x16, 0x18, 0x0a, 0x05, 0x80, 0x5a, 0xf5,
   0x88, 0x16, 0x80, 0xb5, 0x6d, 0x13, 0x40, 0xa8, 0x59, 0x90, 0x28, 0x49, 0x05, 0x82, 0x81, 0x48, 0x28, 0x16, 0x38, 0x89,
   0x80, 0xa8, 0x57, 0x11, 0x31, 0x15, 0x0b, 0x4e, 0x42, 0x05, 0xb3, 0x68, 0x9b, 0x04, 0xd2, 0x2c, 0x02, 0xcc, 0x6e, 0x8b,
@@ -257,17 +257,17 @@ const size_t sizeof_ctx8Unpruned_witness = 0;
 
 /* The commitment Merkle root of the above ctx8Unpruned Simplicity expression. */
 const uint32_t ctx8Unpruned_cmr[] = {
-  0x78f493f7u, 0x2b4e1e9bu, 0x2c85fccdu, 0xaf4141cfu, 0x95e12313u, 0x5c799804u, 0xbe70342fu, 0x1751e4b4u
+  0x7f11746fu, 0xb68fdaedu, 0x3cadda80u, 0xc7cd0245u, 0xa341b927u, 0xe98e60f8u, 0x745dc441u, 0xe11ce1a3u
 };
 
 /* The identity Merkle root of the above ctx8Unpruned Simplicity expression. */
 const uint32_t ctx8Unpruned_imr[] = {
-  0xc40acde5u, 0x5d44db2du, 0x624b2bf8u, 0x296d15eau, 0xef374d2du, 0xcc86a256u, 0x757e5af7u, 0xfd7c27c8u
+  0x8e8742acu, 0x27f42d29u, 0xd87f5229u, 0x02bc0ae2u, 0xbcfc1298u, 0x1641a2ddu, 0x77091830u, 0xb79bf12du
 };
 
 /* The annotated Merkle root of the above ctx8Unpruned Simplicity expression. */
 const uint32_t ctx8Unpruned_amr[] = {
-  0xcd6dfe2eu, 0x0579451du, 0x65c1d64du, 0xb488bfd8u, 0x94800a7cu, 0xd9a966bau, 0x9c232b6fu, 0xd643ba00u
+  0x3e7c69acu, 0xf73edce8u, 0x386c121eu, 0xc3b4d11bu, 0x14923861u, 0xe97ae926u, 0xcccd9f1fu, 0x85a076d5u
 };
 
 /* The cost of the above ctx8Unpruned Simplicity expression in milli weight units. */

diff --git a/simplicity-sys/depend/simplicity/dag.c b/simplicity-sys/depend/simplicity/dag.c
@@ -3,7 +3,6 @@
 #include <stdbool.h>
 #include "bounded.h"
 #include "precomputed.h"
-#include "prefix.h"
 #include "rsort.h"
 #include "sha256.h"
 #include "simplicity_alloc.h"

diff --git a/simplicity-sys/depend/simplicity/sources.mk → ...sys/depend/simplicity/elements-sources.mk b/simplicity-sys/depend/simplicity/sources.mk → ...sys/depend/simplicity/elements-sources.mk
@@ -26,7 +26,7 @@ ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/typeInference.c
 
 ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/primitive/elements/env.c
 ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/primitive/elements/exec.c
-ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/primitive/elements/jets.c
+ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/primitive/elements/elementsJets.c
 ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/primitive/elements/ops.c
 ELEMENTS_SIMPLICITY_LIB_SOURCES_INT += %reldir%/primitive/elements/primitive.c
 
@@ -41,7 +41,6 @@ ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/frame.h
 ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/jets.h
 ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/limitations.h
 ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/precomputed.h
-ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/prefix.h
 ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/primitive.h
 ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/rsort.h
 ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/sha256.h
@@ -89,7 +88,7 @@ ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/secp256k1/secp256k1.h
 ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/secp256k1/secp256k1_impl.h
 ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/secp256k1/util.h
 
-ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/primitive/elements/jets.h
+ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/primitive/elements/elementsJets.h
 ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/primitive/elements/ops.h
 ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/primitive/elements/primitive.h
 ELEMENTS_SIMPLICITY_LIB_HEADERS_INT += %reldir%/primitive/elements/primitiveEnumJet.inc