Skip to content

Commit 9b54fcb

Browse files
authored
Merge branch 'develop' into test/mutants-filter-pr
2 parents 16b7bff + 4b6638a commit 9b54fcb

Some content is hidden

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

47 files changed

+3760
-277
lines changed

.github/workflows/atlas-tests.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ jobs:
3636
- name: Setup Test Environment
3737
id: setup_tests
3838
uses: stacks-network/actions/stacks-core/testenv@main
39-
39+
with:
40+
btc-version: "25.0"
41+
4042
## Run test matrix using restored cache of archive file
4143
## - Test will timeout after env.TEST_TIMEOUT minutes
4244
- name: Run Tests

.github/workflows/bitcoin-tests.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
test-name:
3232
- tests::bitcoin_regtest::bitcoind_integration_test
3333
- tests::integrations::integration_test_get_info
34-
- tests::neon_integrations::antientropy_integration_test ## forced failure
34+
- tests::neon_integrations::antientropy_integration_test
3535
- tests::neon_integrations::bad_microblock_pubkey
3636
- tests::neon_integrations::bitcoind_forking_test
3737
- tests::neon_integrations::bitcoind_integration_test
@@ -68,13 +68,16 @@ jobs:
6868
- tests::neon_integrations::test_problematic_microblocks_are_not_relayed_or_stored
6969
- tests::neon_integrations::test_problematic_txs_are_not_stored
7070
- tests::neon_integrations::use_latest_tip_integration_test
71+
- tests::neon_integrations::min_txs
7172
- tests::should_succeed_handling_malformed_and_valid_txs
7273
steps:
7374
## Setup test environment
7475
- name: Setup Test Environment
7576
id: setup_tests
7677
uses: stacks-network/actions/stacks-core/testenv@main
77-
78+
with:
79+
btc-version: "25.0"
80+
7881
## Run test matrix using restored cache of archive file
7982
## - Test will timeout after env.TEST_TIMEOUT minutes
8083
- name: Run Tests

