revert update jets

Author: stringhandler

update_jets.sh

@@ -1,102 +1,50 @@
-#!/usr/bin/env bash
+#!/bin/bash
 set -e
 
-# Requires (nix-shell with) git, rsync
+# Requires (nix-shell with) cabal
 
-## 0. Parse command-line options
-if [ -z "$1" ] || [ -z "$2" ]; then
-  echo "Usage: $0 <path to depend directory> <path to libsimplicity repository root>"
+if [ -z "$1" ]; then
+  echo "\$1 path to libsimplicity repository root"
   exit 1
 fi
 
-DEPEND_PATH=$(readlink -f "$1")
-LIBSIM_PATH=$(readlink -f "$2")
-VENDORED_SIM_DIR="$DEPEND_PATH/simplicity"
+C_DIR="$1"
+RUST_DIR="$(pwd)"
+VENDORED_HEAD=$(sed -n '2p' "$RUST_DIR"/simplicity-sys/depend/simplicity-HEAD-revision.txt)
 
-DEFAULT_VERSION_CODE=$(grep "^version" "$DEPEND_PATH/../Cargo.toml" | sed 's/\./_/g' | sed 's/.*"\(.*\)".*/\1/' | cut -d_ -f1-2)
+cd "$C_DIR"
+REV=$(git rev-parse HEAD)
 
-: "${SIMPLICITY_ALLOC_VERSION_CODE:=$DEFAULT_VERSION_CODE}"
-
-## 1. Sanity check environment.
-if ! command -v git > /dev/null; then
-    echo "Missing 'git' executable in evironment."
-    exit 1
-fi
-if ! command -v rsync > /dev/null; then
-    echo "Missing 'rsync' executable in evironment."
-    exit 1
-fi
-
-if [ ! -d "$DEPEND_PATH" ]; then
-    echo "Depend path '$DEPEND_PATH' does not appear to be a directory."
-    exit 1
-fi
-
-if [ ! -d "$LIBSIM_PATH" ]; then
-    echo "libsimplicity path '$LIBSIM_PATH' does not appear to be a directory."
-    exit 1
+if [ "$REV" != "$VENDORED_HEAD" ]; then
+    echo "WARNING: Haskell and Rust have different libsimplicity version"
+    echo "Haskell: $REV"
+    echo "Rust:    $VENDORED_HEAD"
 fi
 
-if [ -d "$VENDORED_SIM_DIR" ]; then
-    while true; do
-        read -r -p "$VENDORED_SIM_DIR will be deleted [yn]: " yn
-        case $yn in
-            [Yy]* ) break;;
-            [Nn]* ) exit;;
-            * ) echo "Please answer y or n.";;
-        esac
-    done
-
-    rm -rf "$VENDORED_SIM_DIR"
-elif [ -e "$VENDORED_SIM_DIR" ]; then
-    echo "'simplicity' inside depend directory exists but appears not to be a directory."
-    echo "Please move or delete this file."
-    exit 1
-fi
-
-## 2. Copy files from libsimplicity
-pushd "$LIBSIM_PATH/C"
-
 if test -n "$(git status --porcelain)"; then
     echo "WARNING: libsimplicity repo is not clean"
 fi
 
-HEAD=$(git rev-parse HEAD)
-echo "# This file has been automatically generated." > "$DEPEND_PATH/simplicity-HEAD-revision.txt"
-echo "$HEAD" >> "$DEPEND_PATH/simplicity-HEAD-revision.txt"
-
-# Copy C folder to simplicity-sys/depend/simplicity
-# Use rsync to copy only files tracked by git
-git ls-files | rsync -av --files-from=- . "$VENDORED_SIM_DIR"
+cabal build -j8
+cabal exec GenRustJets
 
-popd
+cd "$RUST_DIR"
 
-## 3. Patch things to include versions
+DEFAULT_VERSION_CODE=$(grep "^version" "./simplicity-sys/Cargo.toml" | sed 's/\./_/g' | sed 's/.*"\(.*\)".*/\1/' | cut -d_ -f1-2)
+: "${SIMPLICITY_ALLOC_VERSION_CODE:=$DEFAULT_VERSION_CODE}"
 
