From 2f76d20fc870ab784e63cc2592493f1986ff0c24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20=C5=A0?= Date: Mon, 19 Aug 2019 22:24:29 +0200 Subject: [PATCH 1/4] Add support for ZeroNet --- app/scripts/lib/ens-ipfs/setup.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/scripts/lib/ens-ipfs/setup.js b/app/scripts/lib/ens-ipfs/setup.js index 86f3e7d47b88..79a77d2be1dd 100644 --- a/app/scripts/lib/ens-ipfs/setup.js +++ b/app/scripts/lib/ens-ipfs/setup.js @@ -54,6 +54,8 @@ function setupEnsIpfsResolver ({ provider }) { } else if (type === 'onion' || type === 'onion3') { url = `http://${hash}.onion${path}${search || ''}` } + } else if (type === 'zeronet') { + url = `http://127.0.0.1:43110/${hash}${path}${search || ''}` } catch (err) { console.warn(err) } finally { From 43c533fe978377a461e0e29092bf0200a1807ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20=C5=A0?= Date: Sun, 1 Sep 2019 18:06:24 +0200 Subject: [PATCH 2/4] Fix typo --- app/scripts/lib/ens-ipfs/setup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/lib/ens-ipfs/setup.js b/app/scripts/lib/ens-ipfs/setup.js index 79a77d2be1dd..6b75adfa472e 100644 --- a/app/scripts/lib/ens-ipfs/setup.js +++ b/app/scripts/lib/ens-ipfs/setup.js @@ -53,9 +53,9 @@ function setupEnsIpfsResolver ({ provider }) { url = `https://swarm-gateways.net/bzz:/${hash}${path}${search || ''}` } else if (type === 'onion' || type === 'onion3') { url = `http://${hash}.onion${path}${search || ''}` - } } else if (type === 'zeronet') { url = `http://127.0.0.1:43110/${hash}${path}${search || ''}` + } } catch (err) { console.warn(err) } finally { From d873c77f27c1a598557a8679378d0878f806de52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20=C5=A0?= Date: Thu, 19 Sep 2019 19:56:25 +0200 Subject: [PATCH 3/4] Update content-hash to 2.4.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 388db4506e1f..35b9132d84ce 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "c3": "^0.6.7", "classnames": "^2.2.5", "clone": "^2.1.2", - "content-hash": "^2.4.3", + "content-hash": "^2.4.4", "copy-to-clipboard": "^3.0.8", "currency-formatter": "^1.4.2", "d3": "^5.7.0", From eee50ef8c3516b26fda04f9aa723115d1a1affe4 Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Wed, 25 Sep 2019 15:08:42 -0600 Subject: [PATCH 4/4] Update yarn.lock --- yarn.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/yarn.lock b/yarn.lock index 1686d3ec20d4..ddd3839f2e7d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6942,13 +6942,13 @@ content-disposition@0.5.3, content-disposition@^0.5.2: dependencies: safe-buffer "5.1.2" -content-hash@^2.4.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/content-hash/-/content-hash-2.4.3.tgz#89e6d295bbf2c53fb69b3d8fb43ae572ac7b6096" - integrity sha512-QBfQRlBBCJP94fV8zcUMChGMKzQMAZX6rn36yldc2A16C47tWdOTYjPosyZ7/AfdyW/xB5cP3RgZIAomnUDGIA== +content-hash@^2.4.4: + version "2.4.4" + resolved "https://registry.yarnpkg.com/content-hash/-/content-hash-2.4.4.tgz#4bec87caecfcff8cf1a37645301cbef4728a083f" + integrity sha512-3FaUsqt7VR725pVxe0vIScGI5efmpryIXdVSeXafQ63fb5gRGparAQlAGxTSOiv0yRg7YeliseXuB20ByD1duQ== dependencies: cids "^0.6.0" - multicodec "^0.5.4" + multicodec "^0.5.5" multihashes "^0.4.15" content-type-parser@^1.0.1: @@ -18381,20 +18381,20 @@ multicast-dns@^7.2.0: dns-packet "^4.0.0" thunky "^1.0.2" -multicodec@^0.5.4, multicodec@~0.5.0: - version "0.5.4" - resolved "https://registry.yarnpkg.com/multicodec/-/multicodec-0.5.4.tgz#ab2afb0cd00cd853c5a2eecb0dd1404dc7745388" - integrity sha512-0lPLiZ58b2jyXylx2qgda9/6N0YCNIpBxRsZ8sxYayVjEKh58XyNN74VTTQOR/ZCQFgbj0CsqfyRpEDPPlOMkw== - dependencies: - varint "^5.0.0" - -multicodec@~0.5.1, multicodec@~0.5.3: +multicodec@^0.5.5, multicodec@~0.5.1, multicodec@~0.5.3: version "0.5.5" resolved "https://registry.yarnpkg.com/multicodec/-/multicodec-0.5.5.tgz#55c2535b44eca9ea40a13771420153fe075bb36d" integrity sha512-1kOifvwAqp9IdiiTKmpK2tS+LY6GHZdKpk3S2EvW4T32vlwDyA3hJoZtGauzqdedUPVNGChnTksEotVOCVlC+Q== dependencies: varint "^5.0.0" +multicodec@~0.5.0: + version "0.5.4" + resolved "https://registry.yarnpkg.com/multicodec/-/multicodec-0.5.4.tgz#ab2afb0cd00cd853c5a2eecb0dd1404dc7745388" + integrity sha512-0lPLiZ58b2jyXylx2qgda9/6N0YCNIpBxRsZ8sxYayVjEKh58XyNN74VTTQOR/ZCQFgbj0CsqfyRpEDPPlOMkw== + dependencies: + varint "^5.0.0" + multihashes@^0.4.12: version "0.4.13" resolved "https://registry.yarnpkg.com/multihashes/-/multihashes-0.4.13.tgz#d10bd71bd51d24aa894e2a6f1457146bb7bac125"