CR's fixes

core/vm/evm.go

@@ -55,25 +55,29 @@ func (evm *EVM) precompile(addr common.Address) (contract.StatefulPrecompiledCon
 		precompiles = PrecompiledContractsHomestead
 	}
 
-	// Check the existing precompiles first
+	// Check the native stateless precompiles first
 	p, ok := precompiles[addr]
 	if ok {
 		return p, true
 	}
 
-	// Otherwise, check for the additionally configured precompiles.
-	module, ok := modules.GetPrecompileModuleByAddress(addr)
-	if !ok {
+	// Otherwise, check for the additionally configured stateful precompiles
+	if !evm.isStatefulPrecompileEnabled(addr) {
 		return nil, false
 	}
-	// Precompile is registered, check if it's enabled at this block height
-	if !slices.Contains(evm.enabledPrecompiles, addr) {
+	module, ok := modules.GetPrecompileModuleByAddress(addr)
+	if !ok {
 		return nil, false
 	}
 
 	return module.Contract, true
 }
 
+// isStatefulPrecompileEnabled checks if stateful precompile is enabled at current block height
+func (evm *EVM) isStatefulPrecompileEnabled(addr common.Address) bool {
+	return slices.Contains(evm.enabledPrecompiles, addr)
+}
+
 // BlockContext provides the EVM with auxiliary information. Once provided
 // it shouldn't be modified.
 type BlockContext struct {