chore: aggregate PRs (#11286)

This PR aggregates changes from the following PRs:

- Closes #11283 by @\oooLowNeoNooo
- Closes #11285 by @\Sharilleed223

Author: DaniPopes

crates/anvil/core/src/eth/wallet.rs

@@ -40,24 +40,24 @@ pub enum WalletError {
     /// The transaction value is not 0.
     ///
     /// The value should be 0 to prevent draining the sequencer.
-    #[error("tx value not zero")]
+    #[error("transaction value must be zero for delegated transactions")]
     ValueNotZero,
     /// The from field is set on the transaction.
     ///
     /// Requests with the from field are rejected, since it is implied that it will always be the
     /// sequencer.
-    #[error("tx from field is set")]
+    #[error("transaction 'from' field should not be set for delegated transactions")]
     FromSet,
     /// The nonce field is set on the transaction.
     ///
     /// Requests with the nonce field set are rejected, as this is managed by the sequencer.
-    #[error("tx nonce is set")]
+    #[error("transaction nonce should not be set for delegated transactions")]
     NonceSet,
     /// An authorization item was invalid.
     ///
     /// The item is invalid if it tries to delegate an account to a contract that is not
     /// whitelisted.
-    #[error("invalid authorization address")]
+    #[error("invalid authorization address: contract is not whitelisted for delegation")]
     InvalidAuthorization,
     /// The to field of the transaction was invalid.
     ///
@@ -66,14 +66,14 @@ pub enum WalletError {
     /// - There is no bytecode at the destination, or
     /// - The bytecode is not an EIP-7702 delegation designator, or
     /// - The delegation designator points to a contract that is not whitelisted
-    #[error("the destination of the transaction is not a delegated account")]
+    #[error("transaction destination is not a valid delegated account")]
     IllegalDestination,
     /// The transaction request was invalid.
     ///
     /// This is likely an internal error, as most of the request is built by the sequencer.
-    #[error("invalid tx request")]
+    #[error("invalid transaction request format")]
     InvalidTransactionRequest,
     /// An internal error occurred.
-    #[error("internal error")]
+    #[error("internal server error occurred")]
     InternalError,
 }

crates/anvil/src/eth/error.rs

@@ -105,7 +105,7 @@ pub enum BlockchainError {
         "op-stack deposit tx received but is not supported.\n\nYou can use it by running anvil with '--optimism'."
     )]
     DepositTransactionUnsupported,
-    #[error("UnknownTransactionType not supported ")]
+    #[error("Unknown transaction type not supported")]
     UnknownTransactionType,
     #[error("Excess blob gas not set.")]
     ExcessBlobGasNotSet,
@@ -178,21 +178,7 @@ where
 
 impl From<WalletError> for BlockchainError {
     fn from(value: WalletError) -> Self {
-        match value {
-            WalletError::ValueNotZero => Self::Message("tx value not zero".to_string()),
-            WalletError::FromSet => Self::Message("tx from field is set".to_string()),
-            WalletError::NonceSet => Self::Message("tx nonce is set".to_string()),
-            WalletError::InvalidAuthorization => {
-                Self::Message("invalid authorization address".to_string())
-            }
-            WalletError::IllegalDestination => Self::Message(
-                "the destination of the transaction is not a delegated account".to_string(),
-            ),
-            WalletError::InternalError => Self::Message("internal error".to_string()),
-            WalletError::InvalidTransactionRequest => {
-                Self::Message("invalid tx request".to_string())
-            }
-        }
+        Self::Message(value.to_string())
     }
 }
 
@@ -349,7 +335,7 @@ impl From<InvalidTransaction> for InvalidTransactionError {
                 Self::GasTooHigh(ErrDetail { detail: String::from("CallGasCostMoreThanGasLimit") })
             }
             InvalidTransaction::GasFloorMoreThanGasLimit { .. } => {
-                Self::GasTooHigh(ErrDetail { detail: String::from("CallGasCostMoreThanGasLimit") })
+                Self::GasTooHigh(ErrDetail { detail: String::from("GasFloorMoreThanGasLimit") })
             }
             InvalidTransaction::RejectCallerWithCode => Self::SenderNoEOA,
             InvalidTransaction::LackOfFundForMaxFee { .. } => Self::InsufficientFunds,