Skip to content

Commit 7d952dc

Browse files
authored
Merge branch 'develop' into feat/block-time-event-dispatcher
2 parents 4d3a200 + 1a87f5b commit 7d952dc

File tree

97 files changed

+7642
-2389
lines changed

Some content is hidden

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

97 files changed

+7642
-2389
lines changed

.github/actions/open-api/Dockerfile.open-api-validate

Lines changed: 0 additions & 10 deletions
This file was deleted.

.github/workflows/bitcoin-tests.yml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ jobs:
4545
- tests::neon_integrations::liquid_ustx_integration
4646
- tests::neon_integrations::microblock_fork_poison_integration_test
4747
- tests::neon_integrations::microblock_integration_test
48-
- tests::neon_integrations::microblock_large_tx_integration_test_FLAKY
48+
# Disable this flaky test. Microblocks are no longer supported anyways.
49+
# - tests::neon_integrations::microblock_large_tx_integration_test_FLAKY
4950
- tests::neon_integrations::microblock_limit_hit_integration_test
5051
- tests::neon_integrations::miner_submit_twice
5152
- tests::neon_integrations::mining_events_integration_test
@@ -86,19 +87,24 @@ jobs:
8687
- tests::nakamoto_integrations::nakamoto_attempt_time
8788
- tests::signer::v0::block_proposal_rejection
8889
- tests::signer::v0::miner_gather_signatures
89-
- tests::signer::v0::mine_2_nakamoto_reward_cycles
9090
- tests::signer::v0::end_of_tenure
9191
- tests::signer::v0::forked_tenure_okay
9292
- tests::signer::v0::forked_tenure_invalid
9393
- tests::signer::v0::empty_sortition
9494
- tests::signer::v0::bitcoind_forking_test
9595
- tests::signer::v0::multiple_miners
9696
- tests::signer::v0::mock_sign_epoch_25
97-
- tests::signer::v0::signer_set_rollover
97+
- tests::signer::v0::multiple_miners_mock_sign_epoch_25
9898
- tests::signer::v0::miner_forking
9999
- tests::signer::v0::reloads_signer_set_in
100100
- tests::signer::v0::signers_broadcast_signed_blocks
101101
- tests::signer::v0::min_gap_between_blocks
102+
- tests::signer::v0::duplicate_signers
103+
- tests::signer::v0::retry_on_rejection
104+
- tests::signer::v0::locally_accepted_blocks_overriden_by_global_rejection
105+
- tests::signer::v0::locally_rejected_blocks_overriden_by_global_acceptance
106+
- tests::signer::v0::reorg_locally_accepted_blocks_across_tenures_succeeds
107+
- tests::signer::v0::miner_recovers_when_broadcast_block_delay_across_tenures_occurs
102108
- tests::nakamoto_integrations::stack_stx_burn_op_integration_test
103109
- tests::nakamoto_integrations::check_block_heights
104110
- tests::nakamoto_integrations::clarity_burn_state
@@ -108,6 +114,13 @@ jobs:
108114
- tests::nakamoto_integrations::continue_tenure_extend
109115
- tests::nakamoto_integrations::mock_mining
110116
- tests::nakamoto_integrations::multiple_miners
117+
- tests::nakamoto_integrations::follower_bootup_across_multiple_cycles
118+
- tests::nakamoto_integrations::utxo_check_on_startup_panic
119+
- tests::nakamoto_integrations::utxo_check_on_startup_recover
120+
- tests::signer::v0::multiple_miners_with_nakamoto_blocks
121+
- tests::signer::v0::partial_tenure_fork
122+
- tests::signer::v0::mine_2_nakamoto_reward_cycles
123+
- tests::signer::v0::signer_set_rollover
111124
# Do not run this one until we figure out why it fails in CI
112125
# - tests::neon_integrations::bitcoin_reorg_flap
113126
# - tests::neon_integrations::bitcoin_reorg_flap_with_follower
@@ -127,6 +140,11 @@ jobs:
127140
with:
128141
btc-version: "25.0"
129142

143+
## Increase open file descriptors limit
144+
- name: Increase Open File Descriptors
145+
run: |
146+
sudo prlimit --nofile=4096:4096
147+
130148
## Run test matrix using restored cache of archive file
131149
## - Test will timeout after env.TEST_TIMEOUT minutes
132150
- name: Run Tests

CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,28 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
1717
- `get-tenure-info?` added
1818
- `get-block-info?` removed
1919

20+
## [2.5.0.0.7]
21+
22+
### Added
23+
24+
- Add warn logs for block validate rejections (#5079)
25+
- Neon mock miner replay (#5060)
26+
27+
### Changed
28+
29+
- Revert BurnchainHeaderHash serialization change (#5094)
30+
- boot_to_epoch_3 in SignerTest should wait for a new commit (#5087)
31+
- Fix block proposal rejection test (#5084)
32+
- Mock signing revamp (#5070)
33+
- Multi miner fixes jude (#5040)
34+
- Remove spurious deadlock condition whenever the sortition DB is opened
35+
36+
## [2.5.0.0.6]
37+
38+
### Changed
39+
40+
- If there is a getchunk/putchunk that fails due to a stale (or future) version NACK, the StackerDB sync state machine should immediately retry sync (#5066)
41+
2042
## [2.5.0.0.5]
2143

2244
### Added

clarity/src/vm/database/sqlite.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use rusqlite::{
2121
};
2222
use stacks_common::types::chainstate::{BlockHeaderHash, StacksBlockId};
2323
use stacks_common::types::sqlite::NO_PARAMS;
24-
use stacks_common::util::db_common::tx_busy_handler;
24+
use stacks_common::util::db::tx_busy_handler;
2525
use stacks_common::util::hash::Sha512Trunc256Sum;
2626

2727
use super::clarity_store::{make_contract_hash_key, ContractCommitment};
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
2-
"okay": false,
3-
"cause": "Unchecked(PublicFunctionNotReadOnly(..."
2+
"value": {
3+
"okay": false,
4+
"cause": "Unchecked(PublicFunctionNotReadOnly(..."
5+
}
46
}
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
2-
"okay": true,
3-
"result": "0x111..."
2+
"value": {
3+
"okay": true,
4+
"result": "0x111..."
5+
}
46
}

docs/rpc/api/core-node/get-burn-ops-peg-in.example.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

docs/rpc/api/core-node/get-burn-ops-peg-out-fulfill.example.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

docs/rpc/api/core-node/get-burn-ops-peg-out-request.example.json

Lines changed: 0 additions & 16 deletions
This file was deleted.

docs/rpc/api/core-node/post-fee-transaction-response.schema.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@
44
"title": "TransactionFeeEstimateResponse",
55
"type": "object",
66
"additionalProperties": false,
7-
"required": ["estimated_cost", "estimated_cost_scalar", "estimated_fee_rates", "estimated_fees"],
7+
"required": [
8+
"estimated_cost",
9+
"estimated_cost_scalar",
10+
"cost_scalar_change_by_byte",
11+
"estimations"
12+
],
813
"properties": {
914
"estimated_cost_scalar": {
1015
"type": "integer"

0 commit comments

Comments
 (0)