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

Stacks 2.1 #3567

Merged
merged 2,211 commits into from
Feb 17, 2023
Merged

Stacks 2.1 #3567

merged 2,211 commits into from
Feb 17, 2023

Conversation

jcnelson
Copy link
Member

Stacks 2.1 stable release: Our love letter to the Stacks community on Valentine's Day 2023.

jcnelson and others added 30 commits December 22, 2022 12:06
@jcnelson
fix: fix failing integration tests
cb7c105
@jcnelson
Merge branch 'feat/check-pox-2-params' of https://github.com/stacks-n…
38f1966 
…etwork/stacks-blockchain into feat/check-pox-2-params
@hugocaillard
docs: fix index-of api reference
af03bfb
@hugocaillard
docs: fix map snippet
48b687d
@jcnelson
fix: max arrival index is 1 if there are none (so sortition invalidat…
1719a1f 
…ions don't trigger a panic)
@jcnelson
fix: order fork quality by height then weight, and minimum max arriva…
2c7917e 
…l index is now 1
@jcnelson
fix: make Txid serialize to text, and make the chain-liveness thread …
5fb047e 
…sleep for 1 second in-between wake-ups
@jcnelson
chore: new default testnet start height and block, and also, pick a v…
1a1556c 
…1 unlock height default that won't panic
@jcnelson
chore: cargo fmt
6a0e8ed
@jcnelson
fix: consider canonical stacks tips with 0 affirmation weight
d48717f
@jcnelson
chore: log start/end sync heights
8faaef9
@jcnelson
fix: only wait for sortitions if we are given a target height, and do…
d92786e 
…n't wait for more than the highest sortition height's height (avoids a livelock)
@jcnelson
fix: burnchain sync in reward cycle intervals only
721811d
@jcnelson
fix: a contract name can decode with up to 128 characters in the name…
b1635b8 
… part
@jcnelson
feat: decode_microblocks subcommand to blockstack-cli
9b8c166
@jcnelson
fix: fix order of debug output args
270c5e0
@jcnelson
fix: start chain-liveness thread before waiting for sortitions
6ab2a13
@jcnelson
fix: start chain-liveness thread before waiting for sortitions
59c9c3a
@jcnelson
fix: if the sortition and canonical AMs are the same length, and the
1bf2b21 
sortition AM doesn't conflict with the heaviest AM but it does with the
canonical AM, then it means that there is a downloaded but not processed
anchor block and we need to unwind the sortition history back to that
point.
@jcnelson
Merge branch 'feat/check-pox-2-params' of https://github.com/stacks-n…
18ac9c2 
…etwork/stacks-blockchain into feat/check-pox-2-params
@jcnelson
Merge branch 'develop' into update-deps-20221207
7571b6b
@jcnelson
fix: add some more indexes on block_commit_metadata to improve perfor…
1bdb0ef 
…mance
@jcnelson
fix: epoch-gate affirmation map reorg, but turn it on if the node is …
62695c5 
…configured to use it before 2.1
@jcnelson
fix: bump stacks block version
4d65ade
@jcnelson
feat: always use affirmation maps by default
732f5e8
@jcnelson
fix: fix failing PoX integration test by ensuring that affirmation ma…
1086ee9 
…ps are disabled prior to 2.1
@jcnelson
Merge pull request #3433 from fpbgg/update-deps-20221207
0986d22 
build(deps): Update secp256k1 to 0.24.2
@jcnelson
fix: backport #3457 to fix failing integration test due to off-by-one…
126f837 
… error
@jcnelson
fix: on devnet, use the sortition tip to generate VRF and microblock …
6b06d86 
…private key data (not the last-sortitioned block)
@jcnelson
fix: disable affirmation maps on pre-2.1 integration tests that fail …
c78fe27 
…due to timeouts
@jcnelson
Copy link
Member Author

Great, that seems in line with what I had posted above. Roughly what block number did you have in mind?

The start of cycle 55 is Bitcoin block 781,551

@igorsyl
Copy link
Contributor

igorsyl commented Feb 14, 2023

Updated from END of Cycle 55 to START of Cycle 55.

Cycle 52 ends in ~6 days.
Estimated activation in 6 days + 2 cycles x 14 days/cycle = 34 days => March 20

cc @diwakergupta

@igorsyl
Copy link
Contributor

igorsyl commented Feb 15, 2023

Failed test cases:

[sampled-genesis (tests::neon_integrations::stx_transfer_btc_integration_test)](https://github.com/stacks-network/stacks-blockchain/actions/runs/4175444795/jobs/7230824324#logs)

#5 181.3 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

[sampled-genesis (tests::epoch_21::test_v1_unlock_height_with_current_stackers)](https://github.com/stacks-network/stacks-blockchain/actions/runs/4175444795/jobs/7230835391#logs)

#5 215.2 thread 'tests::epoch_21::test_v1_unlock_height_with_current_stackers' panicked at 'assertion failed: `(left == right)`
#5 215.2   left: `Tuple(TupleData { type_signature: TupleTypeSignature { "hashbytes": (buff 20), "version": (buff 1),}, data_map: {ClarityName("hashbytes"): Sequence(Buffer(0000000000000000000000000000000000000000)), ClarityName("version"): Sequence(Buffer(00))} })`,
#5 215.2  right: `Tuple(TupleData { type_signature: TupleTypeSignature { "hashbytes": (buff 20), "version": (buff 1),}, data_map: {ClarityName("hashbytes"): Sequence(Buffer(0e6689f4efced11c29b55c4a9c33b67a82758cab)), ClarityName("version"): Sequence(Buffer(00))} })`', testnet/stacks-node/src/tests/epoch_21.rs:5138:21

@jcnelson jcnelson mentioned this pull request Feb 15, 2023
Merged
@jcnelson
Copy link
Member Author

Should be fixed in #3572.

Once that PR merges, we can merge this one.

@wileyj
Copy link
Contributor

wileyj commented Feb 15, 2023

@jcnelson one more that was requested to be merged:
#3537

pavitthrap
pavitthrap approved these changes Feb 15, 2023
View reviewed changes
Copy link
Contributor

@pavitthrap pavitthrap left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just had a few comments about dead code

CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
clarity/src/vm/analysis/type_checker/v2_1/mod.rs Outdated Show resolved Hide resolved
clarity/src/vm/tests/contracts.rs Show resolved Hide resolved
src/chainstate/stacks/block.rs Show resolved Hide resolved
src/net/chat.rs Outdated Show resolved Hide resolved
src/net/chat.rs Outdated Show resolved Hide resolved
kantai
kantai approved these changes Feb 16, 2023
View reviewed changes
Copy link
Member

@kantai kantai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

igorsyl
igorsyl approved these changes Feb 16, 2023
View reviewed changes
Copy link
Contributor

@igorsyl igorsyl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

@jcnelson
Copy link
Member Author

Just gonna write a changelog and address @pavitthrap's feedback real quick (in a separate PR).

@jcnelson jcnelson merged commit f0ed1b9 into master Feb 17, 2023
@blockstack-devops
Copy link
Contributor

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.

@stacks-network stacks-network locked as resolved and limited conversation to collaborators Nov 13, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@pavitthrap pavitthrap pavitthrap approved these changes

@igorsyl igorsyl igorsyl approved these changes

@kantai kantai kantai approved these changes

@lgalabru lgalabru Awaiting requested review from lgalabru

Assignees
No one assigned
Labels
locked stacks-2.1
Projects
Stacks Core Eng
Status: Status: ✅ Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.