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 1.5.0 #2179

Merged
merged 79 commits into from
Oct 30, 2023
Merged

Conversation

benbaley
Copy link
Member

No description provided.

benbaley and others added 30 commits July 11, 2023 18:06
fix downloader heighter mistake
2、insertChain过程中,CurrentBlock可能被woker线程修改,所以允许ErrKnownBlock错误,不抛出防止节点被断开
benbaley and others added 29 commits October 12, 2023 16:45
Bumps [github.com/btcsuite/btcd](https://github.com/btcsuite/btcd) from 0.22.0-beta.0.20220111032746-97732e52810c to 0.23.2.
- [Release notes](https://github.com/btcsuite/btcd/releases)
- [Changelog](https://github.com/btcsuite/btcd/blob/master/CHANGES)
- [Commits](https://github.com/btcsuite/btcd/commits/v0.23.2)

---
updated-dependencies:
- dependency-name: github.com/btcsuite/btcd
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
…hub.com/btcsuite/btcd-0.23.2

Bump github.com/btcsuite/btcd from 0.22.0-beta.0.20220111032746-97732e52810c to 0.23.2
…atONnetwork/PlatON-Go into feature/bump-version-to-1.5.0

# Conflicts:
#	p2p/dial.go
校验Header时,根据不同情况同步或异步从Cbft中获取parent区块
@benbaley benbaley merged commit 3c9bf7f into feature/bump-version-to-1.5.1 Oct 30, 2023
6 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants