Chore/merge develop to next 2023 02 09 #3564
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
build(deps): Update secp256k1 to 0.24.2
docs: fix index-of api reference
docs: fix map snippet
2.1.0.0.0-rc1
…as happened before when comparators were native functions)
…Fs with external blobs, so expect that
These changes are helpful for other users of stacks-common, specifically, subnets.
… do every 5 minutes
…events 2.1 nodes from syncing with testnet
There is no functional difference, since the 2.05 and 2.1 block limits are identical, but this could cause confusion or a problem later on if something changes.
…mation maps elsewhere
….05 -- it's the same as the sortition affirmation map. Normally, there's no difference because the heaviest block-commit by BTC spend (the 2.1 rule) is the same as the Stacks block-commit with the most confirmations (the 2.05 rule). However, in the current testnet, this is not the case for reward cycle #360. This means that once the 2.1 rules take effect, the node will get stuck -- it will think that the stacks and sortition affirmation maps are not in sync with the heaviest affirmation map, and the node will never sync as a result. This fix makes it so the heaviest affirmation map -- and by extension, the canonical affirmation map -- is calculated from the sortition affirmation map for reward cycle in epoch 2.05 and earlier.
fix: use 2.1 block limits
…names Fix: more hardcoded test names
Replace Vec References with slices in function inputs
Codecov Report
@@ Coverage Diff @@
## next #3564 +/- ##
==========================================
+ Coverage 30.55% 31.41% +0.86%
==========================================
Files 304 304
Lines 271424 275329 +3905
==========================================
+ Hits 82923 86503 +3580
- Misses 188501 188826 +325
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
igorsyl
approved these changes
Feb 9, 2023
netrome
approved these changes
Feb 10, 2023
This was referenced Feb 10, 2023
kantai
previously requested changes
Feb 10, 2023
There was a problem hiding this comment.
Can you fix the test that broke due to merge (the test doesn't seem broken in develop)?
#5 157.2 thread 'tests::neon_integrations::stx_transfer_btc_integration_test' panicked at 'unexpected btc transaction type', testnet/stacks-node/src/tests/neon_integrations.rs:1706:21
|
cc @pavitthrap re: |
|
Okay, I think this text is fixed. Let's see if CI likes it. |
|
This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Can we get this merged so that we unblock progress on #3486 and #3510? Thanks.