-# a. patch our own drop/new functions for C structures.
-find "$DEPEND_PATH/.." -name "*.rs" -type f -exec sed -i "s/rust_[0-9_]*_free/rust_${SIMPLICITY_ALLOC_VERSION_CODE}_free/" {} \;
-find "$DEPEND_PATH/.." -name "*.rs" -type f -exec sed -i "s/rust_[0-9_]*_malloc/rust_${SIMPLICITY_ALLOC_VERSION_CODE}_malloc/" {} \;
-find "$DEPEND_PATH/.." -name "*.rs" -type f -exec sed -i "s/rust_[0-9_]*_calloc/rust_${SIMPLICITY_ALLOC_VERSION_CODE}_calloc/" {} \;
+mv "${C_DIR}/jets_ffi.rs" "./simplicity-sys/src/c_jets/jets_ffi.rs"
+mv "${C_DIR}/jets_wrapper.rs" "./simplicity-sys/src/c_jets/jets_wrapper.rs"
+mv "${C_DIR}/jets_wrapper.c" "./simplicity-sys/depend/jets_wrapper.c"
 
-# b. patch the rust_{malloc,calloc,free} functions in simplicity_alloc.h
-sed "s/rust_/rust_${SIMPLICITY_ALLOC_VERSION_CODE}_/" \
-    < "$DEPEND_PATH/simplicity_alloc.h.patch" \
-    | patch "$VENDORED_SIM_DIR/simplicity_alloc.h"
+# Tweak the c_ prefixes in the wrappers
+sed -i -r "s/\"c_/\"rustsimplicity_${SIMPLICITY_ALLOC_VERSION_CODE}_c_/" \
+    "./simplicity-sys/src/c_jets/jets_ffi.rs"
 
-# c. patch every single simplicity_* symbol in the library (every instance except
-#    those in #includes, which is overkill but doesn't hurt anything)
-find "$DEPEND_PATH/simplicity" \( -name "*.[ch]" -o -name '*.inc' \) -type f -print0 | xargs -0 \
-    sed -i "/^#include/! s/simplicity_/rustsimplicity_${SIMPLICITY_ALLOC_VERSION_CODE}_/g"
-# ...ok, actually we didn't want to replace simplicity_err
-find "$DEPEND_PATH/simplicity" \( -name "*.[ch]" -o -name '*.inc' \) -type f -print0 | xargs -0 \
-    sed -i "s/rustsimplicity_${SIMPLICITY_ALLOC_VERSION_CODE}_err/simplicity_err/g"
-# Special-case calls in depend/env.c and depend/warpper.h
-sed -i -r "s/rustsimplicity_[0-9]+_[0-9]+_/rustsimplicity_${SIMPLICITY_ALLOC_VERSION_CODE}_/" \
-    "$DEPEND_PATH/env.c" \
-    "$DEPEND_PATH/wrapper.h"
+# Update version prefix in wrapper.h if the version changed
+sed -i -r "s/ rustsimplicity_[0-9]+_[0-9]+_/ rustsimplicity_${SIMPLICITY_ALLOC_VERSION_CODE}_/" \
+    "./simplicity-sys/depend/wrapper.h"
 
-# d. ...also update the corresponding link_name= entries in the Rust source code
-find "./src/" -name "*.rs" -type f -print0 | xargs -0 \
-     sed -i -r "s/rustsimplicity_[0-9]+_[0-9]+_(.*)([\"\(])/rustsimplicity_${SIMPLICITY_ALLOC_VERSION_CODE}_\1\2/g"
-# e. ...and the links= field in the manifest file
-sed -i -r "s/^links = \".*\"$/links = \"rustsimplicity_${SIMPLICITY_ALLOC_VERSION_CODE}\"/" Cargo.toml
+mv "${C_DIR}/core.rs" "./src/jet/init/"
+mv "${C_DIR}/bitcoin.rs" "./src/jet/init/"
+mv "${C_DIR}/elements.rs" "./src/jet/init/"