Skip to content

Commit 421cc3d

Browse files
delta1delta1
authored
Merge pull request #1396 from psgreco/elem-23.3.0rc3
Prepare 23.3.0rc3
2 parents a3d55ee + a5852ce commit 421cc3d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1465
-1273
lines changed

‎.cirrus.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,10 @@ task:
194194
FILE_ENV: "./ci/test/00_setup_env_win64.sh"
195195

196196
task:
197-
name: '32-bit + dash [gui] [CentOS 8]'
197+
name: '32-bit + dash [gui] [Rocky 8]'
198198
<< : *GLOBAL_TASK_TEMPLATE
199199
container:
200-
image: quay.io/centos/centos:stream8
200+
image: quay.io/rockylinux/rockylinux:8
201201
env:
202202
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
203203
PACKAGE_MANAGER_INSTALL: "yum install -y"
@@ -214,10 +214,10 @@ task:
214214
FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh"
215215

216216
task:
217-
name: '[TSan, depends, gui] [jammy]'
217+
name: '[TSan, depends, gui] [2404]'
218218
<< : *GLOBAL_TASK_TEMPLATE
219219
container:
220-
image: ubuntu:jammy
220+
image: ubuntu:24.04
221221
cpu: 6 # Increase CPU and Memory to avoid timeout
222222
memory: 24G
223223
env:

‎Makefile.am

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ LCOV_FILTER_PATTERN = \
195195
-p "src/crypto/ctaes" \
196196
-p "src/minisketch" \
197197
-p "src/secp256k1" \
198-
-p "src/simplicity/secp256k1" \
199198
-p "depends"
200199

201200
DIR_FUZZ_SEED_CORPUS ?= qa-assets/fuzz_seed_corpus

‎build_msvc/libbitcoin_wallet/libbitcoin_wallet.vcxproj.in

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,40 @@
99
</PropertyGroup>
1010
<ItemGroup>
1111
<ClCompile Include="..\..\src\asset.cpp" />
12+
<ClCompile Include="..\..\src\blockfilter.cpp" />
1213
<ClCompile Include="..\..\src\chain.cpp" />
1314
<ClCompile Include="..\..\src\confidential_validation.cpp" />
15+
<ClCompile Include="..\..\src\consensus/tx_verify.cpp" />
16+
<ClCompile Include="..\..\src\dbwrapper.cpp" />
1417
<ClCompile Include="..\..\src\deploymentstatus.cpp" />
1518
<ClCompile Include="..\..\src\dynafed.cpp" />
19+
<ClCompile Include="..\..\src\flatfile.cpp" />
20+
<ClCompile Include="..\..\src\index/base.cpp" />
21+
<ClCompile Include="..\..\src\index/blockfilterindex.cpp" />
22+
<ClCompile Include="..\..\src\index/coinstatsindex.cpp" />
1623
<ClCompile Include="..\..\src\mainchainrpc.cpp" />
24+
<ClCompile Include="..\..\src\node\blockstorage.cpp" />
25+
<ClCompile Include="..\..\src\node\coinstats.cpp" />
1726
<ClCompile Include="..\..\src\node\interfaces.cpp" />
1827
<ClCompile Include="..\..\src\node\ui_interface.cpp" />
1928
<ClCompile Include="..\..\src\pegins.cpp" />
2029
<ClCompile Include="..\..\src\pow.cpp" />
30+
<ClCompile Include="..\..\src\policy/fees.cpp" />
31+
<ClCompile Include="..\..\src\policy/packages.cpp" />
32+
<ClCompile Include="..\..\src\policy/rbf.cpp" />
33+
<ClCompile Include="..\..\src\policy/settings.cpp" />
2134
<ClCompile Include="..\..\src\primitives\bitcoin\transaction.cpp" />
2235
<ClCompile Include="..\..\src\primitives\pak.cpp" />
2336
<ClCompile Include="..\..\src\rpc\server.cpp" />
2437
<ClCompile Include="..\..\src\script\sigcache.cpp" />
2538
<ClCompile Include="..\..\src\shutdown.cpp" />
39+
<ClCompile Include="..\..\src\signet.cpp" />
2640
<ClCompile Include="..\..\src\sync.cpp" />
41+
<ClCompile Include="..\..\src\timedata.cpp" />
42+
<ClCompile Include="..\..\src\txdb.cpp" />
43+
<ClCompile Include="..\..\src\txmempool.cpp" />
2744
<ClCompile Include="..\..\src\validation.cpp" />
45+
<ClCompile Include="..\..\src\validationinterface.cpp" />
2846
<ClCompile Include="..\..\src\versionbits.cpp" />
2947
<ClCompile Include="..\..\src\wallet\bdb.cpp" />
3048
<ClCompile Include="..\..\src\wallet\rpc\elements.cpp" />
@@ -36,6 +54,12 @@
3654
<ProjectReference Include="..\libsecp256k1\libsecp256k1.vcxproj">
3755
<Project>{bb493552-3b8c-4a8c-bf69-a6e7a51d2ea6}</Project>
3856
</ProjectReference>
57+
<ProjectReference Include="..\libleveldb\libleveldb.vcxproj">
58+
<Project>{18430fef-6b61-4c53-b396-718e02850f1b}</Project>
59+
</ProjectReference>
60+
<ProjectReference Include="..\libelementssimplicity\libelementssimplicity.vcxproj">
61+
<Project>{abae25f0-d700-46e1-9ef6-5d6ddfcf8b26}</Project>
62+
</ProjectReference>
3963
</ItemGroup>
4064
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4165
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

