Merge pull request #3438 from bnb-chain/develop

Draft release v1.6.3

Author: brilliant-lx

CHANGELOG.md

@@ -1,4 +1,16 @@
 # Changelog
+## v1.6.3
+### FEATURE
+NA
+
+### BUGFIX
+[\#3429](https://github.com/bnb-chain/bsc/pull/3429) build(deps): bump github.com/consensys/gnark-crypto
+[\#3433](https://github.com/bnb-chain/bsc/pull/3433) internal/ethapi: fix eth_simulateV1
+[\#3431](https://github.com/bnb-chain/bsc/pull/3431) eth/tracers: fix crasher in TraceCall with BlockOverrides
+
+### IMPROVEMENT
+[\#3436](https://github.com/bnb-chain/bsc/pull/3436) revert: revert the nano check in parlia
+[\#3435](https://github.com/bnb-chain/bsc/pull/3435) eth: fix stuck when handleBlockBroadcast
 
 ## v1.6.2
 ### FEATURE

consensus/parlia/parlia.go

@@ -1416,9 +1416,6 @@ func (p *Parlia) Finalize(chain consensus.ChainHeaderReader, header *types.Heade
 
 	systemcontracts.TryUpdateBuildInSystemContract(p.chainConfig, header.Number, parent.Time, header.Time, state, false)
 
-	if err := p.checkNanoBlackList(state, header); err != nil {
-		return err
-	}
 	if p.chainConfig.IsOnFeynman(header.Number, parent.Time, header.Time) {
 		err := p.initializeFeynmanContract(state, header, cx, txs, receipts, systemTxs, usedGas, false, tracer)
 		if err != nil {
@@ -1518,10 +1515,6 @@ func (p *Parlia) FinalizeAndAssemble(chain consensus.ChainHeaderReader, header *
 
 	systemcontracts.TryUpdateBuildInSystemContract(p.chainConfig, header.Number, parent.Time, header.Time, state, false)
 
-	if err := p.checkNanoBlackList(state, header); err != nil {
-		return nil, nil, err
-	}
-
 	if p.chainConfig.IsOnFeynman(header.Number, parent.Time, header.Time) {
 		err := p.initializeFeynmanContract(state, header, cx, &body.Transactions, &receipts, nil, &header.GasUsed, true, tracer)
 		if err != nil {
@@ -2434,18 +2427,6 @@ func (p *Parlia) NextProposalBlock(chain consensus.ChainHeaderReader, header *ty
 	return snap.nextProposalBlock(proposer)
 }
 
-func (p *Parlia) checkNanoBlackList(state vm.StateDB, header *types.Header) error {
-	if p.chainConfig.IsNano(header.Number) {
-		for _, blackListAddr := range types.NanoBlackList {
-			if state.IsAddressInMutations(blackListAddr) {
-				log.Error("blacklisted address found", "address", blackListAddr)
-				return fmt.Errorf("block contains blacklisted address: %s", blackListAddr.Hex())
-			}
-		}
-	}
-	return nil
-}
-
 func (p *Parlia) detectNewVersionWithFork(chain consensus.ChainHeaderReader, header *types.Header, state vm.StateDB) {
 	// Ignore blocks that are considered too old
 	const maxBlockReceiveDelay = 10 * time.Second

core/state/statedb.go

@@ -1687,11 +1687,6 @@ func (s *StateDB) AccessEvents() *AccessEvents {
 	return s.accessEvents
 }
 
-func (s *StateDB) IsAddressInMutations(addr common.Address) bool {
-	_, ok := s.mutations[addr]
-	return ok
-}
-
 func (s *StateDB) DumpAccessList(block *types.Block) {
 	if s.blockAccessList == nil {
 		return

core/state/statedb_hooked.go

@@ -304,7 +304,3 @@ func (s *hookedStateDB) Finalise(deleteEmptyObjects bool) {
 func (s *hookedStateDB) IntermediateRoot(deleteEmptyObjects bool) common.Hash {
 	return s.inner.IntermediateRoot(deleteEmptyObjects)
 }
-
-func (s *hookedStateDB) IsAddressInMutations(addr common.Address) bool {
-	return s.inner.IsAddressInMutations(addr)
-}

core/vm/interface.go

@@ -109,6 +109,4 @@ type StateDB interface {
 	// Finalise must be invoked at the end of a transaction
 	Finalise(bool)
 	IntermediateRoot(deleteEmptyObjects bool) common.Hash
-
-	IsAddressInMutations(addr common.Address) bool
 }

eth/handler_eth.go

@@ -149,7 +149,9 @@ func (h *ethHandler) handleBlockBroadcast(peer *eth.Peer, packet *eth.NewBlockPa
 	log.Debug("handleBlockBroadcast", "peer", peer.ID(), "block", block.Number(), "hash", block.Hash())
 	h.blockFetcher.Enqueue(peer.ID(), block)
 	stats := h.chain.GetBlockStats(block.Hash())
+	blockFirstReceived := false
 	if stats.RecvNewBlockTime.Load() == 0 {
+		blockFirstReceived = true
 		stats.RecvNewBlockTime.Store(time.Now().UnixMilli())
 		addr := peer.RemoteAddr()
 		if addr != nil {
@@ -166,7 +168,9 @@ func (h *ethHandler) handleBlockBroadcast(peer *eth.Peer, packet *eth.NewBlockPa
 	// Update the peer's total difficulty if better than the previous
 	if _, td := peer.Head(); trueTD.Cmp(td) > 0 {
 		peer.SetHead(trueHead, trueTD)
-		h.chainSync.handlePeerEvent()
+		if blockFirstReceived {
+			h.chainSync.handlePeerEvent()
+		}
 	}
 	return nil
 }

eth/sync.go

@@ -79,7 +79,7 @@ type chainSyncOp struct {
 func newChainSyncer(handler *handler) *chainSyncer {
 	return &chainSyncer{
 		handler:     handler,
-		peerEventCh: make(chan struct{}),
+		peerEventCh: make(chan struct{}, 10),
 	}
 }
 
@@ -186,9 +186,9 @@ func (cs *chainSyncer) nextSyncOp() *chainSyncOp {
 	} else if op.td.Cmp(new(big.Int).Add(ourTD, common.Big2)) <= 0 { // common.Big2: difficulty of an in-turn block
 		// On BSC, blocks are produced much faster than on Ethereum.
 		// If the node is only slightly behind (e.g., 1 block), syncing is unnecessary.
-		// It's likely still processing broadcasted blocks or block hash announcements.
-		// In most cases, the node will catch up within 3 seconds.
-		time.Sleep(3 * time.Second)
+		// It's likely still processing broadcasted blocks(such as including a big tx) or block hash announcements.
+		// In most cases, the node will catch up within 2 seconds.
+		time.Sleep(2 * time.Second)
 
 		// Re-check local head to see if it has caught up
 		if _, latestTD := cs.modeAndLocalHead(); ourTD.Cmp(latestTD) < 0 {

eth/tracers/api.go

@@ -1090,7 +1090,7 @@ func (api *API) TraceCall(ctx context.Context, args ethapi.TransactionArgs, bloc
 
 	// Apply the customization rules if required.
 	if config != nil {
-		if config.BlockOverrides != nil && config.BlockOverrides.Number.ToInt().Uint64() == h.Number.Uint64()+1 {
+		if config.BlockOverrides != nil && config.BlockOverrides.Number != nil && config.BlockOverrides.Number.ToInt().Uint64() == h.Number.Uint64()+1 {
 			// Overriding the block number to n+1 is a common way for wallets to
 			// simulate transactions, however without the following fix, a contract
 			// can assert it is being simulated by checking if blockhash(n) == 0x0 and

eth/tracers/api_test.go

@@ -468,6 +468,20 @@ func TestTraceCall(t *testing.T) {
 		{"pc":0,"op":"NUMBER","gas":24946984,"gasCost":2,"depth":1,"stack":[]},
 		{"pc":1,"op":"STOP","gas":24946982,"gasCost":0,"depth":1,"stack":["0x1337"]}]}`,
 		},
+		// Tests issue #33014 where accessing nil block number override panics.
+		{
+			blockNumber: rpc.BlockNumber(0),
+			call: ethapi.TransactionArgs{
+				From:  &accounts[0].addr,
+				To:    &accounts[1].addr,
+				Value: (*hexutil.Big)(big.NewInt(1000)),
+			},
+			config: &TraceCallConfig{
+				BlockOverrides: &override.BlockOverrides{},
+			},
+			expectErr: nil,
+			expect:    `{"gas":21000,"failed":false,"returnValue":"0x","structLogs":[]}`,
+		},
 	}
 	for i, testspec := range testSuite {
 		result, err := api.TraceCall(context.Background(), testspec.call, rpc.BlockNumberOrHash{BlockNumber: &testspec.blockNumber}, testspec.config)

go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/cloudflare/cloudflare-go v0.114.0
 	github.com/cockroachdb/pebble v1.1.5
 	github.com/cometbft/cometbft v0.37.0
-	github.com/consensys/gnark-crypto v0.18.0
+	github.com/consensys/gnark-crypto v0.18.1
 	github.com/crate-crypto/go-eth-kzg v1.3.0
 	github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a
 	github.com/crate-crypto/go-kzg-4844 v1.1.0