forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-25 14:16:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "Implement Horizontally Sharded Blob Mempool"

Browse source 
This reverts commit 1d59ebae22.
This commit is contained in:
Arunima Chaudhuri 2025-06-11 00:13:52 +05:30
parent 1d59ebae22
commit a4ae7bab4d
2 changed files with 1 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
eth/catalyst/api.go
View file

@ -150,15 +150,12 @@ type ConsensusAPI struct {
forkchoiceLock sync.Mutex // Lock for the forkChoiceUpdated method
newPayloadLock sync.Mutex // Lock for the NewPayload method
isProposer atomic.Bool // Tracks if the node is currently identified as a proposer
}
// NewConsensusAPI creates a new consensus api for the given backend.
// The underlying blockchain needs to have a valid terminal total difficulty set.
func NewConsensusAPI(eth *eth.Ethereum) *ConsensusAPI {
api := newConsensusAPIWithoutHeartbeat(eth)
api.isProposer.Store(false)
go api.heartbeat()
return api
}
@ -175,7 +172,6 @@ func newConsensusAPIWithoutHeartbeat(eth *eth.Ethereum) *ConsensusAPI {
invalidBlocksHits: make(map[common.Hash]int),
invalidTipsets: make(map[common.Hash]*types.Header),
}
api.isProposer.Store(false)
eth.Downloader().SetBadBlockCallback(api.setInvalidAncestor)
return api
}
@ -202,9 +198,6 @@ func (api *ConsensusAPI) ForkchoiceUpdatedV1(update engine.ForkchoiceStateV1, pa
case !api.checkFork(payloadAttributes.Timestamp, forks.Paris, forks.Shanghai):
return engine.STATUS_INVALID, paramsErr("fcuV1 called post-shanghai")
}
api.isProposer.Store(true)
} else {
api.isProposer.Store(false)
}
return api.forkchoiceUpdated(update, payloadAttributes, engine.PayloadV1, false)
}
@ -223,9 +216,6 @@ func (api *ConsensusAPI) ForkchoiceUpdatedV2(update engine.ForkchoiceStateV1, pa
case !api.checkFork(params.Timestamp, forks.Paris, forks.Shanghai):
return engine.STATUS_INVALID, unsupportedForkErr("fcuV2 must only be called with paris or shanghai payloads")
}
api.isProposer.Store(true)
} else {
api.isProposer.Store(false)
}
return api.forkchoiceUpdated(update, params, engine.PayloadV2, false)
}
@ -242,9 +232,6 @@ func (api *ConsensusAPI) ForkchoiceUpdatedV3(update engine.ForkchoiceStateV1, pa
case !api.checkFork(params.Timestamp, forks.Cancun, forks.Prague):
return engine.STATUS_INVALID, unsupportedForkErr("fcuV3 must only be called for cancun or prague payloads")
}
api.isProposer.Store(true)
} else {
api.isProposer.Store(false)
}
// TODO(matt): the spec requires that fcu is applied when called on a valid
// hash, even if params are wrong. To do this we need to split up
@ -253,10 +240,6 @@ func (api *ConsensusAPI) ForkchoiceUpdatedV3(update engine.ForkchoiceStateV1, pa
return api.forkchoiceUpdated(update, params, engine.PayloadV3, false)
}
func (api *ConsensusAPI) IsProposer() bool {
return api.isProposer.Load()
}
func (api *ConsensusAPI) forkchoiceUpdated(update engine.ForkchoiceStateV1, payloadAttributes *engine.PayloadAttributes, payloadVersion engine.PayloadVersion, payloadWitness bool) (engine.ForkChoiceResponse, error) {
api.forkchoiceLock.Lock()
defer api.forkchoiceLock.Unlock()

24
eth/protocols/eth/handlers.go
View file

@ -514,38 +514,16 @@ func handlePooledTransactions(backend Backend, msg Decoder, peer *Peer) error {
if err := msg.Decode(&txs); err != nil {
return err
}
peerID := peer.ID()
peerIDLast4 := peerID[len(peerID)-1] & 0x0F
isProposer := false
var filteredTxs []*types.Transaction
for i, tx := range txs.PooledTransactionsResponse {
// Validate and mark the remote transaction
if tx == nil {
return fmt.Errorf("PooledTransactions: transaction %d is nil", i)
}
txHash := tx.Hash()
txHashLast4 := txHash[len(txHash)-1] & 0x0F
if txHashLast4 != peerIDLast4 && !isProposer && tx.Type() == types.BlobTxType {
continue
}
peer.markTransaction(tx.Hash())
filteredTxs = append(filteredTxs, tx)
}
requestTracker.Fulfil(peer.id, peer.version, PooledTransactionsMsg, txs.RequestId)
if len(filteredTxs) == 0 {
return nil
}
return backend.Handle(peer, &PooledTransactionsPacket{
PooledTransactionsResponse: filteredTxs,
RequestId: txs.RequestId,
})
return backend.Handle(peer, &txs.PooledTransactionsResponse)
}
func handleBlockRangeUpdate(backend Backend, msg Decoder, peer *Peer) error {