From 089e84e908112d9015c6a797bc7464cc6c4cb9f8 Mon Sep 17 00:00:00 2001 From: chris Date: Thu, 23 Aug 2018 08:20:27 -0400 Subject: [PATCH] Remove ETC additions --- app/_locales/en/messages.json | 3 --- app/scripts/controllers/network/enums.js | 6 ----- app/scripts/controllers/network/network.js | 20 +--------------- app/scripts/controllers/network/networks.js | 23 ------------------ app/scripts/controllers/network/util.js | 5 ---- old-ui/app/app.js | 2 -- old-ui/app/components/app-bar.js | 14 ----------- old-ui/app/components/network.js | 13 ---------- old-ui/app/config.js | 5 ---- .../app/controllers/network-contoller-test.js | 6 ----- ui/app/app.js | 4 ---- .../components/dropdowns/network-dropdown.js | 24 ------------------- ui/app/components/network-display/index.scss | 7 ------ .../network-display.component.js | 2 -- ui/app/components/network.js | 13 ---------- 15 files changed, 1 insertion(+), 146 deletions(-) delete mode 100644 app/scripts/controllers/network/networks.js diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 7bc940204b42..feba153b3945 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -820,9 +820,6 @@ "ropsten": { "message": "Ropsten Test Network" }, - "classic": { - "message": "Ethereum Classic Network" - }, "rpc": { "message": "Custom RPC" }, diff --git a/app/scripts/controllers/network/enums.js b/app/scripts/controllers/network/enums.js index f0ef73f0f469..3190eb37c717 100644 --- a/app/scripts/controllers/network/enums.js +++ b/app/scripts/controllers/network/enums.js @@ -3,35 +3,29 @@ const RINKEBY = 'rinkeby' const KOVAN = 'kovan' const MAINNET = 'mainnet' const LOCALHOST = 'localhost' -const CLASSIC = 'classic' const MAINNET_CODE = 1 const ROPSTEN_CODE = 3 const RINKEYBY_CODE = 4 const KOVAN_CODE = 42 -const CLASSIC_CODE = 61 const ROPSTEN_DISPLAY_NAME = 'Ropsten' const RINKEBY_DISPLAY_NAME = 'Rinkeby' const KOVAN_DISPLAY_NAME = 'Kovan' const MAINNET_DISPLAY_NAME = 'Main Ethereum Network' -const CLASSIC_DISPLAY_NAME = 'Ethereum Classic' module.exports = { ROPSTEN, RINKEBY, KOVAN, MAINNET, - CLASSIC, LOCALHOST, MAINNET_CODE, ROPSTEN_CODE, RINKEYBY_CODE, KOVAN_CODE, - CLASSIC_CODE, ROPSTEN_DISPLAY_NAME, RINKEBY_DISPLAY_NAME, KOVAN_DISPLAY_NAME, MAINNET_DISPLAY_NAME, - CLASSIC_DISPLAY_NAME, } diff --git a/app/scripts/controllers/network/network.js b/app/scripts/controllers/network/network.js index c3f80e9a3060..4fce0ff09c8b 100644 --- a/app/scripts/controllers/network/network.js +++ b/app/scripts/controllers/network/network.js @@ -11,7 +11,6 @@ const createInfuraClient = require('./createInfuraClient') const createJsonRpcClient = require('./createJsonRpcClient') const createLocalhostClient = require('./createLocalhostClient') const { createSwappableProxy, createEventEmitterProxy } = require('swappable-obj-proxy') -const networks = require('./networks') const extend = require('xtend') const { @@ -19,11 +18,10 @@ const { RINKEBY, KOVAN, MAINNET, - CLASSIC, LOCALHOST, } = require('./enums') const INFURA_PROVIDER_TYPES = [ROPSTEN, RINKEBY, KOVAN, MAINNET] -const ALL_PROVIDER_TYPES = [ROPSTEN, RINKEBY, KOVAN, MAINNET, CLASSIC] +const ALL_PROVIDER_TYPES = [ROPSTEN, RINKEBY, KOVAN, MAINNET] const env = process.env.METAMASK_ENV const METAMASK_DEBUG = process.env.METAMASK_DEBUG @@ -161,9 +159,6 @@ module.exports = class NetworkController extends EventEmitter { const isInfura = INFURA_PROVIDER_TYPES.includes(type) if (isInfura) { this._configureInfuraProvider(opts) - // other predefined endpoints - } else if (ALL_PROVIDER_TYPES.includes(type)){ - this._configurePredefinedProvider(opts) // other type-based rpc endpoints } else if (type === LOCALHOST) { this._configureLocalhostProvider() @@ -192,19 +187,6 @@ module.exports = class NetworkController extends EventEmitter { this._setNetworkClient(networkClient) } - _configurePredefinedProvider ({ type }) { - log.info('NetworkController - configurePredefinedProvider', type) - // setup networkConfig - var settings = { - network: networks.networkList[type].chainId, - } - settings = extend(settings, networks.networkList[type]) - const rpcUrl = networks.networkList[type].rpcUrl - const networkClient = createJsonRpcClient({ rpcUrl }) - this.networkConfig.putState(settings) - this._setNetworkClient(networkClient) - } - _configureStandardProvider ({ rpcUrl, chainId }) { log.info('NetworkController - configureStandardProvider', rpcUrl) const networkClient = createJsonRpcClient({ rpcUrl }) diff --git a/app/scripts/controllers/network/networks.js b/app/scripts/controllers/network/networks.js deleted file mode 100644 index 9b188980df95..000000000000 --- a/app/scripts/controllers/network/networks.js +++ /dev/null @@ -1,23 +0,0 @@ -'use strict' -var networks = function() {} - -const { - CLASSIC, - CLASSIC_CODE, -} = require('./enums') - -networks.networkList = { - [CLASSIC]: { - 'chainId': CLASSIC_CODE, - 'ticker': 'ETC', - 'blockExplorerTx': 'https://gastracker.io/tx/[[txHash]]', - 'blockExplorerAddr': 'https://gastracker.io/addr/[[address]]', - 'blockExplorerToken': 'https://gastracker.io/token/[[tokenAddress]]/[[address]]', - 'service': 'ETC Cooperative', - 'rpcUrl': 'https://ethereumclassic.network', - 'exchanges': ['ShapeShift'], - 'buyUrl': '', - }, -} - -module.exports = networks diff --git a/app/scripts/controllers/network/util.js b/app/scripts/controllers/network/util.js index 3d5059db4812..261dae7211cd 100644 --- a/app/scripts/controllers/network/util.js +++ b/app/scripts/controllers/network/util.js @@ -3,16 +3,13 @@ const { RINKEBY, KOVAN, MAINNET, - CLASSIC, ROPSTEN_CODE, RINKEYBY_CODE, KOVAN_CODE, - CLASSIC_CODE, ROPSTEN_DISPLAY_NAME, RINKEBY_DISPLAY_NAME, KOVAN_DISPLAY_NAME, MAINNET_DISPLAY_NAME, - CLASSIC_DISPLAY_NAME, } = require('./enums') const networkToNameMap = { @@ -20,11 +17,9 @@ const networkToNameMap = { [RINKEBY]: RINKEBY_DISPLAY_NAME, [KOVAN]: KOVAN_DISPLAY_NAME, [MAINNET]: MAINNET_DISPLAY_NAME, - [CLASSIC]: CLASSIC_DISPLAY_NAME, [ROPSTEN_CODE]: ROPSTEN_DISPLAY_NAME, [RINKEYBY_CODE]: RINKEBY_DISPLAY_NAME, [KOVAN_CODE]: KOVAN_DISPLAY_NAME, - [CLASSIC_CODE]: CLASSIC_DISPLAY_NAME, } const getNetworkDisplayName = key => networkToNameMap[key] diff --git a/old-ui/app/app.js b/old-ui/app/app.js index d2689330d20a..58b065850e6f 100644 --- a/old-ui/app/app.js +++ b/old-ui/app/app.js @@ -298,8 +298,6 @@ App.prototype.getNetworkName = function () { name = 'Kovan Test Network' } else if (providerName === 'rinkeby') { name = 'Rinkeby Test Network' - } else if (providerName === 'classic') { - name = 'Ethereum Classic Network' } else { name = 'Unknown Private Network' } diff --git a/old-ui/app/components/app-bar.js b/old-ui/app/components/app-bar.js index d1dfcf4858dc..5fecb9654240 100644 --- a/old-ui/app/components/app-bar.js +++ b/old-ui/app/components/app-bar.js @@ -287,20 +287,6 @@ module.exports = class AppBar extends Component { ? h('.check', '✓') : null, ]), - h(DropdownMenuItem, { - key: 'classic', - closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), - onClick: () => dispatch(actions.setProviderType('classic')), - style: { - fontSize: '18px', - }, - }, [ - h('.menu-icon.diamond'), - 'Ethereum Classic Network', - providerType === 'classic' - ? h('.check', '✓') - : null, - ]), h(DropdownMenuItem, { key: 'default', closeMenu: () => this.setState({ isNetworkMenuOpen: !isOpen }), diff --git a/old-ui/app/components/network.js b/old-ui/app/components/network.js index 4e12e2733ca5..59596dabd31e 100644 --- a/old-ui/app/components/network.js +++ b/old-ui/app/components/network.js @@ -55,9 +55,6 @@ Network.prototype.render = function () { } else if (providerName === 'rinkeby') { hoverText = 'Rinkeby Test Network' iconName = 'rinkeby-test-network' - } else if (providerName === 'classic') { - hoverText = 'Ethereum Classic' - iconName = 'ethereum-classic-network' } else { hoverText = 'Unknown Private Network' iconName = 'unknown-private-network' @@ -111,16 +108,6 @@ Network.prototype.render = function () { 'Rinkeby Test Net'), props.onClick && h('i.fa.fa-caret-down.fa-lg'), ]) - case 'ethereum-classic-network': - return h('.network-indicator', [ - h('.menu-icon.diamond'), - h('.network-name', { - style: { - color: '#267f00', - }}, - 'Ethereum Classic Network'), - props.onClick && h('i.fa.fa-caret-down.fa-lg'), - ]) default: return h('.network-indicator', [ h('i.fa.fa-question-circle.fa-lg', { diff --git a/old-ui/app/config.js b/old-ui/app/config.js index 1e7fa6a3fe35..1203524ea6d6 100644 --- a/old-ui/app/config.js +++ b/old-ui/app/config.js @@ -269,11 +269,6 @@ function currentProviderDisplay (metamaskState) { value = 'Rinkeby Test Network' break - case 'classic': - title = 'Current Network' - value = 'Ethereum Classic Network' - break - default: title = 'Current RPC' value = metamaskState.provider.rpcTarget diff --git a/test/unit/app/controllers/network-contoller-test.js b/test/unit/app/controllers/network-contoller-test.js index 2721898bdb01..7959e6cc1265 100644 --- a/test/unit/app/controllers/network-contoller-test.js +++ b/test/unit/app/controllers/network-contoller-test.js @@ -80,9 +80,6 @@ describe('Network utils', () => { }, { input: 42, expected: 'Kovan', - }, { - input: 61, - expected: 'Ethereum Classic', }, { input: 'ropsten', expected: 'Ropsten', @@ -92,9 +89,6 @@ describe('Network utils', () => { }, { input: 'kovan', expected: 'Kovan', - }, { - input: 'classic', - expected: 'Ethereum Classic', }, { input: 'mainnet', expected: 'Main Ethereum Network', diff --git a/ui/app/app.js b/ui/app/app.js index 979d8a25c173..642ad86e3f25 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -228,8 +228,6 @@ class App extends Component { name = this.context.t('connectingToRopsten') } else if (providerName === 'rinkeby') { name = this.context.t('connectingToRinkeby') - } else if (providerName === 'classic') { - name = this.context.t('connectingToClassic') } else { name = this.context.t('connectingToUnknown') } @@ -251,8 +249,6 @@ class App extends Component { name = this.context.t('kovan') } else if (providerName === 'rinkeby') { name = this.context.t('rinkeby') - } else if (providerName === 'classic') { - name = this.context.t('classic') } else { name = this.context.t('unknownNetwork') } diff --git a/ui/app/components/dropdowns/network-dropdown.js b/ui/app/components/dropdowns/network-dropdown.js index df77d1220c5a..3b5d7f323936 100644 --- a/ui/app/components/dropdowns/network-dropdown.js +++ b/ui/app/components/dropdowns/network-dropdown.js @@ -200,28 +200,6 @@ NetworkDropdown.prototype.render = function () { ] ), - h( - DropdownMenuItem, - { - key: 'classic', - closeMenu: () => this.props.hideNetworkDropdown(), - onClick: () => props.setProviderType('classic'), - style: dropdownMenuItemStyle, - }, - [ - providerType === 'classic' ? h('i.fa.fa-check') : h('.network-check__transparent', '✓'), - h(NetworkDropdownIcon, { - backgroundColor: '#228B22', // forest green - isSelected: providerType === 'classic', - }), - h('span.network-name-item', { - style: { - color: providerType === 'classic' ? '#ffffff' : '#9b9b9b', - }, - }, this.context.t('classic')), - ] - ), - h( DropdownMenuItem, { @@ -286,8 +264,6 @@ NetworkDropdown.prototype.getNetworkName = function () { name = this.context.t('kovan') } else if (providerName === 'rinkeby') { name = this.context.t('rinkeby') - } else if (providerName === 'classic') { - name = this.context.t('classic') } else { name = this.context.t('unknownNetwork') } diff --git a/ui/app/components/network-display/index.scss b/ui/app/components/network-display/index.scss index 89d46a7b18f5..57c5c45d34f5 100644 --- a/ui/app/components/network-display/index.scss +++ b/ui/app/components/network-display/index.scss @@ -24,9 +24,6 @@ background-color: lighten($tulip-tree, 35%); } - &--classic { - background-color: lighten($java, 45%); - } } &__name { @@ -54,9 +51,5 @@ &--rinkeby { background-color: $tulip-tree; } - - &--classic { - background-color: $java; - } } } diff --git a/ui/app/components/network-display/network-display.component.js b/ui/app/components/network-display/network-display.component.js index 64913bdae263..38626af20667 100644 --- a/ui/app/components/network-display/network-display.component.js +++ b/ui/app/components/network-display/network-display.component.js @@ -6,7 +6,6 @@ import { ROPSTEN_CODE, RINKEYBY_CODE, KOVAN_CODE, - CLASSIC_CODE, } from '../../../../app/scripts/controllers/network/enums' const networkToClassHash = { @@ -14,7 +13,6 @@ const networkToClassHash = { [ROPSTEN_CODE]: 'ropsten', [RINKEYBY_CODE]: 'rinkeby', [KOVAN_CODE]: 'kovan', - [CLASSIC_CODE]: 'classic', } export default class NetworkDisplay extends Component { diff --git a/ui/app/components/network.js b/ui/app/components/network.js index 832f5f1c8abc..83297c4f2251 100644 --- a/ui/app/components/network.js +++ b/ui/app/components/network.js @@ -63,9 +63,6 @@ Network.prototype.render = function () { } else if (providerName === 'rinkeby') { hoverText = context.t('rinkeby') iconName = 'rinkeby-test-network' - } else if (providerName === 'classic') { - hoverText = context.t('classic') - iconName = 'ethereum-classic-network' } else { hoverText = context.t('unknownNetwork') iconName = 'unknown-private-network' @@ -79,7 +76,6 @@ Network.prototype.render = function () { 'ropsten-test-network': providerName === 'ropsten' || parseInt(networkNumber) === 3, 'kovan-test-network': providerName === 'kovan', 'rinkeby-test-network': providerName === 'rinkeby', - 'ethereum-classic-network': providerName === 'classic', }), title: hoverText, onClick: (event) => { @@ -126,15 +122,6 @@ Network.prototype.render = function () { h('.network-name', context.t('rinkeby')), h('i.fa.fa-chevron-down.fa-lg.network-caret'), ]) - case 'ethereum-classic-network': - return h('.network-indicator', [ - h(NetworkDropdownIcon, { - backgroundColor: '#228B22', // green - nonSelectBackgroundColor: '#46893D', - }), - h('.network-name', context.t('classic')), - h('i.fa.fa-chevron-down.fa-lg.network-caret'), - ]) default: return h('.network-indicator', [ h('i.fa.fa-question-circle.fa-lg', {