From 4b7ea506065713cea70c35ba70d07c70e50504e6 Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Tue, 16 Jan 2024 16:00:36 +0100 Subject: [PATCH 1/7] chore: bump to latest next branch --- .github/workflows/build.yml | 2 +- Dockerfile.e2e | 2 +- docker-compose-miner.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1b25a19..fe00e3a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: push: env: - STACKS_BLOCKCHAIN_COMMIT: f8ffd1dbe8990234391def4611b2611be9a3e4ba + STACKS_BLOCKCHAIN_COMMIT: 15e76e5995fda997032828eb14dc0567595be8c1 concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/Dockerfile.e2e b/Dockerfile.e2e index 6532c27..e553900 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -3,7 +3,7 @@ FROM rust:bookworm as builder # A commit hash, tag, or branch -ARG GIT_COMMIT=f8ffd1dbe8990234391def4611b2611be9a3e4ba +ARG GIT_COMMIT=15e76e5995fda997032828eb14dc0567595be8c1 ARG BLOCKCHAIN_REPO=https://github.com/stacks-network/stacks-blockchain.git ARG TARGETPLATFORM diff --git a/docker-compose-miner.yml b/docker-compose-miner.yml index 8faf9a5..6b02215 100644 --- a/docker-compose-miner.yml +++ b/docker-compose-miner.yml @@ -1,7 +1,7 @@ version: "3.9" x-common-vars: - - &STACKS_BLOCKCHAIN_COMMIT feat/naka-neon + - &STACKS_BLOCKCHAIN_COMMIT 15e76e5995fda997032828eb14dc0567595be8c1 - &BTC_ADDR miEJtNKa3ASpA19v5ZhvbKTEieYjLpzCYT - &MINER_SEED 9e446f6b0c6a96cf2190e54bcd5a8569c3e386f091605499464389b8d4e0bfc201 # stx: STEW4ZNT093ZHK4NEQKX8QJGM2Y7WWJ2FQQS5C19, btc: miEJtNKa3ASpA19v5ZhvbKTEieYjLpzCYT, pub_key: 035379aa40c02890d253cfa577964116eb5295570ae9f7287cbae5f2585f5b2c7c, wif: cStMQXkK5yTFGP3KbNXYQ3sJf2qwQiKrZwR9QJnksp32eKzef1za - &BITCOIN_PEER_PORT 18444 From e6330cf95c333a5529f74de2b36d182c37aec06b Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Tue, 16 Jan 2024 16:32:33 +0100 Subject: [PATCH 2/7] fix: update bitcoin core --- Dockerfile.e2e | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.e2e b/Dockerfile.e2e index e553900..f37c6fb 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -47,7 +47,7 @@ EOF FROM debian:bookworm-backports COPY --from=builder /stacks/target/release/stacks-node /usr/local/bin/ -COPY --from=ruimarinho/bitcoin-core:0.21.1 /opt/bitcoin-*/bin /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 @@ -145,7 +145,7 @@ RUN < Date: Tue, 23 Jan 2024 17:46:30 +0100 Subject: [PATCH 3/7] chore: bump stacks-node next branch --- .github/workflows/build.yml | 2 +- Dockerfile.e2e | 2 +- docker-compose-miner.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fe00e3a..0ab6321 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: push: env: - STACKS_BLOCKCHAIN_COMMIT: 15e76e5995fda997032828eb14dc0567595be8c1 + STACKS_BLOCKCHAIN_COMMIT: 9af9c0b5b80f948e90916a45f3f316c81a7ac481 concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/Dockerfile.e2e b/Dockerfile.e2e index f37c6fb..909b45b 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -3,7 +3,7 @@ FROM rust:bookworm as builder # A commit hash, tag, or branch -ARG GIT_COMMIT=15e76e5995fda997032828eb14dc0567595be8c1 +ARG GIT_COMMIT=9af9c0b5b80f948e90916a45f3f316c81a7ac481 ARG BLOCKCHAIN_REPO=https://github.com/stacks-network/stacks-blockchain.git ARG TARGETPLATFORM diff --git a/docker-compose-miner.yml b/docker-compose-miner.yml index 6b02215..0e566ab 100644 --- a/docker-compose-miner.yml +++ b/docker-compose-miner.yml @@ -1,7 +1,7 @@ version: "3.9" x-common-vars: - - &STACKS_BLOCKCHAIN_COMMIT 15e76e5995fda997032828eb14dc0567595be8c1 + - &STACKS_BLOCKCHAIN_COMMIT 9af9c0b5b80f948e90916a45f3f316c81a7ac481 - &BTC_ADDR miEJtNKa3ASpA19v5ZhvbKTEieYjLpzCYT - &MINER_SEED 9e446f6b0c6a96cf2190e54bcd5a8569c3e386f091605499464389b8d4e0bfc201 # stx: STEW4ZNT093ZHK4NEQKX8QJGM2Y7WWJ2FQQS5C19, btc: miEJtNKa3ASpA19v5ZhvbKTEieYjLpzCYT, pub_key: 035379aa40c02890d253cfa577964116eb5295570ae9f7287cbae5f2585f5b2c7c, wif: cStMQXkK5yTFGP3KbNXYQ3sJf2qwQiKrZwR9QJnksp32eKzef1za - &BITCOIN_PEER_PORT 18444 From 5e7e4a179df699f249ee83de374818f707c3f2d8 Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Thu, 25 Jan 2024 20:06:15 +0100 Subject: [PATCH 4/7] fix: specify wallet name in bitcoin conf --- Dockerfile.e2e | 8 ++++---- stacks-krypton-miner.toml | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile.e2e b/Dockerfile.e2e index 909b45b..3cb8562 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -145,8 +145,8 @@ RUN < 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..." diff --git a/stacks-krypton-miner.toml b/stacks-krypton-miner.toml index d62a66d..f2daa2f 100644 --- a/stacks-krypton-miner.toml +++ b/stacks-krypton-miner.toml @@ -44,6 +44,7 @@ rpc_ssl = false username = "$BITCOIN_RPC_USER" password = "$BITCOIN_RPC_PASS" timeout = 30 +wallet_name = "main" [[burnchain.epochs]] epoch_name = "1.0" From 1d675fdbae69b27c437a88e49f636b06bc5447ed Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Thu, 25 Jan 2024 20:29:46 +0100 Subject: [PATCH 5/7] fix: load btc wallet on startup --- Dockerfile.e2e | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.e2e b/Dockerfile.e2e index 3cb8562..fd62321 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -145,7 +145,7 @@ RUN < Date: Thu, 1 Feb 2024 19:37:22 +0100 Subject: [PATCH 6/7] chore: bump stacks-node --- .github/workflows/build.yml | 2 +- Dockerfile.e2e | 2 +- docker-compose-follower.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 360187a..d4639fa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: push: env: - STACKS_BLOCKCHAIN_COMMIT: 390dffc7e3593711c1f55505d3308063a2039df6 + STACKS_BLOCKCHAIN_COMMIT: 74e3cedeec5215f3286af6565c1503e578a848fb concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/Dockerfile.e2e b/Dockerfile.e2e index 69f4667..62290d2 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -3,7 +3,7 @@ FROM rust:bookworm as builder # A commit hash, tag, or branch -ARG GIT_COMMIT=390dffc7e3593711c1f55505d3308063a2039df6 +ARG GIT_COMMIT=74e3cedeec5215f3286af6565c1503e578a848fb ARG BLOCKCHAIN_REPO=https://github.com/stacks-network/stacks-blockchain.git ARG TARGETPLATFORM diff --git a/docker-compose-follower.yml b/docker-compose-follower.yml index a946c06..6d1509c 100644 --- a/docker-compose-follower.yml +++ b/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 From 2b232706f3ef4cd28413391075e73b47ddbb4f1c Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Thu, 1 Feb 2024 19:45:07 +0100 Subject: [PATCH 7/7] chore: bump stacks-node in miner docker compose --- docker-compose-miner.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-miner.yml b/docker-compose-miner.yml index 0e566ab..0b0bc74 100644 --- a/docker-compose-miner.yml +++ b/docker-compose-miner.yml @@ -1,7 +1,7 @@ version: "3.9" x-common-vars: - - &STACKS_BLOCKCHAIN_COMMIT 9af9c0b5b80f948e90916a45f3f316c81a7ac481 + - &STACKS_BLOCKCHAIN_COMMIT 74e3cedeec5215f3286af6565c1503e578a848fb - &BTC_ADDR miEJtNKa3ASpA19v5ZhvbKTEieYjLpzCYT - &MINER_SEED 9e446f6b0c6a96cf2190e54bcd5a8569c3e386f091605499464389b8d4e0bfc201 # stx: STEW4ZNT093ZHK4NEQKX8QJGM2Y7WWJ2FQQS5C19, btc: miEJtNKa3ASpA19v5ZhvbKTEieYjLpzCYT, pub_key: 035379aa40c02890d253cfa577964116eb5295570ae9f7287cbae5f2585f5b2c7c, wif: cStMQXkK5yTFGP3KbNXYQ3sJf2qwQiKrZwR9QJnksp32eKzef1za - &BITCOIN_PEER_PORT 18444