Merge pull request #3275 from Pana/op/errorMessage

op: optimize FutureTxType error message

Author: Pana

crates/cfxcore/core/src/transaction_pool/error.rs

@@ -67,7 +67,7 @@ impl From<TransactionPoolError> for EthApiError {
                 TransactionError::TooBig => Self::InvalidTransaction(RpcInvalidTransactionError::MaxInitCodeSizeExceeded),
                 TransactionError::InvalidRlp(_) => Self::FailedToDecodeSignedTransaction,
                 TransactionError::ZeroGasPrice => Self::PoolError(RpcPoolError::Underpriced),
-                TransactionError::FutureTransactionType => Self::InvalidTransaction(RpcInvalidTransactionError::TxTypeNotSupported),
+                TransactionError::FutureTransactionType { .. } => Self::InvalidTransaction(RpcInvalidTransactionError::TxTypeNotSupported),
                 TransactionError::InvalidReceiver => Self::Other("Invalid receiver".to_string()),
                 TransactionError::TooLargeNonce => Self::InvalidTransaction(RpcInvalidTransactionError::NonceMaxValue),
                 TransactionError::CreateInitCodeSizeLimit => Self::InvalidTransaction(RpcInvalidTransactionError::MaxInitCodeSizeExceeded),

crates/cfxcore/core/src/verification.rs

@@ -27,6 +27,7 @@ use primitives::{
     block_header::compute_next_price_tuple,
     transaction::{
         native_transaction::TypedNativeTransaction, TransactionError,
+        EIP1559_TYPE, EIP7702_TYPE, LEGACY_TX_TYPE,
     },
     Action, Block, BlockHeader, BlockReceipts, MerkleHash, Receipt,
     SignedTransaction, Transaction, TransactionWithSignature,
@@ -777,15 +778,27 @@ impl VerificationConfig {
         }
 
         if !Self::check_eip155_transaction(tx, cip90a, &mode) {
-            bail!(TransactionError::FutureTransactionType);
+            bail!(TransactionError::FutureTransactionType {
+                tx_type: LEGACY_TX_TYPE,
+                current_height: height,
+                enable_height: transitions.cip90a,
+            });
         }
 
         if !Self::check_eip1559_transaction(tx, cip1559, &mode) {
-            bail!(TransactionError::FutureTransactionType)
+            bail!(TransactionError::FutureTransactionType {
+                tx_type: EIP1559_TYPE,
+                current_height: height,
+                enable_height: transitions.cip1559,
+            })
         }
 
         if !Self::check_eip7702_transaction(tx, cip7702, &mode) {
-            bail!(TransactionError::FutureTransactionType)
+            bail!(TransactionError::FutureTransactionType {
+                tx_type: EIP7702_TYPE,
+                current_height: height,
+                enable_height: transitions.cip7702,
+            })
         }
 
         if !Self::check_eip3860(tx, cip645) {

crates/primitives/src/transaction/mod.rs

@@ -131,7 +131,11 @@ pub enum TransactionError {
     InvalidRlp(String),
     ZeroGasPrice,
     /// Transaction types have not been activated
-    FutureTransactionType,
+    FutureTransactionType {
+        tx_type: u8,
+        enable_height: u64,
+        current_height: u64,
+    },
     /// Create transaction with too large init code size,
     CreateInitCodeSizeLimit,
     /// Receiver with invalid type bit.
@@ -203,7 +207,7 @@ impl fmt::Display for TransactionError {
                 format!("Transaction has invalid RLP structure: {}.", err)
             }
             ZeroGasPrice => "Zero gas price is not allowed".into(),
-            FutureTransactionType => "Ethereum like transaction should have u64::MAX storage limit".into(),
+            FutureTransactionType {tx_type, current_height, enable_height} => format!("Transaction type {tx_type} is not enabled, current height {current_height}, enable height {enable_height}"),
             InvalidReceiver => "Sending transaction to invalid address. The first four bits of address must be 0x0, 0x1, or 0x8.".into(),
             TooLargeNonce => "Transaction nonce is too large.".into(),
             CreateInitCodeSizeLimit => "Transaction initcode is too large.".into(),