Fix recognition of intrinsic gas error

Author: jenikd

ethapi/api.go

@@ -1189,7 +1189,7 @@ func DoEstimateGas(ctx context.Context, b Backend, args TransactionArgs, blockNr
 
 		result, err := DoCall(ctx, b, args, blockNrOrHash, nil, 0, gasCap)
 		if err != nil {
-			if errors.Is(err, evmcore.ErrIntrinsicGas) {
+			if errors.Is(err, core.ErrIntrinsicGas) {
 				return true, nil, nil // Special case, raise gas limit
 			}
 			return true, nil, err // Bail out

evmcore/error.go

@@ -18,7 +18,9 @@ package evmcore
 
 import (
 	"errors"
+	"fmt"
 
+	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/types"
 )
 
@@ -60,7 +62,7 @@ var (
 
 	// ErrIntrinsicGas is returned if the transaction is specified to use less gas
 	// than required to start the invocation.
-	ErrIntrinsicGas = errors.New("intrinsic gas too low")
+	ErrIntrinsicGas = fmt.Errorf("%w", core.ErrIntrinsicGas)
 
 	// ErrTxTypeNotSupported is returned if a transaction is not supported in the
 	// current network configuration.