From 4af07a360901cb7eb026a49258dec52ba0e965f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= <sergiodiassalgado@gmail.com>
Date: Tue, 21 Jun 2022 08:30:52 +0100
Subject: [PATCH] fix: always set new web3 providers despite one being
 previously set feat: separate eth wallet names

---
 lib/plugins/wallet/geth/base.js              |  6 +-----
 lib/plugins/wallet/geth/geth.js              | 10 ++++++++--
 lib/plugins/wallet/infura/infura.js          |  4 +++-
 new-lamassu-admin/src/pages/Wallet/Wallet.js |  2 --
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/lib/plugins/wallet/geth/base.js b/lib/plugins/wallet/geth/base.js
index d37227a6..2f37b933 100644
--- a/lib/plugins/wallet/geth/base.js
+++ b/lib/plugins/wallet/geth/base.js
@@ -11,7 +11,6 @@ const pify = require('pify')
 const BN = require('../../../bn')
 const ABI = require('../../tokens')
 
-const NAME = 'geth'
 exports.SUPPORTED_MODULES = ['wallet']
 
 const paymentPrefixPath = "m/44'/60'/0'/0'"
@@ -19,7 +18,6 @@ const defaultPrefixPath = "m/44'/60'/1'/0'"
 let lastUsedNonces = {}
 
 module.exports = {
-  NAME,
   balance,
   sendCoins,
   newAddress,
@@ -35,9 +33,7 @@ module.exports = {
 }
 
 function connect (url) {
-  if (!web3.isConnected()) {
-    web3.setProvider(new web3.providers.HttpProvider(url))
-  }
+  return web3.setProvider(new web3.providers.HttpProvider(url))
 }
 
 const hex = bigNum => '0x' + bigNum.integerValue(BN.ROUND_DOWN).toString(16)
diff --git a/lib/plugins/wallet/geth/geth.js b/lib/plugins/wallet/geth/geth.js
index 53266d90..61b28e73 100644
--- a/lib/plugins/wallet/geth/geth.js
+++ b/lib/plugins/wallet/geth/geth.js
@@ -1,9 +1,15 @@
+const _ = require('lodash/fp')
+
 const base = require('./base')
 
 const { utils: coinUtils } = require('@lamassu/coins')
 const cryptoRec = coinUtils.getCryptoCurrency('ETH')
 const defaultPort = cryptoRec.defaultPort
 
-base.connect(`http://localhost:${defaultPort}`)
+const NAME = 'geth'
 
-module.exports = base
+function run (account) {
+  base.connect(`http://localhost:${defaultPort}`)
+}
+
+module.exports = _.merge(base, { NAME, run })
diff --git a/lib/plugins/wallet/infura/infura.js b/lib/plugins/wallet/infura/infura.js
index 8cff40b4..47d4e35c 100644
--- a/lib/plugins/wallet/infura/infura.js
+++ b/lib/plugins/wallet/infura/infura.js
@@ -1,6 +1,8 @@
 const _ = require('lodash/fp')
 const base = require('../geth/base')
 
+const NAME = 'infura'
+
 function run (account) {
   if (!account.endpoint) throw new Error('Need to configure API endpoint for Infura')
 
@@ -10,4 +12,4 @@ function run (account) {
   base.connect(endpoint)
 }
 
-module.exports = _.merge(base, {run})
+module.exports = _.merge(base, { NAME, run })
diff --git a/new-lamassu-admin/src/pages/Wallet/Wallet.js b/new-lamassu-admin/src/pages/Wallet/Wallet.js
index 31e12c25..b0a9c0c8 100644
--- a/new-lamassu-admin/src/pages/Wallet/Wallet.js
+++ b/new-lamassu-admin/src/pages/Wallet/Wallet.js
@@ -61,8 +61,6 @@ const Wallet = ({ name: SCREEN_KEY }) => {
   const [advancedSettings, setAdvancedSettings] = useState(false)
   const { data } = useQuery(GET_INFO)
 
-  console.log(data)
-
   const [saveConfig, { error }] = useMutation(SAVE_CONFIG, {
     onCompleted: () => setWizard(false),
     refetchQueries: () => ['getData']