Skip to content

Commit e39e2c5

Browse files
authored
Merge branch 'develop' into chore/update_codeowners
2 parents 7cb2132 + 0695b41 commit e39e2c5

File tree

376 files changed

+16270
-13986
lines changed

Some content is hidden

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

376 files changed

+16270
-13986
lines changed

.cargo/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[alias]
22
stacks-node = "run --package stacks-node --"
33
fmt-stacks = "fmt -- --config group_imports=StdExternalCrate,imports_granularity=Module"
4-
clippy-stacks = "clippy -p libstackerdb -p stacks-signer -p pox-locking -p clarity -p libsigner -p stacks-common --no-deps --tests --all-features -- -D warnings"
4+
clippy-stacks = "clippy -p stx-genesis -p libstackerdb -p stacks-signer -p pox-locking -p clarity -p libsigner -p stacks-common --no-deps --tests --all-features -- -D warnings"
55

66
# Uncomment to improve performance slightly, at the cost of portability
77
# * Note that native binaries may not run on CPUs that are different from the build machine

.github/actions/dockerfiles/Dockerfile.alpine-binary

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ RUN case "${TAG}" in \
3131
;; \
3232
*) \
3333
echo "/bin/stacks-node mainnet" > /tmp/command.sh && \
34-
rm /bin/blockstack-cli /bin/clarity-cli /bin/relay-server /bin/stacks-events /bin/stacks-inspect \
34+
rm /bin/blockstack-cli /bin/clarity-cli /bin/stacks-events /bin/stacks-inspect \
3535
;; \
3636
esac && \
3737
chmod +x /tmp/command.sh

.github/actions/dockerfiles/Dockerfile.debian-binary

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ RUN case "${TAG}" in \
3131
;; \
3232
*) \
3333
echo "/bin/stacks-node mainnet" > /tmp/command.sh && \
34-
rm /bin/blockstack-cli /bin/clarity-cli /bin/relay-server /bin/stacks-events /bin/stacks-inspect \
34+
rm /bin/blockstack-cli /bin/clarity-cli /bin/stacks-events /bin/stacks-inspect \
3535
;; \
3636
esac && \
3737
chmod +x /tmp/command.sh

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ on:
1919
- opened
2020
- reopened
2121
- synchronize
22-
- ready_for_review
2322

2423
defaults:
2524
run:

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

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,15 @@ name: Core build tests
44
# - PRs are (re)opened against develop branch
55
on:
66
workflow_call:
7-
7+
88
jobs:
99
check-consts:
1010
name: Check the constants from stacks-inspect
1111
runs-on: ubuntu-latest
12+
defaults:
13+
run:
14+
shell: bash
15+
1216
steps:
1317
- name: Checkout the latest code
1418
id: git_checkout
@@ -21,13 +25,35 @@ jobs:
2125
uses: actions-rust-lang/setup-rust-toolchain@11df97af8e8102fd60b60a77dfbf58d40cd843b8 # v1.10.1
2226
with:
2327
toolchain: ${{ env.RUST_TOOLCHAIN }}
24-
- name: Build the binaries
25-
id: build
28+
29+
## run cargo check steps
30+
- name: Cargo Check
31+
id: cargo_check
32+
run: |
33+
cargo check
34+
35+
- name: Cargo Check (monitoring_prom)
36+
id: cargo_check_prom
37+
run: |
38+
cargo check --features monitoring_prom
39+
40+
- name: Cargo Check (clarity)
41+
id: cargo_check_clarity
2642
run: |
27-
cargo build
43+
cargo check -p clarity --no-default-features
44+
45+
- name: Cargo Check (stacks-common)
46+
id: cargo_check_stacks-common
47+
run: |
48+
cargo check -p stacks-common --no-default-features
49+
2850
- name: Dump constants JSON
2951
id: consts-dump
30-
run: cargo run --bin stacks-inspect -- dump-consts | tee out.json
31-
- name: Set expected constants JSON
52+
run: |
53+
cargo run --bin stacks-inspect -- dump-consts | tee out.json
54+
55+
## output any diff to the github job summary
56+
- name: Compare expected constants JSON
3257
id: expects-json
33-
run: diff out.json ./sample/expected_consts.json
58+
run: |
59+
diff out.json ./sample/expected_consts.json >> $GITHUB_STEP_SUMMARY

