chore: merge with develop branch#2096
Merged
unclezoro merged 31 commits intobnb-chain:bc-fusionfrom Dec 21, 2023
Merged
Conversation
# Conflicts: # trie/stacktrie.go
…198) This PR adds more error message for debugging purpose.
* cmd, core, params: add support for the Holesky testnet * cmd/devp2p: add support for holesky for the dns crawler # Conflicts: # cmd/devp2p/nodesetcmd.go # cmd/geth/main.go # cmd/utils/flags.go # core/genesis.go # params/bootnodes.go # params/config.go
fix tests fix tests
* cmd/geth: add check func to validate state scheme * cmd/geth: add detailed comments --------- Co-authored-by: VM <arimas@foxmail.com>
…rks firstly (bnb-chain#2078) * core: LoadChainConfig return predefined config for built-in net firstly * cmd/geth: add a warn message for chain config in the configuration file * consensus/parlia: change chain config log level when New parlia * core: fix code style
Co-authored-by: Felix Lange <fjl@twurst.com>
…28358) Switch to using BlockNumber.String() which encodes it correctly for use in the JSON-RPC API.
all: pull snap sync PRs from upstream v1.13.5
# Conflicts: # params/config.go
buddh0
approved these changes
Dec 21, 2023
unclezoro
approved these changes
Dec 21, 2023
unclezoro
approved these changes
Dec 21, 2023
This file contains hidden or 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
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.
Description
This pr is to merge develop branch into this branch
Rationale
tell us why we need these changes...
Example
add an example CLI or API response...
Changes
Notable changes:
TokenHubandGovHubto Feynman upgrade