[Backport] merge several fixes into 118 for next rc release #4616
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
Integration Test: wait find unverified blocks finish for all specs
Fix SendLargeCyclesTxToRelay spec on slow machine
chore: add verify log for monitor
…timestamp in main fork
chore(test): Fix the unstable spec ForksContainSameUncle caused by block hash collision
Fix: verify worker exit when signal_exit is_cancelled
chore(RPC): add PRC to clear verify queue
…ockFetchCMD-dropped Do not start `BlockDownload` thread if ckb has received exit signal
…nverified Early return init_load_unverified thread when no unverified blocks found after tip
doitian
previously approved these changes
Aug 28, 2024
…ration-test Integration Test: kill_gracefully on RandomlyKill
Signed-off-by: Eval EXEC <[email protected]>
Integration Test: do not kill gracefully on windows
Integration Test: restart node if it failed to start in `RandomlyKill`
fix: fix atomic ordering in multi-thread
|
Wait #4623 |
Signed-off-by: Eval EXEC <[email protected]>
Recover possible transaction in conflicted cache when RBF
…d-file Rename `ckb_chain::consume_unverified` to `ckb_chain::verify`
CI: windows integration use windows-latest
test: add check relax ordering on ci
chore(test): add retry for git clone in cli_test
test: fix script test error caused by rand step cycles
eval-exec
approved these changes
Sep 2, 2024
eval-exec
requested changes
Sep 2, 2024
There was a problem hiding this comment.
This PR attempts to merge develop into rc/v0.118.x, but the GitHub merge rules for ckb prevent merging when the PR branch (develop) is not based on rc/v0.118.x. Additionally, we can't rebase develop onto rc/v0.118.x.
I suggest closing this PR, creating a new branch from develop (e.g., backport/develop), rebasing backport/develop onto rc/v0.118.x, and then submitting a new PR to merge backport/develop into rc/v0.118.x.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What problem does this PR solve?
Backport: #4605, #4600, #4606, #4612, #4615