From 0ac62139db4eef6781b3cedef8b7fa7b09609efd Mon Sep 17 00:00:00 2001
From: Neal <neal@lamassu.is>
Date: Mon, 17 May 2021 19:16:17 -0400
Subject: [PATCH] feat: re-enable geth install

---
 lib/blockchain/ethereum.js       | 2 +-
 lib/blockchain/install.js        | 4 +---
 lib/new-admin/config/accounts.js | 2 +-
 lib/plugins/wallet/geth/base.js  | 1 +
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/blockchain/ethereum.js b/lib/blockchain/ethereum.js
index 1e8bf2fc..93eb2abe 100644
--- a/lib/blockchain/ethereum.js
+++ b/lib/blockchain/ethereum.js
@@ -7,6 +7,6 @@ module.exports = {setup}
 function setup (dataDir) {
   const coinRec = coinUtils.getCryptoCurrency('ETH')
   common.firewall([coinRec.defaultPort])
-  const cmd = `/usr/local/bin/${coinRec.daemon} --datadir "${dataDir}" --syncmode="fast" --cache 2048 --maxpeers 40 --rpc`
+  const cmd = `/usr/local/bin/${coinRec.daemon} --datadir "${dataDir}" --syncmode="light" --cache 2048 --maxpeers 40 --rpc`
   common.writeSupervisorConfig(coinRec, cmd)
 }
diff --git a/lib/blockchain/install.js b/lib/blockchain/install.js
index 8a71a826..2a312e18 100644
--- a/lib/blockchain/install.js
+++ b/lib/blockchain/install.js
@@ -104,9 +104,7 @@ function run () {
       name: c.display,
       value: c.code,
       checked,
-      disabled: c.cryptoCode === 'ETH'
-        ? 'Use admin\'s Infura plugin'
-        : checked && 'Installed'
+      disabled: checked && 'Installed'
     }
   }, cryptos)
 
diff --git a/lib/new-admin/config/accounts.js b/lib/new-admin/config/accounts.js
index 7fbd76dd..f6678b86 100644
--- a/lib/new-admin/config/accounts.js
+++ b/lib/new-admin/config/accounts.js
@@ -25,7 +25,7 @@ const ALL_ACCOUNTS = [
   { code: 'bitcoind', display: 'bitcoind', class: WALLET, cryptos: [BTC] },
   { code: 'no-layer2', display: 'No Layer 2', class: LAYER_2, cryptos: ALL_CRYPTOS },
   { code: 'infura', display: 'Infura', class: WALLET, cryptos: [ETH, USDT] },
-  { code: 'geth', display: 'geth (DEPRECATED)', class: WALLET, cryptos: [ETH, USDT], deprecated: true },
+  { code: 'geth', display: 'geth', class: WALLET, cryptos: [ETH, USDT] },
   { code: 'zcashd', display: 'zcashd', class: WALLET, cryptos: [ZEC] },
   { code: 'litecoind', display: 'litecoind', class: WALLET, cryptos: [LTC] },
   { code: 'dashd', display: 'dashd', class: WALLET, cryptos: [DASH] },
diff --git a/lib/plugins/wallet/geth/base.js b/lib/plugins/wallet/geth/base.js
index d01ff49a..8b4cdab0 100644
--- a/lib/plugins/wallet/geth/base.js
+++ b/lib/plugins/wallet/geth/base.js
@@ -126,6 +126,7 @@ function generateTx (_toAddress, wallet, amount, includesFee, cryptoCode) {
       const contract = web3.eth.contract(ABI.ERC20).at(coins.utils.getErc20Token(cryptoCode).contractAddress)
 
       const rawTx = {
+        chainId: 1,
         nonce: txCount,
         gasPrice: hex(gasPrice),
         gasLimit: gas,