Merge pull request bnb-chain#2930 from bnb-chain/develop

Author: zzzckck

CHANGELOG.md

@@ -1,4 +1,23 @@
 # Changelog
+## v1.5.7
+v1.5.7 conduct small upstream code merge to follow the latest pectra hard fork and apply some bug fix. There are two PR for the code merge:
+* [\#2897](https://github.com/bnb-chain/bsc/pull/2897) upstream: merge tag 'geth-v1.15.1' into bsc-develop
+* [\#2926](https://github.com/bnb-chain/bsc/pull/2926) upstream: pick bug fix from latest geth
+
+Besides code merge, there are also several important bugfix/improvements, and setup mainnet Pascal hard fork time:
+### FEATURE
+* [\#2928](https://github.com/bnb-chain/bsc/pull/2928) config: update BSC Mainnet hardfork date: Pascal & Praque
+
+### BUGFIX
+* [\#2907](https://github.com/bnb-chain/bsc/pull/0000) go.mod: downgrade bls-eth-go-binary to make it same as the prysm-v5.0.0
+
+### IMPROVEMENT
+* [\#2896](https://github.com/bnb-chain/bsc/pull/2896) consensus/parlia: estimate gas reserved for systemTxs
+* [\#2912](https://github.com/bnb-chain/bsc/pull/2912) consensus/parlia: improve performance of func IsSystemTransaction
+* [\#2916](https://github.com/bnb-chain/bsc/pull/2916) miner: avoid to collect requests when getting pending blocks
+* [\#2913](https://github.com/bnb-chain/bsc/pull/2913) core/vm: add basic test cases for blsSignatureVerify
+* [\#2918](https://github.com/bnb-chain/bsc/pull/2918) core/txpool/legacypool/legacypool.go: add gasTip check when reset
+
 ## v1.5.6
 v1.5.6 performed another small code sync with Geth upstream, mainly sync the 7702 tx type txpool update, refer: https://github.com/bnb-chain/bsc/pull/2888/
 

cmd/evm/testdata/evmrun/3.out.1.txt

@@ -1,12 +1,13 @@
 {
     "root": "b444481d1367188172f8c6091e948aaa68bae763fd26d6b9e994306a66bf69f9",
     "accounts": {
-        "pre(0x30d7a0694cb29af31b982480e11d7ebb003a3fca4026939149071f014689b142)": {
+        "0x0000000000000000000000007265636569766572": {
             "balance": "0",
             "nonce": 0,
             "root": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "codeHash": "0x3e48ef54b89079a075f3b8fc253c657a86b110a7aed3568c1517b10edf2c3eb6",
             "code": "0x6040",
+            "address": "0x0000000000000000000000007265636569766572",
             "key": "0x30d7a0694cb29af31b982480e11d7ebb003a3fca4026939149071f014689b142"
         }
     }

cmd/evm/testdata/evmrun/4.out.1.txt

@@ -1,12 +1,13 @@
 {
     "root": "b444481d1367188172f8c6091e948aaa68bae763fd26d6b9e994306a66bf69f9",
     "accounts": {
-        "pre(0x30d7a0694cb29af31b982480e11d7ebb003a3fca4026939149071f014689b142)": {
+        "0x0000000000000000000000007265636569766572": {
             "balance": "0",
             "nonce": 0,
             "root": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "codeHash": "0x3e48ef54b89079a075f3b8fc253c657a86b110a7aed3568c1517b10edf2c3eb6",
             "code": "0x6040",
+            "address": "0x0000000000000000000000007265636569766572",
             "key": "0x30d7a0694cb29af31b982480e11d7ebb003a3fca4026939149071f014689b142"
         }
     }

cmd/geth/chaincmd.go

@@ -64,6 +64,7 @@ var (
 			utils.OverridePassedForkTime,
 			utils.OverridePascal,
 			utils.OverridePrague,
+			utils.OverrideLorentz,
 			utils.OverrideVerkle,
 			utils.MultiDataBaseFlag,
 		}, utils.DatabaseFlags),
@@ -268,6 +269,10 @@ func initGenesis(ctx *cli.Context) error {
 		v := ctx.Uint64(utils.OverridePrague.Name)
 		overrides.OverridePrague = &v
 	}
+	if ctx.IsSet(utils.OverrideLorentz.Name) {
+		v := ctx.Uint64(utils.OverrideLorentz.Name)
+		overrides.OverrideLorentz = &v
+	}
 	if ctx.IsSet(utils.OverrideVerkle.Name) {
 		v := ctx.Uint64(utils.OverrideVerkle.Name)
 		overrides.OverrideVerkle = &v

cmd/geth/config.go

@@ -213,6 +213,10 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
 		v := ctx.Uint64(utils.OverridePrague.Name)
 		cfg.Eth.OverridePrague = &v
 	}
+	if ctx.IsSet(utils.OverrideLorentz.Name) {
+		v := ctx.Uint64(utils.OverrideLorentz.Name)
+		cfg.Eth.OverrideLorentz = &v
+	}
 	if ctx.IsSet(utils.OverrideVerkle.Name) {
 		v := ctx.Uint64(utils.OverrideVerkle.Name)
 		cfg.Eth.OverrideVerkle = &v

cmd/geth/main.go

@@ -76,6 +76,7 @@ var (
 		utils.OverridePassedForkTime,
 		utils.OverridePascal,
 		utils.OverridePrague,
+		utils.OverrideLorentz,
 		utils.OverrideVerkle,
 		utils.OverrideFullImmutabilityThreshold,
 		utils.OverrideMinBlocksForBlobRequests,
@@ -466,8 +467,8 @@ func startNode(ctx *cli.Context, stack *node.Node, backend ethapi.Backend, isCon
 	// Start auxiliary services if enabled
 	ethBackend, ok := backend.(*eth.EthAPIBackend)
 	gasCeil := ethBackend.Miner().GasCeil()
-	if gasCeil > params.SystemTxsGas {
-		ethBackend.TxPool().SetMaxGas(gasCeil - params.SystemTxsGas)
+	if gasCeil > params.SystemTxsGasSoftLimit {
+		ethBackend.TxPool().SetMaxGas(gasCeil - params.SystemTxsGasSoftLimit)
 	}
 	if ctx.Bool(utils.MiningEnabledFlag.Name) {
 		// Mining only makes sense if a full Ethereum node is running

cmd/jsutils/getchainstatus.js

@@ -6,6 +6,7 @@ program.option("--startNum <startNum>", "start num")
 program.option("--endNum <endNum>", "end num")
 program.option("--miner <miner>", "miner", "")
 program.option("--num <Num>", "validator num", 21)
+program.option("--turnLength <Num>", "the consecutive block length", 4)
 program.option("--topNum <Num>", "top num of address to be displayed", 20)
 program.option("--blockNum <Num>", "block num", 0)
 program.option("-h, --help", "")
@@ -34,7 +35,7 @@ function printUsage() {
     console.log("\nExample:");
     // mainnet https://bsc-mainnet.nodereal.io/v1/454e504917db4f82b756bd0cf6317dce
     console.log("  node getchainstatus.js GetMaxTxCountInBlockRange --rpc https://bsc-testnet-dataseed.bnbchain.org --startNum 40000001  --endNum 40000005")
-    console.log("  node getchainstatus.js GetBinaryVersion --rpc https://bsc-testnet-dataseed.bnbchain.org --num 21")
+    console.log("  node getchainstatus.js GetBinaryVersion --rpc https://bsc-testnet-dataseed.bnbchain.org --num 21 --turnLength 4")
     console.log("  node getchainstatus.js GetTopAddr --rpc https://bsc-testnet-dataseed.bnbchain.org --startNum 40000001  --endNum 40000010 --topNum 10")
     console.log("  node getchainstatus.js GetSlashCount --rpc https://bsc-testnet-dataseed.bnbchain.org --blockNum 40000001")  // default: latest block
     console.log("  node getchainstatus.js GetPerformanceData --rpc https://bsc-testnet-dataseed.bnbchain.org --startNum 40000001  --endNum 40000010")
@@ -193,12 +194,13 @@ async function getMaxTxCountInBlockRange()  {
 // 2.cmd: "GetBinaryVersion", usage:
 // node getchainstatus.js GetBinaryVersion \
 //      --rpc https://bsc-testnet-dataseed.bnbchain.org \
-//       --num(optional): defualt 21, the number of blocks that will be checked
+//       --num(optional): default 21, the number of blocks that will be checked
+//       --turnLength(optional): default 4, the consecutive block length
 async function getBinaryVersion()  {
     const blockNum = await provider.getBlockNumber();
-    console.log(blockNum);
+    let turnLength = program.turnLength
     for (let i = 0; i < program.num; i++) {
-        let blockData = await provider.getBlock(blockNum - i);
+        let blockData = await provider.getBlock(blockNum - i*turnLength);
         // 1.get Geth client version
         let major = ethers.toNumber(ethers.dataSlice(blockData.extraData, 2, 3))
         let minor = ethers.toNumber(ethers.dataSlice(blockData.extraData, 3, 4))
@@ -215,7 +217,8 @@ async function getBinaryVersion()  {
             lastGasPrice = txData.gasPrice
             break
         }
-        console.log(blockData.miner, "version =", major + "." + minor + "." + patch, " MinGasPrice = " + lastGasPrice)
+        var moniker = await getValidatorMoniker(blockData.miner, blockNum)
+        console.log(blockNum - i*turnLength, blockData.miner, "version =", major + "." + minor + "." + patch, " MinGasPrice = " + lastGasPrice, moniker)
     }
 };
 

cmd/utils/flags.go

@@ -311,6 +311,11 @@ var (
 		Usage:    "Manually specify the Prague fork timestamp, overriding the bundled setting",
 		Category: flags.EthCategory,
 	}
+	OverrideLorentz = &cli.Uint64Flag{
+		Name:     "override.lorentz",
+		Usage:    "Manually specify the Lorentz fork timestamp, overriding the bundled setting",
+		Category: flags.EthCategory,
+	}
 	OverrideVerkle = &cli.Uint64Flag{
 		Name:     "override.verkle",
 		Usage:    "Manually specify the Verkle fork timestamp, overriding the bundled setting",

consensus/parlia/parlia.go

@@ -321,18 +321,17 @@ func (p *Parlia) Period() uint64 {
 }
 
 func (p *Parlia) IsSystemTransaction(tx *types.Transaction, header *types.Header) (bool, error) {
-	// deploy a contract
-	if tx.To() == nil {
+	if tx.To() == nil || !isToSystemContract(*tx.To()) {
+		return false, nil
+	}
+	if tx.GasPrice().Sign() != 0 {
 		return false, nil
 	}
 	sender, err := types.Sender(p.signer, tx)
 	if err != nil {
 		return false, errors.New("UnAuthorized transaction")
 	}
-	if sender == header.Coinbase && isToSystemContract(*tx.To()) && tx.GasPrice().Cmp(big.NewInt(0)) == 0 {
-		return true, nil
-	}
-	return false, nil
+	return sender == header.Coinbase, nil
 }
 
 func (p *Parlia) IsSystemContract(to *common.Address) bool {
@@ -1258,6 +1257,44 @@ func (p *Parlia) distributeFinalityReward(chain consensus.ChainHeaderReader, sta
 	return p.applyTransaction(msg, state, header, cx, txs, receipts, systemTxs, usedGas, mining, tracer)
 }
 
+func (p *Parlia) EstimateGasReservedForSystemTxs(chain consensus.ChainHeaderReader, header *types.Header) uint64 {
+	parent := chain.GetHeaderByHash(header.ParentHash)
+	if parent != nil {
+		// Mainnet and Chapel have both passed Feynman. Now, simplify the logic before and during the Feynman hard fork.
+		if p.chainConfig.IsFeynman(header.Number, header.Time) &&
+			!p.chainConfig.IsOnFeynman(header.Number, parent.Time, header.Time) {
+			// const (
+			// 	the following values represent the maximum values found in the most recent blocks on the mainnet
+			// 	depositTxGas         = uint64(60_000)
+			// 	slashTxGas           = uint64(140_000)
+			// 	finalityRewardTxGas  = uint64(350_000)
+			// 	updateValidatorTxGas = uint64(12_160_000)
+			// )
+			// suggestReservedGas := depositTxGas
+			// if header.Difficulty.Cmp(diffInTurn) != 0 {
+			// 	snap, err := p.snapshot(chain, header.Number.Uint64()-1, header.ParentHash, nil)
+			// 	if err != nil || !snap.SignRecently(snap.inturnValidator()) {
+			// 		suggestReservedGas += slashTxGas
+			// 	}
+			// }
+			// if header.Number.Uint64()%p.config.Epoch == 0 {
+			// 	suggestReservedGas += finalityRewardTxGas
+			// }
+			// if isBreatheBlock(parent.Time, header.Time) {
+			// 	suggestReservedGas += updateValidatorTxGas
+			// }
+			// return suggestReservedGas * 150 / 100
+			if !isBreatheBlock(parent.Time, header.Time) {
+				// params.SystemTxsGasSoftLimit > (depositTxGas+slashTxGas+finalityRewardTxGas)*150/100
+				return params.SystemTxsGasSoftLimit
+			}
+		}
+	}
+
+	// params.SystemTxsGasHardLimit > (depositTxGas+slashTxGas+finalityRewardTxGas+updateValidatorTxGas)*150/100
+	return params.SystemTxsGasHardLimit
+}
+
 // Finalize implements consensus.Engine, ensuring no uncles are set, nor block
 // rewards given.
 func (p *Parlia) Finalize(chain consensus.ChainHeaderReader, header *types.Header, state vm.StateDB, txs *[]*types.Transaction,

core/genesis.go

@@ -266,6 +266,7 @@ type ChainOverrides struct {
 	OverridePassedForkTime *uint64
 	OverridePascal         *uint64
 	OverridePrague         *uint64
+	OverrideLorentz        *uint64
 	OverrideVerkle         *uint64
 }
 
@@ -290,6 +291,9 @@ func (o *ChainOverrides) apply(cfg *params.ChainConfig) error {
 	if o.OverridePrague != nil {
 		cfg.PragueTime = o.OverridePrague
 	}
+	if o.OverrideLorentz != nil {
+		cfg.LorentzTime = o.OverrideLorentz
+	}
 	if o.OverrideVerkle != nil {
 		cfg.VerkleTime = o.OverrideVerkle
 	}
@@ -387,6 +391,11 @@ func SetupGenesisBlockWithOverride(db ethdb.Database, triedb *triedb.Database, g
 	}
 	newCfg := genesis.chainConfigOrDefault(ghash, storedCfg)
 
+	// Sanity-check the new configuration.
+	if err := newCfg.CheckConfigForkOrder(); err != nil {
+		return nil, common.Hash{}, nil, err
+	}
+
 	// TODO(rjl493456442) better to define the comparator of chain config
 	// and short circuit if the chain config is not changed.
 	compatErr := storedCfg.CheckCompatible(newCfg, head.Number.Uint64(), head.Time)

core/rawdb/freezer_table.go

@@ -420,6 +420,13 @@ func (t *freezerTable) repairIndex() error {
 	// If legacy metadata is detected, attempt to recover the offset from the
 	// index file to avoid clearing the entire table.
 	if t.metadata.version == freezerTableV1 {
+		// Skip truncation if the legacy metadata is opened in read-only mode.
+		// Since all items in the legacy index file were forcibly synchronized,
+		// data integrity is guaranteed. Therefore, it's safe to leave any extra
+		// items untruncated in this special scenario.
+		if t.readonly {
+			return nil
+		}
 		t.logger.Info("Recovering freezer flushOffset for legacy table", "offset", size)
 		return t.metadata.setFlushOffset(size, true)
 	}

core/txpool/errors.go

@@ -51,10 +51,6 @@ var (
 	// making the transaction invalid, rather a DOS protection.
 	ErrOversizedData = errors.New("oversized data")
 
-	// ErrFutureReplacePending is returned if a future transaction replaces a pending
-	// one. Future transactions should only be able to replace other future transactions.
-	ErrFutureReplacePending = errors.New("future transaction tries to replace pending")
-
 	// ErrAlreadyReserved is returned if the sender address has a pending transaction
 	// in a different subpool. For example, this error is returned in response to any
 	// input transaction of non-blob type when a blob transaction from this sender
@@ -63,13 +59,4 @@ var (
 
 	// ErrInBlackList is returned if the transaction send by banned address
 	ErrInBlackList = errors.New("sender or to in black list")
-
-	// ErrAuthorityReserved is returned if a transaction has an authorization
-	// signed by an address which already has in-flight transactions known to the
-	// pool.
-	ErrAuthorityReserved = errors.New("authority already reserved")
-
-	// ErrAuthorityNonce is returned if a transaction has an authorization with
-	// a nonce that is not currently valid for the authority.
-	ErrAuthorityNonceTooLow = errors.New("authority nonce too low")
 )