fix(clis): Exceptions in mappers

Author: marioevz

Diff for: src/ethereum_clis/clis/besu.py

@@ -235,8 +235,7 @@ class BesuExceptionMapper(ExceptionMapper):
         TransactionException.TYPE_3_TX_MAX_BLOB_GAS_ALLOWANCE_EXCEEDED: "Invalid Blob Count",
         TransactionException.TYPE_3_TX_BLOB_COUNT_EXCEEDED: "Invalid Blob Count",
         TransactionException.TYPE_3_TX_PRE_FORK: (
-            "Transaction type BLOB is invalid, accepted transaction types are "
-            "[EIP1559, ACCESS_LIST, FRONTIER]"
+            "Transaction type BLOB is invalid, accepted transaction types are"
         ),
         TransactionException.TYPE_4_EMPTY_AUTHORIZATION_LIST: (
             "transaction invalid transaction code delegation transactions must have a "

Diff for: src/ethereum_clis/clis/erigon.py

@@ -17,6 +17,7 @@ class ErigonExceptionMapper(ExceptionMapper):
         TransactionException.PRIORITY_GREATER_THAN_MAX_FEE_PER_GAS: "tip higher than fee cap",
         TransactionException.INSUFFICIENT_MAX_FEE_PER_BLOB_GAS: "max fee per blob gas too low",
         TransactionException.NONCE_MISMATCH_TOO_LOW: "nonce too low",
+        TransactionException.TYPE_3_TX_PRE_FORK: "blob txn is not supported by signer",
         TransactionException.TYPE_3_TX_INVALID_BLOB_VERSIONED_HASH: (
             "invalid blob versioned hash, must start with VERSIONED_HASH_VERSION_KZG"
         ),

Diff for: src/ethereum_clis/clis/ethereumjs.py

@@ -61,17 +61,14 @@ class EthereumJSExceptionMapper(ExceptionMapper):
         TransactionException.PRIORITY_GREATER_THAN_MAX_FEE_PER_GAS: (
             "maxFeePerGas cannot be less than maxPriorityFeePerGas"
         ),
-        TransactionException.TYPE_3_TX_PRE_FORK: (
-            "blob tx used but field env.ExcessBlobGas missing"
-        ),
         TransactionException.TYPE_3_TX_INVALID_BLOB_VERSIONED_HASH: (
             "versioned hash does not start with KZG commitment version"
         ),
         # This message is the same as TYPE_3_TX_MAX_BLOB_GAS_ALLOWANCE_EXCEEDED
         TransactionException.TYPE_3_TX_BLOB_COUNT_EXCEEDED: "exceed maximum allowance",
         TransactionException.TYPE_3_TX_ZERO_BLOBS: "tx should contain at least one blob",
         TransactionException.TYPE_3_TX_WITH_FULL_BLOBS: "Invalid EIP-4844 transaction",
-        TransactionException.TYPE_4_TX_CONTRACT_CREATION: (
+        TransactionException.TYPE_3_TX_CONTRACT_CREATION: (
             'tx should have a "to" field and cannot be used to create contracts'
         ),
         TransactionException.TYPE_4_EMPTY_AUTHORIZATION_LIST: (
@@ -140,6 +137,9 @@ class EthereumJSExceptionMapper(ExceptionMapper):
             r"tx causes total blob gas of \d+ to exceed maximum blob gas per block of \d+|"
             r"tx can contain at most \d+ blobs"
         ),
+        TransactionException.TYPE_3_TX_PRE_FORK: (
+            r"blob tx used but field env.ExcessBlobGas missing|EIP-4844 not enabled on Common"
+        ),
         BlockException.BLOB_GAS_USED_ABOVE_LIMIT: r"invalid blobGasUsed expected=\d+ actual=\d+",
         BlockException.INCORRECT_BLOB_GAS_USED: r"invalid blobGasUsed expected=\d+ actual=\d+",
         BlockException.INVALID_BLOCK_HASH: (

Diff for: src/ethereum_clis/clis/geth.py

@@ -44,9 +44,7 @@ class GethExceptionMapper(ExceptionMapper):
         TransactionException.PRIORITY_GREATER_THAN_MAX_FEE_PER_GAS: (
             "max priority fee per gas higher than max fee per gas"
         ),
-        TransactionException.TYPE_3_TX_PRE_FORK: (
-            "blob tx used but field env.ExcessBlobGas missing"
-        ),
+        TransactionException.TYPE_3_TX_PRE_FORK: ("transaction type not supported"),
         TransactionException.TYPE_3_TX_INVALID_BLOB_VERSIONED_HASH: "has invalid hash version",
         # This message is the same as TYPE_3_TX_MAX_BLOB_GAS_ALLOWANCE_EXCEEDED
         TransactionException.TYPE_3_TX_BLOB_COUNT_EXCEEDED: "exceed maximum allowance",
@@ -67,6 +65,7 @@ class GethExceptionMapper(ExceptionMapper):
         TransactionException.NONCE_MISMATCH_TOO_LOW: "nonce too low",
         BlockException.INCORRECT_BLOB_GAS_USED: "blob gas used mismatch",
         BlockException.INCORRECT_EXCESS_BLOB_GAS: "invalid excessBlobGas",
+        BlockException.INVALID_VERSIONED_HASHES: "invalid number of versionedHashes",
         BlockException.INVALID_REQUESTS: "invalid requests hash",
         BlockException.INVALID_BLOCK_HASH: "blockhash mismatch",
         # TODO EVMONE needs to differentiate when the section is missing in the header or body

Diff for: src/ethereum_clis/clis/nethermind.py

@@ -323,7 +323,6 @@ class NethermindExceptionMapper(ExceptionMapper):
 
     mapping_substring = {
         TransactionException.SENDER_NOT_EOA: "sender has deployed code",
-        TransactionException.INSUFFICIENT_ACCOUNT_FUNDS: "insufficient sender balance",
         TransactionException.INTRINSIC_GAS_TOO_LOW: "intrinsic gas too low",
         TransactionException.INSUFFICIENT_MAX_FEE_PER_GAS: "miner premium is negative",
         TransactionException.PRIORITY_GREATER_THAN_MAX_FEE_PER_GAS: (
@@ -334,6 +333,9 @@ class NethermindExceptionMapper(ExceptionMapper):
         TransactionException.INSUFFICIENT_MAX_FEE_PER_BLOB_GAS: (
             "InsufficientMaxFeePerBlobGas: Not enough to cover blob gas fee"
         ),
+        TransactionException.TYPE_3_TX_PRE_FORK: (
+            "InvalidTxType: Transaction type in Custom is not supported"
+        ),
         TransactionException.TYPE_3_TX_ZERO_BLOBS: "blob transaction missing blob hashes",
         TransactionException.TYPE_3_TX_INVALID_BLOB_VERSIONED_HASH: (
             "InvalidBlobVersionedHashVersion: Blob version not supported"
@@ -351,6 +353,9 @@ class NethermindExceptionMapper(ExceptionMapper):
         BlockException.INVALID_REQUESTS: "InvalidRequestsHash: Requests hash mismatch in block",
     }
     mapping_regex = {
+        TransactionException.INSUFFICIENT_ACCOUNT_FUNDS: (
+            r"insufficient sender balance|insufficient MaxFeePerGas for sender balance"
+        ),
         TransactionException.TYPE_3_TX_WITH_FULL_BLOBS: r"Transaction \d+ is not valid",
         TransactionException.TYPE_3_TX_MAX_BLOB_GAS_ALLOWANCE_EXCEEDED: (
             r"BlobTxGasLimitExceeded: Transaction's totalDataGas=\d+ "

Diff for: src/ethereum_clis/clis/reth.py

@@ -22,7 +22,9 @@ class RethExceptionMapper(ExceptionMapper):
         TransactionException.TYPE_3_TX_CONTRACT_CREATION: "unexpected length",
         TransactionException.TYPE_3_TX_WITH_FULL_BLOBS: "unexpected list",
         TransactionException.TYPE_3_TX_INVALID_BLOB_VERSIONED_HASH: "blob version not supported",
-        TransactionException.TYPE_3_TX_ZERO_BLOBS: "empty blobs",
+        TransactionException.TYPE_3_TX_ZERO_BLOBS: (
+            "blob transactions present in pre-cancun payload"
+        ),
         TransactionException.TYPE_4_EMPTY_AUTHORIZATION_LIST: "empty authorization list",
         TransactionException.TYPE_4_TX_CONTRACT_CREATION: "unexpected length",
         BlockException.INVALID_REQUESTS: "mismatched block requests hash",