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

core, miner: fix inconsistent tx blacklist enforcement, close XFN-98 (#1674)

Browse source
This commit is contained in:
Daniel Liu 2025-11-18 13:54:08 +08:00 committed by benjamin202410
parent 247eb0d464
commit 2cb1d3a340
3 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/state_processor.go
View file

@ -93,7 +93,7 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, tra
// Iterate over and process the individual transactions // Iterate over and process the individual transactions
for i, tx := range block.Transactions() { for i, tx := range block.Transactions() {
// check black-list txs after hf // check black-list txs after hf
if (block.Number().Uint64() >= common.BlackListHFNumber) && !common.IsTestnet { if block.Number().Uint64() >= common.BlackListHFNumber {
// check if sender is in black list // check if sender is in black list
if common.IsInBlacklist(tx.From()) { if common.IsInBlacklist(tx.From()) {
return nil, nil, 0, fmt.Errorf("block contains transaction with sender in black-list: %v", tx.From().Hex()) return nil, nil, 0, fmt.Errorf("block contains transaction with sender in black-list: %v", tx.From().Hex())
@ -173,7 +173,7 @@ func (p *StateProcessor) ProcessBlockNoValidator(cBlock *CalculatedBlock, stated
receipts = make([]*types.Receipt, block.Transactions().Len()) receipts = make([]*types.Receipt, block.Transactions().Len())
for i, tx := range block.Transactions() { for i, tx := range block.Transactions() {
// check black-list txs after hf // check black-list txs after hf
if (block.Number().Uint64() >= common.BlackListHFNumber) && !common.IsTestnet { if block.Number().Uint64() >= common.BlackListHFNumber {
// check if sender is in black list // check if sender is in black list
if common.IsInBlacklist(tx.From()) { if common.IsInBlacklist(tx.From()) {
return nil, nil, 0, fmt.Errorf("block contains transaction with sender in black-list: %v", tx.From().Hex()) return nil, nil, 0, fmt.Errorf("block contains transaction with sender in black-list: %v", tx.From().Hex())

23
core/txpool/txpool.go
View file

@ -630,13 +630,20 @@ func (pool *TxPool) validateTx(tx *types.Transaction, local bool) error {
if uint64(tx.Size()) > txMaxSize { if uint64(tx.Size()) > txMaxSize {
return ErrOversizedData return ErrOversizedData
} }
// check if sender is in black list // Get current block number
if common.IsInBlacklist(tx.From()) { var number *big.Int = nil
return fmt.Errorf("reject transaction with sender in black-list: %v", tx.From().Hex()) if pool.chain.CurrentHeader() != nil {
number = pool.chain.CurrentHeader().Number
} }
// check if receiver is in black list if number == nil || number.Uint64() >= common.BlackListHFNumber {
if common.IsInBlacklist(tx.To()) { // check if sender is in black list
return fmt.Errorf("reject transaction with receiver in black-list: %v", tx.To().Hex()) if common.IsInBlacklist(tx.From()) {
return fmt.Errorf("reject transaction with sender in black-list: %v", tx.From().Hex())
}
// check if receiver is in black list
if common.IsInBlacklist(tx.To()) {
return fmt.Errorf("reject transaction with receiver in black-list: %v", tx.To().Hex())
}
} }
// Transactions can't be negative. This may never happen using RLP decoded // Transactions can't be negative. This may never happen using RLP decoded
// transactions but may occur if you create a transaction using the RPC. // transactions but may occur if you create a transaction using the RPC.
@ -687,10 +694,6 @@ func (pool *TxPool) validateTx(tx *types.Transaction, local bool) error {
// cost == V + GP * GL // cost == V + GP * GL
balance := pool.currentState.GetBalance(from) balance := pool.currentState.GetBalance(from)
cost := tx.Cost() cost := tx.Cost()
var number *big.Int = nil
if pool.chain.CurrentHeader() != nil {
number = pool.chain.CurrentHeader().Number
}
minGasPrice := common.GetMinGasPrice(number) minGasPrice := common.GetMinGasPrice(number)
feeCapacity := big.NewInt(0) feeCapacity := big.NewInt(0)

6
miner/worker.go
View file

@ -947,8 +947,7 @@ func (w *Work) commitTransactions(mux *event.TypeMux, balanceFee map[common.Addr
// first priority for special Txs // first priority for special Txs
for _, tx := range specialTxs { for _, tx := range specialTxs {
to := tx.To() to := tx.To()
//HF number for black-list if w.header.Number.Uint64() >= common.BlackListHFNumber {
if (w.header.Number.Uint64() >= common.BlackListHFNumber) && !common.IsTestnet {
from := tx.From() from := tx.From()
// check if sender is in black list // check if sender is in black list
if common.IsInBlacklist(from) { if common.IsInBlacklist(from) {
@ -1057,9 +1056,8 @@ func (w *Work) commitTransactions(mux *event.TypeMux, balanceFee map[common.Addr
break break
} }
//HF number for black-list
to := tx.To() to := tx.To()
if (w.header.Number.Uint64() >= common.BlackListHFNumber) && !common.IsTestnet { if w.header.Number.Uint64() >= common.BlackListHFNumber {
from := tx.From() from := tx.From()
// check if sender is in black list // check if sender is in black list
if common.IsInBlacklist(from) { if common.IsInBlacklist(from) {