Hndl RPC_INVALID_ADDRESS_OR_KEY err for transaction.get

romanz · Oct 22, 2023 · fbaa2c3 · fbaa2c3
1 parent eb63c2c
commit fbaa2c3
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/src/electrum.rs b/src/electrum.rs
@@ -5,6 +5,7 @@ use bitcoin::{
     BlockHash, Txid,
 };
 use crossbeam_channel::Receiver;
+use num_traits::FromPrimitive;
 use rayon::prelude::*;
 use serde_derive::Deserialize;
 use serde_json::{self, json, Value};
@@ -17,7 +18,7 @@ use std::str::FromStr;
 use crate::{
     cache::Cache,
     config::{Config, ELECTRS_VERSION},
-    daemon::{self, extract_bitcoind_error, Daemon},
+    daemon::{self, extract_bitcoind_error, Daemon, RPCErrorCode},
     merkle::Proof,
     metrics::{self, Histogram, Metrics},
     signals::Signal,
@@ -624,6 +625,17 @@ impl Params {
             }
         })
     }
+    fn parse_rpc_error_code(&self, code: i32) -> Option<RpcError> {
+        match self {
+            Params::TransactionGet(_) => match RPCErrorCode::from_i32(code) {
+                Some(RPCErrorCode::RpcInvalidAddressOrKey) => {
+                    Some(RpcError::BadRequest(anyhow!("Transaction not found")))
+                }
+                _ => None,
+            },
+            _ => None,
+        }
+    }
 }
 
 struct Call {
@@ -653,7 +665,10 @@ impl Call {
                     .downcast_ref::<bitcoincore_rpc::Error>()
                     .and_then(extract_bitcoind_error)
                 {
-                    Some(e) => error_msg(&self.id, RpcError::DaemonError(e.clone())),
+                    Some(e) => match self.params.parse_rpc_error_code(e.code) {
+                        Some(err) => error_msg(&self.id, err),
+                        None => error_msg(&self.id, RpcError::DaemonError(e.clone())),
+                    },
                     None => error_msg(&self.id, RpcError::BadRequest(err)),
                 }
             }