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.

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

Merge develop into clarity-wasm branch #5013

Merged
merged 51 commits into from
Jul 26, 2024

Conversation

obycode
Copy link
Contributor

@obycode obycode commented Jul 25, 2024

This is to stay on top of keeping these in sync, but also to ensure this branch has 65d401d so builds won't fail.

jcnelson and others added 30 commits July 1, 2024 17:11
* track sortition timing
* track proposal timing
* make proposal / sortition timing configurable
Workflow to lock closed issues/pr/discussions
Nakamoto: Allow miner to reorg in poorly timed tenures
…` as the coinbase height, and `consensus_hash` and `block_hash` as the tenure-start consensus hash and block hash
jcnelson and others added 18 commits July 17, 2024 14:30
This log can be hit in the case where a nakamoto block does not build
off of the most recently signed nakamoto block, so the warning message
should be less specific about the other case.
fix: make signer's warning log more accurate
refactor(signer): Add enum for version-specific data to `BlockInfo`
We do not have a `std` feature, so this causes an error. Before Rust
1.80, this was not an error.
@obycode obycode requested review from a team as code owners July 25, 2024 21:20
@obycode obycode requested review from csgui and Acaccia July 25, 2024 21:21
@wileyj wileyj merged commit abdd46e into feat/clarity-wasm-develop Jul 26, 2024
1 check passed
@wileyj wileyj deleted the chore/clarity-wasm-merge-develop branch July 26, 2024 18:06
@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 Oct 29, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants