From 5f09fffc90d8217b0dbdc809e5ae21e2d76c8256 Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Sat, 9 Dec 2023 18:57:51 +0100 Subject: [PATCH 01/29] feat: stacks 3.0 --- .github/workflows/build.yml | 16 ++++++++-------- Dockerfile.e2e | 11 +++++++++-- Dockerfile.stacks-node | 4 ++++ docker-compose-miner.yml | 6 +++++- stacks-krypton-miner.toml | 11 ++++++++++- 5 files changed, 36 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 137f523..3b5d58e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: push: env: - STACKS_BLOCKCHAIN_COMMIT: "feat/epoch-2.4" + STACKS_BLOCKCHAIN_COMMIT: 14fc7fee769bfa01484d130a4f269884b0b0e9a8 jobs: cancel-previous-runs: @@ -115,13 +115,13 @@ jobs: images: hirosystems/stacks-api-e2e tags: | type=raw,value=latest,enable={{is_default_branch}} - type=raw,value=stacks2.4,enable={{is_default_branch}} - type=raw,value=stacks2.4-{{branch}}-{{sha}} - type=ref,event=branch,prefix=stacks2.4- - type=ref,event=pr,prefix=stacks2.4- - type=semver,pattern={{version}},prefix=stacks2.4- - type=semver,pattern={{major}}.{{minor}},prefix=stacks2.4- - type=sha,prefix=stacks2.4- + type=raw,value=stacks3.0,enable={{is_default_branch}} + type=raw,value=stacks3.0-{{branch}}-{{sha}} + type=ref,event=branch,prefix=stacks3.0- + type=ref,event=pr,prefix=stacks3.0- + type=semver,pattern={{version}},prefix=stacks3.0- + type=semver,pattern={{major}}.{{minor}},prefix=stacks3.0- + type=sha,prefix=stacks3.0- - name: Set up QEMU uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx diff --git a/Dockerfile.e2e b/Dockerfile.e2e index b09f0ed..f7eba9f 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -3,7 +3,7 @@ FROM rust:bullseye as builder # A commit hash, tag, or branch -ARG GIT_COMMIT=feat/epoch-2.4 +ARG GIT_COMMIT=14fc7fee769bfa01484d130a4f269884b0b0e9a8 ARG BLOCKCHAIN_REPO=https://github.com/stacks-network/stacks-blockchain.git ARG TARGETPLATFORM @@ -94,6 +94,13 @@ ENV STACKS_23_HEIGHT=$STACKS_23_HEIGHT ARG STACKS_24_HEIGHT=111 ENV STACKS_24_HEIGHT=$STACKS_24_HEIGHT +ARG STACKS_25_HEIGHT=112 +ENV STACKS_25_HEIGHT=$STACKS_25_HEIGHT + +# do not boot into epoch3.0 for now (it doesn't work yet) +ARG STACKS_30_HEIGHT=999999 +ENV STACKS_30_HEIGHT=$STACKS_30_HEIGHT + # priv: 6ad9cadb42d4edbfbe0c5bfb3b8a4125ddced021c4174f829b714ccbf527f02001 # ARG REWARD_RECIPIENT=STQM73RQC4EX0A07KWG1J5ECZJYBZS4SJ4ERC6WN ARG REWARD_RECIPIENT @@ -177,7 +184,7 @@ RUN < Date: Sat, 9 Dec 2023 19:04:35 +0100 Subject: [PATCH 02/29] ci: attempt to fix build --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3b5d58e..232159c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,7 +42,7 @@ jobs: if: steps.cache.outputs.cache-hit != 'true' run: | sudo apt-get update - sudo apt-get install -y g++-aarch64-linux-gnu libc6-dev-arm64-cross gcc-aarch64-linux-gnu + sudo apt-get install -y g++-aarch64-linux-gnu libc6-dev-arm64-cross gcc-aarch64-linux-gnu gcc-multilib - name: Fetch Stacks node repo if: steps.cache.outputs.cache-hit != 'true' env: From 37144c3bf943836f65d78de76aae9def3221b6b4 Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Sat, 9 Dec 2023 19:09:31 +0100 Subject: [PATCH 03/29] ci: attempt build fix --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 232159c..66fc757 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: access_token: ${{ github.token }} build-stacks-node: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v3 From 0bc97e2337751d968d77958887847ec219d80219 Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Sat, 9 Dec 2023 19:16:56 +0100 Subject: [PATCH 04/29] ci: attempt build fix 2 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 66fc757..e00d8bb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,7 +42,7 @@ jobs: if: steps.cache.outputs.cache-hit != 'true' run: | sudo apt-get update - sudo apt-get install -y g++-aarch64-linux-gnu libc6-dev-arm64-cross gcc-aarch64-linux-gnu gcc-multilib + sudo apt-get install -y g++-aarch64-linux-gnu gcc-aarch64-linux-gnu libgcc-11-dev-arm64-cross - name: Fetch Stacks node repo if: steps.cache.outputs.cache-hit != 'true' env: From a4cea3ee7e5a900c9a8a0ce9c688899cd88f4d31 Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Sat, 9 Dec 2023 19:36:54 +0100 Subject: [PATCH 05/29] chore: update nodejs install script from deprecated version --- Dockerfile.e2e | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.e2e b/Dockerfile.e2e index f7eba9f..969f29a 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -48,7 +48,7 @@ COPY --from=ruimarinho/bitcoin-core:0.21.1 /opt/bitcoin-*/bin /usr/local/bin ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && apt-get install -y curl/bullseye-backports gettext-base jq -RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && apt-get install -y nodejs +RUN curl -SLO https://deb.nodesource.com/nsolid_setup_deb.sh && chmod 500 nsolid_setup_deb.sh && ./nsolid_setup_deb.sh 20 && apt-get install nodejs -y RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* VOLUME /chainstate From 3ff52f0c3cfc3f5d5c4426eace02c2b989145e05 Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Sat, 9 Dec 2023 19:37:35 +0100 Subject: [PATCH 06/29] chore: bump docker e2e file from bullseye to bookworm --- .github/workflows/build.yml | 2 +- Dockerfile.e2e | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e00d8bb..2b33836 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -94,7 +94,7 @@ jobs: build-push-docker: needs: build-stacks-node - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v3 diff --git a/Dockerfile.e2e b/Dockerfile.e2e index 969f29a..729eb91 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM rust:bullseye as builder +FROM rust:bookworm as builder # A commit hash, tag, or branch ARG GIT_COMMIT=14fc7fee769bfa01484d130a4f269884b0b0e9a8 @@ -41,7 +41,7 @@ RUN < Date: Sat, 9 Dec 2023 19:41:15 +0100 Subject: [PATCH 07/29] chore: fix curl install --- Dockerfile.e2e | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.e2e b/Dockerfile.e2e index 729eb91..7a84e46 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -47,7 +47,7 @@ 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 ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update && apt-get install -y curl/bullseye-backports gettext-base jq +RUN apt-get update && apt-get install -y curl gettext-base jq RUN curl -SLO https://deb.nodesource.com/nsolid_setup_deb.sh && chmod 500 nsolid_setup_deb.sh && ./nsolid_setup_deb.sh 20 && apt-get install nodejs -y RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* From 61ff03a09da428b36d2745b02fe3a3355b768dd8 Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Sun, 10 Dec 2023 12:29:20 +0100 Subject: [PATCH 08/29] fix: add new dependencies to Dockerfile.e2e for building stacks-node next --- Dockerfile.e2e | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile.e2e b/Dockerfile.e2e index 7a84e46..dd9ebce 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -38,6 +38,9 @@ RUN < Date: Sun, 10 Dec 2023 12:29:42 +0100 Subject: [PATCH 09/29] chore: bump stacks-node to wip nakamoto branch --- .github/workflows/build.yml | 2 +- Dockerfile.e2e | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2b33836..5a2ce29 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: push: env: - STACKS_BLOCKCHAIN_COMMIT: 14fc7fee769bfa01484d130a4f269884b0b0e9a8 + STACKS_BLOCKCHAIN_COMMIT: f8ffd1dbe8990234391def4611b2611be9a3e4ba jobs: cancel-previous-runs: diff --git a/Dockerfile.e2e b/Dockerfile.e2e index dd9ebce..6532c27 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=14fc7fee769bfa01484d130a4f269884b0b0e9a8 +ARG GIT_COMMIT=f8ffd1dbe8990234391def4611b2611be9a3e4ba ARG BLOCKCHAIN_REPO=https://github.com/stacks-network/stacks-blockchain.git ARG TARGETPLATFORM From 800259ed4e3387e6bef09081cad543dfca6609a7 Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Sun, 10 Dec 2023 12:52:30 +0100 Subject: [PATCH 10/29] ci: remove deprecated `actions-rs/toolchain` --- .github/workflows/build.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5a2ce29..13627d4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,16 +28,10 @@ jobs: key: cache-stacks-node-${{ env.STACKS_BLOCKCHAIN_COMMIT }} - name: Install Rust - linux/amd64 if: steps.cache.outputs.cache-hit != 'true' - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: x86_64-unknown-linux-gnu + run: rustup toolchain install stable - name: Install Rust - linux/arm64 if: steps.cache.outputs.cache-hit != 'true' - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: aarch64-unknown-linux-gnu + run: rustup target add aarch64-unknown-linux-gnu - name: Install compilation tooling if: steps.cache.outputs.cache-hit != 'true' run: | From 71cfeb5ad5d4e94784fd17ec80b80d67ec227711 Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Sun, 10 Dec 2023 12:58:57 +0100 Subject: [PATCH 11/29] ci: use built-in cancel-in-progress --- .github/workflows/build.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 13627d4..1b25a19 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,15 +6,11 @@ on: env: STACKS_BLOCKCHAIN_COMMIT: f8ffd1dbe8990234391def4611b2611be9a3e4ba -jobs: - cancel-previous-runs: - runs-on: ubuntu-latest - steps: - - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.10.0 - with: - access_token: ${{ github.token }} +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +jobs: build-stacks-node: runs-on: ubuntu-22.04 steps: From 4b7ea506065713cea70c35ba70d07c70e50504e6 Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Tue, 16 Jan 2024 16:00:36 +0100 Subject: [PATCH 12/29] 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 13/29] 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 14/29] 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 15/29] 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 16/29] 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: Fri, 2 Feb 2024 16:44:18 +0100 Subject: [PATCH 17/29] chore: bump stacks-node --- .github/workflows/build.yml | 2 +- Dockerfile.e2e | 2 +- docker-compose-follower.yml | 2 +- docker-compose-miner.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ab6321..0f7bf98 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: push: env: - STACKS_BLOCKCHAIN_COMMIT: 9af9c0b5b80f948e90916a45f3f316c81a7ac481 + STACKS_BLOCKCHAIN_COMMIT: 5c14a440d26c012a0df59f1de0ede7b7a0ea76cd concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/Dockerfile.e2e b/Dockerfile.e2e index fd62321..280afe4 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=9af9c0b5b80f948e90916a45f3f316c81a7ac481 +ARG GIT_COMMIT=5c14a440d26c012a0df59f1de0ede7b7a0ea76cd 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..764101c 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 5c14a440d26c012a0df59f1de0ede7b7a0ea76cd - &MINER_PUB_KEY 035379aa40c02890d253cfa577964116eb5295570ae9f7287cbae5f2585f5b2c7c - &BITCOIN_PEER_PORT 18444 - &BITCOIN_RPC_PORT 18443 diff --git a/docker-compose-miner.yml b/docker-compose-miner.yml index 0e566ab..a80cfd3 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 5c14a440d26c012a0df59f1de0ede7b7a0ea76cd - &BTC_ADDR miEJtNKa3ASpA19v5ZhvbKTEieYjLpzCYT - &MINER_SEED 9e446f6b0c6a96cf2190e54bcd5a8569c3e386f091605499464389b8d4e0bfc201 # stx: STEW4ZNT093ZHK4NEQKX8QJGM2Y7WWJ2FQQS5C19, btc: miEJtNKa3ASpA19v5ZhvbKTEieYjLpzCYT, pub_key: 035379aa40c02890d253cfa577964116eb5295570ae9f7287cbae5f2585f5b2c7c, wif: cStMQXkK5yTFGP3KbNXYQ3sJf2qwQiKrZwR9QJnksp32eKzef1za - &BITCOIN_PEER_PORT 18444 From 8b2307af3879b24efeb80d6b266b486b1d006535 Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Wed, 21 Feb 2024 12:11:45 +0100 Subject: [PATCH 18/29] chore: bump stacks-node --- .github/workflows/build.yml | 2 +- Dockerfile.e2e | 2 +- docker-compose-follower.yml | 2 +- docker-compose-miner.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0f7bf98..851fbd1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: push: env: - STACKS_BLOCKCHAIN_COMMIT: 5c14a440d26c012a0df59f1de0ede7b7a0ea76cd + STACKS_BLOCKCHAIN_COMMIT: 5a4b3882e6f1d80dce73302c44e87271894103b8 concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/Dockerfile.e2e b/Dockerfile.e2e index 280afe4..fe0b748 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=5c14a440d26c012a0df59f1de0ede7b7a0ea76cd +ARG GIT_COMMIT=5a4b3882e6f1d80dce73302c44e87271894103b8 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 764101c..7190b68 100644 --- a/docker-compose-follower.yml +++ b/docker-compose-follower.yml @@ -1,7 +1,7 @@ version: "3.9" x-common-vars: - - &STACKS_BLOCKCHAIN_COMMIT 5c14a440d26c012a0df59f1de0ede7b7a0ea76cd + - &STACKS_BLOCKCHAIN_COMMIT 5a4b3882e6f1d80dce73302c44e87271894103b8 - &MINER_PUB_KEY 035379aa40c02890d253cfa577964116eb5295570ae9f7287cbae5f2585f5b2c7c - &BITCOIN_PEER_PORT 18444 - &BITCOIN_RPC_PORT 18443 diff --git a/docker-compose-miner.yml b/docker-compose-miner.yml index a80cfd3..353614f 100644 --- a/docker-compose-miner.yml +++ b/docker-compose-miner.yml @@ -1,7 +1,7 @@ version: "3.9" x-common-vars: - - &STACKS_BLOCKCHAIN_COMMIT 5c14a440d26c012a0df59f1de0ede7b7a0ea76cd + - &STACKS_BLOCKCHAIN_COMMIT 5a4b3882e6f1d80dce73302c44e87271894103b8 - &BTC_ADDR miEJtNKa3ASpA19v5ZhvbKTEieYjLpzCYT - &MINER_SEED 9e446f6b0c6a96cf2190e54bcd5a8569c3e386f091605499464389b8d4e0bfc201 # stx: STEW4ZNT093ZHK4NEQKX8QJGM2Y7WWJ2FQQS5C19, btc: miEJtNKa3ASpA19v5ZhvbKTEieYjLpzCYT, pub_key: 035379aa40c02890d253cfa577964116eb5295570ae9f7287cbae5f2585f5b2c7c, wif: cStMQXkK5yTFGP3KbNXYQ3sJf2qwQiKrZwR9QJnksp32eKzef1za - &BITCOIN_PEER_PORT 18444 From 160044772cafb737ace99a9c568f08c9eab06f38 Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Wed, 21 Feb 2024 15:21:03 +0100 Subject: [PATCH 19/29] fix: update --config arg usage --- Dockerfile.e2e | 4 ++-- docker-compose-follower.yml | 2 +- docker-compose-miner.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile.e2e b/Dockerfile.e2e index fe0b748..c705ce7 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -155,7 +155,7 @@ RUN < config.toml - stacks-node start --config=config.toml & + stacks-node start --config config.toml & STACKS_PID=$! while true; do @@ -233,7 +233,7 @@ cat > run.sh <<'EOM' bitcoin-cli -rpcwait generatetoaddress 1 $BTC_ADDR envsubst < config.toml.in > config.toml - stacks-node start --config=config.toml & + stacks-node start --config config.toml & STACKS_PID=$! function start_miner() { diff --git a/docker-compose-follower.yml b/docker-compose-follower.yml index 7190b68..ac03fb9 100644 --- a/docker-compose-follower.yml +++ b/docker-compose-follower.yml @@ -60,7 +60,7 @@ services: until $(curl -o /dev/null -s stacks-node-miner:20443); do sleep 5 done - exec stacks-node start --config=config.toml + exec stacks-node start --config config.toml networks: stacks: diff --git a/docker-compose-miner.yml b/docker-compose-miner.yml index 353614f..427f98d 100644 --- a/docker-compose-miner.yml +++ b/docker-compose-miner.yml @@ -133,7 +133,7 @@ services: rm -rf $${DATA_DIR}/* envsubst < config.toml.in > config.toml # bitcoin-cli -rpcwait -rpcconnect=bitcoind getmininginfo - exec stacks-node start --config=config.toml + exec stacks-node start --config config.toml ################################## ##### UNCOMMENT IF USING API ##### From bc92aad2196f4d5734b1262f0552628cad02db74 Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Thu, 4 Apr 2024 18:33:45 +0200 Subject: [PATCH 20/29] chore: bump to latest stacks-node next --- .github/workflows/build.yml | 2 +- Dockerfile.e2e | 2 +- docker-compose-follower.yml | 2 +- docker-compose-miner.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 851fbd1..73d1483 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: push: env: - STACKS_BLOCKCHAIN_COMMIT: 5a4b3882e6f1d80dce73302c44e87271894103b8 + STACKS_BLOCKCHAIN_COMMIT: d54b67c96cfbf5c9542d0e659c915080c6976e4a concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/Dockerfile.e2e b/Dockerfile.e2e index c705ce7..0498d62 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=5a4b3882e6f1d80dce73302c44e87271894103b8 +ARG GIT_COMMIT=d54b67c96cfbf5c9542d0e659c915080c6976e4a 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 ac03fb9..ed42c44 100644 --- a/docker-compose-follower.yml +++ b/docker-compose-follower.yml @@ -1,7 +1,7 @@ version: "3.9" x-common-vars: - - &STACKS_BLOCKCHAIN_COMMIT 5a4b3882e6f1d80dce73302c44e87271894103b8 + - &STACKS_BLOCKCHAIN_COMMIT d54b67c96cfbf5c9542d0e659c915080c6976e4a - &MINER_PUB_KEY 035379aa40c02890d253cfa577964116eb5295570ae9f7287cbae5f2585f5b2c7c - &BITCOIN_PEER_PORT 18444 - &BITCOIN_RPC_PORT 18443 diff --git a/docker-compose-miner.yml b/docker-compose-miner.yml index 427f98d..989d85d 100644 --- a/docker-compose-miner.yml +++ b/docker-compose-miner.yml @@ -1,7 +1,7 @@ version: "3.9" x-common-vars: - - &STACKS_BLOCKCHAIN_COMMIT 5a4b3882e6f1d80dce73302c44e87271894103b8 + - &STACKS_BLOCKCHAIN_COMMIT d54b67c96cfbf5c9542d0e659c915080c6976e4a - &BTC_ADDR miEJtNKa3ASpA19v5ZhvbKTEieYjLpzCYT - &MINER_SEED 9e446f6b0c6a96cf2190e54bcd5a8569c3e386f091605499464389b8d4e0bfc201 # stx: STEW4ZNT093ZHK4NEQKX8QJGM2Y7WWJ2FQQS5C19, btc: miEJtNKa3ASpA19v5ZhvbKTEieYjLpzCYT, pub_key: 035379aa40c02890d253cfa577964116eb5295570ae9f7287cbae5f2585f5b2c7c, wif: cStMQXkK5yTFGP3KbNXYQ3sJf2qwQiKrZwR9QJnksp32eKzef1za - &BITCOIN_PEER_PORT 18444 From 76f055775c187f60548a40ce106b08918d735264 Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Thu, 4 Apr 2024 18:44:41 +0200 Subject: [PATCH 21/29] fix: create portable stacks-node binary builds --- .github/workflows/build.yml | 2 +- Dockerfile.e2e | 2 +- Dockerfile.stacks-node | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 73d1483..e3000b1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,7 +71,7 @@ jobs: CXX_aarch64_unknown_linux_gnu: aarch64-linux-gnu-g++ AR_aarch64_unknown_linux_gnu: aarch64-linux-gnu-ar run: | - cargo build --package stacks-node --bin stacks-node --release --target x86_64-unknown-linux-gnu --target aarch64-unknown-linux-gnu + cargo build --package stacks-node --bin stacks-node --release --target x86_64-unknown-linux-gnu --target aarch64-unknown-linux-gnu --features portable --profile release-lite mkdir -p ../bin/x86_64-unknown-linux-gnu ../bin/aarch64-unknown-linux-gnu cp target/x86_64-unknown-linux-gnu/release/stacks-node ../bin/x86_64-unknown-linux-gnu cp target/aarch64-unknown-linux-gnu/release/stacks-node ../bin/aarch64-unknown-linux-gnu diff --git a/Dockerfile.e2e b/Dockerfile.e2e index 0498d62..257b339 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -41,7 +41,7 @@ RUN < Date: Thu, 4 Apr 2024 18:47:15 +0200 Subject: [PATCH 22/29] chore: fix build ci syntax --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e3000b1..cc35432 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,7 +71,7 @@ jobs: CXX_aarch64_unknown_linux_gnu: aarch64-linux-gnu-g++ AR_aarch64_unknown_linux_gnu: aarch64-linux-gnu-ar run: | - cargo build --package stacks-node --bin stacks-node --release --target x86_64-unknown-linux-gnu --target aarch64-unknown-linux-gnu --features portable --profile release-lite + cargo build --package stacks-node --bin stacks-node --features portable --profile release-lite --target x86_64-unknown-linux-gnu --target aarch64-unknown-linux-gnu mkdir -p ../bin/x86_64-unknown-linux-gnu ../bin/aarch64-unknown-linux-gnu cp target/x86_64-unknown-linux-gnu/release/stacks-node ../bin/x86_64-unknown-linux-gnu cp target/aarch64-unknown-linux-gnu/release/stacks-node ../bin/aarch64-unknown-linux-gnu From 16a6c3d694fb56a1ae4be346df3e67e340cb04ce Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Thu, 4 Apr 2024 19:25:17 +0200 Subject: [PATCH 23/29] fix: build directory and epoch heights --- .github/workflows/build.yml | 4 ++-- Dockerfile.e2e | 10 +++++----- Dockerfile.stacks-node | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cc35432..4fbe5f6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -73,8 +73,8 @@ jobs: run: | cargo build --package stacks-node --bin stacks-node --features portable --profile release-lite --target x86_64-unknown-linux-gnu --target aarch64-unknown-linux-gnu mkdir -p ../bin/x86_64-unknown-linux-gnu ../bin/aarch64-unknown-linux-gnu - cp target/x86_64-unknown-linux-gnu/release/stacks-node ../bin/x86_64-unknown-linux-gnu - cp target/aarch64-unknown-linux-gnu/release/stacks-node ../bin/aarch64-unknown-linux-gnu + cp target/x86_64-unknown-linux-gnu/release-lite/stacks-node ../bin/x86_64-unknown-linux-gnu + cp target/aarch64-unknown-linux-gnu/release-lite/stacks-node ../bin/aarch64-unknown-linux-gnu - uses: actions/upload-artifact@v3 with: name: stacks-node-bin diff --git a/Dockerfile.e2e b/Dockerfile.e2e index 257b339..a139825 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -19,11 +19,11 @@ RUN < Date: Thu, 4 Apr 2024 19:38:42 +0200 Subject: [PATCH 24/29] remove broken .cargo/config file before build --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4fbe5f6..64efb77 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,6 +71,7 @@ jobs: CXX_aarch64_unknown_linux_gnu: aarch64-linux-gnu-g++ AR_aarch64_unknown_linux_gnu: aarch64-linux-gnu-ar run: | + rm ".cargo/config" cargo build --package stacks-node --bin stacks-node --features portable --profile release-lite --target x86_64-unknown-linux-gnu --target aarch64-unknown-linux-gnu mkdir -p ../bin/x86_64-unknown-linux-gnu ../bin/aarch64-unknown-linux-gnu cp target/x86_64-unknown-linux-gnu/release-lite/stacks-node ../bin/x86_64-unknown-linux-gnu From b48ac437e362f5c38d0522984a90db933713eeed Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Tue, 9 Apr 2024 12:13:27 +0200 Subject: [PATCH 25/29] fix: bump reward cycle length from 5 (default) to 10 --- Dockerfile.e2e | 8 +++++++- stacks-krypton-miner.toml | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Dockerfile.e2e b/Dockerfile.e2e index a139825..0edd7a6 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -76,6 +76,12 @@ ENV BITCOIN_RPC_PASS=btc ARG MINE_INTERVAL=5s ENV MINE_INTERVAL=$MINE_INTERVAL +ARG POX_REWARD_LENGTH=10 +ENV POX_REWARD_LENGTH=$POX_REWARD_LENGTH + +ARG POX_PREPARE_LENGTH=5 +ENV POX_PREPARE_LENGTH=$POX_PREPARE_LENGTH + ARG STACKS_20_HEIGHT=0 ENV STACKS_20_HEIGHT=$STACKS_20_HEIGHT @@ -101,7 +107,7 @@ ARG STACKS_25_HEIGHT=112 ENV STACKS_25_HEIGHT=$STACKS_25_HEIGHT # do not boot into epoch3.0 for now (it doesn't work yet) -ARG STACKS_30_HEIGHT=9999997 +ARG STACKS_30_HEIGHT=9999995 ENV STACKS_30_HEIGHT=$STACKS_30_HEIGHT # priv: 6ad9cadb42d4edbfbe0c5bfb3b8a4125ddced021c4174f829b714ccbf527f02001 diff --git a/stacks-krypton-miner.toml b/stacks-krypton-miner.toml index f2daa2f..7048a66 100644 --- a/stacks-krypton-miner.toml +++ b/stacks-krypton-miner.toml @@ -35,6 +35,8 @@ chain = "bitcoin" mode = "neon" poll_time_secs = 1 pox_2_activation = $STACKS_POX2_HEIGHT +pox_reward_length = $POX_REWARD_LENGTH +pox_prepare_length = $POX_PREPARE_LENGTH ### bitcoind-regtest connection info peer_host = "$BITCOIN_PEER_HOST" From 8e54b29284f844a4255267f74c38b8bf5f93f778 Mon Sep 17 00:00:00 2001 From: Rafael Cardenas Date: Wed, 10 Apr 2024 11:29:06 -0600 Subject: [PATCH 26/29] fix: upgrade to latest rc --- .github/workflows/build.yml | 2 +- Dockerfile.e2e | 2 +- docker-compose-follower.yml | 2 +- docker-compose-miner.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 64efb77..dbd4d41 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: push: env: - STACKS_BLOCKCHAIN_COMMIT: d54b67c96cfbf5c9542d0e659c915080c6976e4a + STACKS_BLOCKCHAIN_COMMIT: e14022aa7e2eb82714c2ccaa3b8f2ed0f5568f8e concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/Dockerfile.e2e b/Dockerfile.e2e index 0edd7a6..a94106c 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=d54b67c96cfbf5c9542d0e659c915080c6976e4a +ARG GIT_COMMIT=e14022aa7e2eb82714c2ccaa3b8f2ed0f5568f8e 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 ed42c44..3756f68 100644 --- a/docker-compose-follower.yml +++ b/docker-compose-follower.yml @@ -1,7 +1,7 @@ version: "3.9" x-common-vars: - - &STACKS_BLOCKCHAIN_COMMIT d54b67c96cfbf5c9542d0e659c915080c6976e4a + - &STACKS_BLOCKCHAIN_COMMIT e14022aa7e2eb82714c2ccaa3b8f2ed0f5568f8e - &MINER_PUB_KEY 035379aa40c02890d253cfa577964116eb5295570ae9f7287cbae5f2585f5b2c7c - &BITCOIN_PEER_PORT 18444 - &BITCOIN_RPC_PORT 18443 diff --git a/docker-compose-miner.yml b/docker-compose-miner.yml index 989d85d..d2f689b 100644 --- a/docker-compose-miner.yml +++ b/docker-compose-miner.yml @@ -1,7 +1,7 @@ version: "3.9" x-common-vars: - - &STACKS_BLOCKCHAIN_COMMIT d54b67c96cfbf5c9542d0e659c915080c6976e4a + - &STACKS_BLOCKCHAIN_COMMIT e14022aa7e2eb82714c2ccaa3b8f2ed0f5568f8e - &BTC_ADDR miEJtNKa3ASpA19v5ZhvbKTEieYjLpzCYT - &MINER_SEED 9e446f6b0c6a96cf2190e54bcd5a8569c3e386f091605499464389b8d4e0bfc201 # stx: STEW4ZNT093ZHK4NEQKX8QJGM2Y7WWJ2FQQS5C19, btc: miEJtNKa3ASpA19v5ZhvbKTEieYjLpzCYT, pub_key: 035379aa40c02890d253cfa577964116eb5295570ae9f7287cbae5f2585f5b2c7c, wif: cStMQXkK5yTFGP3KbNXYQ3sJf2qwQiKrZwR9QJnksp32eKzef1za - &BITCOIN_PEER_PORT 18444 From 4d11d85a97d4a0b2773b719d40f3da85c08a3dd3 Mon Sep 17 00:00:00 2001 From: Rafael Cardenas Date: Wed, 10 Apr 2024 11:43:39 -0600 Subject: [PATCH 27/29] fix: try removing portable feature --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dbd4d41..265f5fb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,7 +72,7 @@ jobs: AR_aarch64_unknown_linux_gnu: aarch64-linux-gnu-ar run: | rm ".cargo/config" - cargo build --package stacks-node --bin stacks-node --features portable --profile release-lite --target x86_64-unknown-linux-gnu --target aarch64-unknown-linux-gnu + cargo build --package stacks-node --bin stacks-node --profile release-lite --target x86_64-unknown-linux-gnu --target aarch64-unknown-linux-gnu mkdir -p ../bin/x86_64-unknown-linux-gnu ../bin/aarch64-unknown-linux-gnu cp target/x86_64-unknown-linux-gnu/release-lite/stacks-node ../bin/x86_64-unknown-linux-gnu cp target/aarch64-unknown-linux-gnu/release-lite/stacks-node ../bin/aarch64-unknown-linux-gnu From 0a2c0e2fad08b09fcd2b357cd4d981ae2d033b7c Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Fri, 12 Apr 2024 11:21:30 +0200 Subject: [PATCH 28/29] fix: use ipv4 localhost to fix docker defaulting to ipv6 and breaking url parsing --- Dockerfile.e2e | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.e2e b/Dockerfile.e2e index a94106c..7ae66d9 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -67,7 +67,7 @@ ENV DATA_DIR=/chainstate/stacks-blockchain-data ENV BTC_ADDR=miEJtNKa3ASpA19v5ZhvbKTEieYjLpzCYT ENV BTC_ADDR_WIF=cStMQXkK5yTFGP3KbNXYQ3sJf2qwQiKrZwR9QJnksp32eKzef1za ENV MINER_SEED=9e446f6b0c6a96cf2190e54bcd5a8569c3e386f091605499464389b8d4e0bfc201 -ENV BITCOIN_PEER_HOST=localhost +ENV BITCOIN_PEER_HOST=127.0.0.1 ENV BITCOIN_PEER_PORT=18444 ENV BITCOIN_RPC_PORT=18443 ENV BITCOIN_RPC_USER=btc @@ -165,7 +165,7 @@ RUN < Date: Tue, 9 Jul 2024 12:31:49 -0400 Subject: [PATCH 29/29] fix: Remove `portable` feature flag from build --- Dockerfile.e2e | 2 +- Dockerfile.stacks-node | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.e2e b/Dockerfile.e2e index 7ae66d9..9adcaf6 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -41,7 +41,7 @@ RUN <