chore: bump stacks-node

.github/workflows/build.yml

@@ -4,7 +4,7 @@ on:
   push:
 
 env:
-  STACKS_BLOCKCHAIN_COMMIT: d0882a7ac6bfdd970b1366ead6cc725d79c8f91d
+  STACKS_BLOCKCHAIN_COMMIT: 74e3cedeec5215f3286af6565c1503e578a848fb
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

Dockerfile.e2e

@@ -3,7 +3,7 @@
 FROM rust:bookworm as builder
 
 # A commit hash, tag, or branch
-ARG GIT_COMMIT=d0882a7ac6bfdd970b1366ead6cc725d79c8f91d
+ARG GIT_COMMIT=74e3cedeec5215f3286af6565c1503e578a848fb
 ARG BLOCKCHAIN_REPO=https://github.com/stacks-network/stacks-blockchain.git
 
 ARG TARGETPLATFORM
@@ -47,7 +47,7 @@ EOF
 FROM debian:bookworm-backports
 
 COPY --from=builder /stacks/target/release/stacks-node /usr/local/bin/
-COPY --from=btcpayserver/bitcoin:25.1 /usr/local/bin/bitcoind /usr/local/bin/bitcoin-cli /usr/local/bin/
+COPY --from=dobtc/bitcoin:25.1 /opt/bitcoin-*/bin /usr/local/bin
 
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && apt-get install -y curl gettext-base jq
@@ -174,8 +174,8 @@ RUN <<EOF
   bitcoind &
   BTCD_PID=$!
   bitcoin-cli -rpcwait getmininginfo
-  bitcoin-cli -named createwallet wallet_name="" descriptors=false
-  bitcoin-cli importprivkey $BTC_ADDR_WIF "" false
+  bitcoin-cli -named createwallet wallet_name=main descriptors=false load_on_startup=true
+  bitcoin-cli -rpcwallet=main importprivkey $BTC_ADDR_WIF "" false
   bitcoin-cli generatetoaddress 101 $BTC_ADDR
 
   node event-observer.js &
@@ -199,7 +199,7 @@ RUN <<EOF
   DEFAULT_TIMEOUT=$(($(date +%s) + 30))
   SENT_STACKING=0
   while true; do
-    TX=$(bitcoin-cli listtransactions '*' 1 0 true)
+    TX=$(bitcoin-cli -rpcwallet=main listtransactions '*' 1 0 true)
     CONFS=$(echo "$TX" | jq '.[].confirmations')
     if [ "$CONFS" = "0" ] || [ $(date +%s) -gt $DEFAULT_TIMEOUT ]; then
       if [ $(date +%s) -gt $DEFAULT_TIMEOUT ]; then
@@ -279,7 +279,7 @@ cat > run.sh <<'EOM'
 
   function start_miner() {
     while true; do
-      TX=$(bitcoin-cli listtransactions '*' 1 0 true)
+      TX=$(bitcoin-cli -rpcwallet=main listtransactions '*' 1 0 true)
       CONFS=$(echo "$TX" | jq '.[].confirmations')
       if [ "$CONFS" = "0" ]; then
         echo "Detected Stacks mining mempool tx, mining btc block..."

docker-compose-follower.yml

@@ -1,7 +1,7 @@
 version: "3.9"
 
 x-common-vars:
-  - &STACKS_BLOCKCHAIN_COMMIT master
+  - &STACKS_BLOCKCHAIN_COMMIT 74e3cedeec5215f3286af6565c1503e578a848fb
   - &MINER_PUB_KEY 035379aa40c02890d253cfa577964116eb5295570ae9f7287cbae5f2585f5b2c7c
   - &BITCOIN_PEER_PORT 18444
   - &BITCOIN_RPC_PORT 18443

docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3.9"
 
 x-common-vars:
-  - &STACKS_BLOCKCHAIN_COMMIT 951becfd97bd865caa6d78377ac936ba12af555a
+  - &STACKS_BLOCKCHAIN_COMMIT 74e3cedeec5215f3286af6565c1503e578a848fb
   - &BTC_ADDR miEJtNKa3ASpA19v5ZhvbKTEieYjLpzCYT
   - &MINER_SEED 9e446f6b0c6a96cf2190e54bcd5a8569c3e386f091605499464389b8d4e0bfc201 # stx: STEW4ZNT093ZHK4NEQKX8QJGM2Y7WWJ2FQQS5C19, btc: miEJtNKa3ASpA19v5ZhvbKTEieYjLpzCYT, pub_key: 035379aa40c02890d253cfa577964116eb5295570ae9f7287cbae5f2585f5b2c7c, wif: cStMQXkK5yTFGP3KbNXYQ3sJf2qwQiKrZwR9QJnksp32eKzef1za
   - &BITCOIN_PEER_PORT 18444

stacks-krypton-miner.toml

@@ -55,6 +55,7 @@ rpc_ssl = false
 username = "$BITCOIN_RPC_USER"
 password = "$BITCOIN_RPC_PASS"
 timeout = 30
+wallet_name = "main"
 
 [[burnchain.epochs]]
 epoch_name = "1.0"