‎build_msvc/libbitcoinconsensus/libbitcoinconsensus.vcxproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@
3434
<ClCompile Include="..\..\src\uint256.cpp" />
3535
<ClCompile Include="..\..\src\util\strencodings.cpp" />
3636
</ItemGroup>
37+
<ItemGroup>
38+
<ProjectReference Include="..\libelementssimplicity\libelementssimplicity.vcxproj">
39+
<Project>{abae25f0-d700-46e1-9ef6-5d6ddfcf8b26}</Project>
40+
</ProjectReference>
41+
</ItemGroup>
3742
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3843
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
3944
<Import Project="..\common.vcxproj" />

‎build_msvc/test_bitcoin/test_bitcoin.vcxproj

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,18 @@
1515
<ClCompile Include="..\..\src\test\main.cpp" />
1616
<ClCompile Include="..\..\src\test\util\*.cpp" />
1717
<ClCompile Include="..\..\src\wallet\test\*_fixture.cpp" />
18-
<ClCompile Include="..\..\src\wallet\test\*_tests.cpp" />
18+
<ClCompile Include="..\..\src\wallet\test\coinselector_tests.cpp" />
19+
<ClCompile Include="..\..\src\wallet\test\db_tests.cpp" />
20+
<ClCompile Include="..\..\src\wallet\test\init_tests.cpp" />
21+
<ClCompile Include="..\..\src\wallet\test\ismine_tests.cpp" />
22+
<!-- Exclude psbt_wallet_tests.cpp from the build -->
23+
<!-- <ClCompile Include="..\..\src\wallet\test\psbt_wallet_tests.cpp" /> -->
24+
<ClCompile Include="..\..\src\wallet\test\scriptpubkeyman_tests.cpp" />
25+
<ClCompile Include="..\..\src\wallet\test\spend_tests.cpp" />
26+
<ClCompile Include="..\..\src\wallet\test\wallet_crypto_tests.cpp" />
27+
<ClCompile Include="..\..\src\wallet\test\walletdb_tests.cpp" />
28+
<ClCompile Include="..\..\src\wallet\test\wallet_tests.cpp" />
29+
<ClCompile Include="..\..\src\wallet\test\wallet_transaction_tests.cpp" />
1930
<ClCompile Include="..\..\src\wallet\test\util.cpp" />
2031
<ClCompile Include="..\..\src\primitives\bitcoin\transaction.cpp" />
2132
</ItemGroup>

‎ci/test/00_setup_env_i686_centos.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8
88

99
export HOST=i686-pc-linux-gnu
1010
export CONTAINER_NAME=ci_i686_centos
11-
export DOCKER_NAME_TAG=quay.io/centos/centos:stream8
11+
export DOCKER_NAME_TAG=quay.io/rockylinux/rockylinux:8
1212
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"
1313
export GOAL="install"
1414
export BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-reduce-exports"

