From 89c6d48dfd906aeea3598acdf3d66c912a85a709 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Sat, 9 Jan 2021 20:48:10 -0800
Subject: [PATCH] fix(hydrateUtxos): Passing error message to bch-js

---
 src/routes/v4/route-utils.js | 9 +++++++++
 src/routes/v4/slp.js         | 2 ++
 src/util/route-utils.js      | 9 +++++++++
 3 files changed, 20 insertions(+)

diff --git a/src/routes/v4/route-utils.js b/src/routes/v4/route-utils.js
index fe86c44..cab689c 100644
--- a/src/routes/v4/route-utils.js
+++ b/src/routes/v4/route-utils.js
@@ -175,8 +175,17 @@ function decodeError (err) {
       }
     }
 
+    // Handle general Error objects.
+    if (err.message) {
+      return {
+        message: err.message,
+        status: 422
+      }
+    }
+
     return { msg: false, status: 500 }
   } catch (err) {
+    console.error('unhandled error in route-utils.js/decodeError(): ', err)
     wlogger.error('unhandled error in route-utils.js/decodeError(): ', err)
     return { msg: false, status: 500 }
   }
diff --git a/src/routes/v4/slp.js b/src/routes/v4/slp.js
index adbe985..9ab257b 100644
--- a/src/routes/v4/slp.js
+++ b/src/routes/v4/slp.js
@@ -1999,6 +1999,8 @@ class Slp {
 
       // Decode the error message.
       const { msg, status } = routeUtils.decodeError(err)
+      console.log('msg: ', msg)
+      console.log('status: ', status)
       if (msg) {
         res.status(status)
         return res.json({ error: msg })
diff --git a/src/util/route-utils.js b/src/util/route-utils.js
index a12abd4..d5a98ff 100644
--- a/src/util/route-utils.js
+++ b/src/util/route-utils.js
@@ -154,8 +154,17 @@ class RouteUtils {
         }
       }
 
+      // Handle general Error objects.
+      if (err.message) {
+        return {
+          msg: err.message,
+          status: 422
+        }
+      }
+
       return { msg: false, status: 500 }
     } catch (err) {
+      console.error('unhandled error in route-utils.js/decodeError(): ', err)
       wlogger.error('unhandled error in route-utils.js/decodeError(): ', err)
       return { msg: false, status: 500 }
     }