Merge branch 'main' into transactions-db-migration

stellar · Jun 13, 2024 · dbe9bcd · dbe9bcd
2 parents c1620d2 + 2570fd2
commit dbe9bcd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/cmd/crates/stellar-rpc-client/src/lib.rs b/cmd/crates/stellar-rpc-client/src/lib.rs
@@ -802,7 +802,9 @@ impl Client {
     pub async fn get_transaction(&self, tx_id: &Hash) -> Result<GetTransactionResponse, Error> {
         let mut oparams = ObjectParams::new();
         oparams.insert("hash", tx_id)?;
-        Ok(self.client().request("getTransaction", oparams).await?)
+        let resp: GetTransactionResponseRaw =
+            self.client().request("getTransaction", oparams).await?;
+        Ok(resp.try_into()?)
     }
 
     /// Poll the transaction status. Can provide a timeout in seconds, otherwise uses the default timeout.

diff --git a/cmd/soroban-rpc/internal/methods/get_transaction.go b/cmd/soroban-rpc/internal/methods/get_transaction.go
@@ -105,7 +105,10 @@ func GetTransaction(
 		log.WithError(err).
 			WithField("hash", txHash).
 			Errorf("failed to fetch transaction")
-		return response, err
+		return response, &jrpc2.Error{
+			Code:    jrpc2.InternalError,
+			Message: err.Error(),
+		}
 	}
 
 	response.ApplicationOrder = tx.ApplicationOrder