Error kind detection bug fix (#1769)

jsonrpc/eth_endpoint.go

@@ -573,8 +573,16 @@ func (e *Eth) EstimateGas(arg *txnArgs, rawNum *BlockNumber) (interface{}, error
 
 	// Checks if executor level valid gas errors occurred
 	isGasApplyError := func(err error) bool {
-		// Not linting this as the underlying error is actually wrapped
-		return errors.Is(err, state.ErrNotEnoughIntrinsicGas)
+		if errors.Is(err, state.ErrNotEnoughIntrinsicGas) {
+			return true
+		}
+
+		var expected *state.TransitionApplicationError
+		if errors.As(err, &expected) {
+			return errors.Is(expected.Err, state.ErrNotEnoughIntrinsicGas)
+		}
+
+		return false
 	}
 
 	// Checks if EVM level valid gas errors occurred

state/executor.go

@@ -519,11 +519,11 @@ func (t *Transition) checkDynamicFees(msg *types.Transaction) error {
 // surfacing of these errors reject the transaction thus not including it in the block
 
 var (
-	ErrNonceIncorrect        = fmt.Errorf("incorrect nonce")
-	ErrNotEnoughFundsForGas  = fmt.Errorf("not enough funds to cover gas costs")
-	ErrBlockLimitReached     = fmt.Errorf("gas limit reached in the pool")
-	ErrIntrinsicGasOverflow  = fmt.Errorf("overflow in intrinsic gas calculation")
-	ErrNotEnoughIntrinsicGas = fmt.Errorf("not enough gas supplied for intrinsic gas costs")
+	ErrNonceIncorrect        = errors.New("incorrect nonce")
+	ErrNotEnoughFundsForGas  = errors.New("not enough funds to cover gas costs")
+	ErrBlockLimitReached     = errors.New("gas limit reached in the pool")
+	ErrIntrinsicGasOverflow  = errors.New("overflow in intrinsic gas calculation")
+	ErrNotEnoughIntrinsicGas = errors.New("not enough gas supplied for intrinsic gas costs")
 
 	// ErrTipAboveFeeCap is a sanity error to ensure no one is able to specify a
 	// transaction with a tip higher than the total fee cap.

txrelayer/txrelayer.go

@@ -105,7 +105,7 @@ func (t *TxRelayerImpl) sendTransactionLocked(txn *ethgo.Transaction, key ethgo.
 
 	nonce, err := t.client.Eth().GetNonce(key.Address(), ethgo.Pending)
 	if err != nil {
-		return ethgo.ZeroHash, err
+		return ethgo.ZeroHash, fmt.Errorf("failed to get nonce: %w", err)
 	}
 
 	txn.Nonce = nonce
@@ -115,7 +115,7 @@ func (t *TxRelayerImpl) sendTransactionLocked(txn *ethgo.Transaction, key ethgo.
 	if txn.GasPrice == 0 {
 		gasPrice, err := t.Client().Eth().GasPrice()
 		if err != nil {
-			return ethgo.ZeroHash, err
+			return ethgo.ZeroHash, fmt.Errorf("failed to get gas price: %w", err)
 		}
 
 		txn.GasPrice = gasPrice + (gasPrice * gasPricePercent / 100)
@@ -124,7 +124,7 @@ func (t *TxRelayerImpl) sendTransactionLocked(txn *ethgo.Transaction, key ethgo.
 	if txn.Gas == 0 {
 		gasLimit, err := t.client.Eth().EstimateGas(ConvertTxnToCallMsg(txn))
 		if err != nil {
-			return ethgo.ZeroHash, err
+			return ethgo.ZeroHash, fmt.Errorf("failed to estimate gas: %w", err)
 		}
 
 		txn.Gas = gasLimit + (gasLimit * gasLimitPercent / 100)