Skip to content

Commit ddf733d

Browse files
committed
Merge remote-tracking branch 'core/develop' into feat/tx-replay-failsafe
2 parents 03ba279 + 4f3676f commit ddf733d

File tree

323 files changed

+19780
-4882
lines changed

Some content is hidden

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

323 files changed

+19780
-4882
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 stx-genesis -p libstackerdb -p stacks-signer -p pox-locking -p clarity -p libsigner -p stacks-common --no-deps --tests --all-features -- -D warnings -A clippy::uninlined-format-args"
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
clippy-stackslib = "clippy -p stackslib --no-deps -- -Aclippy::all -Wclippy::indexing_slicing"
66

77
# Uncomment to improve performance slightly, at the cost of portability

.github/actions/bitcoin-int-tests/Dockerfile.atlas-test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ RUN cd / && tar -xvzf bitcoin-25.0-x86_64-linux-gnu.tar.gz
1414
RUN ln -s /bitcoin-25.0/bin/bitcoind /bin/
1515

1616
ENV BITCOIND_TEST 1
17-
WORKDIR /src/testnet/stacks-node
17+
WORKDIR /src/stacks-node
1818
RUN cargo test -- --test-threads 1 --ignored tests::neon_integrations::atlas_integration_test
1919
RUN cargo test -- --test-threads 1 --ignored tests::neon_integrations::atlas_stress_integration_test

.github/actions/bitcoin-int-tests/Dockerfile.generic.bitcoin-tests

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ WORKDIR /src/
44

55
COPY . .
66

7-
WORKDIR /src/testnet/stacks-node
7+
WORKDIR /src/stacks-node
88

99
RUN rustup component add llvm-tools-preview && \
1010
cargo install grcov

.github/actions/bitcoin-int-tests/Dockerfile.large-genesis

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN cargo test --no-run --workspace && \
2222
cargo build --workspace
2323

2424
ENV BITCOIND_TEST 1
25-
RUN cd testnet/stacks-node && cargo test --release --features prod-genesis-chainstate -- --test-threads 1 --ignored neon_integrations::bitcoind_integration_test
25+
RUN cd stacks-node && cargo test --release --features prod-genesis-chainstate -- --test-threads 1 --ignored neon_integrations::bitcoind_integration_test
2626

2727
RUN grcov . --binary-path ./target/debug/ -s . -t lcov --branch --ignore-not-existing --ignore "/*" -o lcov.info
2828

.github/workflows/nix-check.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Check Nix
2+
3+
on:
4+
merge_group:
5+
types:
6+
- checks_requested
7+
push:
8+
branches:
9+
- master
10+
- develop
11+
- next
12+
paths-ignore:
13+
- "**.md"
14+
- "**.yml"
15+
workflow_dispatch:
16+
pull_request:
17+
types:
18+
- opened
19+
- reopened
20+
- synchronize
21+
22+
concurrency:
23+
group: nix-${{ github.head_ref || github.ref || github.run_id }}
24+
## Always cancel duplicate jobs
25+
cancel-in-progress: true
26+
27+
run-name: ${{ github.ref_name }}
28+
29+
permissions: {}
30+
31+
jobs:
32+
build-pkg:
33+
name: Check Nix package
34+
runs-on: ubuntu-latest
35+
steps:
36+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
37+
- uses: DeterminateSystems/determinate-nix-action@d4b23d0b9eeeaeba3648c24d43bcb623dcf75336 # v3.7.0
38+
- uses: DeterminateSystems/magic-nix-cache-action@e1c1dae8e170ed20fd2e6aaf9979ca2d3905d636 # v12
39+
with:
40+
use-flakehub: false # Remove error when trying to authenticate without credentials
41+
- run: nix flake check ./contrib/nix

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,15 @@ jobs:
6161
name: OpenAPI Validation
6262
runs-on: ubuntu-latest
6363
steps:
64-
- name: OpenAPI
64+
- name: Generate OpenAPI documentation
6565
id: openapi
6666
uses: stacks-network/actions/openapi@main
6767
with:
68-
input: ./docs/rpc/openapi.yaml
69-
output: ./open-api-docs.html
68+
input: "./docs/rpc/openapi.yaml"
69+
output: "./openapi-docs.html"
70+
config: "./docs/rpc/redocly.yaml"
71+
validate: "true"
72+
redocly-version: "1.34"
7073

7174
## Disabled
7275
## - this test can take several hours to run
@@ -130,7 +133,7 @@ jobs:
130133
id: clarinet_unit_test_v1
131134
uses: docker://hirosystems/clarinet:1.7.1
132135
with:
133-
args: test --manifest-path=./contrib/core-contract-tests/Clarinet.toml contrib/core-contract-tests/tests/bns/name_register_test.ts
136+
args: test --manifest-path=./contrib/core-contract-tests/Clarinet-v1.toml contrib/core-contract-tests/tests/bns/name_register_test.ts --deployment-plan-path=./deployments/v1.simnet-plan.yaml
134137

135138
check-tests:
136139
name: Check Tests

.gitignore

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,27 +41,12 @@ secrets*
4141
# vim
4242
*.swp
4343

44-
#Docker
45-
Docker/blockstore.ini
46-
47-
#Docs
48-
api/templates/index.html
49-
api/data
50-
51-
# testnets
52-
testnet-logs/
53-
testnet.log
54-
testnet/index.html
55-
5644
# virtualenvs
5745
.venv
5846

5947
# will have compiled files and executables
60-
/target/
61-
/testnet/helium/target/
62-
/contrib/tools/puppet-chain/target/
63-
/contrib/core-contract-tests/.cache/
64-
/contrib/tools/config-docs-generator/target/
48+
target/
49+
contrib/tools/config-docs-generator/target/
6550

6651
# These are backup files generated by rustfmt
6752
**/*.rs.bk
@@ -71,7 +56,6 @@ tarpaulin-report.html
7156
osxcross
7257
osxcross*.tar.xz
7358
.DS_Store
74-
testnet/stacks-node/target
7559

7660
net-test/etc/*.toml
7761
net-test/etc/*.conf

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
"BITCOIND_TEST": "1"
55
},
66
"rust-analyzer.rustfmt.extraArgs": ["+nightly"],
7-
"files.eol": "\n"
7+
"files.eol": "\n",
88
}

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,20 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
77

88
## Unreleased
99

10+
### Added
11+
12+
- Added `/v3/contracts/fast-call-read/:principal/:contract_name/:func_name` api endpoint. It allows to run read-only calls faster by disabling the cost and memory trackers. This endpoint requires authentication.
13+
1014
### Changed
1115

16+
- The HTTP `Date` header in responses now strictly follows RFC7231.
1217
- When a previous block commit is unable to be RBFed, the miner will now just wait for it to be confirmed instead of submitting a new block commit which breaks the miner's UTXO chain.
18+
- When mining, only log new block proposal responses, not duplicates.
19+
20+
### Fixed
21+
22+
- Fixed tenure downloader logic on reward cycle boundaries (#6234).
23+
- Do not send events to event observers for stale StackerDB chunks.
1324

1425
## [3.1.0.0.13]
1526

0 commit comments

Comments
 (0)