Merge pull request bnb-chain#33 from bnb-chain/merge-v1.4.9

feat: merge with upstream v1.4.9

.nancy-ignore

@@ -0,0 +1 @@
+CVE-2024-34478 # "CWE-754: Improper Check for Unusual or Exceptional Conditions." This vulnerability is BTC only, BSC does not have the issue.

CHANGELOG.md

@@ -1,4 +1,51 @@
 # Changelog
+## v1.4.9
+### FEATURE
+* [\#2463](https://github.com/bnb-chain/bsc/pull/2463) utils: add check_blobtx.js
+* [\#2470](https://github.com/bnb-chain/bsc/pull/2470) jsutils: faucet successful requests within blocks
+* [\#2467](https://github.com/bnb-chain/bsc/pull/2467) internal/ethapi: add optional parameter for blobSidecars
+
+### IMPROVEMENT
+* [\#2462](https://github.com/bnb-chain/bsc/pull/2462) cmd/utils: add a flag to change breathe block interval for testing
+* [\#2497](https://github.com/bnb-chain/bsc/pull/2497) params/config: add Bohr hardfork
+* [\#2479](https://github.com/bnb-chain/bsc/pull/2479) dev: ensure consistency in BPS bundle result
+
+### BUGFIX
+* [\#2461](https://github.com/bnb-chain/bsc/pull/2461) eth/handler: check lists in body before broadcast blocks
+* [\#2455](https://github.com/bnb-chain/bsc/pull/2455) cmd: fix memory leak when big dataset
+* [\#2466](https://github.com/bnb-chain/bsc/pull/2466) sync: fix some sync issues caused by prune-block.
+* [\#2475](https://github.com/bnb-chain/bsc/pull/2475) fix: move mev op to MinerAPI & add command to console
+* [\#2473](https://github.com/bnb-chain/bsc/pull/2473) fix: limit the gas price of the mev bid
+* [\#2484](https://github.com/bnb-chain/bsc/pull/2484) fix: fix inspect database error
+* [\#2481](https://github.com/bnb-chain/bsc/pull/2481) fix: keep 9W blocks in ancient db when prune block
+* [\#2495](https://github.com/bnb-chain/bsc/pull/2495) fix: add an empty freeze db
+* [\#2507](https://github.com/bnb-chain/bsc/pull/2507) fix: waiting for the last simulation before pick best bid
+
+## v1.4.8
+### FEATURE
+* [\#2483](https://github.com/bnb-chain/bsc/pull/2483) core/vm: add secp256r1 into PrecompiledContractsHaber
+* [\#2400](https://github.com/bnb-chain/bsc/pull/2400) RIP-7212: Precompile for secp256r1 Curve Support
+
+### IMPROVEMENT
+NA
+
+### BUGFIX
+NA
+
+## v1.4.7
+### FEATURE
+* [\#2439](https://github.com/bnb-chain/bsc/pull/2439) config: setup Mainnet Tycho(Cancun) hardfork date
+
+### IMPROVEMENT
+* [\#2396](https://github.com/bnb-chain/bsc/pull/2396) metrics: add blockInsertMgaspsGauge to trace mgasps
+* [\#2411](https://github.com/bnb-chain/bsc/pull/2411) build(deps): bump golang.org/x/net from 0.19.0 to 0.23.0
+* [\#2435](https://github.com/bnb-chain/bsc/pull/2435) txpool: limit max gas when mining is enabled
+* [\#2438](https://github.com/bnb-chain/bsc/pull/2438) fix: performance issue when load journal
+* [\#2440](https://github.com/bnb-chain/bsc/pull/2440) nancy: add files .nancy-ignore
+
+### BUGFIX
+NA
+
 ## v1.4.6
 ### FEATURE
 * [\#2227](https://github.com/bnb-chain/bsc/pull/2227) core: separated databases for block data

cmd/geth/chaincmd.go

@@ -63,6 +63,8 @@ var (
  Flags: flags.Merge([]cli.Flag{
  utils.CachePreimagesFlag,
  utils.OverrideCancun,
+ utils.OverrideHaber,
+ utils.OverrideBohr,
  utils.OverrideVerkle,
  }, utils.DatabaseFlags),
  Description: `
@@ -256,6 +258,14 @@ func initGenesis(ctx *cli.Context) error {
  v := ctx.Uint64(utils.OverrideCancun.Name)
  overrides.OverrideCancun = &v
  }
+ if ctx.IsSet(utils.OverrideHaber.Name) {
+ v := ctx.Uint64(utils.OverrideHaber.Name)
+ overrides.OverrideHaber = &v
+ }
+ if ctx.IsSet(utils.OverrideBohr.Name) {
+ v := ctx.Uint64(utils.OverrideBohr.Name)
+ overrides.OverrideBohr = &v
+ }
  if ctx.IsSet(utils.OverrideVerkle.Name) {
  v := ctx.Uint64(utils.OverrideVerkle.Name)
  overrides.OverrideVerkle = &v

cmd/geth/config.go

@@ -189,18 +189,18 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
  v := ctx.Uint64(utils.OverrideCancun.Name)
  cfg.Eth.OverrideCancun = &v
  }
+ if ctx.IsSet(utils.OverrideHaber.Name) {
+ v := ctx.Uint64(utils.OverrideHaber.Name)
+ cfg.Eth.OverrideHaber = &v
+ }
+ if ctx.IsSet(utils.OverrideBohr.Name) {
+ v := ctx.Uint64(utils.OverrideBohr.Name)
+ cfg.Eth.OverrideBohr = &v
+ }
  if ctx.IsSet(utils.OverrideVerkle.Name) {
  v := ctx.Uint64(utils.OverrideVerkle.Name)
  cfg.Eth.OverrideVerkle = &v
  }
- if ctx.IsSet(utils.OverrideFeynman.Name) {
- v := ctx.Uint64(utils.OverrideFeynman.Name)
- cfg.Eth.OverrideFeynman = &v
- }
- if ctx.IsSet(utils.OverrideFeynmanFix.Name) {
- v := ctx.Uint64(utils.OverrideFeynmanFix.Name)
- cfg.Eth.OverrideFeynmanFix = &v
- }
  if ctx.IsSet(utils.OverrideFullImmutabilityThreshold.Name) {
  params.FullImmutabilityThreshold = ctx.Uint64(utils.OverrideFullImmutabilityThreshold.Name)
  downloader.FullMaxForkAncestry = ctx.Uint64(utils.OverrideFullImmutabilityThreshold.Name)
@@ -211,6 +211,9 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
  if ctx.IsSet(utils.OverrideDefaultExtraReserveForBlobRequests.Name) {
  params.DefaultExtraReserveForBlobRequests = ctx.Uint64(utils.OverrideDefaultExtraReserveForBlobRequests.Name)
  }
+ if ctx.IsSet(utils.OverrideBreatheBlockInterval.Name) {
+ params.BreatheBlockInterval = ctx.Uint64(utils.OverrideBreatheBlockInterval.Name)
+ }
 
  backend, eth := utils.RegisterEthService(stack, &cfg.Eth)
 

cmd/geth/dbcmd.go

@@ -106,12 +106,12 @@ Remove blockchain and state databases`,
  dbInspectTrieCmd = &cli.Command{
  Action: inspectTrie,
  Name: "inspect-trie",
- ArgsUsage: "<blocknum> <jobnum>",
+ ArgsUsage: "<blocknum> <jobnum> <topn>",
  Flags: []cli.Flag{
  utils.DataDirFlag,
  utils.SyncModeFlag,
  },
- Usage: "Inspect the MPT tree of the account and contract.",
+ Usage: "Inspect the MPT tree of the account and contract. 'blocknum' can be latest/snapshot/number. 'topn' means output the top N storage tries info ranked by the total number of TrieNodes",
  Description: `This commands iterates the entrie WorldState.`,
  }
  dbCheckStateContentCmd = &cli.Command{
@@ -386,6 +386,7 @@ func inspectTrie(ctx *cli.Context) error {
  blockNumber uint64
  trieRootHash common.Hash
  jobnum uint64
+ topN uint64
  )
 
  stack, _ := makeConfigNode(ctx)
@@ -405,24 +406,37 @@ func inspectTrie(ctx *cli.Context) error {
  var err error
  blockNumber, err = strconv.ParseUint(ctx.Args().Get(0), 10, 64)
  if err != nil {
- return fmt.Errorf("failed to Parse blocknum, Args[0]: %v, err: %v", ctx.Args().Get(0), err)
+ return fmt.Errorf("failed to parse blocknum, Args[0]: %v, err: %v", ctx.Args().Get(0), err)
  }
  }
 
  if ctx.NArg() == 1 {
  jobnum = 1000
+ topN = 10
+ } else if ctx.NArg() == 2 {
+ var err error
+ jobnum, err = strconv.ParseUint(ctx.Args().Get(1), 10, 64)
+ if err != nil {
+ return fmt.Errorf("failed to parse jobnum, Args[1]: %v, err: %v", ctx.Args().Get(1), err)
+ }
+ topN = 10
  } else {
  var err error
  jobnum, err = strconv.ParseUint(ctx.Args().Get(1), 10, 64)
  if err != nil {
- return fmt.Errorf("failed to Parse jobnum, Args[1]: %v, err: %v", ctx.Args().Get(1), err)
+ return fmt.Errorf("failed to parse jobnum, Args[1]: %v, err: %v", ctx.Args().Get(1), err)
+ }
+
+ topN, err = strconv.ParseUint(ctx.Args().Get(2), 10, 64)
+ if err != nil {
+ return fmt.Errorf("failed to parse topn, Args[1]: %v, err: %v", ctx.Args().Get(1), err)
  }
  }
 
  if blockNumber != math.MaxUint64 {
  headerBlockHash = rawdb.ReadCanonicalHash(db, blockNumber)
  if headerBlockHash == (common.Hash{}) {
- return errors.New("ReadHeadBlockHash empry hash")
+ return errors.New("ReadHeadBlockHash empty hash")
  }
  blockHeader := rawdb.ReadHeader(db, headerBlockHash, blockNumber)
  trieRootHash = blockHeader.Root
@@ -437,6 +451,7 @@ func inspectTrie(ctx *cli.Context) error {
  if dbScheme == rawdb.PathScheme {
  config = &triedb.Config{
  PathDB: utils.PathDBConfigAddJournalFilePath(stack, pathdb.ReadOnly),
+ Cache: 0,
  }
  } else if dbScheme == rawdb.HashScheme {
  config = triedb.HashDefaults
@@ -448,7 +463,7 @@ func inspectTrie(ctx *cli.Context) error {
  fmt.Printf("fail to new trie tree, err: %v, rootHash: %v\n", err, trieRootHash.String())
  return err
  }
- theInspect, err := trie.NewInspector(theTrie, triedb, trieRootHash, blockNumber, jobnum)
+ theInspect, err := trie.NewInspector(theTrie, triedb, trieRootHash, blockNumber, jobnum, int(topN))
  if err != nil {
  return err
  }
@@ -493,7 +508,7 @@ func ancientInspect(ctx *cli.Context) error {
  stack, _ := makeConfigNode(ctx)
  defer stack.Close()
 
- db := utils.MakeChainDatabase(ctx, stack, true, true)
+ db := utils.MakeChainDatabase(ctx, stack, true, false)
  defer db.Close()
  return rawdb.AncientInspect(db)
 }

cmd/geth/main.go

@@ -25,6 +25,10 @@ import (
  "strings"
  "time"
 
+ "github.com/ethereum/go-ethereum/params"
+
+ "go.uber.org/automaxprocs/maxprocs"
+
  "github.com/ethereum/go-ethereum/accounts"
  "github.com/ethereum/go-ethereum/accounts/keystore"
  "github.com/ethereum/go-ethereum/cmd/utils"
@@ -38,7 +42,6 @@ import (
  "github.com/ethereum/go-ethereum/internal/flags"
  "github.com/ethereum/go-ethereum/log"
  "github.com/ethereum/go-ethereum/node"
- "go.uber.org/automaxprocs/maxprocs"
 
  // Force-load the tracer engines to trigger registration
  _ "github.com/ethereum/go-ethereum/eth/tracers/js"
@@ -71,12 +74,13 @@ var (
  utils.SmartCardDaemonPathFlag,
  utils.RialtoHash,
  utils.OverrideCancun,
+ utils.OverrideHaber,
+ utils.OverrideBohr,
  utils.OverrideVerkle,
- utils.OverrideFeynman,
- utils.OverrideFeynmanFix,
  utils.OverrideFullImmutabilityThreshold,
  utils.OverrideMinBlocksForBlobRequests,
  utils.OverrideDefaultExtraReserveForBlobRequests,
+ utils.OverrideBreatheBlockInterval,
  utils.EnablePersonal,
  utils.TxPoolLocalsFlag,
  utils.TxPoolNoLocalsFlag,
@@ -456,6 +460,10 @@ func startNode(ctx *cli.Context, stack *node.Node, backend ethapi.Backend, isCon
  // Set the gas price to the limits from the CLI and start mining
  gasprice := flags.GlobalBig(ctx, utils.MinerGasPriceFlag.Name)
  ethBackend.TxPool().SetGasTip(gasprice)
+ gasCeil := ethBackend.Miner().GasCeil()
+ if gasCeil > params.SystemTxsGas {
+ ethBackend.TxPool().SetMaxGas(gasCeil - params.SystemTxsGas)
+ }
  if err := ethBackend.StartMining(); err != nil {
  utils.Fatalf("Failed to start mining: %v", err)
  }

cmd/geth/pruneblock_test.go

@@ -75,7 +75,7 @@ func NewLevelDBDatabaseWithFreezer(file string, cache int, handles int, ancient
  if err != nil {
  return nil, err
  }
- frdb, err := rawdb.NewDatabaseWithFreezer(kvdb, ancient, namespace, readonly, disableFreeze, isLastOffset, pruneAncientData)
+ frdb, err := rawdb.NewDatabaseWithFreezer(kvdb, ancient, namespace, readonly, disableFreeze, isLastOffset, pruneAncientData, false)
  if err != nil {
  kvdb.Close()
  return nil, err
@@ -178,11 +178,10 @@ func BlockchainCreator(t *testing.T, chaindbPath, AncientPath string, blockRemai
 
  // Force run a freeze cycle
  type freezer interface {
- Freeze() error
+ Freeze(threshold uint64) error
  Ancients() (uint64, error)
  }
- blockchain.SetFinalized(blocks[len(blocks)-1].Header())
- db.(freezer).Freeze()
+ db.(freezer).Freeze(10)
 
  frozen, err := db.Ancients()
  //make sure there're frozen items

cmd/geth/snapshot.go

@@ -43,9 +43,11 @@ import (
  "github.com/ethereum/go-ethereum/log"
  "github.com/ethereum/go-ethereum/metrics"
  "github.com/ethereum/go-ethereum/node"
+ "github.com/ethereum/go-ethereum/params"
  "github.com/ethereum/go-ethereum/rlp"
  "github.com/ethereum/go-ethereum/trie"
  "github.com/ethereum/go-ethereum/triedb"
+ "github.com/ethereum/go-ethereum/triedb/pathdb"
  cli "github.com/urfave/cli/v2"
 )
 
@@ -245,7 +247,16 @@ func accessDb(ctx *cli.Context, stack *node.Node) (ethdb.Database, error) {
  NoBuild: true,
  AsyncBuild: false,
  }
- snaptree, err := snapshot.New(snapconfig, chaindb, triedb.NewDatabase(chaindb, nil), headBlock.Root(), TriesInMemory, false)
+ dbScheme := rawdb.ReadStateScheme(chaindb)
+ var config *triedb.Config
+ if dbScheme == rawdb.PathScheme {
+ config = &triedb.Config{
+ PathDB: utils.PathDBConfigAddJournalFilePath(stack, pathdb.ReadOnly),
+ }
+ } else if dbScheme == rawdb.HashScheme {
+ config = triedb.HashDefaults
+ }
+ snaptree, err := snapshot.New(snapconfig, chaindb, triedb.NewDatabase(chaindb, config), headBlock.Root(), TriesInMemory, false)
  if err != nil {
  log.Error("snaptree error", "err", err)
  return nil, err // The relevant snapshot(s) might not exist
@@ -333,6 +344,9 @@ func pruneBlock(ctx *cli.Context) error {
  stack, config = makeConfigNode(ctx)
  defer stack.Close()
  blockAmountReserved = ctx.Uint64(utils.BlockAmountReserved.Name)
+ if blockAmountReserved < params.FullImmutabilityThreshold {
+ return fmt.Errorf("block-amount-reserved must be greater than or equal to %d", params.FullImmutabilityThreshold)
+ }
  chaindb, err = accessDb(ctx, stack)
  if err != nil {
  return err
@@ -409,7 +423,7 @@ func pruneBlock(ctx *cli.Context) error {
  }
 
  if _, err := os.Stat(newAncientPath); err == nil {
- // No file lock found for old ancientDB but new ancientDB exsisted, indicating the geth was interrupted
+ // No file lock found for old ancientDB but new ancientDB existed, indicating the geth was interrupted
  // after old ancientDB removal, this happened after backup successfully, so just rename the new ancientDB
  if err := blockpruner.AncientDbReplacer(); err != nil {
  log.Error("Failed to rename new ancient directory")

cmd/jsutils/check_blobtx.js

@@ -0,0 +1,51 @@
+import { ethers } from "ethers";
+import program from "commander";
+
+// depends on ethjs v6.11.0+ for 4844, https://github.com/ethers-io/ethers.js/releases/tag/v6.11.0
+// BSC testnet enabled 4844 on block: 39539137
+// Usage:
+// nvm use 20
+// node check_blobtx.js --rpc https://data-seed-prebsc-1-s1.binance.org:8545 --startNum 39539137
+// node check_blobtx.js --rpc https://data-seed-prebsc-1-s1.binance.org:8545 --startNum 39539137 --endNum 40345994
+program.option("--rpc <Rpc>", "Rpc Server URL");
+program.option("--startNum <Num>", "start block", 0);
+program.option("--endNum <Num>", "end block", 0);
+program.parse(process.argv);
+
+const provider = new ethers.JsonRpcProvider(program.rpc);
+const main = async () => {
+ var startBlock = parseInt(program.startNum)
+ var endBlock = parseInt(program.endNum)
+ if (isNaN(endBlock) || isNaN(startBlock) || startBlock == 0) {
+ console.error("invalid input, --startNum", program.startNum, "--end", program.endNum)
+ return
+ }
+ // if --endNum is not specified, set it to the latest block number.
+ if (endBlock == 0) {
+ endBlock = await provider.getBlockNumber();
+ }
+ if (startBlock > endBlock) {
+ console.error("invalid input, startBlock:",startBlock, " endBlock:", endBlock);
+ return
+ }
+
+ for (let i = startBlock; i <= endBlock; i++) {
+ let blockData = await provider.getBlock(i);
+ console.log("startBlock:",startBlock, "endBlock:", endBlock, "curBlock", i, "blobGasUsed", blockData.blobGasUsed);
+ if (blockData.blobGasUsed == 0) {
+ continue
+ }
+ for (let txIndex = 0; txIndex<= blockData.transactions.length - 1; txIndex++) {
+ let txHash = blockData.transactions[txIndex]
+ let txData = await provider.getTransaction(txHash);
+ if (txData.type == 3) {
+ console.log("BlobTx in block:",i, " txIndex:", txIndex, " txHash:", txHash);
+ }
+ }
+ }
+};
+main().then(() => process.exit(0))
+ .catch((error) => {
+ console.error(error);
+ process.exit(1);
+ });