Resolve onion addresses from ENS domain.eth #6696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

ricott1 wants to merge 22 commits into MetaMask:develop from ricott1:develop

CHANGELOG.md

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,21 @@ @@
     ## Current Develop Branch
+    ## 6.7.2 Mon Jul 01 2019
+    - [#6713](https://github.com/MetaMask/metamask-extension/pull/6713): * Normalize and Validate txParams in TransactionStateManager.addTx too
+    - [#6759](https://github.com/MetaMask/metamask-extension/pull/6759): Update to Node.js v10
+    - [#Fixes #6694](https://github.com/MetaMask/metamask-extension/pull/Fixes #6694): Fixes #6694
+    - [#6743](https://github.com/MetaMask/metamask-extension/pull/6743): * Add tests for ImportWithSeedPhrase#parseSeedPhrase
+    - [#Fixes #6740](https://github.com/MetaMask/metamask-extension/pull/Fixes #6740): Fixes #6740
+    - [#Fixes #6741](https://github.com/MetaMask/metamask-extension/pull/Fixes #6741): Fixes #6741
+    - [#6761](https://github.com/MetaMask/metamask-extension/pull/6761): Fixes #6760, correct PropTypes for nextRoute
+    - [#6754](https://github.com/MetaMask/metamask-extension/pull/6754): There is currently a bug in chrome that prevents reading source maps
+    - [#6589](https://github.com/MetaMask/metamask-extension/pull/6589): Document hotfix protocol
+    - [#6738](https://github.com/MetaMask/metamask-extension/pull/6738): Add codeowner for package-lock-old.json package-lock.json package.json packagelock-old.json files
+    - [#6648](https://github.com/MetaMask/metamask-extension/pull/6648): Add loading view to notification.html
+    - [#6731](https://github.com/MetaMask/metamask-extension/pull/6731): Add brave as a platform type for MetaMask
     ## 6.7.1 Fri Jun 28 2019
     - [#6764](https://github.com/MetaMask/metamask-extension/pull/6764): Fix display of token amount on confirm transaction screen
@@ Expand Down @@

app/manifest.json

-Original file line number
+Diff line change
@@ -1,7 +1,7 @@
     {
       "name": "__MSG_appName__",
       "short_name": "__MSG_appName__",
-      "version": "6.7.1",
+      "version": "6.7.2",
       "manifest_version": 2,
       "author": "https://metamask.io",
       "description": "__MSG_appDescription__",
@@ Expand Down @@

app/scripts/controllers/network/createLocalhostClient.js

-Original file line number
+Diff line change
@@ Expand Up @@
     const createFetchMiddleware = require('eth-json-rpc-middleware/fetch')
     const createBlockRefRewriteMiddleware = require('eth-json-rpc-middleware/block-ref-rewrite')
     const createBlockTrackerInspectorMiddleware = require('eth-json-rpc-middleware/block-tracker-inspector')
+    const createAsyncMiddleware = require('json-rpc-engine/src/createAsyncMiddleware')
     const providerFromMiddleware = require('eth-json-rpc-middleware/providerFromMiddleware')
     const BlockTracker = require('eth-block-tracker')
+    const inTest = process.env.IN_TEST === 'true'
     module.exports = createLocalhostClient
     function createLocalhostClient () {
@@ Expand All / @@ -13,9 +16,24 @@ function createLocalhostClient () { @@
       const blockTracker = new BlockTracker({ provider: blockProvider, pollingInterval: 1000 })
       const networkMiddleware = mergeMiddleware([
+        createEstimateGasMiddleware(),
         createBlockRefRewriteMiddleware({ blockTracker }),
         createBlockTrackerInspectorMiddleware({ blockTracker }),
         fetchMiddleware,
       ])
       return { networkMiddleware, blockTracker }
     }
+    function delay (time) {
+      return new Promise(resolve => setTimeout(resolve, time))
+    }
+    function createEstimateGasMiddleware () {
+      return createAsyncMiddleware(async (req, _, next) => {
+        if (req.method === 'eth_estimateGas' && inTest) {
+          await delay(2000)
+        }
+        return next()
+      })
+    }

app/scripts/lib/ens-ipfs/setup.js

-Original file line number
+Diff line change
@@ Expand Up / @@ -51,6 +51,10 @@ function setupEnsIpfsResolver ({ provider }) { @@
             }
           } else if (type === 'swarm-ns') {
             url = `https://swarm-gateways.net/bzz:/${hash}${path}${search || ''}`
+          } else if (type === 'onion' || type === 'onion3') {
+            const content = hash.split('/')[2]
+            const [addr, port] = content.split(':')
+            url = `http://${addr}.onion:${port}`
           }
         } catch (err) {
           console.warn(err)
@@ Expand Down @@

development/states/send-edit.json

-Original file line number
+Diff line change
@@ -1,4 +1,9 @@
     {
+      "confirmTransaction": {
+        "txData": {
+          "id": 4768706228115573
+        }
+      },
       "metamask": {
         "completedOnboarding": true,
         "isInitialized": true,
@@ Expand Down Expand Up / @@ -66,7 +71,22 @@ @@
         ],
         "tokens": [],
         "transactions": {},
-        "selectedAddressTxList": [],
+        "selectedAddressTxList": [{
+          "id": 4768706228115573,
+          "time": 1487363153561,
+          "status": "unapproved",
+          "gasMultiplier": 1,
+          "metamaskNetworkId": "3",
+          "txParams": {
+            "from": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
+            "to": "0x2f8d4a878cfa04a6e60d46362f5644deab66572d",
+            "value": "0x1bc16d674ec80000",
+            "metamaskId": 4768706228115573,
+            "metamaskNetworkId": "3",
+            "gas": "0xea60",
+            "gasPrice": "0xba43b7400"
+          }
+        }],
         "unapprovedTxs": {
           "4768706228115573": {
             "id": 4768706228115573,
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Resolve onion addresses from ENS domain.eth #6696

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!