.github/workflows/lock-threads.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
id: lock_threads
3030
uses: stacks-network/actions/lock-threads@main
3131
with:
32-
github-token: ${{ secrets.GH_TOKEN }}
32+
github-token: ${{ secrets.GITHUB_TOKEN }}
3333
issue-inactive-days: 7
3434
pr-inactive-days: 7
3535
discussion-inactive-days: 7

.github/workflows/workflow-cleanup.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,19 @@ on:
1212
workflow-ttl:
1313
description: "How many days to keep a successful workflow (default: 30)"
1414
required: false
15-
default: "30"
15+
default: "60"
1616
failed-workflow-ttl:
1717
description: "How many days to keep failed workflows (default: 15)"
1818
required: false
19-
default: "15"
19+
default: "60"
2020
schedule:
2121
## Run every day at 00:00:00
2222
- cron: "0 0 * * *"
2323

24+
permissions:
25+
actions: write # to delete workflow runs and caches
26+
contents: read # to access repo contents
27+
2428
## env vars are transferred to composite action steps
2529
env:
2630
CACHE_TTL: 7 ## number of days to keep a cache
@@ -41,7 +45,7 @@ jobs:
4145
id: cleanup
4246
uses: stacks-network/actions/cleanup/workflows@main
4347
with:
44-
token: ${{ secrets.GH_TOKEN }}
48+
token: ${{ secrets.GITHUB_TOKEN }}
4549
cache-ttl: ${{ inputs.cache-ttl || env.CACHE_TTL}}
4650
workflow-ttl: ${{ inputs.workflow-ttl || env.WORKFLOW_TTL}}
4751
failed-workflow-ttl: ${{ inputs.failed-workflow-ttl || env.FAILED_WORKFLOW_TTL }}

CHANGELOG.md

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,57 @@ 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-
## [Unreleased]
8+
# Unreleased
9+
10+
### Added
11+
12+
- Added a new RPC endpoint `/v3/health` to query the node's health status. The endpoint returns a 200 status code with relevant synchronization information (including the node's current Stacks tip height, the maximum Stacks tip height among its neighbors, and the difference between these two). A user can use the `difference_from_max_peer` value to decide what is a good threshold for them before considering the node out of sync. The endpoint returns a 500 status code if the query cannot retrieve viable data.
13+
14+
### Changed
15+
16+
- Changed default mempool walk strategy to `NextNonceWithHighestFeeRate`
17+
18+
## [3.1.0.0.12]
19+
20+
### Added
21+
22+
- Document missing config structs
23+
- Document MinerConfig parameters
24+
- Document BurnchainConfig parameters
25+
- Document NodeConfig parameters
26+
27+
### Changed
28+
29+
- `get_fresh_random_neighbors` to include allowed neigbors
30+
- Logging improvements and cleanup
31+
- Move serde serializers to stacks_common
32+
- Depend on clarity backing store interface
33+
- Updated `./docs/event-dispacher.md`
34+
35+
### Fixed
36+
37+
- Handle Bitcoin reorgs during Stacks tenure extend
38+
39+
## [3.1.0.0.11]
40+
41+
- Hotfix for p2p stack misbehavior in mempool syncing conditions
42+
43+
## [3.1.0.0.10]
44+
45+
### Added
46+
47+
- Persisted tracking of StackerDB slot versions for mining. This improves miner p2p performance.
48+
49+
## [3.1.0.0.9]
950

1051
### Added
1152

1253
- Added field `vm_error` to EventObserver transaction outputs
1354
- Added new `ValidateRejectCode` values to the `/v3/block_proposal` endpoint
1455
- Added `StateMachineUpdateContent::V1` to support a vector of `StacksTransaction` expected to be replayed in subsequent Stacks blocks
1556
- Include a reason string in the transaction receipt when a transaction is rolled back due to a post-condition. This should help users in understanding what went wrong.
57+
- Updated `StackerDBListener` to monitor signer state machine updates and store signer global state information, enabling miners to perform transaction replays.
58+
- Added a testnet `replay_transactions` flag to the miner configuration to feature-gate transaction replay. When enabled, the miner will construct a replay block if a threshold of signers signals that a transaction set requires replay.
1659

1760
### Changed
1861

Cargo.lock

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

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ members = [
77
"clarity",
88
"stx-genesis",
99
"libstackerdb",
10-
"contrib/tools/relay-server",
1110
"libsigner",
1211
"stacks-signer",
1312
"testnet/stacks-node"]

0 commit comments

Comments
 (0)