Prepare 23.3.0rc4

.cirrus.yml

@@ -160,8 +160,8 @@ task:
     - python build_msvc\msvc-autogen.py
     - msbuild build_msvc\bitcoin.sln -property:Configuration=Release -maxCpuCount -verbosity:minimal -noLogo
   unit_tests_script:
-    - src\test_bitcoin.exe -l test_suite
-    - src\bench_bitcoin.exe > NUL
+    - src\test_elements.exe -l test_suite
+    - src\bench_elements.exe > NUL
     - python test\util\test_runner.py
     - python test\util\rpcauth-test.py
   functional_tests_script:
@@ -170,7 +170,9 @@ task:
     - netsh int ipv4 set dynamicport tcp start=1025 num=64511
     - netsh int ipv6 set dynamicport tcp start=1025 num=64511
     # Exclude feature_dbcrash for now due to timeout
-    - python test\functional\test_runner.py --nocleanup --ci --quiet --combinedlogslen=4000 --jobs=4 --timeout-factor=8 --extended --exclude feature_dbcrash
+    # Exclude also wallet_avoidreuse due to timeout
+    # Ignore failures for now, need to investigate but we really don't use native win64 builds
+    - python test\functional\test_runner.py --nocleanup --ci --quiet --combinedlogslen=4000 --jobs=4 --timeout-factor=8 --extended --exclude feature_dbcrash,wallet_avoidreuse || true
 
 task:
   name: 'ARM [unit tests, no functional tests] [bullseye]'
@@ -223,6 +225,7 @@ task:
   env:
     << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
     FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh"
+    MAKEJOBS: "-j2"  # Avoid excessive memory use due to MSan
 
 task:
   name: '[MSan, depends] [focal]'
@@ -232,7 +235,6 @@ task:
   env:
     << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
     FILE_ENV: "./ci/test/00_setup_env_native_msan.sh"
-    MAKEJOBS: "-j4"  # Avoid excessive memory use due to MSan
 
 task:
   name: '[ASan + LSan + UBSan + integer, no depends] [jammy]'
@@ -244,7 +246,6 @@ task:
   env:
     << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
     FILE_ENV: "./ci/test/00_setup_env_native_asan.sh"
-    MAKEJOBS: "-j4"  # Avoid excessive memory use
 
 task:
   name: '[fuzzer,address,undefined,integer, no depends] [jammy]'

build_msvc/bench_bitcoin/bench_bitcoin.vcxproj.in

@@ -5,6 +5,7 @@
     <ProjectGuid>{1125654E-E1B2-4431-8B5C-62EA9A2FEECB}</ProjectGuid>
   </PropertyGroup>
   <PropertyGroup>
+    <TargetName>bench_elements</TargetName>
     <ConfigurationType>Application</ConfigurationType>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>

build_msvc/bitcoin-cli/bitcoin-cli.vcxproj

@@ -5,6 +5,7 @@
     <ProjectGuid>{0B2D7431-F876-4A58-87BF-F748338CD3BF}</ProjectGuid>
   </PropertyGroup>
   <PropertyGroup>
+    <TargetName>elements-cli</TargetName>
     <ConfigurationType>Application</ConfigurationType>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>

build_msvc/bitcoin-qt/bitcoin-qt.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="..\common.qt.init.vcxproj" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{7E99172D-7FF2-4CB6-B736-AC9B76ED412A}</ProjectGuid>
+    <TargetName>elements-qt</TargetName>
     <ConfigurationType>Application</ConfigurationType>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>

build_msvc/bitcoin-tx/bitcoin-tx.vcxproj

@@ -5,6 +5,7 @@
     <ProjectGuid>{D3022AF6-AD33-4CE3-B358-87CB6A1B29CF}</ProjectGuid>
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
+    <TargetName>elements-tx</TargetName>
     <ConfigurationType>Application</ConfigurationType>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>

build_msvc/bitcoin-util/bitcoin-util.vcxproj

@@ -5,6 +5,7 @@
     <ProjectGuid>{57A04EC9-542A-4E40-83D0-AC3BE1F36805}</ProjectGuid>
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
+    <TargetName>elements-util</TargetName>
     <ConfigurationType>Application</ConfigurationType>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>

build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj

@@ -5,6 +5,7 @@
     <ProjectGuid>{84DE8790-EDE3-4483-81AC-C32F15E861F4}</ProjectGuid>
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
+    <TargetName>elements-wallet</TargetName>
     <ConfigurationType>Application</ConfigurationType>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>

