From e81aa6073d30d5a93fce9a2414203e8367ae16b9 Mon Sep 17 00:00:00 2001 From: Alessandro Ricottone Date: Tue, 23 Jul 2019 21:29:20 +0200 Subject: Resolve onion addresses (#6869) * Resolve onion address * npm i content-hash@latest --- app/scripts/lib/ens-ipfs/setup.js | 2 ++ package-lock.json | 71 ++++++++++++++++----------------------- package.json | 2 +- 3 files changed, 32 insertions(+), 43 deletions(-) diff --git a/app/scripts/lib/ens-ipfs/setup.js b/app/scripts/lib/ens-ipfs/setup.js index 82679db5d..86f3e7d47 100644 --- a/app/scripts/lib/ens-ipfs/setup.js +++ b/app/scripts/lib/ens-ipfs/setup.js @@ -51,6 +51,8 @@ function setupEnsIpfsResolver ({ provider }) { } } else if (type === 'swarm-ns') { url = `https://swarm-gateways.net/bzz:/${hash}${path}${search || ''}` + } else if (type === 'onion' || type === 'onion3') { + url = `http://${hash}.onion${path}${search || ''}` } } catch (err) { console.warn(err) diff --git a/package-lock.json b/package-lock.json index c510e704a..afbe74419 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11287,9 +11287,9 @@ "dev": true }, "cids": { - "version": "0.5.8", - "resolved": "https://registry.npmjs.org/cids/-/cids-0.5.8.tgz", - "integrity": "sha512-Ye8TZP3YQfy0j+i5k+LPHdTY3JOvTwN1pxds44p6BRUv8PTMOAF/Vt4Bc+oiIQ0Sktn0iftkUHgqKNHIMwhshA==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/cids/-/cids-0.6.0.tgz", + "integrity": "sha512-34wuIeiBZOuvBwUuYR4XooVuXUQI2PYU9VmgM2eB3xkSmQYRlv2kh/dIbmGiLY2GuONlGR3lLtYdVkx1G9yXUg==", "requires": { "class-is": "^1.1.0", "multibase": "~0.6.0", @@ -11298,9 +11298,9 @@ }, "dependencies": { "base-x": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.5.tgz", - "integrity": "sha512-C3picSgzPSLE+jW3tcBzJoGwitOtazb5B+5YmAxZm2ybmTi9LNgAtDO/jjVEBZwHoXmDBZ9m/IELj3elJVRBcA==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.6.tgz", + "integrity": "sha512-4PaF8u2+AlViJxRVjurkLTxpp7CaFRD/jo5rPT9ONnKxyhQ8f59yzamEvq7EkriG56yn5On4ONyaG75HLqr46w==", "requires": { "safe-buffer": "^5.0.1" } @@ -11314,18 +11314,13 @@ } }, "multihashes": { - "version": "0.4.14", - "resolved": "https://registry.npmjs.org/multihashes/-/multihashes-0.4.14.tgz", - "integrity": "sha512-V/g/EIN6nALXfS/xHUAgtfPP3mn3sPIF/i9beuGKf25QXS2QZYCpeVJbDPEannkz32B2fihzCe2D/KMrbcmefg==", + "version": "0.4.15", + "resolved": "https://registry.npmjs.org/multihashes/-/multihashes-0.4.15.tgz", + "integrity": "sha512-G/Smj1GWqw1RQP3dRuRRPe3oyLqvPqUaEDIaoi7JF7Loxl4WAWvhJNk84oyDEodSucv0MmSW/ZT0RKUrsIFD3g==", "requires": { "bs58": "^4.0.1", "varint": "^5.0.0" } - }, - "varint": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/varint/-/varint-5.0.0.tgz", - "integrity": "sha1-2Ca4n3SQcy+rwMDtaT7Uddyynr8=" } } }, @@ -12238,20 +12233,19 @@ "dev": true }, "content-hash": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/content-hash/-/content-hash-2.4.0.tgz", - "integrity": "sha512-T6LRy2xaOxgLT3jKj8N9xBiTbY+s60AWP7IUYsz+qmvon92r14z6EWgXt74y/5H+DPuBNPzdYH+jyhtDTTCRMA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/content-hash/-/content-hash-2.4.3.tgz", + "integrity": "sha512-QBfQRlBBCJP94fV8zcUMChGMKzQMAZX6rn36yldc2A16C47tWdOTYjPosyZ7/AfdyW/xB5cP3RgZIAomnUDGIA==", "requires": { - "cids": "^0.5.7", - "multicodec": "^0.5.0", - "multihashes": "^0.4.14", - "varint": "^5.0.0" + "cids": "^0.6.0", + "multicodec": "^0.5.4", + "multihashes": "^0.4.15" }, "dependencies": { "base-x": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.5.tgz", - "integrity": "sha512-C3picSgzPSLE+jW3tcBzJoGwitOtazb5B+5YmAxZm2ybmTi9LNgAtDO/jjVEBZwHoXmDBZ9m/IELj3elJVRBcA==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.6.tgz", + "integrity": "sha512-4PaF8u2+AlViJxRVjurkLTxpp7CaFRD/jo5rPT9ONnKxyhQ8f59yzamEvq7EkriG56yn5On4ONyaG75HLqr46w==", "requires": { "safe-buffer": "^5.0.1" } @@ -12265,18 +12259,13 @@ } }, "multihashes": { - "version": "0.4.14", - "resolved": "https://registry.npmjs.org/multihashes/-/multihashes-0.4.14.tgz", - "integrity": "sha512-V/g/EIN6nALXfS/xHUAgtfPP3mn3sPIF/i9beuGKf25QXS2QZYCpeVJbDPEannkz32B2fihzCe2D/KMrbcmefg==", + "version": "0.4.15", + "resolved": "https://registry.npmjs.org/multihashes/-/multihashes-0.4.15.tgz", + "integrity": "sha512-G/Smj1GWqw1RQP3dRuRRPe3oyLqvPqUaEDIaoi7JF7Loxl4WAWvhJNk84oyDEodSucv0MmSW/ZT0RKUrsIFD3g==", "requires": { "bs58": "^4.0.1", "varint": "^5.0.0" } - }, - "varint": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/varint/-/varint-5.0.0.tgz", - "integrity": "sha1-2Ca4n3SQcy+rwMDtaT7Uddyynr8=" } } }, @@ -41326,18 +41315,11 @@ } }, "multicodec": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/multicodec/-/multicodec-0.5.0.tgz", - "integrity": "sha512-lKsJeT4cKeSq0rVEWhO3oSBgDN4sMY1sNZKlvl68g/ZAahjPS1KIVyF4IqhuYmCdtOyKs4Q4hQ6M0C3iqRnuqQ==", + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/multicodec/-/multicodec-0.5.4.tgz", + "integrity": "sha512-0lPLiZ58b2jyXylx2qgda9/6N0YCNIpBxRsZ8sxYayVjEKh58XyNN74VTTQOR/ZCQFgbj0CsqfyRpEDPPlOMkw==", "requires": { "varint": "^5.0.0" - }, - "dependencies": { - "varint": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/varint/-/varint-5.0.0.tgz", - "integrity": "sha1-2Ca4n3SQcy+rwMDtaT7Uddyynr8=" - } } }, "multihashes": { @@ -54167,6 +54149,11 @@ "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=", "dev": true }, + "varint": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/varint/-/varint-5.0.0.tgz", + "integrity": "sha1-2Ca4n3SQcy+rwMDtaT7Uddyynr8=" + }, "vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", diff --git a/package.json b/package.json index 6b0c58dd9..a16a4ac6a 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "c3": "^0.6.7", "classnames": "^2.2.5", "clone": "^2.1.2", - "content-hash": "^2.3.2", + "content-hash": "^2.4.3", "copy-to-clipboard": "^3.0.8", "currency-formatter": "^1.4.2", "d3": "^5.7.0", -- cgit