core/txpool/validation.go

Type	MOD
Upstream Lines	311
Changed	+2 -2

Rename IsLondon→IsEIP1559 (reject DynamicFee txs when EIP-1559 is off) and honour IsSpiral as the EIP-3860 init-code-size activator in tx pool validation

diff --git a/core/txpool/validation.go b/core/txpool/validation.go
index 3b30dd30e..c54a7dc36 100644
--- a/core/txpool/validation.go
+++ b/core/txpool/validation.go
@@ -77,8 +77,8 @@ func ValidateTransaction(tx *types.Transaction, head *types.Header, signer types
    if !rules.IsBerlin && tx.Type() != types.LegacyTxType {
        return fmt.Errorf("%w: type %d rejected, pool not yet in Berlin", core.ErrTxTypeNotSupported, tx.Type())
    }
-   if !rules.IsLondon && tx.Type() == types.DynamicFeeTxType {
-       return fmt.Errorf("%w: type %d rejected, pool not yet in London", core.ErrTxTypeNotSupported, tx.Type())
+   if !rules.IsEIP1559 && tx.Type() == types.DynamicFeeTxType {
+       return fmt.Errorf("%w: type %d rejected, EIP-1559 not active", core.ErrTxTypeNotSupported, tx.Type())
    }
    if !rules.IsCancun && tx.Type() == types.BlobTxType {
        return fmt.Errorf("%w: type %d rejected, pool not yet in Cancun", core.ErrTxTypeNotSupported, tx.Type())

← Back to Core & EVM