Update to latest Simplicity

The main difference is that there is now explicit simplicity deallocation functions to go with the allocation functions in the API.
There are some minor changes to error message text.
The deserialization code is now automatically generated.
The are some other minor internal changes.

Author: roconnor-blockstream

src/script/interpreter.cpp

@@ -3123,7 +3123,7 @@ bool GenericTransactionSignatureChecker<T>::CheckSimplicity(const valtype& progr
     if (!simplicity_elements_execSimplicity(&error, 0, txdata->m_simplicity_tx_data, nIn, simplicityTapEnv, txdata->m_hash_genesis_block.data(), budget, 0, program.data(), program.size(), witness.data(), witness.size())) {
         assert(!"simplicity_elements_execSimplicity internal error");
     }
-    free(simplicityTapEnv);
+    simplicity_elements_freeTapEnv(simplicityTapEnv);
     switch (error) {
     case SIMPLICITY_NO_ERROR: return set_success(serror);
     case SIMPLICITY_ERR_MALLOC:
@@ -3133,7 +3133,7 @@ bool GenericTransactionSignatureChecker<T>::CheckSimplicity(const valtype& progr
     case SIMPLICITY_ERR_DATA_OUT_OF_RANGE: return set_error(serror, SCRIPT_ERR_SIMPLICITY_DATA_OUT_OF_RANGE);
     case SIMPLICITY_ERR_DATA_OUT_OF_ORDER: return set_error(serror, SCRIPT_ERR_SIMPLICITY_DATA_OUT_OF_ORDER);
     case SIMPLICITY_ERR_FAIL_CODE: return set_error(serror, SCRIPT_ERR_SIMPLICITY_FAIL_CODE);
-    case SIMPLICITY_ERR_STOP_CODE: return set_error(serror, SCRIPT_ERR_SIMPLICITY_STOP_CODE);
+    case SIMPLICITY_ERR_RESERVED_CODE: return set_error(serror, SCRIPT_ERR_SIMPLICITY_RESERVED_CODE);
     case SIMPLICITY_ERR_HIDDEN: return set_error(serror, SCRIPT_ERR_SIMPLICITY_HIDDEN);
     case SIMPLICITY_ERR_BITSTREAM_EOF: return set_error(serror, SCRIPT_ERR_SIMPLICITY_BITSTREAM_EOF);
     case SIMPLICITY_ERR_BITSTREAM_TRAILING_BYTES: return set_error(serror, SCRIPT_ERR_SIMPLICITY_BITSTREAM_TRAILING_BYTES);

src/script/interpreter.h

@@ -222,7 +222,7 @@ struct PrecomputedTransactionData
     template <class T>
     explicit PrecomputedTransactionData(const T& tx);
     ~PrecomputedTransactionData() {
-        free(m_simplicity_tx_data);
+        simplicity_elements_freeTransaction(m_simplicity_tx_data);
     }
 };
 

src/script/script_error.cpp

@@ -140,8 +140,8 @@ std::string ScriptErrorString(const ScriptError serror)
             return SIMPLICITY_ERR_MSG(SIMPLICITY_ERR_DATA_OUT_OF_ORDER);
         case SCRIPT_ERR_SIMPLICITY_FAIL_CODE:
             return SIMPLICITY_ERR_MSG(SIMPLICITY_ERR_FAIL_CODE);
-        case SCRIPT_ERR_SIMPLICITY_STOP_CODE:
-            return SIMPLICITY_ERR_MSG(SIMPLICITY_ERR_STOP_CODE);
+        case SCRIPT_ERR_SIMPLICITY_RESERVED_CODE:
+            return SIMPLICITY_ERR_MSG(SIMPLICITY_ERR_RESERVED_CODE);
         case SCRIPT_ERR_SIMPLICITY_HIDDEN:
             return SIMPLICITY_ERR_MSG(SIMPLICITY_ERR_HIDDEN);
         case SCRIPT_ERR_SIMPLICITY_BITSTREAM_EOF:

src/script/script_error.h

@@ -102,7 +102,7 @@ typedef enum ScriptError_t
     SCRIPT_ERR_SIMPLICITY_DATA_OUT_OF_RANGE,
     SCRIPT_ERR_SIMPLICITY_DATA_OUT_OF_ORDER,
     SCRIPT_ERR_SIMPLICITY_FAIL_CODE,
-    SCRIPT_ERR_SIMPLICITY_STOP_CODE,
+    SCRIPT_ERR_SIMPLICITY_RESERVED_CODE,
     SCRIPT_ERR_SIMPLICITY_HIDDEN,
     SCRIPT_ERR_SIMPLICITY_BITSTREAM_EOF,
     SCRIPT_ERR_SIMPLICITY_BITSTREAM_TRAILING_BYTES,

src/support/lockedpool.cpp

@@ -22,6 +22,9 @@
 #endif
 
 #include <algorithm>
+#include <limits>
+#include <stdexcept>
+#include <utility>
 #ifdef ARENA_DEBUG
 #include <iomanip>
 #include <iostream>

src/support/lockedpool.h

@@ -5,11 +5,11 @@
 #ifndef BITCOIN_SUPPORT_LOCKEDPOOL_H
 #define BITCOIN_SUPPORT_LOCKEDPOOL_H
 
-#include <stdint.h>
+#include <cstddef>
 #include <list>
 #include <map>
-#include <mutex>
 #include <memory>
+#include <mutex>
 #include <unordered_map>
 
 /**

src/util/bip32.h

@@ -6,6 +6,7 @@
 #define BITCOIN_UTIL_BIP32_H
 
 #include <attributes.h>
+#include <cstdint>
 #include <string>
 #include <vector>
 

src/util/string.h

@@ -9,6 +9,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cstdint>
 #include <cstring>
 #include <locale>
 #include <sstream>