Revendor libsimplicity

jets-bench/benches/elements/main.rs

@@ -10,8 +10,8 @@ use simplicity::types;
 use simplicity::types::Final;
 use simplicity::Value;
 use simplicity_bench::input::{
-    self, EqProduct, GenericProduct, InputSample, PrefixBit, Sha256Ctx, UniformBits,
-    DivMod12864Input,
+    self, DivMod12864Input, EqProduct, GenericProduct, InputSample, PrefixBit, Sha256Ctx,
+    UniformBits,
 };
 use simplicity_bench::{
     genesis_pegin, BenchSample, EnvSampling, InputSampling, JetBuffer, JetParams, SimplicityCtx8,
@@ -674,12 +674,12 @@ fn bench(c: &mut Criterion) {
         // No need to specially consider issuances or pegins
         (Elements::CheckLockHeight, ElementsBenchEnvType::Random),
         (Elements::CheckLockTime, ElementsBenchEnvType::Random),
-        (Elements::CheckLockDistance, ElementsBenchEnvType::Random),
-        (Elements::CheckLockDuration, ElementsBenchEnvType::Random),
+        (Elements::BrokenDoNotUseCheckLockDistance, ElementsBenchEnvType::Random),
+        (Elements::BrokenDoNotUseCheckLockDuration, ElementsBenchEnvType::Random),
         (Elements::TxLockHeight, ElementsBenchEnvType::Random),
         (Elements::TxLockTime, ElementsBenchEnvType::Random),
-        (Elements::TxLockDistance, ElementsBenchEnvType::Random),
-        (Elements::TxLockDuration, ElementsBenchEnvType::Random),
+        (Elements::BrokenDoNotUseTxLockDistance, ElementsBenchEnvType::Random),
+        (Elements::BrokenDoNotUseTxLockDuration, ElementsBenchEnvType::Random),
         (Elements::TxIsFinal, ElementsBenchEnvType::Random),
         // -----------------------------------------
         // Jets with no environment required, but no custom sampling required

simplicity-sys/depend/jets_wrapper.c

@@ -20,6 +20,10 @@ WRAP_(and_8)
 WRAP_(annex_hash)
 WRAP_(asset_amount_hash)
 WRAP_(bip_0340_verify)
+WRAP_(broken_do_not_use_check_lock_distance)
+WRAP_(broken_do_not_use_check_lock_duration)
+WRAP_(broken_do_not_use_tx_lock_distance)
+WRAP_(broken_do_not_use_tx_lock_duration)
 WRAP_(build_tapbranch)
 WRAP_(build_tapleaf_simplicity)
 WRAP_(build_taptweak)
@@ -32,8 +36,6 @@ WRAP_(ch_16)
 WRAP_(ch_32)
 WRAP_(ch_64)
 WRAP_(ch_8)
-WRAP_(check_lock_distance)
-WRAP_(check_lock_duration)
 WRAP_(check_lock_height)
 WRAP_(check_lock_time)
 WRAP_(check_sig_verify)
@@ -459,8 +461,6 @@ WRAP_(total_fee)
 WRAP_(transaction_id)
 WRAP_(tx_hash)
 WRAP_(tx_is_final)
-WRAP_(tx_lock_distance)
-WRAP_(tx_lock_duration)
 WRAP_(tx_lock_height)
 WRAP_(tx_lock_time)
 WRAP_(verify)

simplicity-sys/depend/simplicity-HEAD-revision.txt

@@ -1,2 +1,2 @@
 # This file has been automatically generated.
-b7bd4171e74451c8e1b6948674285f0d4274e368
+d190505509f4c04b1b9193c6739515f9faa18aac

simplicity-sys/depend/simplicity/Makefile

@@ -1,4 +1,6 @@
-OBJS := bitstream.o dag.o deserialize.o eval.o frame.o jets.o jets-secp256k1.o rsort.o sha256.o type.o typeInference.o elements/env.o elements/exec.o elements/ops.o elements/elementsJets.o elements/primitive.o elements/cmr.o elements/txEnv.o
+CORE_OBJS := bitstream.o dag.o deserialize.o eval.o frame.o jets.o jets-secp256k1.o rsort.o sha256.o type.o typeInference.o
+BITCOIN_OBJS := bitcoin/env.o bitcoin/ops.o bitcoin/bitcoinJets.o bitcoin/primitive.o bitcoin/txEnv.o
+ELEMENTS_OBJS := elements/env.o elements/exec.o elements/ops.o elements/elementsJets.o elements/primitive.o elements/cmr.o elements/txEnv.o
 TEST_OBJS := test.o ctx8Pruned.o ctx8Unpruned.o hashBlock.o regression4.o schnorr0.o schnorr6.o typeSkipTest.o elements/checkSigHashAllTx1.o
 
 # From https://fastcompression.blogspot.com/2019/01/compiler-warnings.html
@@ -23,13 +25,16 @@ sha256.o: sha256.c
 %.o: %.c
 	$(CC) -c $(CFLAGS) $(CWARN) $(CPPFLAGS) -o $@ $<
 
-libElementsSimplicity.a: $(OBJS)
+libBitcoinSimplicity.a: $(CORE_OBJS) $(BITCOIN_OBJS)
+	ar rcs $@ $^
+
+libElementsSimplicity.a: $(CORE_OBJS) $(ELEMENTS_OBJS)
 	ar rcs $@ $^
 
 test: $(TEST_OBJS) libElementsSimplicity.a
 	$(CC) $^ -o $@ $(LDFLAGS)
 
-install: libElementsSimplicity.a
+install: libBitcoinSimplicity.a libElementsSimplicity.a
 	mkdir -p $(out)/lib
 	cp $^ $(out)/lib/
 	cp -R include $(out)/include