Skip to content

Commit

Permalink
CI: Bump bitcoind to 26.0
Browse files Browse the repository at this point in the history
  • Loading branch information
kristapsk committed Dec 19, 2023
1 parent 83b2771 commit 941cca0
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions ricochet-send.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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")"
Expand All @@ -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!"
Expand All @@ -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]}")"
Expand All @@ -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[@]}"

Expand Down
5 changes: 4 additions & 1 deletion tests/functional/inc.setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 941cca0

Please sign in to comment.