Skip to content

Commit b3823f1

Browse files
Merge pull request #7197 from stacks-network/pox-wf-integration
WIP: PoX-5 and Epoch 4
2 parents 3f6771a + 847f2e2 commit b3823f1

601 files changed

Lines changed: 66977 additions & 53503 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/scripts/bitcoin_tests.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ tests::nakamoto_integrations::large_mempool_next_random_fee
107107
tests::nakamoto_integrations::larger_mempool
108108
tests::nakamoto_integrations::check_block_info_rewards
109109
tests::signer::v0::larger_mempool
110+
# This test takes too long run in CI
111+
tests::pox_5_integrations::check_pox_5_register_for_second_bond_no_downtime
110112
EOF
111113

112114
## ── Append tests tagged with ci_skip to the exclude list ────────────────────

.github/workflows/_check-clippy.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: "Checks: Clippy"
66
run-name: "Checks: Clippy [${{ github.ref_name }}]"
77

88
# Only run when:
9-
# - PRs are (re)opened against develop branch
9+
# - PRs are (re)opened (any target branch)
1010
# - commit is pushed to PR
1111
# - PR is added to merge queue
1212
on:
@@ -15,8 +15,6 @@ on:
1515
types:
1616
- checks_requested
1717
pull_request:
18-
branches:
19-
- develop
2018
types:
2119
- opened
2220
- reopened

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ contrib/tools/config-docs-generator/target/
5151
# These are backup files generated by rustfmt
5252
**/*.rs.bk
5353

54+
# cargo-mutants output directories
55+
mutants.out/
56+
mutants.out.old/
57+
**/mutants-*/
58+
5459
node_modules
5560
tarpaulin-report.html
5661
osxcross

Cargo.lock

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Clarity 6: Add variadic `concat` built-in
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Adds two new Clarity 6 native functions: `verify-merkle-proof`, which checks a Bitcoin-style merkle inclusion proof against a known root using double-SHA-256, and `get-bitcoin-tx-output?`, which parses a serialized Bitcoin transaction (with or without SegWit witness data) and returns the output at a given index along with the canonical, witness-stripped txid in internal byte order
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Updates to pox-5 to prevent a scenario where a bond participant could switch signers, but that switch would cause the new signer to immediately start getting rewards, even though their signing power isn't updated yet.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fixed an issue related to signer managers not being able to withdrawal their accumulated fees.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Adds the ability to pause claiming of rewards in pox-5. This is an irreversable action, which can only be taken by the "pause admin", which is set initially at 4.0 activation.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Consensus now rejects blocks that contain transactions with non-normalized "high S" secp256k1 signatures. This is a requirement of SIP 005, but was never correctly implemented. This change applies starting with Epoch 4.0.

0 commit comments

Comments
 (0)