Merge pull request #275 from bnb-chain/develop

feat: merge for releasing v0.5.7

Author: joey0612

CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## v0.5.7
+
+This release introduces the implementation of [BEP-543](https://github.com/bnb-chain/BEPs/blob/master/BEPs/BEP-543.md), effectively reducing the block time from 1 second to an impressive 500 milliseconds.
+This enhancement significantly improves transaction efficiency and overall network performance, allowing for faster processing and a more seamless experience for users.
+
+It is set to be activated on both the opBNB Mainnet and Testnet environments according to the following schedule:
+
+- Testnet: Apr-02-2025 03:00 AM +UTC
+- Mainnet: Mid-Apr-2025
+
+All mainnet and testnet nodes must upgrade to this release before the hardfork time.
+
+### What's Changed
+
+#### FEATURE
+* [\#269](https://github.com/bnb-chain/op-geth/pull/269) change block internal to 500ms
+* [\#273](https://github.com/bnb-chain/op-geth/pull/273) add millisecond to rpc field
+
+### BUGFIX
+* [\#270](https://github.com/bnb-chain/op-geth/pull/270) concurrent issue of local account set in legacypool
+
+### Docker Images
+ghcr.io/bnb-chain/op-geth:v0.5.7
+
+**Full Changelog**: https://github.com/bnb-chain/op-geth/compare/v0.5.6...v0.5.7
+
 ## v0.5.6
 
 This is a minor release for opBNB Mainnet and Testnet.

beacon/engine/types.go

@@ -18,6 +18,7 @@ package engine
 
 import (
 	"fmt"
+	"github.com/holiman/uint256"
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -26,6 +27,11 @@ import (
 	"github.com/ethereum/go-ethereum/trie"
 )
 
+var (
+	OldBlockMillisecondsInterval uint64 = 1000
+	NewBlockMillisecondsInterval uint64 = 500
+)
+
 // PayloadVersion denotes the version of PayloadAttributes used to request the
 // building of the payload to commence.
 type PayloadVersion byte
@@ -64,12 +70,22 @@ type PayloadAttributes struct {
 
 // JSON type overrides for PayloadAttributes.
 type payloadAttributesMarshaling struct {
-	Timestamp hexutil.Uint64
+	TempTimestamp hexutil.Uint64 // temp change 'Timestamp' to 'TempTimestamp' for debugging
+	Random        hexutil.Bytes  // Random store the milliseconds
 
 	Transactions []hexutil.Bytes
 	GasLimit     *hexutil.Uint64
 }
 
+func (p *PayloadAttributes) millisecondes() uint64 {
+	if p.Random == (common.Hash{}) {
+		return 0
+	}
+	return uint256.NewInt(0).SetBytes2(p.Random[:2]).Uint64()
+}
+
+func (p *PayloadAttributes) MilliTimestamp() uint64 { return p.Timestamp*1000 + p.millisecondes() }
+
 //go:generate go run github.com/fjl/gencodec -type ExecutableData -field-override executableDataMarshaling -out gen_ed.go
 
 // ExecutableData is the data necessary to execute an EL payload.
@@ -99,6 +115,7 @@ type executableDataMarshaling struct {
 	GasLimit      hexutil.Uint64
 	GasUsed       hexutil.Uint64
 	Timestamp     hexutil.Uint64
+	Random        hexutil.Bytes // Random store the milliseconds
 	BaseFeePerGas *hexutil.Big
 	ExtraData     hexutil.Bytes
 	LogsBloom     hexutil.Bytes

consensus/beacon/consensus.go

@@ -255,7 +255,7 @@ func (beacon *Beacon) verifyHeader(chain consensus.ChainHeaderReader, header, pa
 		return errInvalidUncleHash
 	}
 	// Verify the timestamp
-	if header.Time <= parent.Time {
+	if header.MilliTimestamp() <= parent.MilliTimestamp() {
 		return errInvalidTimestamp
 	}
 	// Verify the block's difficulty to ensure it's the default constant

consensus/ethash/consensus.go

@@ -230,7 +230,7 @@ func (ethash *Ethash) verifyHeader(chain consensus.ChainHeaderReader, header, pa
 			return consensus.ErrFutureBlock
 		}
 	}
-	if header.Time <= parent.Time {
+	if header.MilliTimestamp() <= parent.MilliTimestamp() {
 		return errOlderBlockTime
 	}
 	// Verify the block's difficulty based on its timestamp and parent's difficulty
@@ -539,6 +539,7 @@ func (ethash *Ethash) SealHash(header *types.Header) (hash common.Hash) {
 		header.GasLimit,
 		header.GasUsed,
 		header.Time,
+		header.MixDigest,
 		header.Extra,
 	}
 	if header.BaseFee != nil {

core/blockchain.go

@@ -642,16 +642,16 @@ func (bc *BlockChain) loadLastState() error {
 		blockTd  = bc.GetTd(headBlock.Hash(), headBlock.NumberU64())
 	)
 	if headHeader.Hash() != headBlock.Hash() {
-		log.Info("Loaded most recent local header", "number", headHeader.Number, "hash", headHeader.Hash(), "td", headerTd, "age", common.PrettyAge(time.Unix(int64(headHeader.Time), 0)))
+		log.Info("Loaded most recent local header", "number", headHeader.Number, "hash", headHeader.Hash(), "td", headerTd, "age", common.PrettyAge(time.Unix(int64(headHeader.MilliTimestamp()), 0)))
 	}
-	log.Info("Loaded most recent local block", "number", headBlock.Number(), "hash", headBlock.Hash(), "td", blockTd, "age", common.PrettyAge(time.Unix(int64(headBlock.Time()), 0)))
+	log.Info("Loaded most recent local block", "number", headBlock.Number(), "hash", headBlock.Hash(), "td", blockTd, "age", common.PrettyAge(time.Unix(int64(headBlock.MilliTimestamp()), 0)))
 	if headBlock.Hash() != currentSnapBlock.Hash() {
 		snapTd := bc.GetTd(currentSnapBlock.Hash(), currentSnapBlock.Number.Uint64())
-		log.Info("Loaded most recent local snap block", "number", currentSnapBlock.Number, "hash", currentSnapBlock.Hash(), "td", snapTd, "age", common.PrettyAge(time.Unix(int64(currentSnapBlock.Time), 0)))
+		log.Info("Loaded most recent local snap block", "number", currentSnapBlock.Number, "hash", currentSnapBlock.Hash(), "td", snapTd, "age", common.PrettyAge(time.Unix(int64(currentSnapBlock.MilliTimestamp()), 0)))
 	}
 	if currentFinalBlock != nil {
 		finalTd := bc.GetTd(currentFinalBlock.Hash(), currentFinalBlock.Number.Uint64())
-		log.Info("Loaded most recent local finalized block", "number", currentFinalBlock.Number, "hash", currentFinalBlock.Hash(), "td", finalTd, "age", common.PrettyAge(time.Unix(int64(currentFinalBlock.Time), 0)))
+		log.Info("Loaded most recent local finalized block", "number", currentFinalBlock.Number, "hash", currentFinalBlock.Hash(), "td", finalTd, "age", common.PrettyAge(time.Unix(int64(currentFinalBlock.MilliTimestamp()), 0)))
 	}
 	if pivot := rawdb.ReadLastPivotNumber(bc.db); pivot != nil {
 		log.Info("Loaded last snap-sync pivot marker", "number", *pivot)
@@ -1461,7 +1461,7 @@ func (bc *BlockChain) InsertReceiptChain(blockChain types.Blocks, receiptChain [
 		head    = blockChain[len(blockChain)-1]
 		context = []interface{}{
 			"count", stats.processed, "elapsed", common.PrettyDuration(time.Since(start)),
-			"number", head.Number(), "hash", head.Hash(), "age", common.PrettyAge(time.Unix(int64(head.Time()), 0)),
+			"number", head.Number(), "hash", head.Hash(), "age", common.PrettyAge(time.Unix(int64(head.MilliTimestamp()), 0)),
 			"size", common.StorageSize(size),
 		}
 	)
@@ -1684,7 +1684,7 @@ func (bc *BlockChain) writeBlockAndSetHead(block *types.Block, receipts []*types
 func (bc *BlockChain) addFutureBlock(block *types.Block) error {
 	max := uint64(time.Now().Unix() + maxTimeFutureBlocks)
 	if block.Time() > max {
-		return fmt.Errorf("future block timestamp %v > allowed %v", block.Time(), max)
+		return fmt.Errorf("future block timestamp %v > allowed %v", block.MilliTimestamp(), max)
 	}
 	if block.Difficulty().Cmp(common.Big0) == 0 {
 		// Never add PoS blocks into the future queue
@@ -2083,7 +2083,7 @@ func (bc *BlockChain) insertChain(chain types.Blocks, setHead bool) (int, error)
 		if bc.snaps != nil && !minerMode {
 			snapDiffItems, snapBufItems = bc.snaps.Size()
 		}
-		
+
 		var trieDiffNodes, trieBufNodes, trieImmutableBufNodes common.StorageSize
 		if !minerMode {
 			trieDiffNodes, trieBufNodes, trieImmutableBufNodes, _ = bc.triedb.Size()

core/blockchain_insert.go

@@ -60,7 +60,7 @@ func (st *insertStats) report(chain []*types.Block, index int, snapDiffItems, sn
 			"blocks", st.processed, "txs", txs, "mgas", float64(st.usedGas) / 1000000,
 			"elapsed", common.PrettyDuration(elapsed), "mgasps", float64(st.usedGas) * 1000 / float64(elapsed),
 		}
-		mgaspsGauge.Update(int64(st.usedGas)*1000/int64(elapsed))
+		mgaspsGauge.Update(int64(st.usedGas) * 1000 / int64(elapsed))
 		if timestamp := time.Unix(int64(end.Time()), 0); time.Since(timestamp) > time.Minute {
 			context = append(context, []interface{}{"age", common.PrettyAge(timestamp)}...)
 		}

core/chain_makers.go

@@ -217,6 +217,7 @@ func (b *BlockGen) TxNonce(addr common.Address) uint64 {
 func (b *BlockGen) AddUncle(h *types.Header) {
 	// The uncle will have the same timestamp and auto-generated difficulty
 	h.Time = b.header.Time
+	h.MixDigest = b.header.MixDigest
 
 	var parent *types.Header
 	for i := b.i - 1; i >= 0; i-- {

core/headerchain.go

@@ -38,8 +38,8 @@ import (
 )
 
 const (
-	headerCacheLimit = 512
-	tdCacheLimit     = 1024
+	headerCacheLimit = 1280
+	tdCacheLimit     = 1280
 	numberCacheLimit = 2048
 )
 

core/txpool/blobpool/blobpool.go

@@ -401,7 +401,7 @@ func (p *BlobPool) Init(gasTip uint64, head *types.Header, reserve txpool.Addres
 		p.recheck(addr, nil)
 	}
 	var (
-		basefee = uint256.MustFromBig(eip1559.CalcBaseFee(p.chain.Config(), p.head, p.head.Time+1))
+		basefee = uint256.MustFromBig(eip1559.CalcBaseFee(p.chain.Config(), p.head, p.head.NextSecondsTimestamp()))
 		blobfee = uint256.NewInt(params.BlobTxMinBlobGasprice)
 	)
 	if p.head.ExcessBlobGas != nil {
@@ -822,7 +822,7 @@ func (p *BlobPool) Reset(oldHead, newHead *types.Header) {
 	}
 	// Reset the price heap for the new set of basefee/blobfee pairs
 	var (
-		basefee = uint256.MustFromBig(eip1559.CalcBaseFee(p.chain.Config(), newHead, newHead.Time+1))
+		basefee = uint256.MustFromBig(eip1559.CalcBaseFee(p.chain.Config(), newHead, newHead.NextSecondsTimestamp()))
 		blobfee = uint256.MustFromBig(big.NewInt(params.BlobTxMinBlobGasprice))
 	)
 	if newHead.ExcessBlobGas != nil {

core/txpool/legacypool/cache_for_miner.go

@@ -17,7 +17,7 @@ var (
 type pendingCache interface {
 	add(types.Transactions, types.Signer)
 	del(types.Transactions, types.Signer)
-	dump() map[common.Address]types.Transactions
+	dump() (map[common.Address]types.Transactions, map[common.Address]bool)
 	markLocal(common.Address)
 	flattenLocals() []common.Address
 }
@@ -75,8 +75,9 @@ func (pc *cacheForMiner) del(txs types.Transactions, signer types.Signer) {
 	}
 }
 
-func (pc *cacheForMiner) dump() map[common.Address]types.Transactions {
+func (pc *cacheForMiner) dump() (map[common.Address]types.Transactions, map[common.Address]bool) {
 	pending := make(map[common.Address]types.Transactions)
+	locals := make(map[common.Address]bool, len(pc.locals))
 	pc.txLock.Lock()
 	for addr, txlist := range pc.pending {
 		pending[addr] = make(types.Transactions, 0, len(txlist))
@@ -85,11 +86,16 @@ func (pc *cacheForMiner) dump() map[common.Address]types.Transactions {
 		}
 	}
 	pc.txLock.Unlock()
+	pc.addrLock.Lock()
+	for addr := range pc.locals {
+		locals[addr] = true
+	}
+	pc.addrLock.Unlock()
 	for _, txs := range pending {
 		// sorted by nonce
 		sort.Sort(types.TxByNonce(txs))
 	}
-	return pending
+	return pending, locals
 }
 
 func (pc *cacheForMiner) markLocal(addr common.Address) {