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 onto clarity wasm #5509

Merged
merged 512 commits into from
Nov 27, 2024

Conversation

hugocaillard
Copy link
Collaborator

Merge develop branch

obycode and others added 30 commits November 5, 2024 22:35
Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
…on-check

fix: include txid in more failure logs
…tition

test: additional scenarios for empty sortition tenure extends
Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
…. Not the tip consensus hash as it may not match and will result in a bad signer slot generation when writing block proposal

Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
…d-of-tenure-blocks

Add config option tenure_last_block_proposal_timeout_secs and do not allow reorgs at tenure boundary before it is exceeded
Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
… reward set for nakamoto prepare phases eagerly, and pass the stacks tip height via NetworkResult to the relayer so it can update prometheus
Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
We can't wait for all signatures, because if a signer sees the global
acceptance before sending its signature, it will not send it.
@hugocaillard hugocaillard requested a review from csgui November 27, 2024 09:35
@hugocaillard hugocaillard requested review from a team as code owners November 27, 2024 09:35
@hugocaillard hugocaillard changed the title Clarity wasm merge develop Merge clarity wasm in develop Nov 27, 2024
@hugocaillard hugocaillard changed the title Merge clarity wasm in develop Merge develop onto clarity wasm Nov 27, 2024
Copy link

@csgui csgui left a comment

Choose a reason for hiding this comment

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

Code LGTM from the clarity-wasm perspective. Changes previously added to feat/clarity-wasm-develop are not being overridden by this PR.

@hugocaillard hugocaillard merged commit 0431376 into feat/clarity-wasm-develop Nov 27, 2024
1 check passed
@hugocaillard hugocaillard deleted the clarity-wasm-merge-develop branch November 27, 2024 17:42
@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 Dec 5, 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.