Bugfix: GasPool should return ErrGasLimitReached

core/error.go

@@ -94,10 +94,6 @@ var (
 	// next one expected based on the local chain.
 	ErrNonceTooHigh = errors.New("nonce too high")
 
-	// ErrGasLimitReached is returned by the gas pool if the amount of gas required
-	// by a transaction is higher than what's left in the block.
-	ErrGasLimitReached = errors.New("gas limit reached")
-
 	// ErrEtxLimitReached is returned when the ETXs emitted by a transaction
 	// would violate the block's ETX limits.
 	ErrEtxLimitReached = errors.New("etx limit reached")

core/types/gaspool.go

@@ -22,6 +22,10 @@ import (
 	"math"
 )
 
+// ErrGasLimitReached is returned by the gas pool if the amount of gas required
+// by a transaction is higher than what's left in the block.
+var ErrGasLimitReached = errors.New("gas limit reached")
+
 // GasPool tracks the amount of gas available during execution of the transactions
 // in a block. The zero value is a pool with zero gas available.
 type GasPool uint64
@@ -39,7 +43,7 @@ func (gp *GasPool) AddGas(amount uint64) *GasPool {
 // available and returns an error otherwise.
 func (gp *GasPool) SubGas(amount uint64) error {
 	if uint64(*gp) < amount {
-		return errors.New("gas limit reached")
+		return ErrGasLimitReached
 	}
 	*(*uint64)(gp) -= amount
 	return nil

core/worker.go

@@ -945,7 +945,7 @@ func (w *worker) commitTransactions(env *environment, parent *types.WorkObject,
 
 		logs, err := w.commitTransaction(env, parent, tx)
 		switch {
-		case errors.Is(err, ErrGasLimitReached):
+		case errors.Is(err, types.ErrGasLimitReached):
 			// Pop the current out-of-gas transaction without shifting in the next from the account
 			w.logger.WithField("sender", from).Trace("Gas limit exceeded for current block")
 			txs.PopNoSort()