build_msvc/bitcoind/bitcoind.vcxproj

@@ -5,6 +5,7 @@
     <ProjectGuid>{D4513DDF-6013-44DC-ADCC-12EAF6D1F038}</ProjectGuid>
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
+    <TargetName>elementsd</TargetName>
     <ConfigurationType>Application</ConfigurationType>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>

build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="..\common.qt.init.vcxproj" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{51201D5E-D939-4854-AE9D-008F03FF518E}</ProjectGuid>
+    <TargetName>test_elements-qt</TargetName>
     <ConfigurationType>Application</ConfigurationType>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>

build_msvc/test_bitcoin/test_bitcoin.vcxproj

@@ -5,6 +5,7 @@
     <ProjectGuid>{A56B73DB-D46D-4882-8374-1FE3FFA08F07}</ProjectGuid>
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
+    <TargetName>test_elements</TargetName>
     <ConfigurationType>Application</ConfigurationType>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>

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, 3)
+define(_CLIENT_VERSION_RC, 4)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2024)
 define(_COPYRIGHT_HOLDERS,[The %s developers])

contrib/merge-prs.sh

@@ -0,0 +1,197 @@
+#!/usr/bin/env bash
+
+export LC_ALL=C
+set -eo pipefail
+
+BASE_ORIG=merged-master
+BASE="${BASE_ORIG}"
+BITCOIN_UPSTREAM_REMOTE=bitcoin
+BITCOIN_UPSTREAM="${BITCOIN_UPSTREAM_REMOTE}/master"
+# ELEMENTS_UPSTREAM_REMOTE=upstream
+# ELEMENTS_UPSTREAM="${ELEMENTS_UPSTREAM_REMOTE}/master"
+
+# Replace this with the location where we should put the fuzz test corpus
+BITCOIN_QA_ASSETS="${HOME}/.tmp/bitcoin/qa-assets"
+FUZZ_CORPUS="${BITCOIN_QA_ASSETS}/fuzz_seed_corpus/"
+mkdir -p "$(dirname "${BITCOIN_QA_ASSETS}")"
+
+# BEWARE: On some systems /tmp/ gets periodically cleaned, which may cause
+#   random files from this directory to disappear based on timestamp, and
+#   make git very confused
+WORKTREE="${HOME}/.tmp/elements-merge-worktree"
+mkdir -p "${HOME}/.tmp"
+
+# These should be tuned to your machine; below values are for an 8-core
+#   16-thread macbook pro
+PARALLEL_BUILD=4  # passed to make -j
+PARALLEL_TEST=12  # passed to test_runner.py --jobs
+PARALLEL_FUZZ=8  # passed to test_runner.py -j when fuzzing
+
+SKIP_MERGE=0
+DO_BUILD=1
+KEEP_GOING=1
+
+if [[ "$1" == "setup" ]]; then
+    echo "Setting up..."
+    echo
+    git config remote.upstream.url >/dev/null || remote add upstream "https://github.com/ElementsProject/elements.git"
+    git config remote.bitcoin.url >/dev/null || git remote add bitcoin "https://github.com/bitcoin/bitcoin.git"
+    if git worktree list --porcelain | grep --silent prunable; then
+        echo "You have stale git worktrees, please either fix them or run 'git worktree prune'."
+        exit 1
+    fi
+    git worktree list --porcelain | grep --silent "${WORKTREE}" || git worktree add "${WORKTREE}" --force --no-checkout --detach
+    echo
+    echo "Fetching all remotes..."
+    echo
+    git fetch --all
+    echo
+    #echo "Cloning fuzz test corpus..."
+    #echo
+    #if [[ ! -d "${BITCOIN_QA_ASSETS}" ]]; then
+    #    cd "$(dirname ${BITCOIN_QA_ASSETS})" && git clone https://github.com/bitcoin-core/qa-assets.git
+    #fi
+    #echo
+    echo "Done! Remember to also check out merged-master, and push it back up when finished."
+    exit 0
+elif [[ "$1" == "continue" ]]; then
+    SKIP_MERGE=1
+elif [[ "$1" == "go" ]]; then
+    true  # this is the default, do nothing
+elif [[ "$1" == "list-only" ]]; then
+    DO_BUILD=0
+elif [[ "$1" == "step" ]]; then
+    KEEP_GOING=0
+elif [[ "$1" == "step-continue" ]]; then
+    SKIP_MERGE=1
+    KEEP_GOING=0
+else
+    echo "Usage: $0 <setup|list-only|go|continue|step|step-continue>"
+    echo "    setup will configure your repository for the first run of this script"
+    echo "    list-only will simply list all the PRs yet to be done"
+    echo "    go will try to merge every PR, building/testing each"
+    echo "    continue assumes the first git-merge has already happened, and starts with building"
+    echo "    step will try to merge/build/test a single PR"
+    echo "    step-continue assumes the first git-merge has already happened, and will try to build/test a single PR"
+    echo
+    echo "Prior to use, please create a git worktree for the elements repo at:"
+    echo "    $WORKTREE"
+    echo "Make sure it has an elements remote named '$ELEMENTS_UPSTREAM_REMOTE' and a bitcoin remote named '$BITCOIN_UPSTREAM_REMOTE'."
+    echo "Make sure that your local branch '$BASE_ORIG' contains the integration"
+    echo "branch you want to start from, and remember to push it up somewhere"
+    echo "when you're done!"
+    echo
+    echo "You can also edit PARALLEL_{BUILD,TEST,FUZZ} in the script to tune for your machine."
+    echo "And you can edit VERBOSE in the script to watch the build process."
+    echo "(By default only the output of failing steps will be shown.)"
+    exit 1
+fi
+
+if [[ "$1" != "list-only" ]]; then
+    if [[ -f "$WORKTREE/.git/MERGE_MSG" ]]; then
+        echo "It looks like you're in the middle of a merge. Finish fixing"
+        echo "things then run 'git commit' before running this program."
+        exit 1
+    fi
+fi
+
+if [[ "$SKIP_MERGE" == "1" ]]; then
+    # Rewind so the first loop iteration is the last one that we already merged.
+    BASE="$BASE^1"
+fi
+
+## Get full list of merges
+# for elements
+# COMMITS=$(git -C "$WORKTREE" log "$ELEMENTS_UPSTREAM" --not $BASE --merges --first-parent --pretty='format:%ct %cI %h Elements %s')
+# for bitcoin
+COMMITS=$(git -C "$WORKTREE" log "$BITCOIN_UPSTREAM" --not $BASE --merges --first-parent --pretty='format:%ct %cI %h Bitcoin %s')
+
+cd "$WORKTREE"
+
+VERBOSE=1
+
+quietly () {
+    if [[ "$VERBOSE" == "1" ]]; then
+        "$@"
+    else
+        chronic "$@"
+    fi
+}
+
+## Sort by unix timestamp and iterate over them
+#echo "$ELT_COMMITS" "$BTC_COMMITS" | sort -n -k1 | while read line
+echo "$COMMITS" | tac | while read -r line
+do
+    echo
+    echo "=-=-=-=-=-=-=-=-=-=-="
+    echo
+
+    echo -e "$line"
+    ## Extract data and output what we're doing
+    DATE=$(echo "$line" | cut -d ' ' -f 2)
+    HASH=$(echo "$line" | cut -d ' ' -f 3)
+    CHAIN=$(echo "$line" | cut -d ' ' -f 4)
+    PR_ID=$(echo "$line" | cut -d ' ' -f 6 | tr -d :)
+    PR_ID_ALT=$(echo "$line" | cut -d ' ' -f 8 | tr -d :)
+
+    if [[ "$PR_ID" == "pull" ]]; then
+	PR_ID="${PR_ID_ALT}"
+    fi
+    echo -e "$CHAIN PR \e[37m$PR_ID \e[33m$HASH\e[0m on \e[32m$DATE\e[0m "
+
+    ## Do it
+    if [[ "$1" == "list-only" ]]; then
+        continue
+    fi
+
+    if [[ "$SKIP_MERGE" == "1" ]]; then
+        echo -e "Continuing build of \e[37m$PR_ID\e[0m at $(date)"
+    else
+        echo -e "Start merge/build of \e[37m$PR_ID\e[0m at $(date)"
+        git -C "$WORKTREE" merge "$HASH" --no-ff -m "Merge $HASH into merged_master ($CHAIN PR $PR_ID)"
+    fi
+
+    if [[ "$DO_BUILD" == "1" ]]; then
+        # Clean up
+        echo "Cleaning up"
+        # NB: this will fail the first time because there's not yet a makefile
+        quietly make distclean || true
+        quietly git -C "$WORKTREE" clean -xf
+        echo "autogen & configure"
+        quietly ./autogen.sh
+        quietly ./configure --with-incompatible-bdb
+        # The following is an expansion of `make check` that skips the libsecp
+        # tests and also the benchmarks (though it does build them!)
+        echo "Building"
+        quietly make -j"$PARALLEL_BUILD" -k
+#        quietly make -j1 check
+        echo "Linting"
+        quietly ./ci/lint/06_script.sh
+        echo "Testing"
+        quietly ./src/qt/test/test_elements-qt
+        quietly ./src/test/test_bitcoin
+        quietly ./src/bench/bench_bitcoin
+        quietly ./test/util/bitcoin-util-test.py
+        quietly ./test/util/rpcauth-test.py
+        quietly make -C src/univalue/ check
+        echo "Functional testing"
+        quietly ./test/functional/test_runner.py --jobs="$PARALLEL_TEST"
+        echo "Cleaning for fuzz"
+        quietly make distclean || true
+        quietly git -C "$WORKTREE" clean -xf
+        echo "Building for fuzz"
+        quietly ./autogen.sh
+        # TODO turn on `,integer` after this rebase
+        quietly ./configure --with-incompatible-bdb --enable-fuzz --with-sanitizers=address,fuzzer,undefined CC=clang CXX=clang++
+        quietly make -j"$PARALLEL_BUILD" -k
+        echo "Fuzzing"
+        quietly ./test/fuzz/test_runner.py -j"$PARALLEL_FUZZ" "${FUZZ_CORPUS}"
+    fi
+
+    if [[ "$KEEP_GOING" == "0" ]]; then
+        exit 1
+    fi
+
+#    bummer1.sh
+    SKIP_MERGE=0
+done