‎ci/test/00_setup_env_native_tsan.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_native_tsan
10-
export DOCKER_NAME_TAG=ubuntu:22.04
11-
export PACKAGES="clang-13 llvm-13 libc++abi-13-dev libc++-13-dev python3-zmq"
12-
export DEP_OPTS="CC=clang-13 CXX='clang++-13 -stdlib=libc++'"
10+
export DOCKER_NAME_TAG="docker.io/ubuntu:24.04"
11+
export PACKAGES="clang-18 llvm-18 libclang-rt-18-dev libc++abi-18-dev libc++-18-dev python3-zmq"
12+
export DEP_OPTS="CC=clang-18 CXX='clang++-18 -stdlib=libc++'"
1313
export GOAL="install"
14-
export BITCOIN_CONFIG="--enable-zmq CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' CXXFLAGS='-g' --with-sanitizers=thread CC=clang-13 CXX='clang++-13 -stdlib=libc++'"
14+
export BITCOIN_CONFIG="--enable-zmq CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' CXXFLAGS='-g' --with-sanitizers=thread"

‎ci/test/04_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ if [ -n "$DPKG_ADD_ARCH" ]; then
6464
CI_EXEC dpkg --add-architecture "$DPKG_ADD_ARCH"
6565
fi
6666

67-
if [[ $DOCKER_NAME_TAG == *centos* ]]; then
67+
if [[ $DOCKER_NAME_TAG == *centos* ]] || [[ $DOCKER_NAME_TAG == *rocky* ]]; then
6868
${CI_RETRY_EXE} CI_EXEC dnf -y install epel-release
6969
${CI_RETRY_EXE} CI_EXEC dnf -y --allowerasing install "$DOCKER_PACKAGES" "$PACKAGES"
7070
elif [ "$CI_USE_APT_INSTALL" != "no" ]; then

‎ci/test/05_before_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then
4444
fi
4545

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

‎configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
22
define(_CLIENT_VERSION_MAJOR, 23)
33
define(_CLIENT_VERSION_MINOR, 3)
44
define(_CLIENT_VERSION_BUILD, 0)
5-
define(_CLIENT_VERSION_RC, 2)
5+
define(_CLIENT_VERSION_RC, 3)
66
define(_CLIENT_VERSION_IS_RELEASE, true)
77
define(_COPYRIGHT_YEAR, 2024)
88
define(_COPYRIGHT_HOLDERS,[The %s developers])

