Prepare 23.3.0rc3

.cirrus.yml

@@ -194,10 +194,10 @@ task:
     FILE_ENV: "./ci/test/00_setup_env_win64.sh"
 
 task:
-  name: '32-bit + dash [gui] [CentOS 8]'
+  name: '32-bit + dash [gui] [Rocky 8]'
   << : *GLOBAL_TASK_TEMPLATE
   container:
-    image: quay.io/centos/centos:stream8
+    image: quay.io/rockylinux/rockylinux:8
   env:
     << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
     PACKAGE_MANAGER_INSTALL: "yum install -y"
@@ -214,10 +214,10 @@ task:
     FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh"
 
 task:
-  name: '[TSan, depends, gui] [jammy]'
+  name: '[TSan, depends, gui] [2404]'
   << : *GLOBAL_TASK_TEMPLATE
   container:
-    image: ubuntu:jammy
+    image: ubuntu:24.04
     cpu: 6  # Increase CPU and Memory to avoid timeout
     memory: 24G
   env:

Makefile.am

@@ -195,7 +195,6 @@ LCOV_FILTER_PATTERN = \
 	-p "src/crypto/ctaes" \
 	-p "src/minisketch" \
 	-p "src/secp256k1" \
-	-p "src/simplicity/secp256k1" \
 	-p "depends"
 
 DIR_FUZZ_SEED_CORPUS ?= qa-assets/fuzz_seed_corpus

build_msvc/libbitcoin_wallet/libbitcoin_wallet.vcxproj.in

@@ -9,22 +9,40 @@
   </PropertyGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\asset.cpp" />
+    <ClCompile Include="..\..\src\blockfilter.cpp" />
     <ClCompile Include="..\..\src\chain.cpp" />
     <ClCompile Include="..\..\src\confidential_validation.cpp" />
+    <ClCompile Include="..\..\src\consensus/tx_verify.cpp" />
+    <ClCompile Include="..\..\src\dbwrapper.cpp" />
     <ClCompile Include="..\..\src\deploymentstatus.cpp" />
     <ClCompile Include="..\..\src\dynafed.cpp" />
+    <ClCompile Include="..\..\src\flatfile.cpp" />
+    <ClCompile Include="..\..\src\index/base.cpp" />
+    <ClCompile Include="..\..\src\index/blockfilterindex.cpp" />
+    <ClCompile Include="..\..\src\index/coinstatsindex.cpp" />
     <ClCompile Include="..\..\src\mainchainrpc.cpp" />
+    <ClCompile Include="..\..\src\node\blockstorage.cpp" />
+    <ClCompile Include="..\..\src\node\coinstats.cpp" />
     <ClCompile Include="..\..\src\node\interfaces.cpp" />
     <ClCompile Include="..\..\src\node\ui_interface.cpp" />
     <ClCompile Include="..\..\src\pegins.cpp" />
     <ClCompile Include="..\..\src\pow.cpp" />
+    <ClCompile Include="..\..\src\policy/fees.cpp" />
+    <ClCompile Include="..\..\src\policy/packages.cpp" />
+    <ClCompile Include="..\..\src\policy/rbf.cpp" />
+    <ClCompile Include="..\..\src\policy/settings.cpp" />
     <ClCompile Include="..\..\src\primitives\bitcoin\transaction.cpp" />
     <ClCompile Include="..\..\src\primitives\pak.cpp" />
     <ClCompile Include="..\..\src\rpc\server.cpp" />
     <ClCompile Include="..\..\src\script\sigcache.cpp" />
     <ClCompile Include="..\..\src\shutdown.cpp" />
+    <ClCompile Include="..\..\src\signet.cpp" />
     <ClCompile Include="..\..\src\sync.cpp" />
+    <ClCompile Include="..\..\src\timedata.cpp" />
+    <ClCompile Include="..\..\src\txdb.cpp" />
+    <ClCompile Include="..\..\src\txmempool.cpp" />
     <ClCompile Include="..\..\src\validation.cpp" />
+    <ClCompile Include="..\..\src\validationinterface.cpp" />
     <ClCompile Include="..\..\src\versionbits.cpp" />
     <ClCompile Include="..\..\src\wallet\bdb.cpp" />
     <ClCompile Include="..\..\src\wallet\rpc\elements.cpp" />
