simplicity and simplicity-sys: bump major versions

In another PR I add a regression test against the released 0.3.0 version
of rust-simplicity. It breaks some tooling to have two 0.3.0s in play at
once -- one from this repo and one from crates.io.

Take this opportunity to bump versions to 0.4.0 to avoid this conflict.

Once we get this into a reasonable bug-free state we should do another
release.

Author: apoelstra

Cargo-recent.lock

@@ -433,7 +433,7 @@ dependencies = [
 
 [[package]]
 name = "simplicity-lang"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "bitcoin",
  "bitcoin_hashes",
@@ -449,7 +449,7 @@ dependencies = [
 
 [[package]]
 name = "simplicity-sys"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "bitcoin_hashes",
  "cc",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "simplicity-lang"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Andrew Poelstra <apoelstra@wpsoftware.net>"]
 license = "CC0-1.0"
 homepage = "https://github.com/BlockstreamResearch/rust-simplicity/"
@@ -28,14 +28,14 @@ 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"
-simplicity-sys = { version = "0.3.0", path = "./simplicity-sys" }
+simplicity-sys = { version = "0.4.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.3.0", path = "./simplicity-sys", features = [
+simplicity-sys = { version = "0.4.0", path = "./simplicity-sys", features = [
     "test-utils",
 ] }
 

simpcli/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 [dependencies]
 base64 = "0.21"
 # todo add lexopt for command line parsing
-simplicity-lang = { version = "0.3", path = "..", features = [ "serde", "elements" ] }
+simplicity-lang = { version = "0.4", path = "..", features = [ "serde", "elements" ] }
 
 [[bin]]
 name = "simpcli"

simplicity-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "simplicity-sys"
-version = "0.3.0"
+version = "0.4.0"
 license = "CC0-1.0"
 homepage = "https://github.com/BlockstreamResearch/rust-simplicity/"
 repository = "https://github.com/BlockstreamResearch/rust-simplicity/"

simplicity-sys/depend/simplicity/simplicity_alloc.h

@@ -6,17 +6,17 @@
 /* Declare Rust functions so the compiler can handle them.
  * The linker will include the functions from Rust.
  */
-extern void* rust_0_3_malloc(size_t size);
-extern void* rust_0_3_calloc(size_t num, size_t size);
-extern void rust_0_3_free(void* ptr);
+extern void* rust_0_4_malloc(size_t size);
+extern void* rust_0_4_calloc(size_t num, size_t size);
+extern void rust_0_4_free(void* ptr);
 
-/* Allocate with rust_0_3_malloc. */
-#define simplicity_malloc rust_0_3_malloc
+/* Allocate with rust_0_4_malloc. */
+#define simplicity_malloc rust_0_4_malloc
 
-/* Allocate+zero initialize with rust_0_3_calloc. */
-#define simplicity_calloc rust_0_3_calloc
+/* Allocate+zero initialize with rust_0_4_calloc. */
+#define simplicity_calloc rust_0_4_calloc
 
-/* Deallocate with rust_0_3_free. */
-#define simplicity_free rust_0_3_free
+/* Deallocate with rust_0_4_free. */
+#define simplicity_free rust_0_4_free
 
 #endif /* SIMPLICITY_SIMPLICITY_ALLOC_H */

simplicity-sys/src/alloc.rs

@@ -28,7 +28,7 @@ type AllocatorFn = unsafe fn(Layout) -> *mut u8;
 /// # Safety
 ///
 /// - `allocator` must be [`alloc::alloc`] or [`alloc::alloc_zeroed`].
-/// - Allocated bytes must be freed using [`rust_0_3_free`].
+/// - Allocated bytes must be freed using [`rust_0_4_free`].
 unsafe fn allocate(size_bytes: usize, allocator: AllocatorFn) -> *mut u8 {
     assert!(mem::align_of::<usize>() <= MIN_ALIGN);
     assert!(mem::align_of::<&usize>() <= MIN_ALIGN);
@@ -73,9 +73,9 @@ unsafe fn allocate(size_bytes: usize, allocator: AllocatorFn) -> *mut u8 {
 ///
 /// # Safety
 ///
-/// Allocated bytes must be freed using [`rust_0_3_free`].
+/// Allocated bytes must be freed using [`rust_0_4_free`].
 #[no_mangle]
-pub unsafe extern "C" fn rust_0_3_malloc(size_bytes: usize) -> *mut u8 {
+pub unsafe extern "C" fn rust_0_4_malloc(size_bytes: usize) -> *mut u8 {
     // SAFETY: Allocator is `alloc::alloc`.
     allocate(size_bytes, alloc::alloc)
 }
@@ -84,9 +84,9 @@ pub unsafe extern "C" fn rust_0_3_malloc(size_bytes: usize) -> *mut u8 {
 ///
 /// # Safety
 ///
-/// Allocated bytes must be freed using [`rust_0_3_free`].
+/// Allocated bytes must be freed using [`rust_0_4_free`].
 #[no_mangle]
-pub unsafe extern "C" fn rust_0_3_calloc(num: usize, size: usize) -> *mut u8 {
+pub unsafe extern "C" fn rust_0_4_calloc(num: usize, size: usize) -> *mut u8 {
     let size_bytes = num * size;
     // SAFETY: Allocator is `alloc_alloc_zeroed`.
     allocate(size_bytes, alloc::alloc_zeroed)
@@ -96,15 +96,15 @@ pub unsafe extern "C" fn rust_0_3_calloc(num: usize, size: usize) -> *mut u8 {
 ///
 /// # Safety
 ///
-/// - `ptr_bytes` must have been allocated using [`rust_0_3_malloc`] or [`rust_0_3_calloc`].
+/// - `ptr_bytes` must have been allocated using [`rust_0_4_malloc`] or [`rust_0_4_calloc`].
 /// - If `ptr_bytes` is a `NULL` pointer, then this function is a NO-OP.
 #[no_mangle]
-pub unsafe extern "C" fn rust_0_3_free(ptr_bytes: *mut u8) {
+pub unsafe extern "C" fn rust_0_4_free(ptr_bytes: *mut u8) {
     if ptr_bytes.is_null() {
         return;
     }
 
-    // We got a pointer to an allocation from `rust_0_3_malloc` or `rust_0_3_calloc`,
+    // We got a pointer to an allocation from `rust_0_4_malloc` or `rust_0_4_calloc`,
     // so the memory looks as follows.
     // There is a prefix of `MIN_ALIGN` bytes in front of the pointer we got.
     // This prefix holds the total number of allocated bytes.

simplicity-sys/src/c_jets/c_env.rs

@@ -210,8 +210,8 @@ impl CElementsTxEnv {
 impl Drop for CElementsTxEnv {
     fn drop(&mut self) {
         unsafe {
-            crate::alloc::rust_0_3_free(self.tx as *mut u8);
-            crate::alloc::rust_0_3_free(self.taproot as *mut u8);
+            crate::alloc::rust_0_4_free(self.tx as *mut u8);
+            crate::alloc::rust_0_4_free(self.taproot as *mut u8);
         }
     }
 }

simplicity-sys/src/tests/mod.rs

@@ -102,7 +102,7 @@ struct FreeOnDrop(*mut u8);
 impl Drop for FreeOnDrop {
     fn drop(&mut self) {
         unsafe {
-            crate::alloc::rust_0_3_free(self.0);
+            crate::alloc::rust_0_4_free(self.0);
         }
     }
 }