From 0b4e6e37d956ff5966d0704f6c006ed6ee39a141 Mon Sep 17 00:00:00 2001
From: Theo <theo@noreply.org>
Date: Tue, 12 Sep 2023 20:37:42 -0700
Subject: [PATCH] Normalize relayer URL before using & fix relayer status check

---
 cli.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/cli.js b/cli.js
index bb0ce43..d2bb631 100755
--- a/cli.js
+++ b/cli.js
@@ -17,7 +17,7 @@ const { toWei, fromWei, toBN, BN } = require('web3-utils');
 const BigNumber = require('bignumber.js');
 const config = require('./config');
 const program = require('commander');
-const { TornadoFeeOracleV4, TornadoFeeOracleV5, TokenPriceOracle } = require('@tornado/tornado-oracles');
+const { TornadoFeeOracleV4, TornadoFeeOracleV5 } = require('@tornado/tornado-oracles');
 const { SocksProxyAgent } = require('socks-proxy-agent');
 const is_ip_private = require('private-ip');
 const readline = require('readline');
@@ -486,7 +486,15 @@ async function withdraw({ deposit, currency, amount, recipient, relayerURL, refu
         headers: { 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0' }
       };
     }
-    const relayerStatus = await axios.get(relayerURL + '/status', options);
+
+    let relayerStatus;
+    try {
+      relayerURL = new URL(relayerURL).origin;
+      relayerStatus = await axios.get(relayerURL + '/status', options);
+    } catch (err) {
+      console.error(err);
+      throw new Error('Cannot get relayer status');
+    }
 
     const { rewardAccount, netId, ethPrices, tornadoServiceFee } = relayerStatus.data;
     assert(netId === (await web3.eth.net.getId()) || netId === '*', 'This relay is for different network');