@@ -36,6 +54,12 @@
     <ProjectReference Include="..\libsecp256k1\libsecp256k1.vcxproj">
       <Project>{bb493552-3b8c-4a8c-bf69-a6e7a51d2ea6}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\libleveldb\libleveldb.vcxproj">
+      <Project>{18430fef-6b61-4c53-b396-718e02850f1b}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\libelementssimplicity\libelementssimplicity.vcxproj">
+      <Project>{abae25f0-d700-46e1-9ef6-5d6ddfcf8b26}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

build_msvc/libbitcoinconsensus/libbitcoinconsensus.vcxproj

@@ -34,6 +34,11 @@
     <ClCompile Include="..\..\src\uint256.cpp" />
     <ClCompile Include="..\..\src\util\strencodings.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libelementssimplicity\libelementssimplicity.vcxproj">
+      <Project>{abae25f0-d700-46e1-9ef6-5d6ddfcf8b26}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Import Project="..\common.vcxproj" />

build_msvc/test_bitcoin/test_bitcoin.vcxproj

@@ -15,7 +15,18 @@
     <ClCompile Include="..\..\src\test\main.cpp" />
     <ClCompile Include="..\..\src\test\util\*.cpp" />
     <ClCompile Include="..\..\src\wallet\test\*_fixture.cpp" />
-    <ClCompile Include="..\..\src\wallet\test\*_tests.cpp" />
+    <ClCompile Include="..\..\src\wallet\test\coinselector_tests.cpp" />
+    <ClCompile Include="..\..\src\wallet\test\db_tests.cpp" />
+    <ClCompile Include="..\..\src\wallet\test\init_tests.cpp" />
+    <ClCompile Include="..\..\src\wallet\test\ismine_tests.cpp" />
+    <!-- Exclude psbt_wallet_tests.cpp from the build -->
+    <!-- <ClCompile Include="..\..\src\wallet\test\psbt_wallet_tests.cpp" /> -->
+    <ClCompile Include="..\..\src\wallet\test\scriptpubkeyman_tests.cpp" />
+    <ClCompile Include="..\..\src\wallet\test\spend_tests.cpp" />
+    <ClCompile Include="..\..\src\wallet\test\wallet_crypto_tests.cpp" />
+    <ClCompile Include="..\..\src\wallet\test\walletdb_tests.cpp" />
+    <ClCompile Include="..\..\src\wallet\test\wallet_tests.cpp" />
+    <ClCompile Include="..\..\src\wallet\test\wallet_transaction_tests.cpp" />
     <ClCompile Include="..\..\src\wallet\test\util.cpp" />
     <ClCompile Include="..\..\src\primitives\bitcoin\transaction.cpp" />
   </ItemGroup>

ci/test/00_setup_env_i686_centos.sh

@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8
 
 export HOST=i686-pc-linux-gnu
 export CONTAINER_NAME=ci_i686_centos
-export DOCKER_NAME_TAG=quay.io/centos/centos:stream8
+export DOCKER_NAME_TAG=quay.io/rockylinux/rockylinux:8
 export DOCKER_PACKAGES="gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache libtool make git python3 python3-zmq which patch lbzip2 xz procps-ng dash rsync coreutils bison"
 export GOAL="install"
 export BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-reduce-exports"

ci/test/00_setup_env_native_tsan.sh

@@ -7,8 +7,8 @@
 export LC_ALL=C.UTF-8
 
 export CONTAINER_NAME=ci_native_tsan
-export DOCKER_NAME_TAG=ubuntu:22.04
-export PACKAGES="clang-13 llvm-13 libc++abi-13-dev libc++-13-dev python3-zmq"
-export DEP_OPTS="CC=clang-13 CXX='clang++-13 -stdlib=libc++'"
+export DOCKER_NAME_TAG="docker.io/ubuntu:24.04"
+export PACKAGES="clang-18 llvm-18 libclang-rt-18-dev libc++abi-18-dev libc++-18-dev python3-zmq"
+export DEP_OPTS="CC=clang-18 CXX='clang++-18 -stdlib=libc++'"
 export GOAL="install"