.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ on:
1515
tag:
1616
description: "The tag to create (optional)"
1717
required: false
18-
pull_request_target:
18+
pull_request:
1919
types:
2020
- opened
2121
- reopened
2222
- synchronize
23+
- ready_for_review
2324
paths-ignore:
2425
- "**.md"
2526
- "**.yml"
@@ -143,7 +144,7 @@ jobs:
143144
github.event.review.state == 'approved'
144145
) ||
145146
github.event_name == 'workflow_dispatch' ||
146-
github.event_name == 'pull_request_target' ||
147+
github.event_name == 'pull_request' ||
147148
(
148149
contains('
149150
refs/heads/master

.github/workflows/create-cache.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ jobs:
4444
uses: stacks-network/actions/stacks-core/cache/bitcoin@main
4545
with:
4646
action: save
47+
btc-version: "25.0"
4748

4849
## Cache nextest archives for tests
4950
nextest-archive:

.github/workflows/epoch-tests.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ jobs:
5959
- name: Setup Test Environment
6060
id: setup_tests
6161
uses: stacks-network/actions/stacks-core/testenv@main
62-
62+
with:
63+
btc-version: "25.0"
64+
6365
## Run test matrix using restored cache of archive file
6466
## - Test will timeout after env.TEST_TIMEOUT minutes
6567
- name: Run Tests

.github/workflows/slow-tests.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ jobs:
3737
- name: Setup Test Environment
3838
id: setup_tests
3939
uses: stacks-network/actions/stacks-core/testenv@main
40-
40+
with:
41+
btc-version: "25.0"
42+
4143
## Run test matrix using restored cache of archive file
4244
## - Test will timeout after env.TEST_TIMEOUT minutes
4345
- name: Run Tests

.github/workflows/stacks-core-tests.yml

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
uses: stacks-network/actions/stacks-core/testenv@main
3838
with:
3939
genesis: true
40+
btc-version: "25.0"
4041

4142
## Run test matrix using restored cache of archive file
4243
## - Test will timeout after env.TEST_TIMEOUT minutes
@@ -84,7 +85,9 @@ jobs:
8485
- name: Setup Test Environment
8586
id: setup_tests
8687
uses: stacks-network/actions/stacks-core/testenv@main
87-
88+
with:
89+
btc-version: "25.0"
90+
8891
## Run test matrix using restored cache of archive file
8992
## - Test will timeout after env.TEST_TIMEOUT minutes
9093
- name: Run Tests
@@ -135,25 +138,45 @@ jobs:
135138
# Core contract tests
136139
core-contracts-clarinet-test:
137140
name: Core Contracts Test
141+
defaults:
142+
run:
143+
working-directory: "./contrib/core-contract-tests/"
138144
runs-on: ubuntu-latest
139145
steps:
140-
## Checkout the code
141146
- name: Checkout the latest code
142147
id: git_checkout
143-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
144-
145-
## Use Clarinet to run contract unit-tests and create code coverage file
146-
- name: Execute core contract unit tests in Clarinet
148+
uses: actions/checkout@v3
149+
- name: Execute core contract unit tests with clarinet-sdk
147150
id: clarinet_unit_test
148-
uses: docker://hirosystems/clarinet:1.8.0
151+
uses: actions/setup-node@v3
149152
with:
150-
args: test --coverage --manifest-path=./contrib/core-contract-tests/Clarinet.toml
151-
153+
node-version: 18.x
154+
cache: "npm"
155+
cache-dependency-path: "./contrib/core-contract-tests/package-lock.json"
156+
- run: npm ci
157+
- run: npm test
152158
## Upload code coverage file
153159
- name: Code Coverage
154160
id: codecov
155161
uses: stacks-network/actions/codecov@main
156162
with:
157163
test-name: ${{ matrix.test-name }}
158164
upload-only: true
159-
filename: ./coverage.lcov
165+
filename: ./lcov.info
166+
167+
# Core contract tests on Clarinet v1
168+
# Check for false positives/negatives
169+
# https://github.com/stacks-network/stacks-blockchain/pull/4031#pullrequestreview-1713341208
170+
core-contracts-clarinet-test-clarinet-v1:
171+
name: Core Contracts Test Clarinet V1
172+
runs-on: ubuntu-latest
173+
steps:
174+
- name: Checkout the latest code
175+
id: git_checkout
176+
uses: actions/checkout@v3
177+
- name: Execute core contract unit tests in Clarinet
178+
id: clarinet_unit_test_v1
179+
uses: docker://hirosystems/clarinet:1.7.1
180+
with:
181+
args: test --manifest-path=./contrib/core-contract-tests/Clarinet.toml contrib/core-contract-tests/tests/bns/name_register_test.ts
182+

CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,27 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to the versioning scheme outlined in the [README.md](README.md).
77

8+
## [2.4.0.0.5]
9+
10+
This introduces a set of improvements to the Stacks miner behavior. In
11+
particular:
12+
* The VRF public key can be re-used across node restarts.
13+
* Settings that affect mining are hot-reloaded from the config file. They take
14+
effect once the file is updated; there is no longer a need to restart the
15+
node.
16+
* The act of changing the miner settings in the config file automatically
17+
triggers a subsequent block-build attempt, allowing the operator to force the
18+
miner to re-try building blocks.
19+
* This adds a new tip-selection algorithm that minimizes block orphans within a
20+
configurable window of time.
21+
* When configured, the node will automatically stop mining if it is not achieving a
22+
targeted win rate over a configurable window of blocks.
23+
* When configured, the node will selectively mine transactions from only certain
24+
addresses, or only of certain types (STX-transfers, contract-publishes,
25+
contract-calls).
26+
* When configured, the node will optionally only RBF block-commits if it can
27+
produce a block with strictly more transactions.
28+
829
## [2.4.0.0.4]
930

1031
This is a high-priority hotfix that addresses a bug in transaction processing which

CODE_OF_CONDUCT.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ Community leaders will follow these Community Impact Guidelines in determining t
7171

7272
**Consequence**: A permanent ban from any sort of public interaction within the community.
7373

74+
### Secret Code:
75+
The code to the contest is: BITCOINL2
76+
7477
## Attribution
7578

7679
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0,

Cargo.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)