Skip to content

Commit c1b02c2

Browse files
committed
Merge branch 'develop' into refactor/regtest-controller-cleanup
2 parents 0fcd975 + 381ee9b commit c1b02c2

File tree

112 files changed

+5808
-2043
lines changed

Some content is hidden

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

112 files changed

+5808
-2043
lines changed

.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

.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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
77

88
## Unreleased
99

10+
- The HTTP `Date` header in responses now strictly follows RFC7231.
11+
1012
### Changed
1113

1214
- 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.

0 commit comments

Comments
 (0)