From 941cca0e0773b6fc552985a5d3dfc95323d13af9 Mon Sep 17 00:00:00 2001
From: Kristaps Kaupe <kristaps@blogiem.lv>
Date: Tue, 19 Dec 2023 12:51:48 +0200
Subject: [PATCH] CI: Bump bitcoind to 26.0

---
 .github/workflows/tests.yml   | 2 +-
 ricochet-send.sh              | 6 ++++--
 tests/functional/inc.setup.sh | 5 ++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 00ed681..1ea804e 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        bitcoind-version: ["0.17.2", "24.0"]
+        bitcoind-version: ["0.17.2", "26.0"]
         os: [macos-latest, ubuntu-latest]
     steps:
       - uses: actions/checkout@v3
diff --git a/ricochet-send.sh b/ricochet-send.sh
index 74f7bb9..3748723 100755
--- a/ricochet-send.sh
+++ b/ricochet-send.sh
@@ -111,7 +111,7 @@ rawtx="$(show_tx_by_id "$txid")"
 #echo "$rawtx"
 vout_idx=""
 idx=0
-while read -r vout_address; do
+while read -u 3 -r vout_address; do
     if [ "$vout_address" == "${ricochet_addresses[0]}" ]; then
         vout_idx=$idx
         value="$(echo "$rawtx" | jq -r ".vout[$vout_idx].value")"
@@ -121,7 +121,7 @@ while read -r vout_address; do
         fi
     fi
     ((idx++))
-done <<< "$(get_decoded_tx_addresses "$rawtx")"
+done 3< <(get_decoded_tx_addresses "$rawtx")
 if [ "$prev_pubkey" == "" ]; then
     echoerr "$rawtx"
     echoerr "FATAL: Can't find the right vout in the first transaction, please fill a bug report!"
@@ -133,6 +133,7 @@ use_txid="$txid"
 
 # Prepare and sign rest of transactions
 echo "Preparing rest of transactions..."
+set -x
 signedtxes=()
 for i in $(seq 1 $(( hops - 1 ))); do
     send_amount="$(bc_float_calc "$send_amount - ${ricochet_fees[$i]}")"
@@ -147,6 +148,7 @@ for i in $(seq 1 $(( hops - 1 ))); do
     prev_pubkey="$(echo "$decodedtx" | jq -r ".vout[].scriptPubKey.hex")"
     echo "$use_txid"
 done
+set +x
 
 #printf '%s\n' "${signedtxes[@]}"
 
diff --git a/tests/functional/inc.setup.sh b/tests/functional/inc.setup.sh
index 88b8b07..d2b951b 100644
--- a/tests/functional/inc.setup.sh
+++ b/tests/functional/inc.setup.sh
@@ -16,12 +16,15 @@ fi
 # shellcheck disable=SC2034
 retval=0
 
-#set -x
+set -x
 
 rm -rf "$bitcoin_test_datadir"
 mkdir "$bitcoin_test_datadir"
 echo -e "[regtest]\nrpcuser=bitcoinrpc\nrpcpassword=123456abcdef" \
     > "$bitcoin_test_datadir/bitcoin.conf"
+if [[ "$($bitcoind -version | grep -Eo 'v[0-9]+')" == "v26" ]]; then
+    echo "deprecatedrpc=create_bdb" >> "$bitcoin_test_datadir}/bitcoin.conf"
+fi
 $bitcoind -daemon || exit 1
 # Wait until bitcoind has started properly
 while ! $bitcoin_cli getblockchaininfo 2> /dev/null; do sleep 0.1; done