-export BITCOIN_CONFIG="--enable-zmq CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' CXXFLAGS='-g' --with-sanitizers=thread CC=clang-13 CXX='clang++-13 -stdlib=libc++'"
+export BITCOIN_CONFIG="--enable-zmq CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' CXXFLAGS='-g' --with-sanitizers=thread"

ci/test/04_install.sh

@@ -64,7 +64,7 @@ if [ -n "$DPKG_ADD_ARCH" ]; then
   CI_EXEC dpkg --add-architecture "$DPKG_ADD_ARCH"
 fi
 
-if [[ $DOCKER_NAME_TAG == *centos* ]]; then
+if [[ $DOCKER_NAME_TAG == *centos* ]] || [[ $DOCKER_NAME_TAG == *rocky* ]]; then
   ${CI_RETRY_EXE} CI_EXEC dnf -y install epel-release
   ${CI_RETRY_EXE} CI_EXEC dnf -y --allowerasing install "$DOCKER_PACKAGES" "$PACKAGES"
 elif [ "$CI_USE_APT_INSTALL" != "no" ]; then

ci/test/05_before_script.sh

@@ -44,7 +44,7 @@ if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then
 fi
 
 if [ -z "$NO_DEPENDS" ]; then
-  if [[ $DOCKER_NAME_TAG == *centos* ]]; then
+  if [[ $DOCKER_NAME_TAG == *centos* ]] || [[ $DOCKER_NAME_TAG == *rocky* ]]; then
     # CentOS has problems building the depends if the config shell is not explicitly set
     # (i.e. for libevent a Makefile with an empty SHELL variable is generated, leading to
     #  an error as the first command is executed)

configure.ac

@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 23)
 define(_CLIENT_VERSION_MINOR, 3)
 define(_CLIENT_VERSION_BUILD, 0)
-define(_CLIENT_VERSION_RC, 2)
+define(_CLIENT_VERSION_RC, 3)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2024)
 define(_COPYRIGHT_HOLDERS,[The %s developers])

depends/packages/boost.mk

@@ -1,8 +1,8 @@
 package=boost
