fix: check mempool when call eth_getTransactionByHash

axonweb3 · Nov 8, 2023 · fb1ad92 · fb1ad92
1 parent 64f07fb
commit fb1ad92
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/core/api/src/adapter.rs b/core/api/src/adapter.rs
@@ -141,7 +141,11 @@ where
         ctx: Context,
         tx_hash: Hash,
     ) -> ProtocolResult<Option<SignedTransaction>> {
-        self.storage.get_transaction_by_hash(ctx, &tx_hash).await
+        if let Some(tx) = self.mempool.get_tx_from_mem(ctx.clone(), &tx_hash) {
+            Ok(Some(tx))
+        } else {
+            self.storage.get_transaction_by_hash(ctx, &tx_hash).await
+        }
     }
 
     async fn get_transactions_by_hashes(

diff --git a/core/api/src/jsonrpc/error.rs b/core/api/src/jsonrpc/error.rs
@@ -31,8 +31,6 @@ pub enum RpcError {
     GasLimitIsZero,
     #[display(fmt = "Transaction is not signed")]
     TransactionIsNotSigned,
-    #[display(fmt = "Cannot get receipt by hash")]
-    CannotGetReceiptByHash,
     #[display(fmt = "Cannot get latest block")]
     CannotGetLatestBlock,
     #[display(fmt = "Invalid block hash")]
@@ -80,7 +78,6 @@ impl RpcError {
             RpcError::GasLimitIsTooLarge => -40009,
             RpcError::GasLimitIsZero => -40010,
             RpcError::TransactionIsNotSigned => -40011,
-            RpcError::CannotGetReceiptByHash => -40012,
             RpcError::CannotGetLatestBlock => -40013,
             RpcError::InvalidBlockHash => -40014,
             RpcError::InvalidFromBlockNumber(_) => -40015,
@@ -118,7 +115,6 @@ impl From<RpcError> for ErrorObjectOwned {
             RpcError::GasLimitIsTooLarge => ErrorObject::owned(err_code, err, none_data),
             RpcError::GasLimitIsZero => ErrorObject::owned(err_code, err, none_data),
             RpcError::TransactionIsNotSigned => ErrorObject::owned(err_code, err, none_data),
-            RpcError::CannotGetReceiptByHash => ErrorObject::owned(err_code, err, none_data),
             RpcError::CannotGetLatestBlock => ErrorObject::owned(err_code, err, none_data),
             RpcError::InvalidBlockHash => ErrorObject::owned(err_code, err, none_data),
             RpcError::InvalidFromBlockNumber(_) => ErrorObject::owned(err_code, err, none_data),

diff --git a/core/api/src/jsonrpc/impl/web3.rs b/core/api/src/jsonrpc/impl/web3.rs
@@ -335,7 +335,7 @@ impl<Adapter: APIAdapter + 'static> Web3RpcServer for Web3RpcImpl<Adapter> {
             {
                 Ok(Some((stx, receipt).into()))
             } else {
-                Err(RpcError::CannotGetReceiptByHash.into())
+                Ok(Some(stx.into()))
             }
         } else {
             Ok(None)