Skip to content

chore: merge with develop branch#2096

Merged
unclezoro merged 31 commits intobnb-chain:bc-fusionfrom
pythonberg1997:bc-fusion
Dec 21, 2023
Merged

chore: merge with develop branch#2096
unclezoro merged 31 commits intobnb-chain:bc-fusionfrom
pythonberg1997:bc-fusion

Conversation

@pythonberg1997
Copy link
Copy Markdown
Contributor

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:

  • merge with develop branch
  • add new byte code of TokenHub and GovHub to Feynman upgrade

holiman and others added 30 commits December 5, 2023 15:32
# 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
* 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
@unclezoro unclezoro merged commit aab5ad9 into bnb-chain:bc-fusion Dec 21, 2023
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.