fix: block put with CID as string (#2760)

* fix: block put with CID as string * chore: update interface-ipfs-core dep
ipfs · Feb 10, 2020 · 39d87c5 · 39d87c5
1 parent d8be8bb
commit 39d87c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -184,7 +184,7 @@
     "form-data": "^3.0.0",
     "go-ipfs-dep": "^0.4.23",
     "hat": "0.0.3",
-    "interface-ipfs-core": "^0.131.7",
+    "interface-ipfs-core": "^0.132.0",
     "ipfs-interop": "github:ipfs/interop#refactor/async-await",
     "ipfsd-ctl": "github:ipfs/js-ipfsd-ctl#remove-option-normalisation",
     "ncp": "^2.0.0",

diff --git a/src/core/components/block/put.js b/src/core/components/block/put.js
@@ -3,6 +3,7 @@
 const Block = require('ipfs-block')
 const multihashing = require('multihashing-async')
 const CID = require('cids')
+const isIPFS = require('is-ipfs')
 
 module.exports = ({ blockService, gcLock, preload }) => {
   return async function put (block, options) {
@@ -13,8 +14,8 @@ module.exports = ({ blockService, gcLock, preload }) => {
     }
 
     if (!Block.isBlock(block)) {
-      if (options.cid && CID.isCID(options.cid)) {
-        block = new Block(block, options.cid)
+      if (options.cid && isIPFS.cid(options.cid)) {
+        block = new Block(block, CID.isCID(options.cid) ? options.cid : new CID(options.cid))
       } else {
         const mhtype = options.mhtype || 'sha2-256'
         const format = options.format || 'dag-pb'