Skip to content

Commit 35d0840

Browse files
authored
Merge pull request #4917 from stacks-network/chore/merge-master-2.5.0.0.4
Merge branch release/2.5.0.0.4 to master
2 parents b7f7295 + d073cdb commit 35d0840

File tree

236 files changed

+37873
-5146
lines changed

Some content is hidden

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

236 files changed

+37873
-5146
lines changed

.github/workflows/bitcoin-tests.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,17 @@ jobs:
8181
- tests::nakamoto_integrations::correct_burn_outs
8282
- tests::nakamoto_integrations::vote_for_aggregate_key_burn_op
8383
- tests::nakamoto_integrations::follower_bootup
84+
- tests::nakamoto_integrations::forked_tenure_is_ignored
8485
- tests::signer::stackerdb_dkg
85-
- tests::signer::stackerdb_sign
86+
- tests::signer::stackerdb_sign_request_rejected
8687
- tests::signer::stackerdb_block_proposal
8788
- tests::signer::stackerdb_filter_bad_transactions
88-
- tests::signer::stackerdb_mine_2_nakamoto_reward_cycles
89-
- tests::signer::stackerdb_sign_after_signer_reboot
89+
# TODO: enable these once v1 signer is fixed
90+
# - tests::signer::stackerdb_mine_2_nakamoto_reward_cycles
91+
# - tests::signer::stackerdb_sign_after_signer_reboot
9092
- tests::nakamoto_integrations::stack_stx_burn_op_integration_test
93+
- tests::signer::stackerdb_delayed_dkg
94+
- tests::nakamoto_integrations::check_block_heights
9195
# Do not run this one until we figure out why it fails in CI
9296
# - tests::neon_integrations::bitcoin_reorg_flap
9397
# - tests::neon_integrations::bitcoin_reorg_flap_with_follower

.github/workflows/ci.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,6 @@ jobs:
4848
name: Rust Format
4949
runs-on: ubuntu-latest
5050
steps:
51-
- name: Checkout the latest code
52-
id: git_checkout
53-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
54-
55-
- name: Setup Rust Toolchain
56-
id: setup_rust_toolchain
57-
uses: actions-rust-lang/setup-rust-toolchain@f3c84ee10bf5a86e7a5d607d487bf17d57670965 # v1.5.0
58-
with:
59-
components: rustfmt
60-
cache: false
61-
6251
- name: Rustfmt
6352
id: rustfmt
6453
uses: stacks-network/actions/rustfmt@main

.github/workflows/clarity-js-sdk-pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
steps:
2929
- name: Checkout latest clarity js sdk
3030
id: git_checkout
31-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
31+
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
3232
with:
3333
token: ${{ secrets.GH_TOKEN }}
3434
repository: ${{ env.CLARITY_JS_SDK_REPOSITORY }}
@@ -46,7 +46,7 @@ jobs:
4646

4747
- name: Create Pull Request
4848
id: create_pr
49-
uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v5.0.2
49+
uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v6.0.5
5050
with:
5151
token: ${{ secrets.GH_TOKEN }}
5252
commit-message: "chore: update clarity-native-bin tag"

.github/workflows/docs-pr.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
steps:
3737
- name: Checkout the latest code
3838
id: git_checkout
39-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
39+
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
4040

4141
- name: Build docs
4242
id: build_docs
@@ -46,7 +46,7 @@ jobs:
4646

4747
- name: Checkout latest docs
4848
id: git_checkout_docs
49-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
49+
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
5050
with:
5151
token: ${{ secrets.DOCS_GITHUB_TOKEN }}
5252
repository: ${{ env.TARGET_REPOSITORY }}
@@ -77,7 +77,7 @@ jobs:
7777
- name: Open PR
7878
id: open_pr
7979
if: ${{ steps.push.outputs.open_pr == '1' }}
80-
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
80+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
8181
with:
8282
github-token: ${{ secrets.DOCS_GITHUB_TOKEN }}
8383
script: |

.github/workflows/github-release.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,23 @@ jobs:
4848
## Downloads the artifacts built in `create-source-binary.yml`
4949
- name: Download Artifacts
5050
id: download_artifacts
51-
uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
51+
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
5252
with:
53-
name: artifact
53+
pattern: ${{ inputs.tag }}-binary-build-*
5454
path: release
55+
merge-multiple: true
5556

5657
## Generate a checksums file to be added to the release page
5758
- name: Generate Checksums
5859
id: generate_checksum
5960
uses: stacks-network/actions/generate-checksum@main
61+
with:
62+
artifact_download_pattern: "${{ inputs.tag }}-binary-build-*"
6063

6164
## Upload the release archives with the checksums file
6265
- name: Upload Release
6366
id: upload_release
64-
uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 #v0.1.15
67+
uses: softprops/action-gh-release@69320dbe05506a9a39fc8ae11030b214ec2d1f87 #v2.0.5
6568
env:
6669
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
6770
with:

.github/workflows/image-build-binary.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
## ex. debian will have this tag: `type=ref,event=tag,enable=${{ matrix.dist == 'debian' }}`
6363
- name: Docker Metadata ( ${{matrix.dist}} )
6464
id: docker_metadata
65-
uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 #v5.0.0
65+
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 #v5.5.1
6666
with:
6767
## tag images with current repo name `stacks-core` as well as legacy `stacks-blockchain`
6868
images: |
@@ -79,7 +79,7 @@ jobs:
7979
## Build docker image for release
8080
- name: Build and Push ( ${{matrix.dist}} )
8181
id: docker_build
82-
uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
82+
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
8383
with:
8484
file: ./.github/actions/dockerfiles/Dockerfile.${{ matrix.dist }}-binary
8585
platforms: ${{ env.docker_platforms }}

