From 0add0cd6395f9f27802b63084fb9d298caa0e68e Mon Sep 17 00:00:00 2001 From: reasv <7143787+reasv@users.noreply.github.com> Date: Wed, 6 Nov 2019 21:01:37 +0100 Subject: [PATCH 1/3] dht.provide() should accept string keys (#2573) --- src/core/components/dht.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/core/components/dht.js b/src/core/components/dht.js index 78ca7fbf6d..69aaec1d9d 100644 --- a/src/core/components/dht.js +++ b/src/core/components/dht.js @@ -119,7 +119,18 @@ module.exports = (self) => { if (!Array.isArray(keys)) { keys = [keys] } - + for (var i in keys){ + if (typeof keys[i] === 'string') { + try { + keys[i] = new CID(keys[i]) + } catch (err) { + log.error(err) + + throw errcode(err, 'ERR_INVALID_CID') + } + } + } + // ensure blocks are actually local const has = await every(keys, (key) => { return self._repo.blocks.has(key) From 0aafb44f23893011bec91298de8e62386beca55e Mon Sep 17 00:00:00 2001 From: reasv <7143787+reasv@users.noreply.github.com> Date: Wed, 6 Nov 2019 21:24:44 +0100 Subject: [PATCH 2/3] FIx linting issues --- src/core/components/dht.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/core/components/dht.js b/src/core/components/dht.js index 69aaec1d9d..b4d861a26a 100644 --- a/src/core/components/dht.js +++ b/src/core/components/dht.js @@ -119,18 +119,17 @@ module.exports = (self) => { if (!Array.isArray(keys)) { keys = [keys] } - for (var i in keys){ + for (var i in keys) { if (typeof keys[i] === 'string') { try { keys[i] = new CID(keys[i]) } catch (err) { log.error(err) - throw errcode(err, 'ERR_INVALID_CID') } } } - + // ensure blocks are actually local const has = await every(keys, (key) => { return self._repo.blocks.has(key) From a7f1bb7a4a93d19c69be79cd1afe23541cd6e525 Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Mon, 11 Nov 2019 09:40:28 +0000 Subject: [PATCH 3/3] chore: update interface-ipfs-core dep --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3b7ba54fb0..7736c2e47b 100644 --- a/package.json +++ b/package.json @@ -204,7 +204,7 @@ "execa": "^3.0.0", "form-data": "^2.5.1", "hat": "0.0.3", - "interface-ipfs-core": "^0.118.0", + "interface-ipfs-core": "^0.119.0", "ipfs-interop": "^0.1.1", "ipfsd-ctl": "^0.47.2", "libp2p-websocket-star": "~0.10.2",