fix: pick appropriate CID version

License: MIT
Signed-off-by: Alan Shaw <[email protected]>

Author: Alan Shaw

src/cli/commands/block/put.js

@@ -9,7 +9,7 @@ const { cidToString } = require('../../../utils/cid')
 function addBlock (data, opts) {
   const ipfs = opts.ipfs
 
-  ipfs.block.put(data, (err, block) => {
+  ipfs.block.put(data, opts, (err, block) => {
     if (err) {
       throw err
     }
@@ -38,8 +38,7 @@ module.exports = {
     },
     version: {
       describe: 'cid version',
-      type: 'number',
-      default: 0
+      type: 'number'
     },
     'cid-base': {
       describe: 'Number base to display CIDs in.',

src/core/components/block.js

@@ -58,15 +58,29 @@ module.exports = function block (self) {
 
           const mhtype = options.mhtype || 'sha2-256'
           const format = options.format || 'dag-pb'
-          const cidVersion = options.version || 0
+          let cidVersion
           // const mhlen = options.mhlen || 0
 
+          if (options.version == null) {
+            // Pick appropriate CID version
+            cidVersion = mhtype === 'sha2-256' && format === 'dag-pb' ? 0 : 1
+          } else {
+            cidVersion = options.version
+          }
+
           multihashing(block, mhtype, (err, multihash) => {
             if (err) {
               return cb(err)
             }
 
-            cb(null, new Block(block, new CID(cidVersion, format, multihash)))
+            let cid
+            try {
+              cid = new CID(cidVersion, format, multihash)
+            } catch (err) {
+              return cb(err)
+            }
+
+            cb(null, new Block(block, cid))
           })
         },
         (block, cb) => self._blockService.put(block, (err) => {