Backport "Use ethereum-ens-network-map for network support (#7960)" (#8465)

Backport #7960 to v7.7.9

Co-authored-by: Whymarrh Whitby <whymarrh.whitby@gmail.com>
feature/default_network_editable
Mark Stacey 5 years ago committed by GitHub
parent 8a8c774e6d
commit aab262a3d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      app/scripts/controllers/ens/ens.js
  2. 1
      package.json
  3. 2
      ui/app/pages/send/send-content/add-recipient/ens-input.component.js
  4. 2
      yarn.lock

@ -1,5 +1,5 @@
const EthJsEns = require('ethjs-ens') const EthJsEns = require('ethjs-ens')
const ensNetworkMap = require('ethjs-ens/lib/network-map.json') const ensNetworkMap = require('ethereum-ens-network-map')
class Ens { class Ens {
static getNetworkEnsSupport (network) { static getNetworkEnsSupport (network) {

@ -101,6 +101,7 @@
"eth-sig-util": "^2.3.0", "eth-sig-util": "^2.3.0",
"eth-token-tracker": "^1.1.10", "eth-token-tracker": "^1.1.10",
"eth-trezor-keyring": "^0.4.0", "eth-trezor-keyring": "^0.4.0",
"ethereum-ens-network-map": "^1.0.2",
"ethereumjs-abi": "^0.6.4", "ethereumjs-abi": "^0.6.4",
"ethereumjs-tx": "1.3.7", "ethereumjs-tx": "1.3.7",
"ethereumjs-util": "5.1.0", "ethereumjs-util": "5.1.0",

@ -7,7 +7,7 @@ import { ellipsify } from '../../send.utils'
import debounce from 'debounce' import debounce from 'debounce'
import copyToClipboard from 'copy-to-clipboard/index' import copyToClipboard from 'copy-to-clipboard/index'
import ENS from 'ethjs-ens' import ENS from 'ethjs-ens'
import networkMap from 'ethjs-ens/lib/network-map.json' import networkMap from 'ethereum-ens-network-map'
import log from 'loglevel' import log from 'loglevel'

@ -10369,7 +10369,7 @@ ethereum-common@^0.0.18:
resolved "https://registry.yarnpkg.com/ethereum-common/-/ethereum-common-0.0.18.tgz#2fdc3576f232903358976eb39da783213ff9523f" resolved "https://registry.yarnpkg.com/ethereum-common/-/ethereum-common-0.0.18.tgz#2fdc3576f232903358976eb39da783213ff9523f"
integrity sha1-L9w1dvIykDNYl26znaeDIT/5Uj8= integrity sha1-L9w1dvIykDNYl26znaeDIT/5Uj8=
ethereum-ens-network-map@^1.0.0: ethereum-ens-network-map@^1.0.0, ethereum-ens-network-map@^1.0.2:
version "1.0.2" version "1.0.2"
resolved "https://registry.yarnpkg.com/ethereum-ens-network-map/-/ethereum-ens-network-map-1.0.2.tgz#4e27bad18dae7bd95d84edbcac2c9e739fc959b9" resolved "https://registry.yarnpkg.com/ethereum-ens-network-map/-/ethereum-ens-network-map-1.0.2.tgz#4e27bad18dae7bd95d84edbcac2c9e739fc959b9"
integrity sha512-5qwJ5n3YhjSpE6O/WEBXCAb2nagUgyagJ6C0lGUBWC4LjKp/rRzD+pwtDJ6KCiITFEAoX4eIrWOjRy0Sylq5Hg== integrity sha512-5qwJ5n3YhjSpE6O/WEBXCAb2nagUgyagJ6C0lGUBWC4LjKp/rRzD+pwtDJ6KCiITFEAoX4eIrWOjRy0Sylq5Hg==

Loading…
Cancel
Save