Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Epoch3 interim blocks #29

Open
wants to merge 33 commits into
base: feat/epoch25
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
5ca6d01
feat: almost activating epoch3
zone117x Dec 12, 2023
fb2f31b
stashing some close to working changes
kantai Dec 12, 2023
dec3fe5
okay, working-ish version
kantai Dec 13, 2023
f801252
ah, better working version
kantai Dec 13, 2023
aa53140
build for release
zone117x Dec 13, 2023
7951b47
build for release
zone117x Dec 13, 2023
8f95e53
ci: bump stacks-node commit
zone117x Dec 13, 2023
9c369a1
feat: epoch3 working with docker-compose
zone117x Dec 16, 2023
4551d13
fix: add timeout to bitcoin mining
zone117x Dec 16, 2023
0e7f57e
feat: robust stacking script
zone117x Dec 16, 2023
658bb90
chore: re-enable stacks-api
zone117x Dec 17, 2023
0bc6dc8
bump stacks-core next branch, include tx-broadcasting script
zone117x Dec 20, 2023
6913eb4
chore: bump stacks-node with stability fixes
zone117x Dec 21, 2023
eb4b12f
feat: slow down bitcoin block mining in epoch3
zone117x Dec 21, 2023
74ce0fb
chore: stack for multiple cycles to reduce pox activation flakiness
zone117x Dec 21, 2023
3d65412
update stacks core commit hash for next (#28)
rafaelcr Jan 23, 2024
269b140
fix: stacking with latest version of stack-stx (#30)
rafaelcr Jan 25, 2024
4a8c53f
fix: add `mining_key` for epoch3.0
zone117x Jan 26, 2024
c8f17f3
chore: bump stacks-api
zone117x Jan 26, 2024
ce0db11
chore: bump stacks-node
zone117x Feb 1, 2024
025ae3c
Merge branch 'feat/epoch25' into feat/epoch30
zone117x Feb 1, 2024
2b23270
chore: bump stacks-node in miner docker compose
zone117x Feb 1, 2024
ec7c627
chore: bump stacks-node
zone117x Feb 1, 2024
2fd5faf
fix: add wallet name in bitcoind command
zone117x Feb 2, 2024
ad24eb6
chore: bump stacks-api
zone117x Feb 6, 2024
c5e985e
chore: bump latest next
zone117x Feb 6, 2024
e40a25b
fix: stacks-node --config option change
zone117x Feb 6, 2024
7966530
chore: update to next and add pox signer logic
zone117x Feb 20, 2024
b0a8c8e
fix: stacks signature logic
zone117x Feb 21, 2024
1e6ad6a
chore: revert debug changes
zone117x Feb 21, 2024
a8fee88
Merge pull request #31 from hirosystems/chore/update-next-signer-keys
zone117x Feb 21, 2024
0e0672c
Merge branch 'feat/epoch25' into epoch3-interim-blocks
zone117x Feb 21, 2024
777bf36
chore: bump stacks-node next and stacks.js stacking script
zone117x Feb 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: bump stacks-node with stability fixes
zone117x committed Dec 21, 2023

Verified

This commit was signed with the committer’s verified signature.
targos Michaël Zasso
commit 6913eb49361d77617c0ed8133b04faa4d4054936
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ on:
push:

env:
STACKS_BLOCKCHAIN_COMMIT: 8cffc3892f6451fdff525952a025f77482a8f728
STACKS_BLOCKCHAIN_COMMIT: d0882a7ac6bfdd970b1366ead6cc725d79c8f91d

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
2 changes: 1 addition & 1 deletion Dockerfile.e2e
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
FROM rust:bookworm as builder

# A commit hash, tag, or branch
ARG GIT_COMMIT=390dffc7e3593711c1f55505d3308063a2039df6
ARG GIT_COMMIT=d0882a7ac6bfdd970b1366ead6cc725d79c8f91d
ARG BLOCKCHAIN_REPO=https://github.com/stacks-network/stacks-blockchain.git

ARG TARGETPLATFORM
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3.9"

x-common-vars:
- &STACKS_BLOCKCHAIN_COMMIT 2789b184ef301734f0af2132fac4b303ef0f9a7c
- &STACKS_BLOCKCHAIN_COMMIT d0882a7ac6bfdd970b1366ead6cc725d79c8f91d
- &BTC_ADDR miEJtNKa3ASpA19v5ZhvbKTEieYjLpzCYT
- &MINER_SEED 9e446f6b0c6a96cf2190e54bcd5a8569c3e386f091605499464389b8d4e0bfc201 # stx: STEW4ZNT093ZHK4NEQKX8QJGM2Y7WWJ2FQQS5C19, btc: miEJtNKa3ASpA19v5ZhvbKTEieYjLpzCYT, pub_key: 035379aa40c02890d253cfa577964116eb5295570ae9f7287cbae5f2585f5b2c7c, wif: cStMQXkK5yTFGP3KbNXYQ3sJf2qwQiKrZwR9QJnksp32eKzef1za
- &BITCOIN_PEER_PORT 18444
4 changes: 3 additions & 1 deletion stacking/stacking.js
Original file line number Diff line number Diff line change
@@ -25,7 +25,9 @@ async function run() {
return;
}
const nextCycleStx = poxInfo.next_cycle.stacked_ustx;
const minStx = poxInfo.next_cycle.min_threshold_ustx;
let minStx = poxInfo.next_cycle.min_threshold_ustx;
// Bump min threshold by 50% to avoid getting stuck if threshold increases
minStx = Math.floor(minStx * 1.5);
if (nextCycleStx >= minStx) {
console.log(`Next cycle has enough stacked, skipping stacking (stacked=${nextCycleStx}, min=${minStx})`);
return;