merge: next-costs into next
#2956
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… connection, adding evaluated epoch to block receipt
…et current burn height in integration test
… sane-ish block height. Explicit special case for genesis block in get_epoch_of. Use Clarity epoch for read only connections
…llback_unconfirmed
Added sortition db schema transition logic
Stacks 2.05: ExecutionCost inside of StacksEpoch
2.05: use serialized_size() aggregation for cost inputs of linear methods
…s an epoch boundary, it must not have a microblock parent. It will be invalid if it does.
… microblock stream if the block it produces has a parent anchored block in a different epoch. Also, add unit tests to both the miner and consensus rules to make sure that the miner behaves this way, and a block that violates this new rule will be rejected
…t is allowed to fail
…ntegration_test to match new expected behavior
2.05 integration testing: exact costs matching in miner and follower: #2913
…coverage in vm::tests::costs
kantai
reviewed
Dec 8, 2021
kantai
reviewed
Dec 8, 2021
kantai
reviewed
Dec 8, 2021
|
Retracting approval until all consensus bugs are fixed |
kantai
reviewed
Dec 8, 2021
kantai
reviewed
Dec 8, 2021
There was a problem hiding this comment.
There's a couple issues that need to be addressed before being merged, but otherwise looks great. Thanks for taking this on, @gregorycoppola!
added 10 commits
December 9, 2021 19:38
|
I pushed changes to most but not all comments in case anyone wants to review. I kept the replies to one commit per comment addressed. cc @jcnelson The extra merges of "merge/nc2" into itself are because I was working in parallel from three different directories. There will be failures due to |
kantai
approved these changes
Dec 11, 2021
jcnelson
approved these changes
Dec 15, 2021
|
Thanks for the reviews everyone! Probably harder to review than write. |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR merges the
next-costsbranch (Stacks 2.05) into thenextbranch (Stacks 2.1).Some code re-writes required for reasons, e.g.:
next-coststransitions 2->2.05 andnexttransitions 2->2.1, so we need to make sure we make both transitionsnext-costscode/tests aren't aware of ClarityVersion'sStacksEpochnext