diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | app/_locales/index.json | 4 | ||||
| -rw-r--r-- | app/_locales/ja/messages.json | 33 | ||||
| -rw-r--r-- | app/images/ethereum-metamask-chrome.png | bin | 0 -> 60022 bytes | |||
| -rw-r--r-- | app/manifest.json | 3 | ||||
| -rw-r--r-- | app/phishing.html | 60 | ||||
| -rw-r--r-- | app/scripts/contentscript.js | 5 | ||||
| -rw-r--r-- | app/scripts/lib/inpage-provider.js | 5 | ||||
| -rw-r--r-- | package-lock.json | 21 |
9 files changed, 116 insertions, 17 deletions
@@ -1,8 +1,6 @@ # MetaMask Browser Extension [](https://circleci.com/gh/MetaMask/metamask-extension) [](https://coveralls.io/github/MetaMask/metamask-extension?branch=master) [](https://greenkeeper.io/) [](https://waffle.io/MetaMask/metamask-extension) -🚨 As of 7/25/18, the MetaMask extension has been removed from the Chrome Web Store. In the meantime, you can download the latest version of MetaMask on our [Releases](https://github.com/MetaMask/metamask-extension/releases) page and load it in Chrome by visiting `chrome://extensions`. For more detailed steps, see our [help center](https://consensys.zendesk.com/hc/en-us/articles/360004134152-How-to-Install-MetaMask-Manually). Follow [@metamask_io](https://twitter.com/metamask_io) on Twitter for updates. 🚨 - ## Support If you're a user seeking support, [here is our support site](https://metamask.helpscoutdocs.com/). diff --git a/app/_locales/index.json b/app/_locales/index.json index 7717502b7..f50c09f88 100644 --- a/app/_locales/index.json +++ b/app/_locales/index.json @@ -17,6 +17,6 @@ { "code": "tml", "name": "Tamil" }, { "code": "tr", "name": "Turkish" }, { "code": "vi", "name": "Vietnamese" }, - { "code": "zh_CN", "name": "Mandarin" }, - { "code": "zh_TW", "name": "Taiwanese" } + { "code": "zh_CN", "name": "Chinese (Simplified)" }, + { "code": "zh_TW", "name": "Chinese (Traditional)" } ] diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index 75deeaddf..c9d192139 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -122,6 +122,9 @@ "copy": { "message": "コピー" }, + "copyContractAddress": { + "message": "コントラクトアドレスをコピー" + }, "copyToClipboard": { "message": "クリップボードへコピー" }, @@ -395,6 +398,9 @@ "mainnet": { "message": "Ethereumメインネットワーク" }, + "menu": { + "message": "メニュー" + }, "message": { "message": "メッセージ" }, @@ -464,6 +470,9 @@ "oldUIMessage": { "message": "旧UIを表示しています。右上のドロップダウンメニューのオプションより、新UIへ切り替えが可能です。" }, + "openInTab": { + "message": "タブを開く" + }, "or": { "message": "または", "description": "choice between creating or importing a new account" @@ -573,6 +582,15 @@ "searchResults": { "message": "検索結果" }, + "newPassword8Chars": { + "message": "新しいパスワード (8桁以上)" + }, + "select": { + "message": "選択" + }, + "selectCurrency": { + "message": "通貨を選択" + }, "selectService": { "message": "サービスを選択" }, @@ -586,10 +604,14 @@ "message": "ETHの送信" }, "sendTokens": { - "message": "トークンを送る" + "message": "トークンを送信" }, "onlySendToEtherAddress": { - "message": "ETHはイーサリウムアカウントのみに送信できます。" + "message": "ETH はイーサリウムアカウントのみに送信できます。" + }, + "onlySendTokensToAccountAddress": { + "message": "$1 はイーサリアムアカウントのみに送信できます。", + "description": "displays token symbol" }, "searchTokens": { "message": "トークンの検索" @@ -690,10 +712,10 @@ "message": "パスワードの入力" }, "uiWelcome": { - "message": "新UIへようこそ！(ベータ版)" + "message": "新UIへようこそ! (ベータ版)" }, "uiWelcomeMessage": { - "message": "現在Metamaskの新しいUIをお使いになっています。トークン送信など、新たな機能を試してみましょう！何か問題があればご報告ください。" + "message": "現在、MetaMask の新しいUIをお使いになっています。トークン送信など、新たな機能を試してみましょう! 何か問題があればご報告ください。" }, "unavailable": { "message": "有効ではありません。" @@ -720,6 +742,9 @@ "viewAccount": { "message": "アカウントを見る" }, + "viewOnEtherscan": { + "message": "Etherscan で見る" + }, "warning": { "message": "警告" }, diff --git a/app/images/ethereum-metamask-chrome.png b/app/images/ethereum-metamask-chrome.png Binary files differnew file mode 100644 index 000000000..0b886babb --- /dev/null +++ b/app/images/ethereum-metamask-chrome.png diff --git a/app/manifest.json b/app/manifest.json index 52256c5b7..ed328f19f 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -67,7 +67,8 @@ "notifications" ], "web_accessible_resources": [ - "inpage.js" + "inpage.js", + "phishing.html" ], "externally_connectable": { "matches": [ diff --git a/app/phishing.html b/app/phishing.html new file mode 100644 index 000000000..86f2985cc --- /dev/null +++ b/app/phishing.html @@ -0,0 +1,60 @@ +<!DOCTYPE HTML> + +<html> + + <head> + <title>Phishing Warning</title> + + <style> +body { + background: #c50000; + padding: 50px; + display: flex; + justify-content: center; + font-family: sans-serif; +} +.centered { + display: flex; + flex-direction: column; + justify-content: center; + color: white; + max-width: 600px; +} +a { + color: white; +} + </style> + + <script> + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); + ga('create', 'UA-37075177-6', 'auto'); + ga('send', 'pageview'); + //Send referral data to EAL + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); + ga('create', 'UA-68598031-1', 'auto' {'allowLinker':true}); + ga('send', 'pageview'); + ga('require', 'linker'); + ga('linker:autoLink', ['harrydenley.com', 'metamask.io'], false, true); + </script> + + </head> + + <body> + <div class="centered"> + + <img src="/images/ethereum-metamask-chrome.png" style="width:100%"> + <h3>ATTENTION</h3> + <p>MetaMask believes this domain to have malicious intent and has prevented you from interacting with it.</p> + <p>This is because the site tested positive on the <a href="https://github.com/metamask/eth-phishing-detect">Ethereum Phishing Detector</a>.</p> + <p>You can turn MetaMask off to interact with this site, but it's advised not to.</p> + <p>If you think this domain is incorrectly flagged, <a href="https://github.com/metamask/eth-phishing-detect/issues/new">please file an issue</a>.</p> + + </div> + </body> +</html>
\ No newline at end of file diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js index 7b7114c35..b7496f318 100644 --- a/app/scripts/contentscript.js +++ b/app/scripts/contentscript.js @@ -197,6 +197,7 @@ function blacklistedDomainCheck () { * Redirects the current page to a phishing information page */ function redirectToPhishingWarning () { - console.log('MetaMask - redirecting to phishing warning') - window.location.href = 'https://metamask.io/phishing.html' + console.log('MetaMask - routing to Phishing Warning component') + let extensionURL = extension.runtime.getURL('phishing.html') + window.location.href = extensionURL } diff --git a/app/scripts/lib/inpage-provider.js b/app/scripts/lib/inpage-provider.js index 4e65f0a23..6ef511453 100644 --- a/app/scripts/lib/inpage-provider.js +++ b/app/scripts/lib/inpage-provider.js @@ -54,6 +54,11 @@ function MetamaskInpageProvider (connectionStream) { // also remap ids inbound and outbound MetamaskInpageProvider.prototype.sendAsync = function (payload, cb) { const self = this + + if (payload.method === 'eth_signTypedData') { + console.warn('MetaMask: This experimental version of eth_signTypedData will be deprecated in the next release in favor of the standard as defined in EIP-712. See https://git.io/fNzPl for more information on the new standard.') + } + self.rpcEngine.handle(payload, cb) } diff --git a/package-lock.json b/package-lock.json index 1a2897a9e..074e90cce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8397,12 +8397,13 @@ "resolved": "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-2.0.1.tgz", "integrity": "sha512-lxHZOQspexk3DaGj4RBbWy4C/qNOWRnxpaJzNnYD3WEmC8shcJ4tHs7Xv878rzvILfJnSFSCCiKQhng1m80oBQ==", "requires": { + "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7", "ethereumjs-util": "^5.1.1" }, "dependencies": { "ethereumjs-abi": { "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7", - "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7", + "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git", "requires": { "bn.js": "^4.10.0", "ethereumjs-util": "^5.0.0" @@ -8727,12 +8728,14 @@ "integrity": "sha512-lxHZOQspexk3DaGj4RBbWy4C/qNOWRnxpaJzNnYD3WEmC8shcJ4tHs7Xv878rzvILfJnSFSCCiKQhng1m80oBQ==", "dev": true, "requires": { + "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7", "ethereumjs-util": "^5.1.1" }, "dependencies": { "ethereumjs-abi": { "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7", - "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7", + "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git", + "dev": true, "requires": { "bn.js": "^4.10.0", "ethereumjs-util": "^5.0.0" @@ -8744,6 +8747,7 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", + "dev": true, "requires": { "bn.js": "^4.11.0", "create-hash": "^1.1.2", @@ -30691,6 +30695,7 @@ "version": "3.1.5", "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "dev": true, "requires": { "is-typedarray": "^1.0.0" } @@ -31714,6 +31719,7 @@ "resolved": "https://registry.npmjs.org/web3/-/web3-0.20.3.tgz", "integrity": "sha1-yqRDc9yIFayHZ73ba6cwc5ZMqos=", "requires": { + "bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", "crypto-js": "^3.1.4", "utf8": "^2.1.1", "xhr2": "*", @@ -31722,7 +31728,7 @@ "dependencies": { "bignumber.js": { "version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", - "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934" + "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git" } } }, @@ -32221,7 +32227,8 @@ "dev": true, "requires": { "underscore": "1.8.3", - "web3-core-helpers": "1.0.0-beta.34" + "web3-core-helpers": "1.0.0-beta.34", + "websocket": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2" }, "dependencies": { "underscore": { @@ -32232,7 +32239,8 @@ }, "websocket": { "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2", - "from": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2", + "from": "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible", + "dev": true, "requires": { "debug": "^2.2.0", "nan": "^2.3.3", @@ -33588,7 +33596,8 @@ "yaeti": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz", - "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=" + "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=", + "dev": true }, "yallist": { "version": "2.1.2", |
