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

Merging latest develop #5089

Merged
merged 200 commits into from
Aug 20, 2024
Merged

Conversation

obycode
Copy link
Contributor

@obycode obycode commented Aug 19, 2024

Only conflicts were in Cargo.toml files:

  • clarity/Cargo.toml
  • testnet/stacks-node/Cargo.toml

…hus its maximum time between steps), and raise relayer initiative when there's a new network result
…es if the sortition reward cycle is not equal to our tracked reward cycle
…wnloader has it on a reward cycle boundary. Don't treat it as an error if the node doesn't have it yet (which it won't, most of the time, except on reward cycle boundaries)
jferrant and others added 19 commits August 15, 2024 16:41
Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
…call when we process a sortition (just as we have in neon node)
Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
chore: add warn logs for block validate rejections
Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
…to mock signing using it for mock proposals

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: shangchengbabaiban <shuang.cui@live.cn>
…jection

Fix block proposal rejection test
@obycode obycode requested review from a team as code owners August 19, 2024 20:25
@obycode obycode requested a review from Acaccia August 19, 2024 20:25
@obycode obycode merged commit 4eaeabe into feat/clarity-wasm-develop Aug 20, 2024
1 check passed
@obycode obycode deleted the feat/clarity-wasm-develop-merge branch August 20, 2024 15:23
@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 28, 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.