-$(package)_version=1.77.0
-$(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$($(package)_version)/source/
-$(package)_file_name=boost_$(subst .,_,$($(package)_version)).tar.bz2
-$(package)_sha256_hash=fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854
+$(package)_version=1.81.0
+$(package)_download_path=https://archives.boost.io/release/$($(package)_version)/source/
+$(package)_file_name=boost_$(subst .,_,$($(package)_version)).tar.gz
+$(package)_sha256_hash=205666dea9f6a7cfed87c7a6dfbeb52a2c1b9de55712c9c1a87735d7181452b6
 
 define $(package)_stage_cmds
   mkdir -p $($(package)_staging_prefix_dir)/include && \

depends/packages/xcb_proto.mk

@@ -1,8 +1,8 @@
 package=xcb_proto
-$(package)_version=1.14.1
+$(package)_version=1.15.2
 $(package)_download_path=https://xorg.freedesktop.org/archive/individual/proto
 $(package)_file_name=xcb-proto-$($(package)_version).tar.xz
-$(package)_sha256_hash=f04add9a972ac334ea11d9d7eb4fc7f8883835da3e4859c9afa971efdf57fcc3
+$(package)_sha256_hash=7072beb1f680a2fe3f9e535b797c146d22528990c72f63ddb49d2f350a3653ed
 
 define $(package)_config_cmds
   $($(package)_autoconf)

doc/man/elements-cli.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH ELEMENTS-CLI "1" "November 2024" "elements-cli v23.3.0" "User Commands"
+.TH ELEMENTS-CLI "1" "February 2025" "elements-cli v23.3.0" "User Commands"
 .SH NAME
 elements-cli \- manual page for elements-cli v23.3.0
 .SH SYNOPSIS

doc/man/elements-qt.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH ELEMENTS-QT "1" "November 2024" "elements-qt v23.3.0" "User Commands"
+.TH ELEMENTS-QT "1" "February 2025" "elements-qt v23.3.0" "User Commands"
 .SH NAME
 elements-qt \- manual page for elements-qt v23.3.0
 .SH SYNOPSIS
@@ -637,7 +637,8 @@ Chain selection options:
 .HP
 \fB\-acceptdiscountct\fR
 .IP
-Accept discounted fees for Confidential Transactions (default: false)
+Accept discounted fees for Confidential Transactions (default: true in
+liquidtestnet and liquidv1, false otherwise)
 .HP
 \fB\-bech32_hrp\fR
 .IP

doc/man/elements-tx.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH ELEMENTS-TX "1" "November 2024" "elements-tx v23.3.0" "User Commands"
+.TH ELEMENTS-TX "1" "February 2025" "elements-tx v23.3.0" "User Commands"
 .SH NAME
 elements-tx \- manual page for elements-tx v23.3.0
 .SH SYNOPSIS

doc/man/elements-util.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH ELEMENTS-UTIL "1" "November 2024" "elements-util v23.3.0" "User Commands"
+.TH ELEMENTS-UTIL "1" "February 2025" "elements-util v23.3.0" "User Commands"
 .SH NAME
 elements-util \- manual page for elements-util v23.3.0
 .SH SYNOPSIS

doc/man/elements-wallet.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH ELEMENTS-WALLET "1" "November 2024" "elements-wallet v23.3.0" "User Commands"
+.TH ELEMENTS-WALLET "1" "February 2025" "elements-wallet v23.3.0" "User Commands"
 .SH NAME
 elements-wallet \- manual page for elements-wallet v23.3.0
 .SH DESCRIPTION

doc/man/elementsd.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH ELEMENTSD "1" "November 2024" "elementsd v23.3.0" "User Commands"
+.TH ELEMENTSD "1" "February 2025" "elementsd v23.3.0" "User Commands"
 .SH NAME
 elementsd \- manual page for elementsd v23.3.0
 .SH SYNOPSIS
@@ -637,7 +637,8 @@ Chain selection options:
 .HP
 \fB\-acceptdiscountct\fR
 .IP
-Accept discounted fees for Confidential Transactions (default: false)
+Accept discounted fees for Confidential Transactions (default: true in
+liquidtestnet and liquidv1, false otherwise)
 .HP
 \fB\-bech32_hrp\fR
 .IP

src/Makefile.elementssimplicity.include

@@ -3,4 +3,4 @@ include simplicity/elements-sources.mk
 LIBELEMENTSSIMPLICITY = libelementssimplicity.la
 noinst_LTLIBRARIES += $(LIBELEMENTSSIMPLICITY)
 libelementssimplicity_la_SOURCES = $(ELEMENTS_SIMPLICITY_LIB_SOURCES_INT) $(ELEMENTS_SIMPLICITY_DIST_HEADERS_INT) $(ELEMENTS_SIMPLICITY_LIB_HEADERS_INT)
-libelementssimplicity_la_CPPFLAGS = $(AM_CPPFLAGS) $(SHANI_CXXFLAGS) -I$(srcdir)/$(ELEMENTS_SIMPLICITY_INCLUDE_DIR_INT)
+libelementssimplicity_la_CPPFLAGS = $(AM_CPPFLAGS) $(SHANI_CXXFLAGS) $(SANITIZER_CXXFLAGS) -I$(srcdir)/$(ELEMENTS_SIMPLICITY_INCLUDE_DIR_INT)

src/mapport.cpp

@@ -168,8 +168,11 @@ static bool ProcessUpnp()
     struct UPNPUrls urls;
     struct IGDdatas data;
     int r;
-
+#if MINIUPNPC_API_VERSION <= 17
     r = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr));
