bump version of simplicity-sys to 0.6.0

Author: apoelstra

Cargo-recent.lock

@@ -467,7 +467,7 @@ dependencies = [
  "miniscript",
  "santiago",
  "serde",
- "simplicity-sys 0.5.0",
+ "simplicity-sys 0.6.0",
 ]
 
 [[package]]
@@ -482,7 +482,7 @@ dependencies = [
 
 [[package]]
 name = "simplicity-sys"
-version = "0.5.0"
+version = "0.6.0"
 dependencies = [
  "bitcoin_hashes",
  "cc",

Cargo.toml

@@ -30,14 +30,14 @@ ghost-cell = { version = "0.2.6", default-features = false }
 hashes = { package = "bitcoin_hashes", version = "0.14" }
 hex = { package = "hex-conservative", version = "0.2.1" }
 santiago = "1.3"
-simplicity-sys = { version = "0.5.0", path = "./simplicity-sys" }
+simplicity-sys = { version = "0.6.0", path = "./simplicity-sys" }
 serde = { version = "1.0.103", features = ["derive"], optional = true }
 
 [target.wasm32-unknown-unknown.dependencies]
 getrandom = { version = "0.2", features = ["js"] }
 
 [dev-dependencies]
-simplicity-sys = { version = "0.5.0", path = "./simplicity-sys", features = [
+simplicity-sys = { version = "0.6.0", path = "./simplicity-sys", features = [
     "test-utils",
 ] }
 

simplicity-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "simplicity-sys"
-version = "0.5.0"
+version = "0.6.0"
 license = "CC0-1.0"
 homepage = "https://github.com/BlockstreamResearch/rust-simplicity/"
 repository = "https://github.com/BlockstreamResearch/rust-simplicity/"
@@ -9,7 +9,7 @@ description = "FFI bindings to libsimplicity"
 edition = "2021"
 rust-version = "1.74.0"
 build = "build.rs"
-links = "rustsimplicity_0_5"
+links = "rustsimplicity_0_6"
 
 [build-dependencies]
 cc = "1.0.83"

simplicity-sys/depend/env.c

@@ -11,23 +11,23 @@ typedef rawElementsInput rawInput;
 typedef rawElementsTransaction rawTransaction;
 typedef rawElementsTapEnv rawTapEnv;
 
-const size_t rustsimplicity_0_5_c_sizeof_rawElementsBuffer = sizeof(rawElementsBuffer);
-const size_t rustsimplicity_0_5_c_sizeof_rawElementsOutput = sizeof(rawElementsOutput);
-const size_t rustsimplicity_0_5_c_sizeof_rawElementsInput = sizeof(rawElementsInput);
-const size_t rustsimplicity_0_5_c_sizeof_rawElementsTransaction = sizeof(rawElementsTransaction);
-const size_t rustsimplicity_0_5_c_sizeof_rawElementsTapEnv = sizeof(rawElementsTapEnv);
-const size_t rustsimplicity_0_5_c_sizeof_txEnv = sizeof(txEnv);
+const size_t rustsimplicity_0_6_c_sizeof_rawElementsBuffer = sizeof(rawElementsBuffer);
+const size_t rustsimplicity_0_6_c_sizeof_rawElementsOutput = sizeof(rawElementsOutput);
+const size_t rustsimplicity_0_6_c_sizeof_rawElementsInput = sizeof(rawElementsInput);
+const size_t rustsimplicity_0_6_c_sizeof_rawElementsTransaction = sizeof(rawElementsTransaction);
+const size_t rustsimplicity_0_6_c_sizeof_rawElementsTapEnv = sizeof(rawElementsTapEnv);
+const size_t rustsimplicity_0_6_c_sizeof_txEnv = sizeof(txEnv);
 
-const size_t rustsimplicity_0_5_c_alignof_rawElementsBuffer = alignof(rawElementsBuffer);
-const size_t rustsimplicity_0_5_c_alignof_rawElementsOutput = alignof(rawElementsOutput);
-const size_t rustsimplicity_0_5_c_alignof_rawElementsInput = alignof(rawElementsInput);
-const size_t rustsimplicity_0_5_c_alignof_rawElementsTransaction = alignof(rawElementsTransaction);
-const size_t rustsimplicity_0_5_c_alignof_rawElementsTapEnv = alignof(rawElementsTapEnv);
-const size_t rustsimplicity_0_5_c_alignof_txEnv = alignof(txEnv);
+const size_t rustsimplicity_0_6_c_alignof_rawElementsBuffer = alignof(rawElementsBuffer);
+const size_t rustsimplicity_0_6_c_alignof_rawElementsOutput = alignof(rawElementsOutput);
+const size_t rustsimplicity_0_6_c_alignof_rawElementsInput = alignof(rawElementsInput);
+const size_t rustsimplicity_0_6_c_alignof_rawElementsTransaction = alignof(rawElementsTransaction);
+const size_t rustsimplicity_0_6_c_alignof_rawElementsTapEnv = alignof(rawElementsTapEnv);
+const size_t rustsimplicity_0_6_c_alignof_txEnv = alignof(txEnv);
 
-void rustsimplicity_0_5_c_set_txEnv(txEnv *result, const elementsTransaction *tx, const elementsTapEnv *taproot, const unsigned char *genesisHash, unsigned int ix)
+void rustsimplicity_0_6_c_set_txEnv(txEnv *result, const elementsTransaction *tx, const elementsTapEnv *taproot, const unsigned char *genesisHash, unsigned int ix)
 {
     sha256_midstate genesis;
     sha256_toMidstate(genesis.s, genesisHash);
-    *result = rustsimplicity_0_5_elements_build_txEnv(tx, taproot, &genesis, ix);
+    *result = rustsimplicity_0_6_elements_build_txEnv(tx, taproot, &genesis, ix);
 }

simplicity-sys/depend/simplicity/bitstream.c

@@ -10,7 +10,7 @@
  *
  * Precondition: NULL != stream
  */
-simplicity_err rustsimplicity_0_5_closeBitstream(bitstream* stream) {
+simplicity_err rustsimplicity_0_6_closeBitstream(bitstream* stream) {
   if (1 < stream->len) return SIMPLICITY_ERR_BITSTREAM_TRAILING_BYTES;        /* If there is more than one byte remaining. */
   if (1 == stream->len) {
     if (0 == stream->offset) return SIMPLICITY_ERR_BITSTREAM_TRAILING_BYTES;  /* If there is one byte remaining */
@@ -30,8 +30,8 @@ simplicity_err rustsimplicity_0_5_closeBitstream(bitstream* stream) {
  * Precondition: 0 <= n < 32
  *               NULL != stream
  */
-int32_t rustsimplicity_0_5_readNBits(int n, bitstream* stream) {
-  rustsimplicity_0_5_assert(0 <= n && n < 32);
+int32_t rustsimplicity_0_6_readNBits(int n, bitstream* stream) {
+  rustsimplicity_0_6_assert(0 <= n && n < 32);
 
   uint32_t result = 0;
   while (CHAR_BIT <= stream->offset + n) {
@@ -109,7 +109,7 @@ static int32_t decodeUpto3Bits(int32_t* result, bitstream* stream) {
   } else {
     int32_t n = decodeUpto3(stream);
     if (0 <= n) {
-      *result = rustsimplicity_0_5_readNBits(n, stream);
+      *result = rustsimplicity_0_6_readNBits(n, stream);
       if (*result < 0) return *result;
     }
     return n;
@@ -153,7 +153,7 @@ static int32_t decodeUpto15Bits(int32_t* result, bitstream* stream) {
   } else {
     int32_t n = decodeUpto15(stream);
     if (0 <= n) {
-      *result = rustsimplicity_0_5_readNBits(n, stream);
+      *result = rustsimplicity_0_6_readNBits(n, stream);
       if (*result < 0) return *result;
     }
     return n;
@@ -184,7 +184,7 @@ static int32_t decodeUpto65535(bitstream* stream) {
  *
  * Precondition: NULL != stream
  */
-int32_t rustsimplicity_0_5_decodeUptoMaxInt(bitstream* stream) {
+int32_t rustsimplicity_0_6_decodeUptoMaxInt(bitstream* stream) {
   int32_t bit = read1Bit(stream);
   if (bit < 0) return bit;
   if (0 == bit) {
@@ -194,7 +194,7 @@ int32_t rustsimplicity_0_5_decodeUptoMaxInt(bitstream* stream) {
     if (n < 0) return n;
     if (30 < n) return SIMPLICITY_ERR_DATA_OUT_OF_RANGE;
     {
-      int32_t result = rustsimplicity_0_5_readNBits(n, stream);
+      int32_t result = rustsimplicity_0_6_readNBits(n, stream);
       if (result < 0) return result;
       return ((1 << n) | result);
     }
@@ -211,9 +211,9 @@ int32_t rustsimplicity_0_5_decodeUptoMaxInt(bitstream* stream) {
  *               n <= 2^31
  *               NULL != stream
  */
-simplicity_err rustsimplicity_0_5_readBitstring(bitstring* result, size_t n, bitstream* stream) {
+simplicity_err rustsimplicity_0_6_readBitstring(bitstring* result, size_t n, bitstream* stream) {
   static_assert(0x80000000u + 2*(CHAR_BIT - 1) <= SIZE_MAX, "size_t needs to be at least 32-bits");
-  rustsimplicity_0_5_assert(n <= 0x80000000u);
+  rustsimplicity_0_6_assert(n <= 0x80000000u);
   size_t total_offset = n + stream->offset;
   /* |= stream->len * CHAR_BIT < total_offset iff stream->len < (total_offset + (CHAR_BIT - 1)) / CHAR_BIT */
   if (stream->len < (total_offset + (CHAR_BIT - 1)) / CHAR_BIT) return SIMPLICITY_ERR_BITSTREAM_EOF;

simplicity-sys/depend/simplicity/bitstream.h

@@ -36,7 +36,7 @@ static inline bitstream initializeBitstream(const unsigned char* arr, size_t len
  *
  * Precondition: NULL != stream
  */
-simplicity_err rustsimplicity_0_5_closeBitstream(bitstream* stream);
+simplicity_err rustsimplicity_0_6_closeBitstream(bitstream* stream);
 
 /* Fetches up to 31 bits from 'stream' as the 'n' least significant bits of return value.
  * The 'n' bits are set from the MSB to the LSB.
@@ -45,15 +45,15 @@ simplicity_err rustsimplicity_0_5_closeBitstream(bitstream* stream);
  * Precondition: 0 <= n < 32
  *               NULL != stream
  */
-int32_t rustsimplicity_0_5_readNBits(int n, bitstream* stream);
+int32_t rustsimplicity_0_6_readNBits(int n, bitstream* stream);
 
 /* Returns one bit from 'stream', 0 or 1.
  * Returns 'SIMPLICITY_ERR_BITSTREAM_EOF' if no bits are available.
  *
  * Precondition: NULL != stream
  */
 static inline int32_t read1Bit(bitstream* stream) {
-  return rustsimplicity_0_5_readNBits(1, stream);
+  return rustsimplicity_0_6_readNBits(1, stream);
 }
 
 /* Decode an encoded number between 1 and 2^31 - 1 inclusive.
@@ -64,7 +64,7 @@ static inline int32_t read1Bit(bitstream* stream) {
  *
  * Precondition: NULL != stream
  */
-int32_t rustsimplicity_0_5_decodeUptoMaxInt(bitstream* stream);
+int32_t rustsimplicity_0_6_decodeUptoMaxInt(bitstream* stream);
 
 /* Fills a 'bitstring' containing 'n' bits from 'stream'.
  * Returns 'SIMPLICITY_ERR_BITSTREAM_EOF' if not enough bits are available.
@@ -76,5 +76,5 @@ int32_t rustsimplicity_0_5_decodeUptoMaxInt(bitstream* stream);
  *               n <= 2^31
  *               NULL != stream
  */
-simplicity_err rustsimplicity_0_5_readBitstring(bitstring* result, size_t n, bitstream* stream);
+simplicity_err rustsimplicity_0_6_readBitstring(bitstring* result, size_t n, bitstream* stream);
 #endif

simplicity-sys/depend/simplicity/bitstring.h

@@ -30,7 +30,7 @@ typedef struct bitstring {
  */
 static inline bool getBit(const bitstring *s, size_t n) {
   size_t total_offset = s->offset + n;
-  rustsimplicity_0_5_assert(n < s->len);
+  rustsimplicity_0_6_assert(n < s->len);
   return 1 & (s->arr[total_offset / CHAR_BIT] >> (CHAR_BIT - 1 - (total_offset % CHAR_BIT)));
 }
 
@@ -40,8 +40,8 @@ static inline bool getBit(const bitstring *s, size_t n) {
  *               n + 8 <= s->len;
  */
 static inline uint_fast8_t getByte(const bitstring *s, size_t n) {
-  rustsimplicity_0_5_assert(8 <= s->len);
-  rustsimplicity_0_5_assert(n <= s->len - 8);
+  rustsimplicity_0_6_assert(8 <= s->len);
+  rustsimplicity_0_6_assert(n <= s->len - 8);
   size_t total_offset = s->offset + n;
   if (total_offset % CHAR_BIT <= CHAR_BIT - 8) {
     return (uint_fast8_t)(0xff & (s->arr[total_offset / CHAR_BIT] >> (CHAR_BIT - 8 - (total_offset % CHAR_BIT))));