‎depends/packages/boost.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package=boost
2-
$(package)_version=1.77.0
3-
$(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$($(package)_version)/source/
4-
$(package)_file_name=boost_$(subst .,_,$($(package)_version)).tar.bz2
5-
$(package)_sha256_hash=fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854
2+
$(package)_version=1.81.0
3+
$(package)_download_path=https://archives.boost.io/release/$($(package)_version)/source/
4+
$(package)_file_name=boost_$(subst .,_,$($(package)_version)).tar.gz
5+
$(package)_sha256_hash=205666dea9f6a7cfed87c7a6dfbeb52a2c1b9de55712c9c1a87735d7181452b6
66

77
define $(package)_stage_cmds
88
mkdir -p $($(package)_staging_prefix_dir)/include && \

‎depends/packages/xcb_proto.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package=xcb_proto
2-
$(package)_version=1.14.1
2+
$(package)_version=1.15.2
33
$(package)_download_path=https://xorg.freedesktop.org/archive/individual/proto
44
$(package)_file_name=xcb-proto-$($(package)_version).tar.xz
5-
$(package)_sha256_hash=f04add9a972ac334ea11d9d7eb4fc7f8883835da3e4859c9afa971efdf57fcc3
5+
$(package)_sha256_hash=7072beb1f680a2fe3f9e535b797c146d22528990c72f63ddb49d2f350a3653ed
66

77
define $(package)_config_cmds
88
$($(package)_autoconf)

‎doc/man/elements-cli.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH ELEMENTS-CLI "1" "November 2024" "elements-cli v23.3.0" "User Commands"
2+
.TH ELEMENTS-CLI "1" "February 2025" "elements-cli v23.3.0" "User Commands"
33
.SH NAME
44
elements-cli \- manual page for elements-cli v23.3.0
55
.SH SYNOPSIS

‎doc/man/elements-qt.1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH ELEMENTS-QT "1" "November 2024" "elements-qt v23.3.0" "User Commands"
2+
.TH ELEMENTS-QT "1" "February 2025" "elements-qt v23.3.0" "User Commands"
33
.SH NAME
44
elements-qt \- manual page for elements-qt v23.3.0
55
.SH SYNOPSIS
@@ -637,7 +637,8 @@ Chain selection options:
637637
.HP
638638
\fB\-acceptdiscountct\fR
639639
.IP
640-
Accept discounted fees for Confidential Transactions (default: false)
640+
Accept discounted fees for Confidential Transactions (default: true in
641+
liquidtestnet and liquidv1, false otherwise)
641642
.HP
642643
\fB\-bech32_hrp\fR
643644
.IP

‎doc/man/elements-tx.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH ELEMENTS-TX "1" "November 2024" "elements-tx v23.3.0" "User Commands"
2+
.TH ELEMENTS-TX "1" "February 2025" "elements-tx v23.3.0" "User Commands"
33
.SH NAME
44
elements-tx \- manual page for elements-tx v23.3.0
55
.SH SYNOPSIS

‎doc/man/elements-util.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH ELEMENTS-UTIL "1" "November 2024" "elements-util v23.3.0" "User Commands"
2+
.TH ELEMENTS-UTIL "1" "February 2025" "elements-util v23.3.0" "User Commands"
33
.SH NAME
44
elements-util \- manual page for elements-util v23.3.0
55
.SH SYNOPSIS

‎doc/man/elements-wallet.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH ELEMENTS-WALLET "1" "November 2024" "elements-wallet v23.3.0" "User Commands"
2+
.TH ELEMENTS-WALLET "1" "February 2025" "elements-wallet v23.3.0" "User Commands"
33
.SH NAME
44
elements-wallet \- manual page for elements-wallet v23.3.0
55
.SH DESCRIPTION

‎doc/man/elementsd.1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH ELEMENTSD "1" "November 2024" "elementsd v23.3.0" "User Commands"
2+
.TH ELEMENTSD "1" "February 2025" "elementsd v23.3.0" "User Commands"
33
.SH NAME
44
elementsd \- manual page for elementsd v23.3.0
55
.SH SYNOPSIS
@@ -637,7 +637,8 @@ Chain selection options:
637637
.HP
638638
\fB\-acceptdiscountct\fR
639639
.IP
640-
Accept discounted fees for Confidential Transactions (default: false)
640+
Accept discounted fees for Confidential Transactions (default: true in
641+
liquidtestnet and liquidv1, false otherwise)
641642
.HP
642643
\fB\-bech32_hrp\fR
643644
.IP

‎src/Makefile.elementssimplicity.include

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ include simplicity/elements-sources.mk
33
LIBELEMENTSSIMPLICITY = libelementssimplicity.la
44
noinst_LTLIBRARIES += $(LIBELEMENTSSIMPLICITY)
55
libelementssimplicity_la_SOURCES = $(ELEMENTS_SIMPLICITY_LIB_SOURCES_INT) $(ELEMENTS_SIMPLICITY_DIST_HEADERS_INT) $(ELEMENTS_SIMPLICITY_LIB_HEADERS_INT)
6-
libelementssimplicity_la_CPPFLAGS = $(AM_CPPFLAGS) $(SHANI_CXXFLAGS) -I$(srcdir)/$(ELEMENTS_SIMPLICITY_INCLUDE_DIR_INT)
6+
libelementssimplicity_la_CPPFLAGS = $(AM_CPPFLAGS) $(SHANI_CXXFLAGS) $(SANITIZER_CXXFLAGS) -I$(srcdir)/$(ELEMENTS_SIMPLICITY_INCLUDE_DIR_INT)

‎src/mapport.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,11 @@ static bool ProcessUpnp()
168168
struct UPNPUrls urls;
169169
struct IGDdatas data;
170170
int r;
171-
171+
#if MINIUPNPC_API_VERSION <= 17
172172
r = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr));
173+
#else
174+
r = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr), nullptr, 0);
175+
#endif
173176
if (r == 1)
174177
{
175178
if (fDiscover) {

‎src/primitives/confidential.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,11 @@ class CConfidentialValue : public CConfidentialCommitment<9, 8, 9>
135135
CConfidentialValue() { SetNull(); }
136136
CConfidentialValue(CAmount nAmount) { SetToAmount(nAmount); }
137137

138+
template <typename Stream>
139+
inline void Unserialize(Stream& s) {
140+
CConfidentialCommitment::Unserialize(s);
141+
}
142+
138143
/* An explicit value is called an amount. The first byte indicates it is
139144
* an explicit value, and the remaining 8 bytes is the value serialized as
140145
* a 64-bit big-endian integer. */

‎src/primitives/transaction.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,9 @@ class CTxOut
295295
s >> nAsset;
296296
s >> nValue;
297297
s >> nNonce;
298+
if (nAsset.IsNull() || nValue.IsNull()) {
299+
throw std::ios_base::failure("Confidential values may not be null");
300+
}
298301
} else {
299302
CAmount value;
300303
s >> value;

‎src/script/interpreter.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2660,7 +2660,8 @@ void PrecomputedTransactionData::Init(const T& txTo, std::vector<CTxOut>&& spent
26602660
}
26612661

26622662
rawTransaction simplicityRawTx;
2663-
simplicityRawTx.txid = txTo.GetHash().begin();
2663+
uint256 rawHash = txTo.GetHash();
2664+
simplicityRawTx.txid = rawHash.begin();
26642665
simplicityRawTx.input = simplicityRawInput.data();
26652666
simplicityRawTx.numInputs = simplicityRawInput.size();
26662667
simplicityRawTx.output = simplicityRawOutput.data();
@@ -3123,7 +3124,7 @@ bool GenericTransactionSignatureChecker<T>::CheckSimplicity(const valtype& progr
31233124
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())) {
31243125
assert(!"simplicity_elements_execSimplicity internal error");
31253126
}
3126-
free(simplicityTapEnv);
3127+
simplicity_elements_freeTapEnv(simplicityTapEnv);
31273128
switch (error) {
31283129
case SIMPLICITY_NO_ERROR: return set_success(serror);
31293130
case SIMPLICITY_ERR_MALLOC:
@@ -3133,7 +3134,7 @@ bool GenericTransactionSignatureChecker<T>::CheckSimplicity(const valtype& progr
31333134
case SIMPLICITY_ERR_DATA_OUT_OF_RANGE: return set_error(serror, SCRIPT_ERR_SIMPLICITY_DATA_OUT_OF_RANGE);
31343135
case SIMPLICITY_ERR_DATA_OUT_OF_ORDER: return set_error(serror, SCRIPT_ERR_SIMPLICITY_DATA_OUT_OF_ORDER);
31353136
case SIMPLICITY_ERR_FAIL_CODE: return set_error(serror, SCRIPT_ERR_SIMPLICITY_FAIL_CODE);
3136-
case SIMPLICITY_ERR_STOP_CODE: return set_error(serror, SCRIPT_ERR_SIMPLICITY_STOP_CODE);
3137+
case SIMPLICITY_ERR_RESERVED_CODE: return set_error(serror, SCRIPT_ERR_SIMPLICITY_RESERVED_CODE);
31373138
case SIMPLICITY_ERR_HIDDEN: return set_error(serror, SCRIPT_ERR_SIMPLICITY_HIDDEN);
31383139
case SIMPLICITY_ERR_BITSTREAM_EOF: return set_error(serror, SCRIPT_ERR_SIMPLICITY_BITSTREAM_EOF);
31393140
case SIMPLICITY_ERR_BITSTREAM_TRAILING_BYTES: return set_error(serror, SCRIPT_ERR_SIMPLICITY_BITSTREAM_TRAILING_BYTES);

‎src/script/interpreter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ struct PrecomputedTransactionData
222222
template <class T>
223223
explicit PrecomputedTransactionData(const T& tx);
224224
~PrecomputedTransactionData() {
225-
free(m_simplicity_tx_data);
225+
simplicity_elements_freeTransaction(m_simplicity_tx_data);
226226
}
227227
};
228228

‎src/script/script_error.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ std::string ScriptErrorString(const ScriptError serror)
140140
return SIMPLICITY_ERR_MSG(SIMPLICITY_ERR_DATA_OUT_OF_ORDER);
141141
case SCRIPT_ERR_SIMPLICITY_FAIL_CODE:
142142
return SIMPLICITY_ERR_MSG(SIMPLICITY_ERR_FAIL_CODE);
143-
case SCRIPT_ERR_SIMPLICITY_STOP_CODE:
144-
return SIMPLICITY_ERR_MSG(SIMPLICITY_ERR_STOP_CODE);
143+
case SCRIPT_ERR_SIMPLICITY_RESERVED_CODE:
144+
return SIMPLICITY_ERR_MSG(SIMPLICITY_ERR_RESERVED_CODE);
145145
case SCRIPT_ERR_SIMPLICITY_HIDDEN:
146146
return SIMPLICITY_ERR_MSG(SIMPLICITY_ERR_HIDDEN);
147147
case SCRIPT_ERR_SIMPLICITY_BITSTREAM_EOF:

‎src/script/script_error.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ typedef enum ScriptError_t
102102
SCRIPT_ERR_SIMPLICITY_DATA_OUT_OF_RANGE,
103103
SCRIPT_ERR_SIMPLICITY_DATA_OUT_OF_ORDER,
104104
SCRIPT_ERR_SIMPLICITY_FAIL_CODE,
105-
SCRIPT_ERR_SIMPLICITY_STOP_CODE,
105+
SCRIPT_ERR_SIMPLICITY_RESERVED_CODE,
106106
SCRIPT_ERR_SIMPLICITY_HIDDEN,
107107
SCRIPT_ERR_SIMPLICITY_BITSTREAM_EOF,
108108
SCRIPT_ERR_SIMPLICITY_BITSTREAM_TRAILING_BYTES,

‎src/simplicity/ctx8Pruned.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,8 @@ const uint32_t ctx8Pruned_cmr[] = {
270270
0x7f11746fu, 0xb68fdaedu, 0x3cadda80u, 0xc7cd0245u, 0xa341b927u, 0xe98e60f8u, 0x745dc441u, 0xe11ce1a3u
271271
};
272272

273-
/* The identity Merkle root of the above ctx8Pruned Simplicity expression. */
274-
const uint32_t ctx8Pruned_imr[] = {
273+
/* The identity hash of the root of the above ctx8Pruned Simplicity expression. */
274+
const uint32_t ctx8Pruned_ihr[] = {
275275
0x8e8742acu, 0x27f42d29u, 0xd87f5229u, 0x02bc0ae2u, 0xbcfc1298u, 0x1641a2ddu, 0x77091830u, 0xb79bf12du
276276
};
277277

‎src/simplicity/ctx8Pruned.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ extern const size_t sizeof_ctx8Pruned_witness;
1818
/* The commitment Merkle root of the above ctx8Pruned Simplicity expression. */
1919
extern const uint32_t ctx8Pruned_cmr[];
2020

21-
/* The identity Merkle root of the above ctx8Pruned Simplicity expression. */
22-
extern const uint32_t ctx8Pruned_imr[];
21+
/* The identity hash of the root of the above ctx8Pruned Simplicity expression. */
22+
extern const uint32_t ctx8Pruned_ihr[];
2323

2424
/* The annotated Merkle root of the above ctx8Pruned Simplicity expression. */
2525
extern const uint32_t ctx8Pruned_amr[];

‎src/simplicity/ctx8Unpruned.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,8 @@ const uint32_t ctx8Unpruned_cmr[] = {
260260
0x7f11746fu, 0xb68fdaedu, 0x3cadda80u, 0xc7cd0245u, 0xa341b927u, 0xe98e60f8u, 0x745dc441u, 0xe11ce1a3u
261261
};
262262

263-
/* The identity Merkle root of the above ctx8Unpruned Simplicity expression. */
264-
const uint32_t ctx8Unpruned_imr[] = {
263+
/* The identity hash of the root of the above ctx8Unpruned Simplicity expression. */
264+
const uint32_t ctx8Unpruned_ihr[] = {
265265
0x8e8742acu, 0x27f42d29u, 0xd87f5229u, 0x02bc0ae2u, 0xbcfc1298u, 0x1641a2ddu, 0x77091830u, 0xb79bf12du
266266
};
267267

‎src/simplicity/ctx8Unpruned.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ extern const size_t sizeof_ctx8Unpruned_witness;
1818
/* The commitment Merkle root of the above ctx8Unpruned Simplicity expression. */
1919
extern const uint32_t ctx8Unpruned_cmr[];
2020

21-
/* The identity Merkle root of the above ctx8Unpruned Simplicity expression. */
22-
extern const uint32_t ctx8Unpruned_imr[];
21+
/* The identity hash of the root of the above ctx8Unpruned Simplicity expression. */
22+
extern const uint32_t ctx8Unpruned_ihr[];
2323

2424
/* The annotated Merkle root of the above ctx8Unpruned Simplicity expression. */
2525
extern const uint32_t ctx8Unpruned_amr[];

0 commit comments

Comments
 (0)