Merge branch 'master' of github.com:MetaMask/metamask-plugin into fixMigrator2

feature/default_network_editable
kumavis 8 years ago
commit 092807f56e
  1. 5
      .babelrc
  2. 2
      .eslintrc
  3. 6
      CHANGELOG.md
  4. 1
      app/currencies.json
  5. 2
      app/manifest.json
  6. 6
      package.json
  7. 16
      ui/app/components/ens-input.js
  8. 5937
      ui/app/conversion.json

@ -1 +1,4 @@
{ "presets": ["es2015"] } {
"presets": ["es2015"],
"plugins": ["transform-runtime"]
}

@ -1,7 +1,7 @@
{ {
"parserOptions": { "parserOptions": {
"sourceType": "module", "sourceType": "module",
"ecmaVersion": 6, "ecmaVersion": 2017,
"ecmaFeatures": { "ecmaFeatures": {
"experimentalObjectRestSpread": true, "experimentalObjectRestSpread": true,
"impliedStrict": true, "impliedStrict": true,

@ -2,6 +2,12 @@
## Current Master ## Current Master
- Trim currency list.
## 3.6.4 2017-5-8
- Fix main-net ENS resolution.
## 3.6.3 2017-5-8 ## 3.6.3 2017-5-8
- Fix bug that could stop newer versions of Geth from working with MetaMask. - Fix bug that could stop newer versions of Geth from working with MetaMask.

File diff suppressed because one or more lines are too long

@ -1,7 +1,7 @@
{ {
"name": "MetaMask", "name": "MetaMask",
"short_name": "Metamask", "short_name": "Metamask",
"version": "3.6.3", "version": "3.6.4",
"manifest_version": 2, "manifest_version": 2,
"author": "https://metamask.io", "author": "https://metamask.io",
"description": "Ethereum Browser Extension", "description": "Ethereum Browser Extension",

@ -34,7 +34,8 @@
"babelify", "babelify",
{ {
"presets": [ "presets": [
"es2015" "es2015",
"stage-3"
] ]
} }
], ],
@ -45,6 +46,7 @@
"dependencies": { "dependencies": {
"async": "^1.5.2", "async": "^1.5.2",
"async-q": "^0.3.1", "async-q": "^0.3.1",
"babel-runtime": "^6.23.0",
"bip39": "^2.2.0", "bip39": "^2.2.0",
"bluebird": "^3.5.0", "bluebird": "^3.5.0",
"browser-passworder": "^2.0.3", "browser-passworder": "^2.0.3",
@ -125,6 +127,8 @@
}, },
"devDependencies": { "devDependencies": {
"babel-eslint": "^6.0.5", "babel-eslint": "^6.0.5",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-stage-3": "^6.24.1",
"babel-register": "^6.7.2", "babel-register": "^6.7.2",
"babelify": "^7.2.0", "babelify": "^7.2.0",
"beefy": "^2.1.5", "beefy": "^2.1.5",

@ -5,11 +5,9 @@ const extend = require('xtend')
const debounce = require('debounce') const debounce = require('debounce')
const copyToClipboard = require('copy-to-clipboard') const copyToClipboard = require('copy-to-clipboard')
const ENS = require('ethjs-ens') const ENS = require('ethjs-ens')
const networkMap = require('ethjs-ens/lib/network-map.json')
const ensRE = /.+\.eth$/ const ensRE = /.+\.eth$/
const networkResolvers = {
'3': '112234455c3a32fd11230c42e7bccd4a84e02010',
}
module.exports = EnsInput module.exports = EnsInput
@ -24,8 +22,8 @@ EnsInput.prototype.render = function () {
list: 'addresses', list: 'addresses',
onChange: () => { onChange: () => {
const network = this.props.network const network = this.props.network
const resolverAddress = networkResolvers[network] const networkHasEnsSupport = getNetworkEnsSupport(network)
if (!resolverAddress) return if (!networkHasEnsSupport) return
const recipient = document.querySelector('input[name="address"]').value const recipient = document.querySelector('input[name="address"]').value
if (recipient.match(ensRE) === null) { if (recipient.match(ensRE) === null) {
@ -73,9 +71,9 @@ EnsInput.prototype.render = function () {
EnsInput.prototype.componentDidMount = function () { EnsInput.prototype.componentDidMount = function () {
const network = this.props.network const network = this.props.network
const resolverAddress = networkResolvers[network] const networkHasEnsSupport = getNetworkEnsSupport(network)
if (resolverAddress) { if (networkHasEnsSupport) {
const provider = global.ethereumProvider const provider = global.ethereumProvider
this.ens = new ENS({ provider, network }) this.ens = new ENS({ provider, network })
this.checkName = debounce(this.lookupEnsName.bind(this), 200) this.checkName = debounce(this.lookupEnsName.bind(this), 200)
@ -169,3 +167,7 @@ EnsInput.prototype.ensIconContents = function (recipient) {
}) })
} }
} }
function getNetworkEnsSupport(network) {
return Boolean(networkMap[network])
}

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save