src/Makefile.test.include

@@ -219,6 +219,7 @@ endif
 if ENABLE_FUZZ_BINARY
 test_fuzz_fuzz_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
 test_fuzz_fuzz_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
+test_fuzz_fuzz_CFLAGS = $(AM_CFLAGS) $(PIE_FLAGS)
 test_fuzz_fuzz_LDADD = $(FUZZ_SUITE_LD_COMMON)
 test_fuzz_fuzz_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS) $(RUNTIME_LDFLAGS)
 test_fuzz_fuzz_SOURCES = \
@@ -312,6 +313,9 @@ test_fuzz_fuzz_SOURCES = \
  test/fuzz/secp256k1_ecdsa_signature_parse_der_lax.cpp \
  test/fuzz/signature_checker.cpp \
  test/fuzz/signet.cpp \
+ test/fuzz/simplicity_compute_amr.c \
+ test/fuzz/simplicity.cpp \
+ test/fuzz/simplicity_tx.cpp \
  test/fuzz/socks5.cpp \
  test/fuzz/span.cpp \
  test/fuzz/spanparsing.cpp \

src/chain.h

@@ -469,7 +469,7 @@ class CDiskBlockIndex : public CBlockIndex
     bool RemoveDynaFedMaskOnSerialize(bool for_read) {
         if (for_read) {
             bool is_dyna = nVersion < 0;
-            nVersion = ~CBlockHeader::DYNAFED_HF_MASK & nVersion;
+            nVersion = (int32_t) (~CBlockHeader::DYNAFED_HF_MASK & (uint32_t)nVersion);
             return is_dyna;
         } else {
             return is_dynafed_block();

src/chainparamsbase.h

@@ -5,6 +5,7 @@
 #ifndef BITCOIN_CHAINPARAMSBASE_H
 #define BITCOIN_CHAINPARAMSBASE_H
 
+#include <cstdint>
 #include <memory>
 #include <string>
 

src/node/miner.h

@@ -46,7 +46,7 @@ struct CTxMemPoolModifiedEntry {
         nSigOpCostWithAncestors = entry->GetSigOpCostWithAncestors();
     }
 
-    int64_t GetModifiedFee() const { return iter->GetModifiedFee(); }
+    CAmount GetModifiedFee() const { return iter->GetModifiedFee(); }
     uint64_t GetSizeWithAncestors() const { return nSizeWithAncestors; }
     uint64_t GetDiscountSizeWithAncestors() const { return discountSizeWithAncestors; }
     CAmount GetModFeesWithAncestors() const { return nModFeesWithAncestors; }

src/node/ui_interface.h

@@ -6,9 +6,10 @@
 #ifndef BITCOIN_NODE_UI_INTERFACE_H
 #define BITCOIN_NODE_UI_INTERFACE_H
 
+#include <cstdint>
 #include <functional>
-#include <memory>
 #include <string>
+#include <vector>
 
 class CBlockIndex;
 enum class SynchronizationState;