.github/workflows/image-build-source.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
## Set docker metatdata
5050
- name: Docker Metadata ( ${{matrix.dist}} )
5151
id: docker_metadata
52-
uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 #v5.0.0
52+
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 #v5.5.1
5353
with:
5454
images: |
5555
${{env.docker-org}}/${{ github.event.repository.name }}
@@ -61,7 +61,7 @@ jobs:
6161
## Build docker image
6262
- name: Build and Push ( ${{matrix.dist}} )
6363
id: docker_build
64-
uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
64+
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
6565
with:
6666
file: ./.github/actions/dockerfiles/Dockerfile.${{matrix.dist}}-source
6767
platforms: ${{ env.docker_platforms }}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127
## checkout the code
128128
- name: Checkout the latest code
129129
id: git_checkout
130-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
130+
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
131131

132132
- name: Run network relay tests
133133
id: nettest
@@ -145,10 +145,10 @@ jobs:
145145
steps:
146146
- name: Checkout the latest code
147147
id: git_checkout
148-
uses: actions/checkout@v3
148+
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
149149
- name: Execute core contract unit tests with clarinet-sdk
150150
id: clarinet_unit_test
151-
uses: actions/setup-node@v3
151+
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
152152
with:
153153
node-version: 18.x
154154
cache: "npm"
@@ -174,7 +174,7 @@ jobs:
174174
steps:
175175
- name: Checkout the latest code
176176
id: git_checkout
177-
uses: actions/checkout@v3
177+
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
178178
- name: Execute core contract unit tests in Clarinet
179179
id: clarinet_unit_test_v1
180180
uses: docker://hirosystems/clarinet:1.7.1

CHANGELOG.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,37 @@ 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.5.0.0.4]
9+
10+
### Added
11+
12+
- Adds the solo stacking scenarios to the stateful property-based testing strategy for PoX-4 (#4725)
13+
- Add signer-key to synthetic stack-aggregation-increase event (#4728)
14+
- Implement the assumed total commit with carry-over (ATC-C) strategy for denying opportunistic Bitcoin miners from mining Stacks at a discount (#4733)
15+
- Adding support for stacks-block-height and tenure-height in Clarity 3 (#4745)
16+
- Preserve PeerNetwork struct when transitioning to 3.0 (#4767)
17+
- Implement singer monitor server error (#4773)
18+
- Pull current stacks signer out into v1 implementation and create placeholder v0 mod (#4778)
19+
- Create new block signature message type for v0 signer (#4787)
20+
- Isolate the rusqlite dependency in stacks-common and clarity behind a cargo feature (#4791)
21+
- Add next_initiative_delay config option to control how frequently the miner checks if a new burnchain block has been processed (#4795)
22+
- Various performance improvements and cleanup
23+
24+
### Changed
25+
26+
- Downgraded log messages about transactions from warning to info (#4697)
27+
- Fix race condition between the signer binary and the /v2/pox endpoint (#4738)
28+
- Make node config mock_miner item hot-swappable (#4743)
29+
- Mandates that a burnchain block header be resolved by a BurnchainHeaderReader, which will resolve a block height to at most one burnchain header (#4748)
30+
- Optional config option to resolve DNS of bootstrap nodes (#4749)
31+
- Limit inventory syncs with new peers (#4750)
32+
- Update /v2/fees/transfer to report the median transaction fee estimate for a STX-transfer of 180 bytes (#4754)
33+
- Reduce connection spamming in stackerdb (#4759)
34+
- Remove deprecated signer cli commands (#4772)
35+
- Extra pair of signer slots got introduced at the epoch 2.5 boundary (#4845, #4868, #4891)
36+
- Never consider Stacks chain tips that are not on the canonical burn chain #4886 (#4893)
37+
38+
839
## [2.5.0.0.3]
940

1041
This release fixes a regression in `2.5.0.0.0` from `2.4.0.1.0` caused by git merge

CODEOWNERS

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# These owners will be the default owners for everything in
2+
# the repo. Unless a later match takes precedence,
3+
# @stacks-network/blockchain-team-codeowners will be requested for
4+
# review when someone opens a pull request.
5+
* @stacks-network/blockchain-team-codeowners
6+
7+
# Generic file extensions that shouldn't require much scrutiny. Anyone with write access to the repo may approve a PR
8+
*.md @stacks-network/blockchain-team
9+
*.yml @stacks-network/blockchain-team
10+
*.yaml @stacks-network/blockchain-team
11+
*.txt @stacks-network/blockchain-team
12+
*.toml @stacks-network/blockchain-team
13+
14+
# Signer code
15+
libsigner/**/*.rs @stacks-network/blockchain-team-signer
16+
stacks-signer/**/*.rs @stacks-network/blockchain-team-signer
17+
18+
# CI workflows
19+
./github/workflows/ @stacks-network/blockchain-team-ci
20+
./github/actions/ @stacks-network/blockchain-team-ci

0 commit comments

Comments
 (0)