+#else
+    r = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr), nullptr, 0);
+#endif
     if (r == 1)
     {
         if (fDiscover) {

src/primitives/confidential.h

@@ -135,6 +135,11 @@ class CConfidentialValue : public CConfidentialCommitment<9, 8, 9>
     CConfidentialValue() { SetNull(); }
     CConfidentialValue(CAmount nAmount) { SetToAmount(nAmount); }
 
+    template <typename Stream>
+    inline void Unserialize(Stream& s) {
+        CConfidentialCommitment::Unserialize(s);
+    }
+
     /* An explicit value is called an amount. The first byte indicates it is
      * an explicit value, and the remaining 8 bytes is the value serialized as
      * a 64-bit big-endian integer. */

src/primitives/transaction.h

@@ -295,6 +295,9 @@ class CTxOut
             s >> nAsset;
             s >> nValue;
             s >> nNonce;
+            if (nAsset.IsNull() || nValue.IsNull()) {
+                throw std::ios_base::failure("Confidential values may not be null");
+            }
         } else {
             CAmount value;
             s >> value;

src/script/interpreter.cpp

@@ -2660,7 +2660,8 @@ void PrecomputedTransactionData::Init(const T& txTo, std::vector<CTxOut>&& spent
         }
 
         rawTransaction simplicityRawTx;
-        simplicityRawTx.txid = txTo.GetHash().begin();
+        uint256 rawHash = txTo.GetHash();
+        simplicityRawTx.txid = rawHash.begin();
         simplicityRawTx.input = simplicityRawInput.data();
         simplicityRawTx.numInputs = simplicityRawInput.size();
         simplicityRawTx.output = simplicityRawOutput.data();
@@ -3123,7 +3124,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 +3134,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/simplicity/ctx8Pruned.c

@@ -270,8 +270,8 @@ const uint32_t ctx8Pruned_cmr[] = {
   0x7f11746fu, 0xb68fdaedu, 0x3cadda80u, 0xc7cd0245u, 0xa341b927u, 0xe98e60f8u, 0x745dc441u, 0xe11ce1a3u
 };
 
-/* The identity Merkle root of the above ctx8Pruned Simplicity expression. */
-const uint32_t ctx8Pruned_imr[] = {
+/* The identity hash of the root of the above ctx8Pruned Simplicity expression. */
+const uint32_t ctx8Pruned_ihr[] = {
   0x8e8742acu, 0x27f42d29u, 0xd87f5229u, 0x02bc0ae2u, 0xbcfc1298u, 0x1641a2ddu, 0x77091830u, 0xb79bf12du
 };
 

src/simplicity/ctx8Pruned.h

@@ -18,8 +18,8 @@ extern const size_t sizeof_ctx8Pruned_witness;
 /* The commitment Merkle root of the above ctx8Pruned Simplicity expression. */
 extern const uint32_t ctx8Pruned_cmr[];
 
-/* The identity Merkle root of the above ctx8Pruned Simplicity expression. */
-extern const uint32_t ctx8Pruned_imr[];
+/* The identity hash of the root of the above ctx8Pruned Simplicity expression. */
+extern const uint32_t ctx8Pruned_ihr[];
 
 /* The annotated Merkle root of the above ctx8Pruned Simplicity expression. */
 extern const uint32_t ctx8Pruned_amr[];

src/simplicity/ctx8Unpruned.c

@@ -260,8 +260,8 @@ const uint32_t ctx8Unpruned_cmr[] = {
   0x7f11746fu, 0xb68fdaedu, 0x3cadda80u, 0xc7cd0245u, 0xa341b927u, 0xe98e60f8u, 0x745dc441u, 0xe11ce1a3u
 };
 
-/* The identity Merkle root of the above ctx8Unpruned Simplicity expression. */
-const uint32_t ctx8Unpruned_imr[] = {
+/* The identity hash of the root of the above ctx8Unpruned Simplicity expression. */
+const uint32_t ctx8Unpruned_ihr[] = {
   0x8e8742acu, 0x27f42d29u, 0xd87f5229u, 0x02bc0ae2u, 0xbcfc1298u, 0x1641a2ddu, 0x77091830u, 0xb79bf12du
 };
 

src/simplicity/ctx8Unpruned.h

@@ -18,8 +18,8 @@ extern const size_t sizeof_ctx8Unpruned_witness;
 /* The commitment Merkle root of the above ctx8Unpruned Simplicity expression. */
 extern const uint32_t ctx8Unpruned_cmr[];
 
-/* The identity Merkle root of the above ctx8Unpruned Simplicity expression. */
-extern const uint32_t ctx8Unpruned_imr[];
+/* The identity hash of the root of the above ctx8Unpruned Simplicity expression. */
+extern const uint32_t ctx8Unpruned_ihr[];
 
 /* The annotated Merkle root of the above ctx8Unpruned Simplicity expression. */
 extern const uint32_t ctx8Unpruned_amr[];