Skip to content

Commit 22864da

Browse files
authored
Merge branch 'develop' into fix/6390
2 parents fd21dc4 + 6a2f682 commit 22864da

Some content is hidden

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

43 files changed

+2959
-2321
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,3 @@
2020
- [ ] Changelog is updated
2121
- [ ] Required documentation changes (e.g., `docs/rpc/openapi.yaml` and `rpc-endpoints.md` for v2 endpoints, `event-dispatcher.md` for new events)
2222
- [ ] New clarity functions have corresponding PR in `clarity-benchmarking` repo
23-
- [ ] New integration test(s) added to `bitcoin-tests.yml`

.github/workflows/bitcoin-tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ jobs:
5858
exclude:
5959
# The following tests are excluded from CI runs. Some of these may be
6060
# worth investigating adding back into the CI
61-
- test-name: tests::bitcoin_regtest::bitcoind_integration_test_segwit
6261
- test-name: tests::nakamoto_integrations::consensus_hash_event_dispatcher
6362
- test-name: tests::neon_integrations::atlas_integration_test
6463
- test-name: tests::neon_integrations::atlas_stress_integration_test

.github/workflows/cargo-hack-check.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,26 @@ jobs:
107107
--no-dev-deps \
108108
--include-features=wasm-deterministic,slog_json \
109109
--features=wasm-deterministic
110+
- name: Run cargo hack check
111+
run: ${{ matrix.command }}
112+
113+
fuzz-targets:
114+
name: Fuzz targets (nightly)
115+
runs-on: ubuntu-latest
116+
steps:
117+
- name: Checkout
118+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
119+
with:
120+
persist-credentials: false
121+
122+
- name: Install Rust nightly toolchain
123+
uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 # v1.13.0
124+
with:
125+
toolchain: nightly
126+
127+
- name: Check fuzz targets
128+
run: |
129+
cargo +nightly check \
130+
--manifest-path clarity/fuzz/Cargo.toml \
131+
--bins \
132+
--locked

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ 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
9+
10+
### Added
11+
12+
- When determining a global transaction replay set, the state evaluator now uses a longest-common-prefix algorithm to find a replay set in the case where a single replay set has less than 70% of signer weight.
13+
814
## [3.2.0.0.1]
915
### Added
1016

0 commit comments

Comments
 (0)