From d0b8953daf9f0e374eadb1706dfbd08122392315 Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Thu, 4 May 2023 20:19:23 +0200 Subject: [PATCH 1/7] feat: Stacks 2.4 image --- Dockerfile.e2e | 47 +++++++++++++++++++++++++++++++++++---- docker-compose.yml | 9 ++++++++ stacks-krypton-miner.toml | 12 ++++++++++ wip.md | 11 +++++++++ 4 files changed, 75 insertions(+), 4 deletions(-) create mode 100644 wip.md diff --git a/Dockerfile.e2e b/Dockerfile.e2e index 9cc1fc6..691fba5 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=2.2.0.0.1 +ARG GIT_COMMIT=test/epoch-2.4-draft ARG BLOCKCHAIN_REPO=https://github.com/stacks-network/stacks-blockchain.git ARG TARGETPLATFORM @@ -85,6 +85,15 @@ ENV STACKS_21_HEIGHT=$STACKS_21_HEIGHT ARG STACKS_POX2_HEIGHT=107 ENV STACKS_POX2_HEIGHT=$STACKS_POX2_HEIGHT +ARG STACKS_22_HEIGHT=108 +ENV STACKS_22_HEIGHT=$STACKS_22_HEIGHT + +ARG STACKS_23_HEIGHT=109 +ENV STACKS_23_HEIGHT=$STACKS_23_HEIGHT + +ARG STACKS_24_HEIGHT=111 +ENV STACKS_24_HEIGHT=$STACKS_24_HEIGHT + # priv: 6ad9cadb42d4edbfbe0c5bfb3b8a4125ddced021c4174f829b714ccbf527f02001 # ARG REWARD_RECIPIENT=STQM73RQC4EX0A07KWG1J5ECZJYBZS4SJ4ERC6WN ARG REWARD_RECIPIENT @@ -128,7 +137,7 @@ RUN < Date: Thu, 4 May 2023 20:21:14 +0200 Subject: [PATCH 2/7] ci: stop building epoch2.0-2.1 transition image --- .github/workflows/build.yml | 73 ++++--------------------------------- 1 file changed, 7 insertions(+), 66 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index deddb0f..6440500 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -115,13 +115,13 @@ jobs: images: hirosystems/stacks-api-e2e tags: | type=raw,value=latest,enable={{is_default_branch}} - type=raw,value=stacks2.1,enable={{is_default_branch}} - type=raw,value=stacks2.1-{{branch}}-{{sha}} - type=ref,event=branch,prefix=stacks2.1- - type=ref,event=pr,prefix=stacks2.1- - type=semver,pattern={{version}},prefix=stacks2.1- - type=semver,pattern={{major}}.{{minor}},prefix=stacks2.1- - type=sha,prefix=stacks2.1- + 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- - name: Set up QEMU uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx @@ -146,62 +146,3 @@ jobs: labels: ${{ steps.meta.outputs.labels }} cache-from: type=registry,ref=hirosystems/stacks-api-e2e:latest cache-to: type=inline - - build-push-stacks2_1-transition-docker: - needs: build-stacks-node - runs-on: ubuntu-20.04 - steps: - - name: Checkout - uses: actions/checkout@v3 - - uses: actions/download-artifact@v3 - with: - name: stacks-node-bin - path: stacks-blockchain-binaries - - name: Process of downloaded artifacts - working-directory: stacks-blockchain-binaries - run: | - ls -R - chmod +x x86_64-unknown-linux-gnu/stacks-node - chmod +x aarch64-unknown-linux-gnu/stacks-node - - name: Docker meta - id: meta - uses: docker/metadata-action@v4 - with: - images: hirosystems/stacks-api-e2e - flavor: | - latest=false - tags: | - type=raw,value=stacks2.1-transition,enable={{is_default_branch}} - type=raw,value=stacks2.1-transition-{{branch}}-{{sha}} - type=ref,event=branch,prefix=stacks2.1-transition- - type=ref,event=pr,prefix=stacks2.1-transition- - type=semver,pattern={{version}},prefix=stacks2.1-transition- - type=semver,pattern={{major}}.{{minor}},prefix=stacks2.1-transition- - type=sha,prefix=stacks2.1-transition- - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - with: - config-inline: | - [worker.oci] - max-parallelism = 1 - - name: Login to DockerHub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN || secrets.DOCKERHUB_PASSWORD }} - - name: Build Docker images - uses: docker/build-push-action@v3 - with: - file: Dockerfile.e2e - context: . - push: true - platforms: linux/amd64,linux/arm64 - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - cache-from: type=registry,ref=hirosystems/stacks-api-e2e:stacks2.1-transition - cache-to: type=inline - build-args: | - STACKS_21_HEIGHT=120 - STACKS_POX2_HEIGHT=136 From 2f20135e33ceadbb0004ec4a673b559cdb6f258d Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Thu, 4 May 2023 20:23:34 +0200 Subject: [PATCH 3/7] ci: bump stacks-blockchain branch --- .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 6440500..7c652c5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: push: env: - STACKS_BLOCKCHAIN_COMMIT: "2.2.0.0.1" + STACKS_BLOCKCHAIN_COMMIT: "test/epoch-2.4-draft" jobs: cancel-previous-runs: From 1395ac321c86a2ccae8a44cda4f2503c3a9df0b0 Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Mon, 8 May 2023 10:37:57 +0200 Subject: [PATCH 4/7] chore: bump to latest stacks 2.4 code --- .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 7c652c5..24ef041 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: push: env: - STACKS_BLOCKCHAIN_COMMIT: "test/epoch-2.4-draft" + STACKS_BLOCKCHAIN_COMMIT: "2f20135e33ceadbb0004ec4a673b559cdb6f258d" jobs: cancel-previous-runs: diff --git a/Dockerfile.e2e b/Dockerfile.e2e index 691fba5..f2939ec 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=test/epoch-2.4-draft +ARG GIT_COMMIT=2f20135e33ceadbb0004ec4a673b559cdb6f258d ARG BLOCKCHAIN_REPO=https://github.com/stacks-network/stacks-blockchain.git ARG TARGETPLATFORM From f930debb01cd844048d5700f0cd04daf0bc7d1ab Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Mon, 8 May 2023 10:40:26 +0200 Subject: [PATCH 5/7] chore: bump to latest stacks 2.4 code, attempt 2 --- .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 24ef041..62f3988 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: push: env: - STACKS_BLOCKCHAIN_COMMIT: "2f20135e33ceadbb0004ec4a673b559cdb6f258d" + STACKS_BLOCKCHAIN_COMMIT: "test/epoch-2.4-draft.2" jobs: cancel-previous-runs: diff --git a/Dockerfile.e2e b/Dockerfile.e2e index f2939ec..f406be5 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=2f20135e33ceadbb0004ec4a673b559cdb6f258d +ARG GIT_COMMIT=test/epoch-2.4-draft.2 ARG BLOCKCHAIN_REPO=https://github.com/stacks-network/stacks-blockchain.git ARG TARGETPLATFORM From dcb10f1fafc197efc522f95ad04c2bb2bdf2e44c Mon Sep 17 00:00:00 2001 From: Matthew Little Date: Tue, 9 May 2023 18:36:10 +0200 Subject: [PATCH 6/7] chore: bump to latest stacks-node-2.4 --- .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 62f3988..137f523 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: push: env: - STACKS_BLOCKCHAIN_COMMIT: "test/epoch-2.4-draft.2" + STACKS_BLOCKCHAIN_COMMIT: "feat/epoch-2.4" jobs: cancel-previous-runs: diff --git a/Dockerfile.e2e b/Dockerfile.e2e index f406be5..b09f0ed 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=test/epoch-2.4-draft.2 +ARG GIT_COMMIT=feat/epoch-2.4 ARG BLOCKCHAIN_REPO=https://github.com/stacks-network/stacks-blockchain.git ARG TARGETPLATFORM From 531300175e0325f8d14f36b722ed3e4b77372f01 Mon Sep 17 00:00:00 2001 From: CharlieC3 <2747302+CharlieC3@users.noreply.github.com> Date: Fri, 1 Dec 2023 14:25:45 -0500 Subject: [PATCH 7/7] fix: tenative fix for bad config file syntax --- docker-compose.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index a267b1b..8b5ee5c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.9" x-common-vars: - - &STACKS_BLOCKCHAIN_COMMIT ecfe80bf16cfe60ef6e68aa30e9b3f8d7b18e268 + - &STACKS_BLOCKCHAIN_COMMIT master - &BTC_ADDR miEJtNKa3ASpA19v5ZhvbKTEieYjLpzCYT - &MINER_SEED 9e446f6b0c6a96cf2190e54bcd5a8569c3e386f091605499464389b8d4e0bfc201 # stx: STEW4ZNT093ZHK4NEQKX8QJGM2Y7WWJ2FQQS5C19, btc: miEJtNKa3ASpA19v5ZhvbKTEieYjLpzCYT, pub_key: 035379aa40c02890d253cfa577964116eb5295570ae9f7287cbae5f2585f5b2c7c, wif: cStMQXkK5yTFGP3KbNXYQ3sJf2qwQiKrZwR9QJnksp32eKzef1za - &BITCOIN_PEER_PORT 18444 @@ -9,6 +9,8 @@ x-common-vars: - &BITCOIN_RPC_USER btc - &BITCOIN_RPC_PASS btc - &MINE_INTERVAL ${MINE_INTERVAL:-0.5s} + - &STACKS_20_HEIGHT ${STACKS_20_HEIGHT:-101} + - &STACKS_2_05_HEIGHT ${STACKS_2_05_HEIGHT:-102} - &STACKS_21_HEIGHT ${STACKS_21_HEIGHT:-103} - &STACKS_POX2_HEIGHT ${STACKS_POX2_HEIGHT:-104} # 104 is is stacks_block=1, 106 is stacks_block=3 - &STACKS_22_HEIGHT ${STACKS_22_HEIGHT:-105} @@ -40,6 +42,8 @@ services: MINER_SEED: *MINER_SEED BTC_ADDR: *BTC_ADDR INIT_BLOCKS: 101 + STACKS_20_HEIGHT: *STACKS_20_HEIGHT + STACKS_2_05_HEIGHT: *STACKS_2_05_HEIGHT STACKS_21_HEIGHT: *STACKS_21_HEIGHT STACKS_POX2_HEIGHT: *STACKS_POX2_HEIGHT STACKS_22_HEIGHT: *STACKS_22_HEIGHT @@ -172,6 +176,8 @@ services: BITCOIN_RPC_USER: *BITCOIN_RPC_USER BITCOIN_RPC_PASS: *BITCOIN_RPC_PASS MINER_SEED: *MINER_SEED + STACKS_20_HEIGHT: *STACKS_20_HEIGHT + STACKS_2_05_HEIGHT: *STACKS_2_05_HEIGHT STACKS_21_HEIGHT: *STACKS_21_HEIGHT STACKS_POX2_HEIGHT: *STACKS_POX2_HEIGHT STACKS_22_HEIGHT: *STACKS_22_HEIGHT