feat(errors): catch error and map to invalid params (#1146)

Author: 0xfourzerofour

crates/pool/proto/op_pool/op_pool.proto

@@ -620,6 +620,7 @@ message MempoolError {
     TooManyExpectedStorageSlots too_many_expected_storage_slots = 19;
     UseUnsupportedEIP use_unsupported_eip = 20;
     AggregatorError aggregator = 21;
+    Invalid7702AuthSignature invalid_7702_auth_signature = 22;
   }
 }
 
@@ -660,6 +661,9 @@ message SenderAddressUsedAsAlternateEntity {
 
 message DiscardedOnInsertError {}
 
+message Invalid7702AuthSignature {
+  string reason = 1;
+}
 
 message AggregatorError {
   string reason = 1;

crates/pool/src/mempool/pool.rs

@@ -453,7 +453,8 @@ where
                 .chain_spec
                 .supports_eip7702(self.config.entry_point)
             {
-                auth.validate(uo.sender())?;
+                auth.validate(uo.sender())
+                    .map_err(|err| MempoolError::Invalid7702AuthSignature(err.to_string()))?;
                 Ok(())
             } else {
                 Err(MempoolError::EIPNotSupported("EIP-7702".to_string()))

crates/pool/src/server/remote/error.rs

@@ -28,20 +28,20 @@ use super::protos::{
     CallGasLimitTooLow, CallHadValue, CalledBannedEntryPointMethod, CodeHashChanged, DidNotRevert,
     DiscardedOnInsertError, Entity, EntityThrottledError, EntityType, EntryPointRevert,
     ExecutionGasLimitEfficiencyTooLow, ExistingSenderWithInitCode, FactoryCalledCreate2Twice,
-    FactoryIsNotContract, FactoryMustBeEmpty, InvalidAccountSignature, InvalidPaymasterSignature,
-    InvalidSignature, InvalidStorageAccess, InvalidTimeRange, MaxFeePerGasTooLow,
-    MaxOperationsReachedError, MaxPriorityFeePerGasTooLow, MempoolError as ProtoMempoolError,
-    MultipleRolesViolation, NotStaked, OperationAlreadyKnownError, OperationDropTooSoon,
-    OperationRevert, OutOfGas, OverMaxCost, PanicRevert, PaymasterBalanceTooLow,
-    PaymasterDepositTooLow, PaymasterIsNotContract, PreVerificationGasTooLow,
-    PrecheckViolationError as ProtoPrecheckViolationError, ReplacementUnderpricedError,
-    SenderAddressUsedAsAlternateEntity, SenderFundsTooLow, SenderIsNotContractAndNoInitCode,
-    SimulationViolationError as ProtoSimulationViolationError, TooManyExpectedStorageSlots,
-    TotalGasLimitTooHigh, UnintendedRevert, UnintendedRevertWithMessage, UnknownEntryPointError,
-    UnknownRevert, UnstakedPaymasterContext, UseUnsupportedEip, UsedForbiddenOpcode,
-    UsedForbiddenPrecompile, ValidationRevert as ProtoValidationRevert,
-    VerificationGasLimitBufferTooLow, VerificationGasLimitEfficiencyTooLow,
-    VerificationGasLimitTooHigh, WrongNumberOfPhases,
+    FactoryIsNotContract, FactoryMustBeEmpty, Invalid7702AuthSignature, InvalidAccountSignature,
+    InvalidPaymasterSignature, InvalidSignature, InvalidStorageAccess, InvalidTimeRange,
+    MaxFeePerGasTooLow, MaxOperationsReachedError, MaxPriorityFeePerGasTooLow,
+    MempoolError as ProtoMempoolError, MultipleRolesViolation, NotStaked,
+    OperationAlreadyKnownError, OperationDropTooSoon, OperationRevert, OutOfGas, OverMaxCost,
+    PanicRevert, PaymasterBalanceTooLow, PaymasterDepositTooLow, PaymasterIsNotContract,
+    PreVerificationGasTooLow, PrecheckViolationError as ProtoPrecheckViolationError,
+    ReplacementUnderpricedError, SenderAddressUsedAsAlternateEntity, SenderFundsTooLow,
+    SenderIsNotContractAndNoInitCode, SimulationViolationError as ProtoSimulationViolationError,
+    TooManyExpectedStorageSlots, TotalGasLimitTooHigh, UnintendedRevert,
+    UnintendedRevertWithMessage, UnknownEntryPointError, UnknownRevert, UnstakedPaymasterContext,
+    UseUnsupportedEip, UsedForbiddenOpcode, UsedForbiddenPrecompile,
+    ValidationRevert as ProtoValidationRevert, VerificationGasLimitBufferTooLow,
+    VerificationGasLimitEfficiencyTooLow, VerificationGasLimitTooHigh, WrongNumberOfPhases,
 };
 
 impl TryFrom<ProtoMempoolError> for PoolError {
@@ -141,6 +141,9 @@ impl TryFrom<ProtoMempoolError> for MempoolError {
             Some(mempool_error::Error::UseUnsupportedEip(e)) => {
                 MempoolError::EIPNotSupported(e.eip_name)
             }
+            Some(mempool_error::Error::Invalid7702AuthSignature(e)) => {
+                MempoolError::Invalid7702AuthSignature(e.reason)
+            }
             None => bail!("unknown proto mempool error"),
         })
     }
@@ -270,6 +273,11 @@ impl From<MempoolError> for ProtoMempoolError {
                     eip_name: msg,
                 })),
             },
+            MempoolError::Invalid7702AuthSignature(msg) => ProtoMempoolError {
+                error: Some(mempool_error::Error::Invalid7702AuthSignature(
+                    Invalid7702AuthSignature { reason: msg },
+                )),
+            },
         }
     }
 }

crates/rpc/src/eth/error.rs

@@ -315,6 +315,7 @@ impl From<MempoolError> for EthRpcError {
             | MempoolError::VerificationGasLimitEfficiencyTooLow(_, _)
             | MempoolError::ExecutionGasLimitEfficiencyTooLow(_, _)
             | MempoolError::TooManyExpectedStorageSlots(_, _)
+            | MempoolError::Invalid7702AuthSignature(_)
             | MempoolError::EIPNotSupported(_) => Self::InvalidParams(value.to_string()),
         }
     }

crates/types/src/pool/error.rs

@@ -75,6 +75,9 @@ pub enum MempoolError {
     /// Operation was discarded on inserting due to size limit
     #[error("Operation was discarded on inserting")]
     DiscardedOnInsert,
+    /// Operation 7702 Authorization tuple was signed with the wrong address
+    #[error("Invalid 7702 Auth signature: {0}")]
+    Invalid7702AuthSignature(String),
     /// Paymaster balance too low
     /// Spec rule: EREP-010
     #[error("Paymaster balance too low. Required balance: {0}. Current balance {1}")]