Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Time based tenure extend #5530

Merged
merged 141 commits into from
Dec 9, 2024
Merged

Time based tenure extend #5530

merged 141 commits into from
Dec 9, 2024

Conversation

obycode
Copy link
Contributor

@obycode obycode commented Dec 4, 2024

See #5476

obycode and others added 30 commits November 9, 2024 16:29
@obycode
test: add test for tenure-extend upon failed miner
8fe3394
@obycode
feat: implement tenure-extend after bad sortition winner
311ad50 
See #5361
@obycode
feat: make signer accept tenure extend on bad sortition
2a4a09b 
With this change, the signer will accept a tenure extend from miner N-1
when miner N wins a sortition but commits to the wrong parent tenure.
@obycode
Merge branch 'develop' into feat/tenure-extend-no-blocks
c294617
@obycode
test: add tenure_extend_after_bad_commit to yaml file
a56a73c
@obycode
refactor: move the StackerDBChannel into the EventDispatcher
6438551 
The previous design using a global singleton causes trouble in testing,
when we have multiple miners running in different threads of the same
process.
@obycode
feat: add an index for block state
4420c82
@obycode
docs: update changelogs
3fa8116
@obycode
Merge branch 'develop' into feat/tenure-extend-no-blocks
0b3a2c1
@obycode
chore: improve comment about checking the parent tenure
df8f240
@obycode
test: add unit test for SignerDb::get_canonical_tip
44769cf
@obycode
chore: remove unnecessary log
4c7c5aa
@obycode
feat: simplify signerdb migration
a9acfa0
@obycode
chore: cleanup unused
58fda00
@obycode
refactor: clean up continue_tenure
2178846
@obycode
refactor: last_block_contains_tenure_change_tx
d8140e0
@obycode
test: additional checks requested in PR review
54c88c6
@obycode
feat: add ability to disable tenure-extend for tests
ba2faf7 
This is useful when checking the behavior during forking.
@obycode
fix: fix import for test-only feature
965f58b
@obycode
refactor: add comments and improve naming
cd5e7cc
@jferrant
Add tenure_extend_timestamp to Block Response Reject and Accept messages
52e0d1f 
Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
@jferrant
Change to use u64::MAX in default value of tenure_extend_timestamp
9a327c4 
Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
@jferrant
Fix failing test
9b4b89c 
Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
@jferrant
Add timestamp calculation to all block responses
4de3da9 
Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
@hstove
wip: integration tests for tenure extends
91be5cc
@obycode
feat: add validation time to block proposal response
012ed87
@obycode
chore: make validation_time_ms a u64
de7b677
@aldur
Merge pull request #5466 from stacks-network/chore/add-timestamp-to-b…
a8c09a1 
…lock-response

Add tenure_extend_timestamp to Block Response Accept messages
@obycode
Merge pull request #5474 from stacks-network/feat/update-block-valida…
9308df9 
…tion

feat: add validation time to block proposal response
@jferrant
Merge branch 'feat/time-based-tenure-extend' of https://github.com/st…
f1c442a 
…acks-network/stacks-core into chore/calc-tenure-idle-timestamp-with-config
hstove
hstove previously approved these changes Dec 8, 2024
View reviewed changes
@obycode
Copy link
Contributor Author

obycode commented Dec 8, 2024

Failing tests all pass locally, except for tests::nakamoto_integrations::mock_mining. I'm checking on that now.

@obycode obycode dismissed stale reviews from jcnelson and hstove via 1f79b52 December 9, 2024 13:08
@obycode
Copy link
Contributor Author

obycode commented Dec 9, 2024

I pushed two changes related to mock-mining:

  1. Do not propose block when mock-mining -- this was a new problem, caused by these changes
  2. Do not broadcast the block when mock-mining -- this was an existing problem

The mock-mining test is back to being flaky now.

@jferrant jferrant self-requested a review December 9, 2024 13:49
jferrant
jferrant previously approved these changes Dec 9, 2024
View reviewed changes
@obycode obycode enabled auto-merge December 9, 2024 19:22
@obycode obycode added this pull request to the merge queue Dec 9, 2024
Merged via the queue into develop with commit 9999941 Dec 9, 2024
157 of 170 checks passed
@obycode obycode mentioned this pull request Dec 9, 2024
Merged
@obycode obycode deleted the feat/time-based-tenure-extend branch December 12, 2024 15:23
@obycode obycode mentioned this pull request Dec 13, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jferrant jferrant jferrant approved these changes

@jbencin jbencin jbencin approved these changes

@hstove hstove hstove approved these changes

@jcnelson jcnelson jcnelson approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@obycode @jcnelson @hstove @jbencin @jferrant @aldur