Merge pull request #84 from shapeshift/fix/error-logs

shapeshift · Jul 26, 2024 · f57386e · f57386e
2 parents cd76ea8 + 4f7ebe7
commit f57386e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/cli/src/ipfs.ts b/cli/src/ipfs.ts
@@ -1,6 +1,6 @@
 import * as prompts from '@inquirer/prompts'
 import PinataClient from '@pinata/sdk'
-import axios from 'axios'
+import axios, { isAxiosError } from 'axios'
 import BigNumber from 'bignumber.js'
 import { error, info } from './logging'
 import { Epoch, RFOXMetadata, RewardDistribution } from './types'
@@ -132,8 +132,15 @@ export class IPFS {
         error(`The contents of IPFS hash (${hash}) are not valid epoch contents, exiting.`)
         process.exit(1)
       }
-    } catch {
-      error(`Failed to get content of IPFS hash (${hash}), exiting.`)
+    } catch (err) {
+      if (isAxiosError(err)) {
+        error(
+          `Failed to get content of IPFS hash (${hash}): ${err.request?.data?.message || err.response?.data?.message || err.message}, exiting.`,
+        )
+      } else {
+        error(`Failed to get content of IPFS hash (${hash}): ${err}, exiting.`)
+      }
+
       process.exit(1)
     }
   }
@@ -290,8 +297,15 @@ export class IPFS {
 
       error(`The contents of IPFS hash (${hash}) are not valid metadata contents, exiting.`)
       process.exit(1)
-    } catch {
-      error(`Failed to get content of IPFS hash (${hash}), exiting.`)
+    } catch (err) {
+      if (isAxiosError(err)) {
+        error(
+          `Failed to get content of IPFS hash (${hash}): ${err.request?.data || err.response?.data || err.message}, exiting.`,
+        )
+      } else {
+        error(`Failed to get content of IPFS hash (${hash}): ${err}, exiting.`)
+      }
+
       process.exit(1)
     }
   }

diff --git a/cli/src/wallet.ts b/cli/src/wallet.ts
@@ -135,7 +135,7 @@ export class Wallet {
         resolve && resolve()
 
         return true
-      } catch (err: any) {
+      } catch (err) {
         spinner?.fail()
 
         if (isAxiosError(err)) {