From 6d46e2e9bf5d36dc7f8dcbc92b97347e193719d3 Mon Sep 17 00:00:00 2001
From: Alan Shaw <alan.shaw@protocol.ai>
Date: Mon, 17 Dec 2018 10:18:55 +0000
Subject: [PATCH] feat: cid base option (#1552)

Implements an option for the CLI, HTTP API and core (where appropriate) that will allow the user to pick the multibase encoding for any CIDs that are returned as strings.

**NOTE** Using the CID base option in `bitswap`, `dag` and `object` APIs **WILL NOT** auto upgrade your CID to v1 if it is a v0 CID and **WILL NOT** apply the encoding you specified. This is because these APIs return IPLD objects with links and changing the version of the links would result in a different hash for the node if you were to re-add it. Also, the CID you used to retrieve the node wouldn't actually refer to the node you got back any longer. [Read this](https://github.com/ipfs/go-ipfs/issues/5349#issuecomment-445104823) for further context.

This PR adds a `--cid-base` option to the following **CLI commands**:

* `jsipfs bitswap stat`
* `jsipfs bitswap unwant`
* `jsipfs bitswap wantlist`
* `jsipfs block put`
* `jsipfs block stat`
* `jsipfs add`
* `jsipfs ls`
* `jsipfs object get`
* `jsipfs object links`
* `jsipfs object new`
* `jsipfs object patch add-link`
* `jsipfs object patch append-data`
* `jsipfs object patch rm-link`
* `jsipfs object patch set-data`
* `jsipfs object put`
* `jsipfs object stat`
* `jsipfs pin add`
* `jsipfs pin ls`
* `jsipfs pin rm`
* `jsipfs resolve`

Note: these two MFS commands _already_ implement the `--cid-base` option:

* `jsipfs files ls`
* `jsipfs files stat`

It also adds `?cid-base=` query option to the following **HTTP endpoints**:

* `/api/v0/bitswap/wantlist`
* `/api/v0/bitswap/stat`
* `/api/v0/bitswap/unwant`
* `/api/v0/block/put`
* `/api/v0/block/stat`
* `/api/v0/add`
* `/api/v0/ls`
* `/api/v0/object/new`
* `/api/v0/object/get`
* `/api/v0/object/put`
* `/api/v0/object/stat`
* `/api/v0/object/links`
* `/api/v0/object/patch/append-data`
* `/api/v0/object/patch/set-data`
* `/api/v0/object/patch/add-link`
* `/api/v0/object/patch/rm-link`
* `/api/v0/pin/ls`
* `/api/v0/pin/add`
* `/api/v0/pin/rm`
* `/api/v0/resolve`

It adds a `cidBase` option to the following **core functions**:

* `resolve`

License: MIT
Signed-off-by: Alan Shaw <alan.shaw@protocol.ai>
---
 package.json                                  |   4 +-
 src/cli/commands/add.js                       |  17 +-
 src/cli/commands/bitswap/stat.js              |  19 +-
 src/cli/commands/bitswap/unwant.js            |  15 +-
 src/cli/commands/bitswap/wantlist.js          |  17 +-
 src/cli/commands/block/get.js                 |   7 +-
 src/cli/commands/block/put.js                 |  32 +-
 src/cli/commands/block/rm.js                  |  12 +-
 src/cli/commands/block/stat.js                |  19 +-
 src/cli/commands/ls.js                        |  36 +-
 src/cli/commands/object/get.js                |  60 ++-
 src/cli/commands/object/links.js              |  17 +-
 src/cli/commands/object/new.js                |  18 +-
 src/cli/commands/object/patch/add-link.js     |  22 +-
 src/cli/commands/object/patch/append-data.js  |  23 +-
 src/cli/commands/object/patch/rm-link.js      |  18 +-
 src/cli/commands/object/patch/set-data.js     |  23 +-
 src/cli/commands/object/put.js                |  19 +-
 src/cli/commands/object/stat.js               |   6 +-
 src/cli/commands/pin/add.js                   |  17 +-
 src/cli/commands/pin/ls.js                    |  19 +-
 src/cli/commands/pin/rm.js                    |  16 +-
 src/cli/commands/resolve.js                   |   9 +-
 src/core/components/bitswap.js                |  34 +-
 src/core/components/block.js                  |  21 +-
 .../files-regular/add-pull-stream.js          |  20 +-
 .../files-regular/ls-pull-stream.js           |   3 +-
 src/core/components/object.js                 |   2 +
 src/core/components/pin.js                    |  29 +-
 src/core/components/resolve.js                |   5 +-
 src/http/api/resources/bitswap.js             |  37 +-
 src/http/api/resources/block.js               |  22 +-
 src/http/api/resources/files-regular.js       |  22 +-
 src/http/api/resources/object.js              | 174 +++++--
 src/http/api/resources/pin.js                 |  35 +-
 src/http/api/resources/resolve.js             |   9 +-
 src/http/api/routes/bitswap.js                |   9 +-
 src/http/api/routes/block.js                  |  12 +-
 src/http/api/routes/object.js                 |  27 +-
 src/http/api/routes/pin.js                    |   9 +-
 src/utils/cid.js                              |  35 ++
 test/cli/bitswap.js                           |  42 +-
 test/cli/block.js                             |  24 +
 test/cli/files.js                             |   9 +
 test/cli/ls.js                                |  15 +
 test/cli/object.js                            |  89 +++-
 test/cli/pin.js                               |  28 ++
 test/cli/resolve.js                           |  24 +-
 test/http-api/inject/bitswap.js               |  78 +++
 test/http-api/inject/block.js                 |  85 +++-
 test/http-api/inject/files.js                 |  77 ++-
 test/http-api/inject/object.js                | 469 ++++++++++++++++++
 test/http-api/inject/pin.js                   | 169 +++++++
 test/http-api/inject/resolve.js               |  72 +++
 54 files changed, 1784 insertions(+), 347 deletions(-)
 create mode 100644 src/utils/cid.js
 create mode 100644 test/http-api/inject/resolve.js

diff --git a/package.json b/package.json
index d1f51beaab..9875580401 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "ipfs-bitswap": "~0.21.0",
     "ipfs-block": "~0.8.0",
     "ipfs-block-service": "~0.15.1",
-    "ipfs-http-client": "^28.0.1",
+    "ipfs-http-client": "^28.1.0",
     "ipfs-http-response": "~0.2.1",
     "ipfs-mfs": "~0.8.0",
     "ipfs-multipart": "~0.1.0",
@@ -122,7 +122,7 @@
     "ipld-git": "~0.2.2",
     "ipld-zcash": "~0.1.6",
     "ipns": "~0.4.3",
-    "is-ipfs": "~0.4.7",
+    "is-ipfs": "~0.4.8",
     "is-pull-stream": "~0.0.0",
     "is-stream": "^1.1.0",
     "joi": "^14.3.0",
diff --git a/src/cli/commands/add.js b/src/cli/commands/add.js
index 8b930434d6..1d29e46853 100644
--- a/src/cli/commands/add.js
+++ b/src/cli/commands/add.js
@@ -11,9 +11,9 @@ const getFolderSize = require('get-folder-size')
 const byteman = require('byteman')
 const waterfall = require('async/waterfall')
 const mh = require('multihashes')
-const utils = require('../utils')
-const print = require('../utils').print
-const createProgressBar = require('../utils').createProgressBar
+const multibase = require('multibase')
+const { print, isDaemonOn, createProgressBar } = require('../utils')
+const { cidToString } = require('../../utils/cid')
 
 function checkPath (inPath, recursive) {
   // This function is to check for the following possible inputs
@@ -90,7 +90,7 @@ function addPipeline (index, addStream, list, argv) {
       sortBy(added, 'path')
         .reverse()
         .map((file) => {
-          const log = [ 'added', file.hash ]
+          const log = [ 'added', cidToString(file.hash, { base: argv.cidBase }) ]
 
           if (!quiet && file.path.length > 0) log.push(file.path)
 
@@ -156,10 +156,15 @@ module.exports = {
       describe: 'CID version. Defaults to 0 unless an option that depends on CIDv1 is passed. (experimental)',
       default: 0
     },
+    'cid-base': {
+      describe: 'Number base to display CIDs in.',
+      type: 'string',
+      choices: multibase.names
+    },
     hash: {
       type: 'string',
       choices: Object.keys(mh.names),
-      describe: 'Hash function to use. Will set Cid version to 1 if used. (experimental)'
+      describe: 'Hash function to use. Will set CID version to 1 if used. (experimental)'
     },
     quiet: {
       alias: 'q',
@@ -202,7 +207,7 @@ module.exports = {
       chunker: argv.chunker
     }
 
-    if (options.enableShardingExperiment && utils.isDaemonOn()) {
+    if (options.enableShardingExperiment && isDaemonOn()) {
       throw new Error('Error: Enabling the sharding experiment should be done on the daemon')
     }
     const ipfs = argv.ipfs
diff --git a/src/cli/commands/bitswap/stat.js b/src/cli/commands/bitswap/stat.js
index d7a26680f1..94060701eb 100644
--- a/src/cli/commands/bitswap/stat.js
+++ b/src/cli/commands/bitswap/stat.js
@@ -1,22 +1,29 @@
 'use strict'
 
-const print = require('../../utils').print
+const multibase = require('multibase')
+const { print } = require('../../utils')
+const { cidToString } = require('../../../utils/cid')
 
 module.exports = {
   command: 'stat',
 
   describe: 'Show some diagnostic information on the bitswap agent.',
 
-  builder: {},
+  builder: {
+    'cid-base': {
+      describe: 'Number base to display CIDs in. Note: specifying a CID base for v0 CIDs will have no effect.',
+      type: 'string',
+      choices: multibase.names
+    }
+  },
 
-  handler (argv) {
-    argv.ipfs.bitswap.stat((err, stats) => {
+  handler ({ ipfs, cidBase }) {
+    ipfs.bitswap.stat((err, stats) => {
       if (err) {
         throw err
       }
 
-      stats.wantlist = stats.wantlist || []
-      stats.wantlist = stats.wantlist.map(entry => entry['/'])
+      stats.wantlist = stats.wantlist.map(k => cidToString(k['/'], { base: cidBase, upgrade: false }))
       stats.peers = stats.peers || []
 
       print(`bitswap status
diff --git a/src/cli/commands/bitswap/unwant.js b/src/cli/commands/bitswap/unwant.js
index ea676450fa..af0c77296b 100644
--- a/src/cli/commands/bitswap/unwant.js
+++ b/src/cli/commands/bitswap/unwant.js
@@ -1,6 +1,8 @@
 'use strict'
 
-const print = require('../../utils').print
+const multibase = require('multibase')
+const { print } = require('../../utils')
+const { cidToString } = require('../../../utils/cid')
 
 module.exports = {
   command: 'unwant <key>',
@@ -12,14 +14,19 @@ module.exports = {
       alias: 'k',
       describe: 'Key to remove from your wantlist',
       type: 'string'
+    },
+    'cid-base': {
+      describe: 'Number base to display CIDs in. Note: specifying a CID base for v0 CIDs will have no effect.',
+      type: 'string',
+      choices: multibase.names
     }
   },
-  handler (argv) {
-    argv.ipfs.bitswap.unwant(argv.key, (err) => {
+  handler ({ ipfs, key, cidBase }) {
+    ipfs.bitswap.unwant(key, (err) => {
       if (err) {
         throw err
       }
-      print(`Key ${argv.key} removed from wantlist`)
+      print(`Key ${cidToString(key, { base: cidBase, upgrade: false })} removed from wantlist`)
     })
   }
 }
diff --git a/src/cli/commands/bitswap/wantlist.js b/src/cli/commands/bitswap/wantlist.js
index 9397f492ae..7c8e15d1a2 100644
--- a/src/cli/commands/bitswap/wantlist.js
+++ b/src/cli/commands/bitswap/wantlist.js
@@ -1,6 +1,8 @@
 'use strict'
 
-const print = require('../../utils').print
+const multibase = require('multibase')
+const { print } = require('../../utils')
+const { cidToString } = require('../../../utils/cid')
 
 module.exports = {
   command: 'wantlist [peer]',
@@ -12,17 +14,20 @@ module.exports = {
       alias: 'p',
       describe: 'Specify which peer to show wantlist for.',
       type: 'string'
+    },
+    'cid-base': {
+      describe: 'Number base to display CIDs in. Note: specifying a CID base for v0 CIDs will have no effect.',
+      type: 'string',
+      choices: multibase.names
     }
   },
 
-  handler (argv) {
-    argv.ipfs.bitswap.wantlist(argv.peer, (err, res) => {
+  handler ({ ipfs, peer, cidBase }) {
+    ipfs.bitswap.wantlist(peer, (err, list) => {
       if (err) {
         throw err
       }
-      res.Keys.forEach((cid) => {
-        print(cid['/'])
-      })
+      list.Keys.forEach(k => print(cidToString(k['/'], { base: cidBase, upgrade: false })))
     })
   }
 }
diff --git a/src/cli/commands/block/get.js b/src/cli/commands/block/get.js
index 9fb61f4434..f5c32fe0e1 100644
--- a/src/cli/commands/block/get.js
+++ b/src/cli/commands/block/get.js
@@ -1,6 +1,5 @@
 'use strict'
 
-const CID = require('cids')
 const print = require('../../utils').print
 
 module.exports = {
@@ -10,10 +9,8 @@ module.exports = {
 
   builder: {},
 
-  handler (argv) {
-    const cid = new CID(argv.key)
-
-    argv.ipfs.block.get(cid, (err, block) => {
+  handler ({ ipfs, key }) {
+    ipfs.block.get(key, (err, block) => {
       if (err) {
         throw err
       }
diff --git a/src/cli/commands/block/put.js b/src/cli/commands/block/put.js
index 9d75a9c72f..a87204b46e 100644
--- a/src/cli/commands/block/put.js
+++ b/src/cli/commands/block/put.js
@@ -1,33 +1,19 @@
 'use strict'
 
-const CID = require('cids')
-const multihashing = require('multihashing-async')
 const bl = require('bl')
 const fs = require('fs')
-const Block = require('ipfs-block')
-const waterfall = require('async/waterfall')
-const print = require('../../utils').print
+const multibase = require('multibase')
+const { print } = require('../../utils')
+const { cidToString } = require('../../../utils/cid')
 
 function addBlock (data, opts) {
   const ipfs = opts.ipfs
-  let cid
 
-  waterfall([
-    (cb) => multihashing(data, opts.mhtype || 'sha2-256', cb),
-    (multihash, cb) => {
-      if (opts.format !== 'dag-pb' || opts.version !== 0) {
-        cid = new CID(1, opts.format || 'dag-pb', multihash)
-      } else {
-        cid = new CID(0, 'dag-pb', multihash)
-      }
-
-      ipfs.block.put(new Block(data, cid), cb)
-    }
-  ], (err) => {
+  ipfs.block.put(data, opts, (err, block) => {
     if (err) {
       throw err
     }
-    print(cid.toBaseEncodedString())
+    print(cidToString(block.cid, { base: opts.cidBase }))
   })
 }
 
@@ -52,8 +38,12 @@ module.exports = {
     },
     version: {
       describe: 'cid version',
-      type: 'number',
-      default: 0
+      type: 'number'
+    },
+    'cid-base': {
+      describe: 'Number base to display CIDs in.',
+      type: 'string',
+      choices: multibase.names
     }
   },
 
diff --git a/src/cli/commands/block/rm.js b/src/cli/commands/block/rm.js
index 40e1951058..7b8a27db60 100644
--- a/src/cli/commands/block/rm.js
+++ b/src/cli/commands/block/rm.js
@@ -1,8 +1,6 @@
 'use strict'
 
-const utils = require('../../utils')
-const mh = require('multihashes')
-const print = utils.print
+const { print, isDaemonOn } = require('../../utils')
 
 module.exports = {
   command: 'rm <key>',
@@ -11,18 +9,18 @@ module.exports = {
 
   builder: {},
 
-  handler (argv) {
-    if (utils.isDaemonOn()) {
+  handler ({ ipfs, key }) {
+    if (isDaemonOn()) {
       // TODO implement this once `js-ipfs-http-client` supports it
       throw new Error('rm block with daemon running is not yet implemented')
     }
 
-    argv.ipfs.block.rm(mh.fromB58String(argv.key), (err) => {
+    ipfs.block.rm(key, (err) => {
       if (err) {
         throw err
       }
 
-      print('removed ' + argv.key)
+      print('removed ' + key)
     })
   }
 }
diff --git a/src/cli/commands/block/stat.js b/src/cli/commands/block/stat.js
index 07190fd225..9c9bdb5e21 100644
--- a/src/cli/commands/block/stat.js
+++ b/src/cli/commands/block/stat.js
@@ -1,22 +1,29 @@
 'use strict'
 
-const CID = require('cids')
-const print = require('../../utils').print
+const multibase = require('multibase')
+const { print } = require('../../utils')
+const { cidToString } = require('../../../utils/cid')
 
 module.exports = {
   command: 'stat <key>',
 
   describe: 'Print information of a raw IPFS block',
 
-  builder: {},
+  builder: {
+    'cid-base': {
+      describe: 'Number base to display CIDs in.',
+      type: 'string',
+      choices: multibase.names
+    }
+  },
 
-  handler (argv) {
-    argv.ipfs.block.stat(new CID(argv.key), (err, stats) => {
+  handler ({ ipfs, key, cidBase }) {
+    ipfs.block.stat(key, (err, stats) => {
       if (err) {
         throw err
       }
 
-      print('Key: ' + stats.key)
+      print('Key: ' + cidToString(stats.key, { base: cidBase }))
       print('Size: ' + stats.size)
     })
   }
diff --git a/src/cli/commands/ls.js b/src/cli/commands/ls.js
index 97ba7ca692..66667326bd 100644
--- a/src/cli/commands/ls.js
+++ b/src/cli/commands/ls.js
@@ -1,6 +1,8 @@
 'use strict'
 
-const utils = require('../utils')
+const multibase = require('multibase')
+const { print, rightpad } = require('../utils')
+const { cidToString } = require('../../utils/cid')
 
 module.exports = {
   command: 'ls <key>',
@@ -24,33 +26,41 @@ module.exports = {
       desc: 'Resolve linked objects to find out their types. (not implemented yet)',
       type: 'boolean',
       default: false // should be true when implemented
+    },
+    'cid-base': {
+      describe: 'Number base to display CIDs in.',
+      type: 'string',
+      choices: multibase.names
     }
   },
 
-  handler (argv) {
-    let path = argv.key
-    if (path.startsWith('/ipfs/')) {
-      path = path.replace('/ipfs/', '')
-    }
-
-    argv.ipfs.ls(path, { recursive: argv.recursive }, (err, links) => {
+  handler ({ ipfs, key, recursive, headers, cidBase }) {
+    ipfs.ls(key, { recursive }, (err, links) => {
       if (err) {
         throw err
       }
 
-      if (argv.headers) {
+      links = links.map(file => Object.assign(file, { hash: cidToString(file.hash, { base: cidBase }) }))
+
+      if (headers) {
         links = [{ hash: 'Hash', size: 'Size', name: 'Name' }].concat(links)
       }
 
       const multihashWidth = Math.max.apply(null, links.map((file) => file.hash.length))
       const sizeWidth = Math.max.apply(null, links.map((file) => String(file.size).length))
 
+      let pathParts = key.split('/')
+
+      if (key.startsWith('/ipfs/')) {
+        pathParts = pathParts.slice(2)
+      }
+
       links.forEach(link => {
         const fileName = link.type === 'dir' ? `${link.name || ''}/` : link.name
-        const padding = link.depth - path.split('/').length
-        utils.print(
-          utils.rightpad(link.hash, multihashWidth + 1) +
-          utils.rightpad(link.size || '', sizeWidth + 1) +
+        const padding = link.depth - pathParts.length
+        print(
+          rightpad(link.hash, multihashWidth + 1) +
+          rightpad(link.size || '', sizeWidth + 1) +
           '  '.repeat(padding) + fileName
         )
       })
diff --git a/src/cli/commands/object/get.js b/src/cli/commands/object/get.js
index 548ae4f508..456449492c 100644
--- a/src/cli/commands/object/get.js
+++ b/src/cli/commands/object/get.js
@@ -1,7 +1,8 @@
 'use strict'
 
-const print = require('../../utils').print
-const dagPB = require('ipld-dag-pb')
+const multibase = require('multibase')
+const { print } = require('../../utils')
+const { cidToString } = require('../../../utils/cid')
 
 module.exports = {
   command: 'get <key>',
@@ -14,43 +15,38 @@ module.exports = {
       default: 'base64'
     },
     'cid-base': {
-      default: 'base58btc',
-      describe: 'CID base to use.'
+      describe: 'Number base to display CIDs in. Note: specifying a CID base for v0 CIDs will have no effect.',
+      type: 'string',
+      choices: multibase.names
     }
   },
 
-  handler (argv) {
-    argv.ipfs.object.get(argv.key, { enc: 'base58' }, (err, node) => {
+  handler ({ ipfs, key, dataEncoding, cidBase }) {
+    ipfs.object.get(key, { enc: 'base58' }, (err, node) => {
       if (err) {
         throw err
       }
 
-      dagPB.util.cid(node, (err, result) => {
-        if (err) {
-          throw err
-        }
-
-        let data = node.data
-
-        if (Buffer.isBuffer(data)) {
-          data = node.data.toString(argv.dataEncoding || undefined)
-        }
-
-        const answer = {
-          Data: data,
-          Hash: result.toBaseEncodedString(argv.cidBase),
-          Size: node.size,
-          Links: node.links.map((l) => {
-            return {
-              Name: l.name,
-              Size: l.size,
-              Hash: l.cid.toBaseEncodedString(argv.cidBase)
-            }
-          })
-        }
-
-        print(JSON.stringify(answer))
-      })
+      let data = node.data
+
+      if (Buffer.isBuffer(data)) {
+        data = node.data.toString(dataEncoding || undefined)
+      }
+
+      const answer = {
+        Data: data,
+        Hash: cidToString(key, { base: cidBase, upgrade: false }),
+        Size: node.size,
+        Links: node.links.map((l) => {
+          return {
+            Name: l.name,
+            Size: l.size,
+            Hash: cidToString(l.cid, { base: cidBase, upgrade: false })
+          }
+        })
+      }
+
+      print(JSON.stringify(answer))
     })
   }
 }
diff --git a/src/cli/commands/object/links.js b/src/cli/commands/object/links.js
index 9a3a3e203e..768e42150c 100644
--- a/src/cli/commands/object/links.js
+++ b/src/cli/commands/object/links.js
@@ -1,6 +1,8 @@
 'use strict'
 
-const print = require('../../utils').print
+const multibase = require('multibase')
+const { print } = require('../../utils')
+const { cidToString } = require('../../../utils/cid')
 
 module.exports = {
   command: 'links <key>',
@@ -9,21 +11,20 @@ module.exports = {
 
   builder: {
     'cid-base': {
-      default: 'base58btc',
-      describe: 'CID base to use.'
+      describe: 'Number base to display CIDs in. Note: specifying a CID base for v0 CIDs will have no effect.',
+      type: 'string',
+      choices: multibase.names
     }
   },
 
-  handler (argv) {
-    argv.ipfs.object.links(argv.key, {
-      enc: 'base58'
-    }, (err, links) => {
+  handler ({ ipfs, key, cidBase }) {
+    ipfs.object.links(key, { enc: 'base58' }, (err, links) => {
       if (err) {
         throw err
       }
 
       links.forEach((link) => {
-        print(`${link.cid.toBaseEncodedString(argv.cidBase)} ${link.size} ${link.name}`)
+        print(`${cidToString(link.cid, { base: cidBase, upgrade: false })} ${link.size} ${link.name}`)
       })
     })
   }
diff --git a/src/cli/commands/object/new.js b/src/cli/commands/object/new.js
index fc8543fd25..d48f4c69ee 100644
--- a/src/cli/commands/object/new.js
+++ b/src/cli/commands/object/new.js
@@ -1,9 +1,8 @@
 'use strict'
 
-const debug = require('debug')
-const log = debug('cli:object')
-log.error = debug('cli:object:error')
-const print = require('../../utils').print
+const multibase = require('multibase')
+const { print } = require('../../utils')
+const { cidToString } = require('../../../utils/cid')
 
 module.exports = {
   command: 'new [<template>]',
@@ -12,18 +11,19 @@ module.exports = {
 
   builder: {
     'cid-base': {
-      default: 'base58btc',
-      describe: 'CID base to use.'
+      describe: 'Number base to display CIDs in. Note: specifying a CID base for v0 CIDs will have no effect.',
+      type: 'string',
+      choices: multibase.names
     }
   },
 
-  handler (argv) {
-    argv.ipfs.object.new(argv.template, (err, cid) => {
+  handler ({ ipfs, template, cidBase }) {
+    ipfs.object.new(template, (err, cid) => {
       if (err) {
         throw err
       }
 
-      print(cid.toBaseEncodedString(argv.cidBase))
+      print(cidToString(cid, { base: cidBase, upgrade: false }))
     })
   }
 }
diff --git a/src/cli/commands/object/patch/add-link.js b/src/cli/commands/object/patch/add-link.js
index 83e0af8ba4..a1a573a031 100644
--- a/src/cli/commands/object/patch/add-link.js
+++ b/src/cli/commands/object/patch/add-link.js
@@ -2,7 +2,9 @@
 
 const dagPB = require('ipld-dag-pb')
 const DAGLink = dagPB.DAGLink
-const print = require('../../../utils').print
+const multibase = require('multibase')
+const { print } = require('../../../utils')
+const { cidToString } = require('../../../../utils/cid')
 
 module.exports = {
   command: 'add-link <root> <name> <ref>',
@@ -11,16 +13,14 @@ module.exports = {
 
   builder: {
     'cid-base': {
-      default: 'base58btc',
-      describe: 'CID base to use.'
+      describe: 'Number base to display CIDs in. Note: specifying a CID base for v0 CIDs will have no effect.',
+      type: 'string',
+      choices: multibase.names
     }
   },
 
-  handler (argv) {
-    const ipfs = argv.ipfs
-    ipfs.object.get(argv.ref, {
-      enc: 'base58'
-    }, (err, nodeA) => {
+  handler ({ ipfs, root, name, ref, cidBase }) {
+    ipfs.object.get(ref, { enc: 'base58' }, (err, nodeA) => {
       if (err) {
         throw err
       }
@@ -30,16 +30,16 @@ module.exports = {
           throw err
         }
 
-        const link = new DAGLink(argv.name, nodeA.size, result)
+        const link = new DAGLink(name, nodeA.size, result)
 
-        ipfs.object.patch.addLink(argv.root, link, {
+        ipfs.object.patch.addLink(root, link, {
           enc: 'base58'
         }, (err, cid) => {
           if (err) {
             throw err
           }
 
-          print(cid.toBaseEncodedString(argv.cidBase))
+          print(cidToString(cid, { base: cidBase, upgrade: false }))
         })
       })
     })
diff --git a/src/cli/commands/object/patch/append-data.js b/src/cli/commands/object/patch/append-data.js
index 0449a2e35d..b54f301f62 100644
--- a/src/cli/commands/object/patch/append-data.js
+++ b/src/cli/commands/object/patch/append-data.js
@@ -2,12 +2,11 @@
 
 const bl = require('bl')
 const fs = require('fs')
-const debug = require('debug')
-const log = debug('cli:object')
-log.error = debug('cli:object:error')
-const print = require('../../../utils').print
+const multibase = require('multibase')
+const { print } = require('../../../utils')
+const { cidToString } = require('../../../../utils/cid')
 
-function appendData (key, data, ipfs) {
+function appendData (key, data, ipfs, options) {
   ipfs.object.patch.appendData(key, data, {
     enc: 'base58'
   }, (err, cid) => {
@@ -15,7 +14,7 @@ function appendData (key, data, ipfs) {
       throw err
     }
 
-    print(cid.toBaseEncodedString())
+    print(cidToString(cid, { base: options.cidBase, upgrade: false }))
   })
 }
 
@@ -24,12 +23,18 @@ module.exports = {
 
   describe: 'Append data to the data segment of a dag node',
 
-  builder: {},
+  builder: {
+    'cid-base': {
+      describe: 'Number base to display CIDs in. Note: specifying a CID base for v0 CIDs will have no effect.',
+      type: 'string',
+      choices: multibase.names
+    }
+  },
 
   handler (argv) {
     const ipfs = argv.ipfs
     if (argv.data) {
-      return appendData(argv.root, fs.readFileSync(argv.data), ipfs)
+      return appendData(argv.root, fs.readFileSync(argv.data), ipfs, argv)
     }
 
     process.stdin.pipe(bl((err, input) => {
@@ -37,7 +42,7 @@ module.exports = {
         throw err
       }
 
-      appendData(argv.root, input, ipfs)
+      appendData(argv.root, input, ipfs, argv)
     }))
   }
 }
diff --git a/src/cli/commands/object/patch/rm-link.js b/src/cli/commands/object/patch/rm-link.js
index 0324250054..ca7be4e8a5 100644
--- a/src/cli/commands/object/patch/rm-link.js
+++ b/src/cli/commands/object/patch/rm-link.js
@@ -1,9 +1,8 @@
 'use strict'
 
-const debug = require('debug')
-const log = debug('cli:object')
-log.error = debug('cli:object:error')
-const print = require('../../../utils').print
+const multibase = require('multibase')
+const { print } = require('../../../utils')
+const { cidToString } = require('../../../../utils/cid')
 
 module.exports = {
   command: 'rm-link <root> <link>',
@@ -12,20 +11,21 @@ module.exports = {
 
   builder: {
     'cid-base': {
-      default: 'base58btc',
-      describe: 'CID base to use.'
+      describe: 'Number base to display CIDs in. Note: specifying a CID base for v0 CIDs will have no effect.',
+      type: 'string',
+      choices: multibase.names
     }
   },
 
-  handler (argv) {
-    argv.ipfs.object.patch.rmLink(argv.root, { name: argv.link }, {
+  handler ({ ipfs, root, link, cidBase }) {
+    ipfs.object.patch.rmLink(root, { name: link }, {
       enc: 'base58'
     }, (err, cid) => {
       if (err) {
         throw err
       }
 
-      print(cid.toBaseEncodedString(argv.cidBase))
+      print(cidToString(cid, { base: cidBase, upgrade: false }))
     })
   }
 }
diff --git a/src/cli/commands/object/patch/set-data.js b/src/cli/commands/object/patch/set-data.js
index cb4b83b19a..7c7209ea57 100644
--- a/src/cli/commands/object/patch/set-data.js
+++ b/src/cli/commands/object/patch/set-data.js
@@ -2,12 +2,11 @@
 
 const fs = require('fs')
 const bl = require('bl')
-const debug = require('debug')
-const log = debug('cli:object')
-log.error = debug('cli:object:error')
-const print = require('../../../utils').print
+const multibase = require('multibase')
+const { print } = require('../../../utils')
+const { cidToString } = require('../../../../utils/cid')
 
-function parseAndAddNode (key, data, ipfs) {
+function parseAndAddNode (key, data, ipfs, options) {
   ipfs.object.patch.setData(key, data, {
     enc: 'base58'
   }, (err, cid) => {
@@ -15,7 +14,7 @@ function parseAndAddNode (key, data, ipfs) {
       throw err
     }
 
-    print(cid.toBaseEncodedString())
+    print(cidToString(cid, { base: options.cidBase, upgrade: false }))
   })
 }
 
@@ -24,12 +23,18 @@ module.exports = {
 
   describe: 'Set data field of an ipfs object',
 
-  builder: {},
+  builder: {
+    'cid-base': {
+      describe: 'Number base to display CIDs in. Note: specifying a CID base for v0 CIDs will have no effect.',
+      type: 'string',
+      choices: multibase.names
+    }
+  },
 
   handler (argv) {
     const ipfs = argv.ipfs
     if (argv.data) {
-      return parseAndAddNode(argv.root, fs.readFileSync(argv.data), ipfs)
+      return parseAndAddNode(argv.root, fs.readFileSync(argv.data), ipfs, argv)
     }
 
     process.stdin.pipe(bl((err, input) => {
@@ -37,7 +42,7 @@ module.exports = {
         throw err
       }
 
-      parseAndAddNode(argv.root, input, ipfs)
+      parseAndAddNode(argv.root, input, ipfs, argv)
     }))
   }
 }
diff --git a/src/cli/commands/object/put.js b/src/cli/commands/object/put.js
index 110a5a2238..c9999bb335 100644
--- a/src/cli/commands/object/put.js
+++ b/src/cli/commands/object/put.js
@@ -2,15 +2,17 @@
 
 const bl = require('bl')
 const fs = require('fs')
-const print = require('../../utils').print
+const multibase = require('multibase')
+const { print } = require('../../utils')
+const { cidToString } = require('../../../utils/cid')
 
-function putNode (buf, enc, ipfs, cidEnc) {
-  ipfs.object.put(buf, { enc: enc }, (err, cid) => {
+function putNode (buf, options, ipfs) {
+  ipfs.object.put(buf, { enc: options.inputEnc }, (err, cid) => {
     if (err) {
       throw err
     }
 
-    print(`added ${cid.toBaseEncodedString(cidEnc)}`)
+    print(`added ${cidToString(cid, { base: options.cidBase, upgrade: false })}`)
   })
 }
 
@@ -25,8 +27,9 @@ module.exports = {
       default: 'json'
     },
     'cid-base': {
-      default: 'base58btc',
-      describe: 'CID base to use.'
+      describe: 'Number base to display CIDs in. Note: specifying a CID base for v0 CIDs will have no effect.',
+      type: 'string',
+      choices: multibase.names
     }
   },
 
@@ -34,7 +37,7 @@ module.exports = {
     const ipfs = argv.ipfs
     if (argv.data) {
       const buf = fs.readFileSync(argv.data)
-      return putNode(buf, argv.inputEnc, ipfs)
+      return putNode(buf, argv, ipfs)
     }
 
     process.stdin.pipe(bl((err, input) => {
@@ -42,7 +45,7 @@ module.exports = {
         throw err
       }
 
-      putNode(input, argv.inputEnc, ipfs, argv.cidBase)
+      putNode(input, argv, ipfs)
     }))
   }
 }
diff --git a/src/cli/commands/object/stat.js b/src/cli/commands/object/stat.js
index 01fbec16ff..e89fe64860 100644
--- a/src/cli/commands/object/stat.js
+++ b/src/cli/commands/object/stat.js
@@ -9,10 +9,8 @@ module.exports = {
 
   builder: {},
 
-  handler (argv) {
-    argv.ipfs.object.stat(argv.key, {
-      enc: 'base58'
-    }, (err, stats) => {
+  handler ({ ipfs, key, cidBase }) {
+    ipfs.object.stat(key, { enc: 'base58' }, (err, stats) => {
       if (err) {
         throw err
       }
diff --git a/src/cli/commands/pin/add.js b/src/cli/commands/pin/add.js
index bfb0a0b9a3..8d7ec6ccdc 100644
--- a/src/cli/commands/pin/add.js
+++ b/src/cli/commands/pin/add.js
@@ -1,6 +1,8 @@
 'use strict'
 
-const print = require('../../utils').print
+const multibase = require('multibase')
+const { print } = require('../../utils')
+const { cidToString } = require('../../../utils/cid')
 
 module.exports = {
   command: 'add <ipfsPath...>',
@@ -13,16 +15,21 @@ module.exports = {
       alias: 'r',
       default: true,
       describe: 'Recursively pin the object linked to by the specified object(s).'
+    },
+    'cid-base': {
+      describe: 'Number base to display CIDs in.',
+      type: 'string',
+      choices: multibase.names
     }
   },
 
-  handler (argv) {
-    const recursive = argv.recursive
+  handler ({ ipfs, ipfsPath, recursive, cidBase }) {
     const type = recursive ? 'recursive' : 'direct'
-    argv.ipfs.pin.add(argv.ipfsPath, { recursive: recursive }, (err, results) => {
+
+    ipfs.pin.add(ipfsPath, { recursive }, (err, results) => {
       if (err) { throw err }
       results.forEach((res) => {
-        print(`pinned ${res.hash} ${type}ly`)
+        print(`pinned ${cidToString(res.hash, { base: cidBase })} ${type}ly`)
       })
     })
   }
diff --git a/src/cli/commands/pin/ls.js b/src/cli/commands/pin/ls.js
index a59958942d..68792dc9d8 100644
--- a/src/cli/commands/pin/ls.js
+++ b/src/cli/commands/pin/ls.js
@@ -1,6 +1,8 @@
 'use strict'
 
-const print = require('../../utils').print
+const multibase = require('multibase')
+const { print } = require('../../utils')
+const { cidToString } = require('../../../utils/cid')
 
 module.exports = {
   // bracket syntax with '...' tells yargs to optionally accept a list
@@ -21,18 +23,21 @@ module.exports = {
       alias: 'q',
       default: false,
       describe: 'Write just hashes of objects.'
+    },
+    'cid-base': {
+      describe: 'Number base to display CIDs in.',
+      type: 'string',
+      choices: multibase.names
     }
   },
 
-  handler: (argv) => {
-    const paths = argv.ipfsPath
-    const type = argv.type
-    const quiet = argv.quiet
+  handler: ({ ipfs, ipfsPath, type, quiet, cidBase }) => {
+    const paths = ipfsPath
 
-    argv.ipfs.pin.ls(paths, { type }, (err, results) => {
+    ipfs.pin.ls(paths, { type }, (err, results) => {
       if (err) { throw err }
       results.forEach((res) => {
-        let line = res.hash
+        let line = cidToString(res.hash, { base: cidBase })
         if (!quiet) {
           line += ` ${res.type}`
         }
diff --git a/src/cli/commands/pin/rm.js b/src/cli/commands/pin/rm.js
index acbadf8a96..d99f16ebc9 100644
--- a/src/cli/commands/pin/rm.js
+++ b/src/cli/commands/pin/rm.js
@@ -1,6 +1,8 @@
 'use strict'
 
-const print = require('../../utils').print
+const multibase = require('multibase')
+const { print } = require('../../utils')
+const { cidToString } = require('../../../utils/cid')
 
 module.exports = {
   command: 'rm <ipfsPath...>',
@@ -13,15 +15,19 @@ module.exports = {
       alias: 'r',
       default: true,
       describe: 'Recursively unpin the objects linked to by the specified object(s).'
+    },
+    'cid-base': {
+      describe: 'Number base to display CIDs in.',
+      type: 'string',
+      choices: multibase.names
     }
   },
 
-  handler: (argv) => {
-    const recursive = argv.recursive
-    argv.ipfs.pin.rm(argv.ipfsPath, { recursive: recursive }, (err, results) => {
+  handler: ({ ipfs, ipfsPath, recursive, cidBase }) => {
+    ipfs.pin.rm(ipfsPath, { recursive }, (err, results) => {
       if (err) { throw err }
       results.forEach((res) => {
-        print(`unpinned ${res.hash}`)
+        print(`unpinned ${cidToString(res.hash, { base: cidBase })}`)
       })
     })
   }
diff --git a/src/cli/commands/resolve.js b/src/cli/commands/resolve.js
index c1b7a54991..6cf4e891c8 100644
--- a/src/cli/commands/resolve.js
+++ b/src/cli/commands/resolve.js
@@ -1,5 +1,6 @@
 'use strict'
 
+const multibase = require('multibase')
 const print = require('../utils').print
 
 module.exports = {
@@ -12,11 +13,17 @@ module.exports = {
       alias: 'r',
       type: 'boolean',
       default: false
+    },
+    'cid-base': {
+      describe: 'Number base to display CIDs in.',
+      type: 'string',
+      choices: multibase.names
     }
   },
 
   handler (argv) {
-    argv.ipfs.resolve(argv.name, { recursive: argv.recursive }, (err, res) => {
+    const { recursive, cidBase } = argv
+    argv.ipfs.resolve(argv.name, { recursive, cidBase }, (err, res) => {
       if (err) throw err
       print(res)
     })
diff --git a/src/core/components/bitswap.js b/src/core/components/bitswap.js
index 652135c70a..930ab88e2d 100644
--- a/src/core/components/bitswap.js
+++ b/src/core/components/bitswap.js
@@ -8,16 +8,16 @@ const CID = require('cids')
 const PeerId = require('peer-id')
 const errCode = require('err-code')
 
-function formatWantlist (list) {
+function formatWantlist (list, cidBase) {
   return Array.from(list).map((e) => ({ '/': e[1].cid.toBaseEncodedString() }))
 }
 
 module.exports = function bitswap (self) {
   return {
     wantlist: promisify((peerId, callback) => {
-      if (!callback) {
+      if (typeof peerId === 'function') {
         callback = peerId
-        peerId = undefined
+        peerId = null
       }
 
       if (!self.isOnline()) {
@@ -38,8 +38,8 @@ module.exports = function bitswap (self) {
       } else {
         list = self._bitswap.getWantlist()
       }
-      list = formatWantlist(list)
-      return setImmediate(() => callback(null, { Keys: list }))
+
+      setImmediate(() => callback(null, { Keys: formatWantlist(list) }))
     }),
 
     stat: promisify((callback) => {
@@ -49,16 +49,18 @@ module.exports = function bitswap (self) {
 
       const snapshot = self._bitswap.stat().snapshot
 
-      callback(null, {
-        provideBufLen: parseInt(snapshot.providesBufferLength.toString()),
-        blocksReceived: new Big(snapshot.blocksReceived),
-        wantlist: formatWantlist(self._bitswap.getWantlist()),
-        peers: self._bitswap.peers().map((id) => id.toB58String()),
-        dupBlksReceived: new Big(snapshot.dupBlksReceived),
-        dupDataReceived: new Big(snapshot.dupDataReceived),
-        dataReceived: new Big(snapshot.dataReceived),
-        blocksSent: new Big(snapshot.blocksSent),
-        dataSent: new Big(snapshot.dataSent)
+      setImmediate(() => {
+        callback(null, {
+          provideBufLen: parseInt(snapshot.providesBufferLength.toString()),
+          blocksReceived: new Big(snapshot.blocksReceived),
+          wantlist: formatWantlist(self._bitswap.getWantlist()),
+          peers: self._bitswap.peers().map((id) => id.toB58String()),
+          dupBlksReceived: new Big(snapshot.dupBlksReceived),
+          dupDataReceived: new Big(snapshot.dupDataReceived),
+          dataReceived: new Big(snapshot.dataReceived),
+          blocksSent: new Big(snapshot.blocksSent),
+          dataSent: new Big(snapshot.dataSent)
+        })
       })
     }),
 
@@ -82,7 +84,7 @@ module.exports = function bitswap (self) {
         return setImmediate(() => callback(errCode(err, 'ERR_INVALID_CID')))
       }
 
-      return setImmediate(() => callback(null, self._bitswap.unwant(keys)))
+      setImmediate(() => callback(null, self._bitswap.unwant(keys)))
     })
   }
 }
diff --git a/src/core/components/block.js b/src/core/components/block.js
index 1e39880993..6a1bb960d1 100644
--- a/src/core/components/block.js
+++ b/src/core/components/block.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const Block = require('ipfs-block')
-const multihash = require('multihashes')
 const multihashing = require('multihashing-async')
 const CID = require('cids')
 const waterfall = require('async/waterfall')
@@ -57,15 +56,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) => {
@@ -112,7 +125,7 @@ module.exports = function block (self) {
           return callback(err)
         }
         callback(null, {
-          key: multihash.toB58String(cid.multihash),
+          key: cid.toString(),
           size: block.data.length
         })
       })
diff --git a/src/core/components/files-regular/add-pull-stream.js b/src/core/components/files-regular/add-pull-stream.js
index f32bff090b..0d56b5e459 100644
--- a/src/core/components/files-regular/add-pull-stream.js
+++ b/src/core/components/files-regular/add-pull-stream.js
@@ -13,7 +13,7 @@ const WRAPPER = 'wrapper/'
 
 function noop () {}
 
-function prepareFile (self, opts, file, callback) {
+function prepareFile (file, self, opts, callback) {
   opts = opts || {}
 
   let cid = new CID(file.multihash)
@@ -46,7 +46,7 @@ function prepareFile (self, opts, file, callback) {
   ], callback)
 }
 
-function normalizeContent (opts, content) {
+function normalizeContent (content, opts) {
   if (!Array.isArray(content)) {
     content = [content]
   }
@@ -88,7 +88,7 @@ function normalizeContent (opts, content) {
   })
 }
 
-function preloadFile (self, opts, file) {
+function preloadFile (file, self, opts) {
   const isRootFile = opts.wrapWithDirectory
     ? file.path === ''
     : !file.path.includes('/')
@@ -102,7 +102,7 @@ function preloadFile (self, opts, file) {
   return file
 }
 
-function pinFile (self, opts, file, cb) {
+function pinFile (file, self, opts, cb) {
   // Pin a file if it is the root dir of a recursive add or the single file
   // of a direct add.
   const pin = 'pin' in opts ? opts.pin : true
@@ -117,7 +117,9 @@ function pinFile (self, opts, file, cb) {
 
 module.exports = function (self) {
   // Internal add func that gets used by all add funcs
-  return function addPullStream (options = {}) {
+  return function addPullStream (options) {
+    options = options || {}
+
     let chunkerOptions
     try {
       chunkerOptions = parseChunkerString(options.chunker)
@@ -145,12 +147,12 @@ module.exports = function (self) {
 
     opts.progress = progress
     return pull(
-      pull.map(normalizeContent.bind(null, opts)),
+      pull.map(content => normalizeContent(content, opts)),
       pull.flatten(),
       importer(self._ipld, opts),
-      pull.asyncMap(prepareFile.bind(null, self, opts)),
-      pull.map(preloadFile.bind(null, self, opts)),
-      pull.asyncMap(pinFile.bind(null, self, opts))
+      pull.asyncMap((file, cb) => prepareFile(file, self, opts, cb)),
+      pull.map(file => preloadFile(file, self, opts)),
+      pull.asyncMap((file, cb) => pinFile(file, self, opts, cb))
     )
   }
 }
diff --git a/src/core/components/files-regular/ls-pull-stream.js b/src/core/components/files-regular/ls-pull-stream.js
index 25d1e27a0c..bd1b962451 100644
--- a/src/core/components/files-regular/ls-pull-stream.js
+++ b/src/core/components/files-regular/ls-pull-stream.js
@@ -26,8 +26,7 @@ module.exports = function (self) {
         recursive ? node.depth >= pathDepth : node.depth === pathDepth
       ),
       pull.map(node => {
-        const cid = new CID(node.hash)
-        node = Object.assign({}, node, { hash: cid.toBaseEncodedString() })
+        node.hash = new CID(node.hash).toBaseEncodedString()
         delete node.content
         return node
       })
diff --git a/src/core/components/object.js b/src/core/components/object.js
index 57e8e0b9b4..85a3137522 100644
--- a/src/core/components/object.js
+++ b/src/core/components/object.js
@@ -293,6 +293,8 @@ module.exports = function object (self) {
         options = {}
       }
 
+      options = options || {}
+
       waterfall([
         (cb) => self.object.get(multihash, options, cb),
         (node, cb) => {
diff --git a/src/core/components/pin.js b/src/core/components/pin.js
index e89c9f3fad..e74427a96a 100644
--- a/src/core/components/pin.js
+++ b/src/core/components/pin.js
@@ -14,6 +14,8 @@ const detectLimit = require('async/detectLimit')
 const setImmediate = require('async/setImmediate')
 const { Key } = require('interface-datastore')
 const errCode = require('err-code')
+const multibase = require('multibase')
+
 const createPinSet = require('./pin-set')
 const { resolvePath } = require('../utils')
 
@@ -143,6 +145,7 @@ module.exports = (self) => {
         callback = options
         options = {}
       }
+
       options = options || {}
 
       const recursive = options.recursive == null ? true : options.recursive
@@ -193,18 +196,25 @@ module.exports = (self) => {
           // persist updated pin sets to datastore
           flushPins((err, root) => {
             if (err) { return callback(err) }
-            return callback(null, results.map(hash => ({ hash })))
+            callback(null, results.map(hash => ({ hash })))
           })
         })
       })
     }),
 
     rm: promisify((paths, options, callback) => {
-      let recursive = true
       if (typeof options === 'function') {
         callback = options
-      } else if (options && options.recursive === false) {
-        recursive = false
+      }
+
+      options = options || {}
+
+      const recursive = options.recursive == null ? true : options.recursive
+
+      if (options.cidBase && !multibase.names.includes(options.cidBase)) {
+        return setImmediate(() => {
+          callback(errCode(new Error('invalid multibase'), 'ERR_INVALID_MULTIBASE'))
+        })
       }
 
       resolvePath(self.object, paths, (err, mhs) => {
@@ -251,7 +261,7 @@ module.exports = (self) => {
           flushPins((err, root) => {
             if (err) { return callback(err) }
             self.log(`Removed pins: ${results}`)
-            return callback(null, results.map(hash => ({ hash })))
+            callback(null, results.map(hash => ({ hash })))
           })
         })
       })
@@ -261,7 +271,7 @@ module.exports = (self) => {
       let type = types.all
       if (typeof paths === 'function') {
         callback = paths
-        options = null
+        options = {}
         paths = null
       }
       if (typeof options === 'function') {
@@ -271,7 +281,10 @@ module.exports = (self) => {
         options = paths
         paths = null
       }
-      if (options && options.type) {
+
+      options = options || {}
+
+      if (options.type) {
         if (typeof options.type !== 'string') {
           return setImmediate(() => callback(invalidPinTypeErr(options.type)))
         }
@@ -348,7 +361,7 @@ module.exports = (self) => {
             return callback(null, pins)
           })
         } else {
-          return callback(null, pins)
+          callback(null, pins)
         }
       }
     }),
diff --git a/src/core/components/resolve.js b/src/core/components/resolve.js
index dd866cbfbb..bd23a33b20 100644
--- a/src/core/components/resolve.js
+++ b/src/core/components/resolve.js
@@ -5,6 +5,7 @@ const isIpfs = require('is-ipfs')
 const setImmediate = require('async/setImmediate')
 const doUntil = require('async/doUntil')
 const CID = require('cids')
+const { cidToString } = require('../../utils/cid')
 
 module.exports = (self) => {
   return promisify((name, opts, cb) => {
@@ -28,7 +29,7 @@ module.exports = (self) => {
     const cid = new CID(split[2])
 
     if (split.length === 3) {
-      return setImmediate(() => cb(null, name))
+      return setImmediate(() => cb(null, `/ipfs/${cidToString(cid, { base: opts.cidBase })}`))
     }
 
     const path = split.slice(3).join('/')
@@ -36,7 +37,7 @@ module.exports = (self) => {
     resolve(cid, path, (err, cid) => {
       if (err) return cb(err)
       if (!cid) return cb(new Error('found non-link at given path'))
-      cb(null, `/ipfs/${cid.toBaseEncodedString(opts.cidBase)}`)
+      cb(null, `/ipfs/${cidToString(cid, { base: opts.cidBase })}`)
     })
   })
 
diff --git a/src/http/api/resources/bitswap.js b/src/http/api/resources/bitswap.js
index 33eccd7bcb..9028fce698 100644
--- a/src/http/api/resources/bitswap.js
+++ b/src/http/api/resources/bitswap.js
@@ -1,26 +1,47 @@
 'use strict'
 
 const boom = require('boom')
-
+const Joi = require('joi')
+const multibase = require('multibase')
+const { cidToString } = require('../../../utils/cid')
 const parseKey = require('./block').parseKey
 
 exports = module.exports
 
 exports.wantlist = {
+  validate: {
+    query: Joi.object().keys({
+      'cid-base': Joi.string().valid(multibase.names)
+    }).unknown()
+  },
+
   handler: (request, reply) => {
     const peerId = request.query.peer
+    const cidBase = request.query['cid-base']
+
     request.server.app.ipfs.bitswap.wantlist(peerId, (err, list) => {
       if (err) {
         return reply(boom.badRequest(err))
       }
-      reply(list)
+      reply({
+        Keys: list.Keys.map(k => ({
+          '/': cidToString(k['/'], { base: cidBase, upgrade: false })
+        }))
+      })
     })
   }
 }
 
 exports.stat = {
+  validate: {
+    query: Joi.object().keys({
+      'cid-base': Joi.string().valid(multibase.names)
+    }).unknown()
+  },
+
   handler: (request, reply) => {
     const ipfs = request.server.app.ipfs
+    const cidBase = request.query['cid-base']
 
     ipfs.bitswap.stat((err, stats) => {
       if (err) {
@@ -30,6 +51,10 @@ exports.stat = {
         }).code(500)
       }
 
+      stats.wantlist = stats.wantlist.map(k => ({
+        '/': cidToString(k['/'], { base: cidBase, upgrade: false })
+      }))
+
       reply({
         ProvideBufLen: stats.provideBufLen,
         BlocksReceived: stats.blocksReceived,
@@ -46,6 +71,12 @@ exports.stat = {
 }
 
 exports.unwant = {
+  validate: {
+    query: Joi.object().keys({
+      'cid-base': Joi.string().valid(multibase.names)
+    }).unknown()
+  },
+
   // uses common parseKey method that assigns a `key` to request.pre.args
   parseArgs: parseKey,
 
@@ -57,7 +88,7 @@ exports.unwant = {
       if (err) {
         return reply(boom.badRequest(err))
       }
-      reply({ key: key.toBaseEncodedString() })
+      reply({ key: cidToString(key, { base: request.query['cid-base'], upgrade: false }) })
     })
   }
 }
diff --git a/src/http/api/resources/block.js b/src/http/api/resources/block.js
index 9ef21b3c70..929e1a40ab 100644
--- a/src/http/api/resources/block.js
+++ b/src/http/api/resources/block.js
@@ -2,6 +2,9 @@
 
 const CID = require('cids')
 const multipart = require('ipfs-multipart')
+const Joi = require('joi')
+const multibase = require('multibase')
+const { cidToString } = require('../../../utils/cid')
 const debug = require('debug')
 const log = debug('jsipfs:http-api:block')
 log.error = debug('jsipfs:http-api:block:error')
@@ -57,6 +60,12 @@ exports.get = {
 }
 
 exports.put = {
+  validate: {
+    query: Joi.object().keys({
+      'cid-base': Joi.string().valid(multibase.names)
+    }).unknown()
+  },
+
   // pre request handler that parses the args and returns `data` which is assigned to `request.pre.args`
   parseArgs: (request, reply) => {
     if (!request.payload) {
@@ -110,14 +119,14 @@ exports.put = {
       }
 
       return reply({
-        Key: block.cid.toBaseEncodedString(),
+        Key: cidToString(block.cid, { base: request.query['cid-base'] }),
         Size: block.data.length
       })
     })
   }
 }
 
-exports.del = {
+exports.rm = {
   // uses common parseKey method that returns a `key`
   parseArgs: exports.parseKey,
 
@@ -140,12 +149,19 @@ exports.del = {
 }
 
 exports.stat = {
+  validate: {
+    query: Joi.object().keys({
+      'cid-base': Joi.string().valid(multibase.names)
+    }).unknown()
+  },
+
   // uses common parseKey method that returns a `key`
   parseArgs: exports.parseKey,
 
   // main route handler which is called after the above `parseArgs`, but only if the args were valid
   handler: (request, reply) => {
     const key = request.pre.args.key
+
     request.server.app.ipfs.block.stat(key, (err, stats) => {
       if (err) {
         log.error(err)
@@ -156,7 +172,7 @@ exports.stat = {
       }
 
       return reply({
-        Key: stats.key,
+        Key: cidToString(stats.key, { base: request.query['cid-base'] }),
         Size: stats.size
       })
     })
diff --git a/src/http/api/resources/files-regular.js b/src/http/api/resources/files-regular.js
index d38c1ede7b..d0944e250e 100644
--- a/src/http/api/resources/files-regular.js
+++ b/src/http/api/resources/files-regular.js
@@ -15,6 +15,8 @@ const abortable = require('pull-abortable')
 const Joi = require('joi')
 const ndjson = require('pull-ndjson')
 const { PassThrough } = require('readable-stream')
+const multibase = require('multibase')
+const { cidToString } = require('../../../utils/cid')
 
 exports = module.exports
 
@@ -124,11 +126,11 @@ exports.get = {
 
   // main route handler which is called after the above `parseArgs`, but only if the args were valid
   handler: (request, reply) => {
-    const cid = request.pre.args.key
+    const key = request.pre.args.key
     const ipfs = request.server.app.ipfs
     const pack = tar.pack()
 
-    ipfs.get(cid, (err, filesArray) => {
+    ipfs.get(key, (err, filesArray) => {
       if (err) {
         log.error(err)
         pack.emit('error', err)
@@ -169,6 +171,7 @@ exports.add = {
     query: Joi.object()
       .keys({
         'cid-version': Joi.number().integer().min(0).max(1).default(0),
+        'cid-base': Joi.string().valid(multibase.names),
         'raw-leaves': Joi.boolean(),
         'only-hash': Joi.boolean(),
         pin: Joi.boolean().default(true),
@@ -277,7 +280,7 @@ exports.add = {
       pull.map((file) => {
         return {
           Name: file.path, // addPullStream already turned this into a hash if it wanted to
-          Hash: file.hash,
+          Hash: cidToString(file.hash, { base: request.query['cid-base'] }),
           Size: file.size
         }
       }),
@@ -298,16 +301,23 @@ exports.add = {
 }
 
 exports.ls = {
+  validate: {
+    query: Joi.object().keys({
+      'cid-base': Joi.string().valid(multibase.names)
+    }).unknown()
+  },
+
   // uses common parseKey method that returns a `key`
   parseArgs: exports.parseKey,
 
   // main route handler which is called after the above `parseArgs`, but only if the args were valid
   handler: (request, reply) => {
-    const key = request.pre.args.key
+    const { key } = request.pre.args
     const ipfs = request.server.app.ipfs
     const recursive = request.query && request.query.recursive === 'true'
+    const cidBase = request.query['cid-base']
 
-    ipfs.ls(key, { recursive: recursive }, (err, files) => {
+    ipfs.ls(key, { recursive }, (err, files) => {
       if (err) {
         return reply({
           Message: 'Failed to list dir: ' + err.message,
@@ -321,7 +331,7 @@ exports.ls = {
           Hash: key,
           Links: files.map((file) => ({
             Name: file.name,
-            Hash: file.hash,
+            Hash: cidToString(file.hash, { base: cidBase }),
             Size: file.size,
             Type: toTypeCode(file.type),
             Depth: file.depth
diff --git a/src/http/api/resources/object.js b/src/http/api/resources/object.js
index a65009a937..e3ed14d72f 100644
--- a/src/http/api/resources/object.js
+++ b/src/http/api/resources/object.js
@@ -1,11 +1,14 @@
 'use strict'
 
-const mh = require('multihashes')
+const CID = require('cids')
 const multipart = require('ipfs-multipart')
 const dagPB = require('ipld-dag-pb')
 const DAGLink = dagPB.DAGLink
 const DAGNode = dagPB.DAGNode
 const waterfall = require('async/waterfall')
+const Joi = require('joi')
+const multibase = require('multibase')
+const { cidToString } = require('../../../utils/cid')
 const debug = require('debug')
 const log = debug('jsipfs:http-api:object')
 log.error = debug('jsipfs:http-api:object:error')
@@ -20,7 +23,7 @@ exports.parseKey = (request, reply) => {
 
   try {
     return reply({
-      key: mh.fromB58String(request.query.arg)
+      key: new CID(request.query.arg)
     })
   } catch (err) {
     log.error(err)
@@ -31,42 +34,56 @@ exports.parseKey = (request, reply) => {
   }
 }
 
-exports.new = (request, reply) => {
-  const ipfs = request.server.app.ipfs
-  const template = request.query.arg
+exports.new = {
+  validate: {
+    query: Joi.object().keys({
+      'cid-base': Joi.string().valid(multibase.names)
+    }).unknown()
+  },
 
-  waterfall([
-    (cb) => ipfs.object.new(template, cb),
-    (cid, cb) => ipfs.object.get(cid, (err, node) => cb(err, { node, cid }))
-  ], (err, results) => {
-    if (err) {
-      log.error(err)
-      return reply({
-        Message: `Failed to create object: ${err.message}`,
-        Code: 0
-      }).code(500)
-    }
+  handler (request, reply) {
+    const ipfs = request.server.app.ipfs
+    const template = request.query.arg
 
-    const nodeJSON = results.node.toJSON()
-
-    const answer = {
-      Data: nodeJSON.data,
-      Hash: results.cid.toBaseEncodedString(),
-      Size: nodeJSON.size,
-      Links: nodeJSON.links.map((l) => {
-        return {
-          Name: l.name,
-          Size: l.size,
-          Hash: l.cid
-        }
-      })
-    }
+    waterfall([
+      (cb) => ipfs.object.new(template, cb),
+      (cid, cb) => ipfs.object.get(cid, (err, node) => cb(err, { node, cid }))
+    ], (err, results) => {
+      if (err) {
+        log.error(err)
+        return reply({
+          Message: `Failed to create object: ${err.message}`,
+          Code: 0
+        }).code(500)
+      }
 
-    return reply(answer)
-  })
+      const nodeJSON = results.node.toJSON()
+
+      const answer = {
+        Data: nodeJSON.data,
+        Hash: cidToString(results.cid, { base: request.query['cid-base'], upgrade: false }),
+        Size: nodeJSON.size,
+        Links: nodeJSON.links.map((l) => {
+          return {
+            Name: l.name,
+            Size: l.size,
+            Hash: cidToString(l.cid, { base: request.query['cid-base'], upgrade: false })
+          }
+        })
+      }
+
+      return reply(answer)
+    })
+  }
 }
 
 exports.get = {
+  validate: {
+    query: Joi.object().keys({
+      'cid-base': Joi.string().valid(multibase.names)
+    }).unknown()
+  },
+
   // uses common parseKey method that returns a `key`
   parseArgs: exports.parseKey,
 
@@ -96,13 +113,13 @@ exports.get = {
 
       const answer = {
         Data: nodeJSON.data,
-        Hash: results.cid.toBaseEncodedString(),
+        Hash: cidToString(results.cid, { base: request.query['cid-base'], upgrade: false }),
         Size: nodeJSON.size,
         Links: nodeJSON.links.map((l) => {
           return {
             Name: l.name,
             Size: l.size,
-            Hash: l.cid
+            Hash: cidToString(l.cid, { base: request.query['cid-base'], upgrade: false })
           }
         })
       }
@@ -113,6 +130,12 @@ exports.get = {
 }
 
 exports.put = {
+  validate: {
+    query: Joi.object().keys({
+      'cid-base': Joi.string().valid(multibase.names)
+    }).unknown()
+  },
+
   // pre request handler that parses the args and returns `node`
   // which is assigned to `request.pre.args`
   parseArgs: (request, reply) => {
@@ -215,13 +238,13 @@ exports.put = {
 
       const answer = {
         Data: nodeJSON.data,
-        Hash: results.cid.toBaseEncodedString(),
+        Hash: cidToString(results.cid, { base: request.query['cid-base'], upgrade: false }),
         Size: nodeJSON.size,
         Links: nodeJSON.links.map((l) => {
           return {
             Name: l.name,
             Size: l.size,
-            Hash: l.cid
+            Hash: cidToString(l.cid, { base: request.query['cid-base'], upgrade: false })
           }
         })
       }
@@ -232,6 +255,12 @@ exports.put = {
 }
 
 exports.stat = {
+  validate: {
+    query: Joi.object().keys({
+      'cid-base': Joi.string().valid(multibase.names)
+    }).unknown()
+  },
+
   // uses common parseKey method that returns a `key`
   parseArgs: exports.parseKey,
 
@@ -249,6 +278,8 @@ exports.stat = {
         }).code(500)
       }
 
+      stats.Hash = cidToString(stats.Hash, { base: request.query['cid-base'], upgrade: false })
+
       return reply(stats)
     })
   }
@@ -278,6 +309,12 @@ exports.data = {
 }
 
 exports.links = {
+  validate: {
+    query: Joi.object().keys({
+      'cid-base': Joi.string().valid(multibase.names)
+    }).unknown()
+  },
+
   // uses common parseKey method that returns a `key`
   parseArgs: exports.parseKey,
 
@@ -286,10 +323,7 @@ exports.links = {
     const key = request.pre.args.key
     const ipfs = request.server.app.ipfs
 
-    waterfall([
-      (cb) => ipfs.object.get(key, cb),
-      (node, cb) => dagPB.util.cid(node, (err, cid) => cb(err, { node, cid }))
-    ], (err, results) => {
+    ipfs.object.get(key, (err, node) => {
       if (err) {
         log.error(err)
         return reply({
@@ -298,15 +332,15 @@ exports.links = {
         }).code(500)
       }
 
-      const nodeJSON = results.node.toJSON()
+      const nodeJSON = node.toJSON()
 
       return reply({
-        Hash: results.cid.toBaseEncodedString(),
+        Hash: cidToString(key, { base: request.query['cid-base'], upgrade: false }),
         Links: nodeJSON.links.map((l) => {
           return {
             Name: l.name,
             Size: l.size,
-            Hash: l.cid
+            Hash: cidToString(l.cid, { base: request.query['cid-base'], upgrade: false })
           }
         })
       })
@@ -342,7 +376,7 @@ exports.parseKeyAndData = (request, reply) => {
       return reply({
         data: file,
         // TODO: support ipfs paths: https://github.com/ipfs/http-api-spec/pull/68/files#diff-2625016b50d68d922257f74801cac29cR3880
-        key: mh.fromB58String(request.query.arg)
+        key: new CID(request.query.arg)
       })
     } catch (err) {
       return reply({
@@ -354,6 +388,12 @@ exports.parseKeyAndData = (request, reply) => {
 }
 
 exports.patchAppendData = {
+  validate: {
+    query: Joi.object().keys({
+      'cid-base': Joi.string().valid(multibase.names)
+    }).unknown()
+  },
+
   // uses common parseKeyAndData method that returns a `data` & `key`
   parseArgs: exports.parseKeyAndData,
 
@@ -380,13 +420,13 @@ exports.patchAppendData = {
 
       const answer = {
         Data: nodeJSON.data,
-        Hash: results.cid.toBaseEncodedString(),
+        Hash: cidToString(results.cid, { base: request.query['cid-base'], upgrade: false }),
         Size: nodeJSON.size,
         Links: nodeJSON.links.map((l) => {
           return {
             Name: l.name,
             Size: l.size,
-            Hash: l.cid
+            Hash: cidToString(l.cid, { base: request.query['cid-base'], upgrade: false })
           }
         })
       }
@@ -397,6 +437,12 @@ exports.patchAppendData = {
 }
 
 exports.patchSetData = {
+  validate: {
+    query: Joi.object().keys({
+      'cid-base': Joi.string().valid(multibase.names)
+    }).unknown()
+  },
+
   // uses common parseKeyAndData method that returns a `data` & `key`
   parseArgs: exports.parseKeyAndData,
 
@@ -422,14 +468,26 @@ exports.patchSetData = {
       const nodeJSON = results.node.toJSON()
 
       return reply({
-        Hash: results.cid.toBaseEncodedString(),
-        Links: nodeJSON.links
+        Hash: cidToString(results.cid, { base: request.query['cid-base'], upgrade: false }),
+        Links: nodeJSON.links.map((l) => {
+          return {
+            Name: l.name,
+            Size: l.size,
+            Hash: cidToString(l.cid, { base: request.query['cid-base'], upgrade: false })
+          }
+        })
       })
     })
   }
 }
 
 exports.patchAddLink = {
+  validate: {
+    query: Joi.object().keys({
+      'cid-base': Joi.string().valid(multibase.names)
+    }).unknown()
+  },
+
   // pre request handler that parses the args and returns `root`, `name` & `ref` which is assigned to `request.pre.args`
   parseArgs: (request, reply) => {
     if (!(request.query.arg instanceof Array) ||
@@ -456,9 +514,9 @@ exports.patchAddLink = {
 
     try {
       return reply({
-        root: mh.fromB58String(request.query.arg[0]),
+        root: new CID(request.query.arg[0]),
         name: request.query.arg[1],
-        ref: mh.fromB58String(request.query.arg[2])
+        ref: new CID(request.query.arg[2])
       })
     } catch (err) {
       log.error(err)
@@ -490,13 +548,13 @@ exports.patchAddLink = {
 
       const answer = {
         Data: nodeJSON.data,
-        Hash: results.cid.toBaseEncodedString(),
+        Hash: cidToString(results.cid, { base: request.query['cid-base'], upgrade: false }),
         Size: nodeJSON.size,
         Links: nodeJSON.links.map((l) => {
           return {
             Name: l.name,
             Size: l.size,
-            Hash: l.cid
+            Hash: cidToString(l.cid, { base: request.query['cid-base'], upgrade: false })
           }
         })
       }
@@ -507,6 +565,12 @@ exports.patchAddLink = {
 }
 
 exports.patchRmLink = {
+  validate: {
+    query: Joi.object().keys({
+      'cid-base': Joi.string().valid(multibase.names)
+    }).unknown()
+  },
+
   // pre request handler that parses the args and returns `root` & `link` which is assigned to `request.pre.args`
   parseArgs: (request, reply) => {
     if (!(request.query.arg instanceof Array) ||
@@ -523,7 +587,7 @@ exports.patchRmLink = {
 
     try {
       return reply({
-        root: mh.fromB58String(request.query.arg[0]),
+        root: new CID(request.query.arg[0]),
         link: request.query.arg[1]
       })
     } catch (err) {
@@ -557,13 +621,13 @@ exports.patchRmLink = {
 
       const answer = {
         Data: nodeJSON.data,
-        Hash: results.cid.toBaseEncodedString(),
+        Hash: cidToString(results.cid, { base: request.query['cid-base'], upgrade: false }),
         Size: nodeJSON.size,
         Links: nodeJSON.links.map((l) => {
           return {
             Name: l.name,
             Size: l.size,
-            Hash: l.cid
+            Hash: cidToString(l.cid, { base: request.query['cid-base'], upgrade: false })
           }
         })
       }
diff --git a/src/http/api/resources/pin.js b/src/http/api/resources/pin.js
index 5499dfd34f..4aea71de58 100644
--- a/src/http/api/resources/pin.js
+++ b/src/http/api/resources/pin.js
@@ -1,6 +1,10 @@
 'use strict'
 
-const _ = require('lodash')
+const mapValues = require('lodash/mapValues')
+const keyBy = require('lodash/keyBy')
+const multibase = require('multibase')
+const Joi = require('joi')
+const { cidToString } = require('../../../utils/cid')
 const debug = require('debug')
 const log = debug('jsipfs:http-api:pin')
 log.error = debug('jsipfs:http-api:pin:error')
@@ -24,6 +28,12 @@ function parseArgs (request, reply) {
 }
 
 exports.ls = {
+  validate: {
+    query: Joi.object().keys({
+      'cid-base': Joi.string().valid(multibase.names)
+    }).unknown()
+  },
+
   parseArgs: (request, reply) => {
     const type = request.query.type || 'all'
 
@@ -36,6 +46,7 @@ exports.ls = {
   handler: (request, reply) => {
     const { path, type } = request.pre.args
     const ipfs = request.server.app.ipfs
+
     ipfs.pin.ls(path, { type }, (err, result) => {
       if (err) {
         log.error(err)
@@ -46,8 +57,8 @@ exports.ls = {
       }
 
       return reply({
-        Keys: _.mapValues(
-          _.keyBy(result, obj => obj.hash),
+        Keys: mapValues(
+          keyBy(result, obj => cidToString(obj.hash, { base: request.query['cid-base'] })),
           obj => ({ Type: obj.type })
         )
       })
@@ -56,11 +67,18 @@ exports.ls = {
 }
 
 exports.add = {
+  validate: {
+    query: Joi.object().keys({
+      'cid-base': Joi.string().valid(multibase.names)
+    }).unknown()
+  },
+
   parseArgs: parseArgs,
 
   handler: (request, reply) => {
     const ipfs = request.server.app.ipfs
     const { path, recursive } = request.pre.args
+
     ipfs.pin.add(path, { recursive }, (err, result) => {
       if (err) {
         log.error(err)
@@ -71,18 +89,25 @@ exports.add = {
       }
 
       return reply({
-        Pins: result.map(obj => obj.hash)
+        Pins: result.map(obj => cidToString(obj.hash, { base: request.query['cid-base'] }))
       })
     })
   }
 }
 
 exports.rm = {
+  validate: {
+    query: Joi.object().keys({
+      'cid-base': Joi.string().valid(multibase.names)
+    }).unknown()
+  },
+
   parseArgs: parseArgs,
 
   handler: (request, reply) => {
     const ipfs = request.server.app.ipfs
     const { path, recursive } = request.pre.args
+
     ipfs.pin.rm(path, { recursive }, (err, result) => {
       if (err) {
         log.error(err)
@@ -93,7 +118,7 @@ exports.rm = {
       }
 
       return reply({
-        Pins: result.map(obj => obj.hash)
+        Pins: result.map(obj => cidToString(obj.hash, { base: request.query['cid-base'] }))
       })
     })
   }
diff --git a/src/http/api/resources/resolve.js b/src/http/api/resources/resolve.js
index 417f50d8e8..478e423595 100644
--- a/src/http/api/resources/resolve.js
+++ b/src/http/api/resources/resolve.js
@@ -2,6 +2,7 @@
 
 const Joi = require('joi')
 const debug = require('debug')
+const multibase = require('multibase')
 
 const log = debug('jsipfs:http-api:resolve')
 log.error = debug('jsipfs:http-api:resolve:error')
@@ -16,17 +17,19 @@ module.exports = {
           otherwise: Joi.boolean()
         }),
       recursive: Joi.boolean(),
-      arg: Joi.string().required()
+      arg: Joi.string().required(),
+      'cid-base': Joi.string().valid(multibase.names)
     }).unknown()
   },
   handler (request, reply) {
     const ipfs = request.server.app.ipfs
     const name = request.query.arg
     const recursive = request.query.r || request.query.recursive || false
+    const cidBase = request.query['cid-base']
 
-    log(name, { recursive })
+    log(name, { recursive, cidBase })
 
-    ipfs.resolve(name, { recursive }, (err, res) => {
+    ipfs.resolve(name, { recursive, cidBase }, (err, res) => {
       if (err) {
         log.error(err)
         return reply({ Message: err.message, Code: 0 }).code(500)
diff --git a/src/http/api/routes/bitswap.js b/src/http/api/routes/bitswap.js
index 04def2fb91..45be830b6d 100644
--- a/src/http/api/routes/bitswap.js
+++ b/src/http/api/routes/bitswap.js
@@ -9,7 +9,8 @@ module.exports = (server) => {
     method: '*',
     path: '/api/v0/bitswap/wantlist',
     config: {
-      handler: resources.bitswap.wantlist.handler
+      handler: resources.bitswap.wantlist.handler,
+      validate: resources.bitswap.wantlist.validate
     }
   })
 
@@ -17,7 +18,8 @@ module.exports = (server) => {
     method: '*',
     path: '/api/v0/bitswap/stat',
     config: {
-      handler: resources.bitswap.stat.handler
+      handler: resources.bitswap.stat.handler,
+      validate: resources.bitswap.stat.validate
     }
   })
 
@@ -28,7 +30,8 @@ module.exports = (server) => {
       pre: [
         { method: resources.bitswap.unwant.parseArgs, assign: 'args' }
       ],
-      handler: resources.bitswap.unwant.handler
+      handler: resources.bitswap.unwant.handler,
+      validate: resources.bitswap.unwant.validate
     }
   })
 }
diff --git a/src/http/api/routes/block.js b/src/http/api/routes/block.js
index 0ee4ca6204..03d8159876 100644
--- a/src/http/api/routes/block.js
+++ b/src/http/api/routes/block.js
@@ -27,18 +27,19 @@ module.exports = (server) => {
       pre: [
         { method: resources.block.put.parseArgs, assign: 'args' }
       ],
-      handler: resources.block.put.handler
+      handler: resources.block.put.handler,
+      validate: resources.block.put.validate
     }
   })
 
   api.route({
     method: '*',
-    path: '/api/v0/block/del',
+    path: '/api/v0/block/rm',
     config: {
       pre: [
-        { method: resources.block.del.parseArgs, assign: 'args' }
+        { method: resources.block.rm.parseArgs, assign: 'args' }
       ],
-      handler: resources.block.del.handler
+      handler: resources.block.rm.handler
     }
   })
 
@@ -49,7 +50,8 @@ module.exports = (server) => {
       pre: [
         { method: resources.block.stat.parseArgs, assign: 'args' }
       ],
-      handler: resources.block.stat.handler
+      handler: resources.block.stat.handler,
+      validate: resources.block.stat.validate
     }
   })
 }
diff --git a/src/http/api/routes/object.js b/src/http/api/routes/object.js
index 51d7ba9fe9..407b6c58a0 100644
--- a/src/http/api/routes/object.js
+++ b/src/http/api/routes/object.js
@@ -9,7 +9,8 @@ module.exports = (server) => {
     method: '*',
     path: '/api/v0/object/new',
     config: {
-      handler: resources.object.new
+      handler: resources.object.new.handler,
+      validate: resources.object.new.validate
     }
   })
 
@@ -20,7 +21,8 @@ module.exports = (server) => {
       pre: [
         { method: resources.object.get.parseArgs, assign: 'args' }
       ],
-      handler: resources.object.get.handler
+      handler: resources.object.get.handler,
+      validate: resources.object.get.validate
     }
   })
 
@@ -35,7 +37,8 @@ module.exports = (server) => {
       pre: [
         { method: resources.object.put.parseArgs, assign: 'args' }
       ],
-      handler: resources.object.put.handler
+      handler: resources.object.put.handler,
+      validate: resources.object.put.validate
     }
   })
 
@@ -46,7 +49,8 @@ module.exports = (server) => {
       pre: [
         { method: resources.object.stat.parseArgs, assign: 'args' }
       ],
-      handler: resources.object.stat.handler
+      handler: resources.object.stat.handler,
+      validate: resources.object.stat.validate
     }
   })
 
@@ -68,7 +72,8 @@ module.exports = (server) => {
       pre: [
         { method: resources.object.links.parseArgs, assign: 'args' }
       ],
-      handler: resources.object.links.handler
+      handler: resources.object.links.handler,
+      validate: resources.object.links.validate
     }
   })
 
@@ -83,7 +88,8 @@ module.exports = (server) => {
       pre: [
         { method: resources.object.patchAppendData.parseArgs, assign: 'args' }
       ],
-      handler: resources.object.patchAppendData.handler
+      handler: resources.object.patchAppendData.handler,
+      validate: resources.object.patchAppendData.validate
     }
   })
 
@@ -98,7 +104,8 @@ module.exports = (server) => {
       pre: [
         { method: resources.object.patchSetData.parseArgs, assign: 'args' }
       ],
-      handler: resources.object.patchSetData.handler
+      handler: resources.object.patchSetData.handler,
+      validate: resources.object.patchSetData.validate
     }
   })
 
@@ -109,7 +116,8 @@ module.exports = (server) => {
       pre: [
         { method: resources.object.patchAddLink.parseArgs, assign: 'args' }
       ],
-      handler: resources.object.patchAddLink.handler
+      handler: resources.object.patchAddLink.handler,
+      validate: resources.object.patchAddLink.validate
     }
   })
 
@@ -120,7 +128,8 @@ module.exports = (server) => {
       pre: [
         { method: resources.object.patchRmLink.parseArgs, assign: 'args' }
       ],
-      handler: resources.object.patchRmLink.handler
+      handler: resources.object.patchRmLink.handler,
+      validate: resources.object.patchRmLink.validate
     }
   })
 }
diff --git a/src/http/api/routes/pin.js b/src/http/api/routes/pin.js
index 657bb375ac..76b6a57ad1 100644
--- a/src/http/api/routes/pin.js
+++ b/src/http/api/routes/pin.js
@@ -12,7 +12,8 @@ module.exports = (server) => {
       pre: [
         { method: resources.pin.add.parseArgs, assign: 'args' }
       ],
-      handler: resources.pin.add.handler
+      handler: resources.pin.add.handler,
+      validate: resources.pin.add.validate
     }
   })
 
@@ -23,7 +24,8 @@ module.exports = (server) => {
       pre: [
         { method: resources.pin.rm.parseArgs, assign: 'args' }
       ],
-      handler: resources.pin.rm.handler
+      handler: resources.pin.rm.handler,
+      validate: resources.pin.rm.validate
     }
   })
 
@@ -34,7 +36,8 @@ module.exports = (server) => {
       pre: [
         { method: resources.pin.ls.parseArgs, assign: 'args' }
       ],
-      handler: resources.pin.ls.handler
+      handler: resources.pin.ls.handler,
+      validate: resources.pin.ls.validate
     }
   })
 }
diff --git a/src/utils/cid.js b/src/utils/cid.js
new file mode 100644
index 0000000000..adf16963d0
--- /dev/null
+++ b/src/utils/cid.js
@@ -0,0 +1,35 @@
+'use strict'
+
+const CID = require('cids')
+
+/**
+* Stringify a CID encoded in the requested base, upgrading to v1 if necessary.
+*
+* Setting upgrade to false will disable automatic CID upgrading from v0 to v1
+* which is necessary if the multibase is something other than base58btc. Note
+* that it will also not apply the encoding (since v0 CIDs can only be encoded
+* as base58btc).
+*
+* @param {CID|Buffer|String} cid The CID to encode
+* @param {Object} [options] Optional options
+* @param {String} [options.base] Name of multibase codec to encode the CID with
+* @param {Boolean} [options.upgrade] Automatically upgrade v0 CIDs to v1 when
+* necessary. Default: true.
+* @returns {String}
+*/
+exports.cidToString = (cid, options) => {
+  options = options || {}
+  options.base = options.base || null
+  options.upgrade = options.upgrade !== false
+
+  if (!CID.isCID(cid)) {
+    cid = new CID(cid)
+  }
+
+  if (cid.version === 0 && options.base && options.base !== 'base58btc') {
+    if (!options.upgrade) return cid.toString()
+    cid = cid.toV1()
+  }
+
+  return cid.toBaseEncodedString(options.base)
+}
diff --git a/test/cli/bitswap.js b/test/cli/bitswap.js
index 087bb19453..ddc0d9b626 100644
--- a/test/cli/bitswap.js
+++ b/test/cli/bitswap.js
@@ -4,19 +4,22 @@
 const expect = require('chai').expect
 const runOn = require('../utils/on-and-off').on
 const PeerId = require('peer-id')
+const CID = require('cids')
 const waitFor = require('../utils/wait-for')
 
 describe('bitswap', () => runOn((thing) => {
   let ipfs
   let peerId
-  const key = 'QmUBdnXXPyoDFXj3Hj39dNJ5VkN3QFRskXxcGaYFBB8CNR'
+  const key0 = 'QmUBdnXXPyoDFXj3Hj39dNJ5VkN3QFRskXxcGaYFBB8CNR'
+  const key1 = 'zb2rhafnd6kEUujnoMkozHnWXY7XpWttyVDWKXfChqA42VTDU'
 
   before(() => {
     ipfs = thing.ipfs
   })
 
   before(() => {
-    ipfs('block get ' + key).catch(() => {})
+    ipfs('block get ' + key0).catch(() => {})
+    ipfs('block get ' + key1).catch(() => {})
   })
 
   before(function (done) {
@@ -34,12 +37,12 @@ describe('bitswap', () => runOn((thing) => {
 
     const test = (cb) => {
       ipfs('bitswap wantlist')
-        .then(out => cb(null, out.includes(key)))
+        .then(out => cb(null, out.includes(key0) && out.includes(key1)))
         .catch(cb)
     }
 
     waitFor(test, {
-      name: key + ' to be wanted',
+      name: `${key0} and ${key1} to be wanted`,
       timeout: 60 * 1000
     }, done)
   })
@@ -47,7 +50,15 @@ describe('bitswap', () => runOn((thing) => {
   it('wantlist', function () {
     this.timeout(20 * 1000)
     return ipfs('bitswap wantlist').then((out) => {
-      expect(out).to.eql(key + '\n')
+      expect(out).to.include(key0)
+      expect(out).to.include(key1)
+    })
+  })
+
+  it('should get wantlist with CIDs encoded in specified base', function () {
+    this.timeout(20 * 1000)
+    return ipfs('bitswap wantlist --cid-base=base64').then((out) => {
+      expect(out).to.include(new CID(key1).toBaseEncodedString('base64') + '\n')
     })
   })
 
@@ -67,17 +78,26 @@ describe('bitswap', () => runOn((thing) => {
         '  blocks received: 0',
         '  dup blocks received: 0',
         '  dup data received: 0B',
-        '  wantlist [1 keys]',
-        `    ${key}`,
-        // We sometimes pick up partners while the tests run so our assertion ends here
-        '  partners'
+        // We sometimes pick up partners while the tests run and the order of
+        // wanted keys is not defined so our assertion ends here.
+        '  wantlist [2 keys]'
       ].join('\n'))
+
+      expect(out).to.include(key0)
+      expect(out).to.include(key1)
+    })
+  })
+
+  it('should get stats with wantlist CIDs encoded in specified base', function () {
+    this.timeout(20 * 1000)
+    return ipfs('bitswap stat --cid-base=base64').then((out) => {
+      expect(out).to.include(new CID(key1).toBaseEncodedString('base64'))
     })
   })
 
   it('unwant', function () {
-    return ipfs('bitswap unwant ' + key).then((out) => {
-      expect(out).to.eql(`Key ${key} removed from wantlist\n`)
+    return ipfs('bitswap unwant ' + key0).then((out) => {
+      expect(out).to.eql(`Key ${key0} removed from wantlist\n`)
     })
   })
 }))
diff --git a/test/cli/block.js b/test/cli/block.js
index 054e14995b..940aeb6bff 100644
--- a/test/cli/block.js
+++ b/test/cli/block.js
@@ -26,6 +26,14 @@ describe('block', () => runOnAndOff((thing) => {
         expect(out).to.eql('z43AaGF23fmvRnDP56Ub9WcJCfzSfqtmzNCCvmz5eudT8dtdCDS\n'))
   })
 
+  it('should put and print CID encoded in specified base', function () {
+    this.timeout(40 * 1000)
+
+    return ipfs('block put test/fixtures/test-data/hello --cid-base=base64').then((out) => {
+      expect(out).to.eql('mAXASIKlIkE8vD0ebj4GXaUswGEsNLtHBzSoewPuF0pmhkqRH\n')
+    })
+  })
+
   it('get', function () {
     this.timeout(40 * 1000)
 
@@ -55,6 +63,22 @@ describe('block', () => runOnAndOff((thing) => {
       })
   })
 
+  it('should stat and print CID encoded in specified base', function () {
+    this.timeout(80 * 1000)
+
+    return ipfs('block put test/fixtures/test-data/hello')
+      .then((out) => {
+        expect(out).to.eql('QmZjTnYw2TFhn9Nn7tjmPSoTBoY7YRkwPzwSrSbabY24Kp\n')
+        return ipfs('block stat QmZjTnYw2TFhn9Nn7tjmPSoTBoY7YRkwPzwSrSbabY24Kp --cid-base=base64')
+      })
+      .then((out) => {
+        expect(out).to.eql([
+          'Key: mAXASIKlIkE8vD0ebj4GXaUswGEsNLtHBzSoewPuF0pmhkqRH',
+          'Size: 12'
+        ].join('\n') + '\n')
+      })
+  })
+
   it.skip('rm', function () {
     this.timeout(40 * 1000)
 
diff --git a/test/cli/files.js b/test/cli/files.js
index 69843145e6..71f0a8a886 100644
--- a/test/cli/files.js
+++ b/test/cli/files.js
@@ -363,6 +363,15 @@ describe('files', () => runOnAndOff((thing) => {
     })
   })
 
+  it('should add and print CID encoded in specified base', function () {
+    this.timeout(30 * 1000)
+
+    return ipfs('add test/fixtures/test-data/hello --cid-base=base64')
+      .then((out) => {
+        expect(out).to.eql('added mAXASIEbUSBS5xa8UHDqqt8BdxehE6tX5HxKFiwIeukV2i0wO hello\n')
+      })
+  })
+
   it('cat', function () {
     this.timeout(30 * 1000)
 
diff --git a/test/cli/ls.js b/test/cli/ls.js
index 4eccf82c07..f833a1e32b 100644
--- a/test/cli/ls.js
+++ b/test/cli/ls.js
@@ -89,4 +89,19 @@ describe('ls', () => runOnAndOff((thing) => {
         )
       })
   })
+
+  it('should ls and print CIDs encoded in specified base', function () {
+    this.timeout(20 * 1000)
+
+    return ipfs('ls Qmaj2NmcyAXT8dFmZRRytE12wpcaHADzbChKToMEjBsj5Z --cid-base=base64')
+      .then((out) => {
+        expect(out).to.eql(
+          'mAXASILidvV1YroHLqBvmuXko1Ly1UVenZV1K+MvhsjXhdvZQ 123530 blocks/\n' +
+          'mAXASIBT4ZYkQw0IApLoNHBxSjpezyayKZHJyxmFKpt0I3sK5 3939   config\n' +
+          'mAXASIGCpScP8zpa0CqUgyVCR/Cm0Co8pnULGe3seXSsOnJsJ 5503   datastore/\n' +
+          'mAXASIF58POI3+TbHb69iXpD3dRqfXusEj1mHMwPCFenM6HWZ 7397   init-docs/\n' +
+          'mAXASICiW5ai+KiU60glImEMMkiHaNSOAivpXspriIhJO8iHI 10     version\n'
+        )
+      })
+  })
 }))
diff --git a/test/cli/object.js b/test/cli/object.js
index 1462d00d55..ceb9f24627 100644
--- a/test/cli/object.js
+++ b/test/cli/object.js
@@ -9,6 +9,7 @@ const path = require('path')
 const fs = require('fs')
 const crypto = require('crypto')
 const os = require('os')
+const multibase = require('multibase')
 
 describe('object', () => runOnAndOff((thing) => {
   let ipfs
@@ -33,6 +34,15 @@ describe('object', () => runOnAndOff((thing) => {
     })
   })
 
+  // TODO: unskip after switch to v1 CIDs by default
+  it.skip('should new and print CID encoded in specified base', () => {
+    return ipfs('object new --cid-base=base64').then((out) => {
+      expect(out).to.eql(
+        'mAXASIOOwxEKY/BwUmvv0yJlvuSQnrkHkZJuTTKSVmRt4UrhV\n'
+      )
+    })
+  })
+
   it('get', () => {
     return ipfs('object get QmdfTbBqBPQ7VNxZEYEj14VmRuZBkqFbiwReogJgS1zR1n').then((out) => {
       const result = JSON.parse(out)
@@ -69,6 +79,22 @@ describe('object', () => runOnAndOff((thing) => {
       })
   })
 
+  it('should get and print CIDs encoded in specified base', () => {
+    return ipfs('add test/fixtures/planets -r --cid-version=1')
+      .then(out => {
+        const lines = out.trim().split('\n')
+        return lines[lines.length - 1].split(' ')[1]
+      })
+      .then(cid => ipfs(`object get ${cid} --cid-base=base64`))
+      .then(out => {
+        const result = JSON.parse(out)
+        expect(multibase.isEncoded(result.Hash)).to.deep.equal('base64')
+        result.Links.forEach(l => {
+          expect(multibase.isEncoded(l.Hash)).to.deep.equal('base64')
+        })
+      })
+  })
+
   it('put', () => {
     return ipfs('object put test/fixtures/test-data/node.json').then((out) => {
       expect(out).to.eql(
@@ -77,6 +103,16 @@ describe('object', () => runOnAndOff((thing) => {
     })
   })
 
+  // TODO: unskip after switch to v1 CIDs by default
+  it.skip('should put and print CID encoded in specified base', () => {
+    return ipfs('object put test/fixtures/test-data/node.json --cid-base=base64')
+      .then((out) => {
+        expect(out).to.eql(
+          'added mAXASIKbM02Neyt6L1RRLYVEOuNlqDOzTvBboo3cI/u6f/+Vk\n'
+        )
+      })
+  })
+
   it('stat', function () {
     this.timeout(40 * 1000)
 
@@ -97,7 +133,7 @@ describe('object', () => runOnAndOff((thing) => {
     })
   })
 
-  it('unadulterated data', function () {
+  it('unaltered data', function () {
     this.timeout(10 * 1000)
 
     // has to be big enough to span several DAGNodes
@@ -126,6 +162,21 @@ describe('object', () => runOnAndOff((thing) => {
     })
   })
 
+  it('should get links and print CIDs encoded in specified base', () => {
+    return ipfs('add test/fixtures/planets -r --cid-version=1')
+      .then(out => {
+        const lines = out.trim().split('\n')
+        return lines[lines.length - 1].split(' ')[1]
+      })
+      .then(cid => ipfs(`object links ${cid} --cid-base=base64`))
+      .then(out => {
+        out.trim().split('\n').forEach(line => {
+          const cid = line.split(' ')[0]
+          expect(multibase.isEncoded(cid)).to.deep.equal('base64')
+        })
+      })
+  })
+
   describe('patch', function () {
     this.timeout(40 * 1000)
 
@@ -137,6 +188,15 @@ describe('object', () => runOnAndOff((thing) => {
       })
     })
 
+    // TODO: unskip after switch to v1 CIDs by default
+    it.skip('should append-data and print CID encoded in specified base', () => {
+      return ipfs('object patch append-data QmdfTbBqBPQ7VNxZEYEj14VmRuZBkqFbiwReogJgS1zR1n test/fixtures/test-data/badconfig --cid-base=base64').then((out) => {
+        expect(out).to.eql(
+          'mAXASIP+BZ7jGtaTyLGOs0xYcQvH7K9kVKEbyzXAkwLoZwrRj\n'
+        )
+      })
+    })
+
     it('set-data', () => {
       return ipfs('object patch set-data QmfY37rjbPCZRnhvvJuQ46htW3VCAWziVB991P79h6WSv6 test/fixtures/test-data/badconfig').then((out) => {
         expect(out).to.eql(
@@ -145,6 +205,15 @@ describe('object', () => runOnAndOff((thing) => {
       })
     })
 
+    // TODO: unskip after switch to v1 CIDs by default
+    it.skip('should set-data and print CID encoded in specified base', () => {
+      return ipfs('object patch set-data QmfY37rjbPCZRnhvvJuQ46htW3VCAWziVB991P79h6WSv6 test/fixtures/test-data/badconfig --cid-base=base64').then((out) => {
+        expect(out).to.eql(
+          'mAXASIP+BZ7jGtaTyLGOs0xYcQvH7K9kVKEbyzXAkwLoZwrRj\n'
+        )
+      })
+    })
+
     it('add-link', () => {
       return ipfs('object patch add-link QmdfTbBqBPQ7VNxZEYEj14VmRuZBkqFbiwReogJgS1zR1n foo QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn').then((out) => {
         expect(out).to.eql(
@@ -153,6 +222,15 @@ describe('object', () => runOnAndOff((thing) => {
       })
     })
 
+    // TODO: unskip after switch to v1 CIDs by default
+    it.skip('should add-link and print CID encoded in specified base', () => {
+      return ipfs('object patch add-link QmdfTbBqBPQ7VNxZEYEj14VmRuZBkqFbiwReogJgS1zR1n foo QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn --cid-base=base64').then((out) => {
+        expect(out).to.eql(
+          'mAXASIOEVPbXq2xYoEsRZhaPB61btcy1x359osjv4a2L/lgPs\n'
+        )
+      })
+    })
+
     it('rm-link', () => {
       return ipfs('object patch rm-link QmdVHE8fUD6FLNLugtNxqDFyhaCgdob372hs6BYEe75VAK foo').then((out) => {
         expect(out).to.eql(
@@ -160,5 +238,14 @@ describe('object', () => runOnAndOff((thing) => {
         )
       })
     })
+
+    // TODO: unskip after switch to v1 CIDs by default
+    it.skip('should rm-link and print CID encoded in specified base', () => {
+      return ipfs('object patch rm-link QmdVHE8fUD6FLNLugtNxqDFyhaCgdob372hs6BYEe75VAK foo --cid-base=base64').then((out) => {
+        expect(out).to.eql(
+          'mAXASIOOwxEKY/BwUmvv0yJlvuSQnrkHkZJuTTKSVmRt4UrhV\n'
+        )
+      })
+    })
   })
 }))
diff --git a/test/cli/pin.js b/test/cli/pin.js
index a3fc1d0b03..5313e3dbd3 100644
--- a/test/cli/pin.js
+++ b/test/cli/pin.js
@@ -3,6 +3,7 @@
 'use strict'
 
 const expect = require('chai').expect
+const CID = require('cids')
 const runOnAndOff = require('../utils/on-and-off')
 
 // fixture structure:
@@ -32,6 +33,17 @@ describe('pin', () => runOnAndOff(thing => {
       return ipfs(`pin rm ${pins.root}`)
         .then(out => expect(out).to.equal(`unpinned ${pins.root}\n`))
     })
+
+    it('should rm and print CIDs encoded in specified base', function () {
+      this.timeout(30 * 1000)
+
+      return ipfs(`add -r ${fixturePath}`)
+        .then(() => ipfs(`pin rm ${pins.root} --cid-base=base64`))
+        .then(out => {
+          const b64CidStr = new CID(pins.root).toV1().toBaseEncodedString('base64')
+          expect(out).to.eql(`unpinned ${b64CidStr}\n`)
+        })
+    })
   })
 
   describe('add', function () {
@@ -48,6 +60,14 @@ describe('pin', () => runOnAndOff(thing => {
           expect(out).to.eql(`pinned ${pins.solarWiki} directly\n`)
         )
     })
+
+    it('should add and print CIDs encoded in specified base', () => {
+      return ipfs(`pin add ${pins.root} --cid-base=base64`)
+        .then(out => {
+          const b64CidStr = new CID(pins.root).toV1().toBaseEncodedString('base64')
+          expect(out).to.eql(`pinned ${b64CidStr} recursively\n`)
+        })
+    })
   })
 
   describe('ls', function () {
@@ -73,5 +93,13 @@ describe('pin', () => runOnAndOff(thing => {
         expect(firstLineParts).to.have.length(1)
       })
     })
+
+    it('should ls and print CIDs encoded in specified base', () => {
+      return ipfs(`pin ls ${pins.root} --cid-base=base64`)
+        .then(out => {
+          const b64CidStr = new CID(pins.root).toV1().toBaseEncodedString('base64')
+          expect(out).to.eql(`${b64CidStr} recursive\n`)
+        })
+    })
   })
 }))
diff --git a/test/cli/resolve.js b/test/cli/resolve.js
index 667c459e3b..3aa7bcb70c 100644
--- a/test/cli/resolve.js
+++ b/test/cli/resolve.js
@@ -4,6 +4,7 @@
 const path = require('path')
 const expect = require('chai').expect
 const isIpfs = require('is-ipfs')
+const CID = require('cids')
 
 const runOnAndOff = require('../utils/on-and-off')
 
@@ -29,7 +30,28 @@ describe('resolve', () => runOnAndOff((thing) => {
       })
   })
 
-  it('should resolve an IPFS path link', () => {
+  it('should resolve an IPFS hash and print CID encoded in specified base', function () {
+    this.timeout(10 * 1000)
+
+    const filePath = path.join(process.cwd(), '/src/init-files/init-docs/readme')
+    let b58Hash
+    let b64Hash
+
+    return ipfs(`add ${filePath}`)
+      .then((out) => {
+        b58Hash = out.split(' ')[1]
+        expect(isIpfs.cid(b58Hash)).to.be.true()
+        b64Hash = new CID(b58Hash).toV1().toBaseEncodedString('base64')
+        return ipfs(`resolve /ipfs/${b58Hash} --cid-base=base64`)
+      })
+      .then((out) => {
+        expect(out).to.contain(`/ipfs/${b64Hash}`)
+      })
+  })
+
+  it('should resolve an IPFS path link', function () {
+    this.timeout(10 * 1000)
+
     const filePath = path.join(process.cwd(), '/src/init-files/init-docs/readme')
     let fileHash, rootHash
 
diff --git a/test/http-api/inject/bitswap.js b/test/http-api/inject/bitswap.js
index 16e2c6ceef..e91f80293e 100644
--- a/test/http-api/inject/bitswap.js
+++ b/test/http-api/inject/bitswap.js
@@ -2,15 +2,46 @@
 'use strict'
 
 const expect = require('chai').expect
+const CID = require('cids')
+const waitFor = require('../../utils/wait-for')
 
 module.exports = (http) => {
   describe('/bitswap', () => {
+    const wantedCid0 = 'QmUBdnXXPyoDFXj3Hj39dNJ5VkN3QFRskXxcGaYFBB8CNR'
+    const wantedCid1 = 'zb2rhafnd6kEUujnoMkozHnWXY7XpWttyVDWKXfChqA42VTDU'
     let api
 
     before(() => {
       api = http.api.server.select('API')
     })
 
+    before(function (done) {
+      this.timeout(120 * 1000)
+
+      // Add a CID to the wantlist
+      api.inject({ method: 'GET', url: `/api/v0/block/get?arg=${wantedCid0}` })
+      api.inject({ method: 'GET', url: `/api/v0/block/get?arg=${wantedCid1}` })
+
+      const test = (cb) => {
+        api.inject({
+          method: 'GET',
+          url: '/api/v0/bitswap/wantlist'
+        }, (res) => {
+          if (res.statusCode !== 200) {
+            return cb(new Error(`unexpected status ${res.statusCode}`))
+          }
+          const isWanted0 = res.result.Keys.some(k => k['/'] === wantedCid0)
+          const isWanted1 = res.result.Keys.some(k => k['/'] === wantedCid1)
+          cb(null, isWanted0 && isWanted1)
+        })
+      }
+
+      waitFor(test, {
+        name: `${wantedCid0} and ${wantedCid1} to be wanted`,
+        timeout: 60 * 1000
+      }, done)
+    })
+
     it('/wantlist', (done) => {
       api.inject({
         method: 'GET',
@@ -18,6 +49,30 @@ module.exports = (http) => {
       }, (res) => {
         expect(res.statusCode).to.equal(200)
         expect(res.result).to.have.property('Keys')
+        expect(res.result.Keys).to.deep.include({ '/': wantedCid0 })
+        done()
+      })
+    })
+
+    it('/wantlist?cid-base=base64', (done) => {
+      const base64Cid = new CID(wantedCid1).toString('base64')
+      api.inject({
+        method: 'GET',
+        url: '/api/v0/bitswap/wantlist?cid-base=base64'
+      }, (res) => {
+        expect(res.statusCode).to.equal(200)
+        expect(res.result.Keys).to.deep.include({ '/': base64Cid })
+        done()
+      })
+    })
+
+    it('/wantlist?cid-base=invalid', (done) => {
+      api.inject({
+        method: 'GET',
+        url: '/api/v0/bitswap/wantlist?cid-base=invalid'
+      }, (res) => {
+        expect(res.statusCode).to.equal(400)
+        expect(res.result.Message).to.include('child "cid-base" fails')
         done()
       })
     })
@@ -40,5 +95,28 @@ module.exports = (http) => {
         done()
       })
     })
+
+    it('/stat?cid-base=base64', (done) => {
+      const base64Cid = new CID(wantedCid1).toString('base64')
+      api.inject({
+        method: 'GET',
+        url: '/api/v0/bitswap/stat?cid-base=base64'
+      }, (res) => {
+        expect(res.statusCode).to.equal(200)
+        expect(res.result.Wantlist).to.deep.include({ '/': base64Cid })
+        done()
+      })
+    })
+
+    it('/stat?cid-base=invalid', (done) => {
+      api.inject({
+        method: 'GET',
+        url: '/api/v0/bitswap/stat?cid-base=invalid'
+      }, (res) => {
+        expect(res.statusCode).to.equal(400)
+        expect(res.result.Message).to.include('child "cid-base" fails')
+        done()
+      })
+    })
   })
 }
diff --git a/test/http-api/inject/block.js b/test/http-api/inject/block.js
index 643fd0b766..efa44a9212 100644
--- a/test/http-api/inject/block.js
+++ b/test/http-api/inject/block.js
@@ -6,6 +6,7 @@ const expect = require('chai').expect
 const fs = require('fs')
 const FormData = require('form-data')
 const streamToPromise = require('stream-to-promise')
+const multibase = require('multibase')
 
 module.exports = (http) => {
   describe('/block', () => {
@@ -56,6 +57,44 @@ module.exports = (http) => {
           })
         })
       })
+
+      it('should put a value and return a base64 encoded CID', (done) => {
+        const form = new FormData()
+        form.append('data', Buffer.from('TEST' + Date.now()))
+        const headers = form.getHeaders()
+
+        streamToPromise(form).then((payload) => {
+          api.inject({
+            method: 'POST',
+            url: '/api/v0/block/put?cid-base=base64',
+            headers: headers,
+            payload: payload
+          }, (res) => {
+            expect(res.statusCode).to.equal(200)
+            expect(multibase.isEncoded(res.result.Key)).to.deep.equal('base64')
+            done()
+          })
+        })
+      })
+
+      it('should not put a value for invalid cid-base option', (done) => {
+        const form = new FormData()
+        form.append('data', Buffer.from('TEST' + Date.now()))
+        const headers = form.getHeaders()
+
+        streamToPromise(form).then((payload) => {
+          api.inject({
+            method: 'POST',
+            url: '/api/v0/block/put?cid-base=invalid',
+            headers: headers,
+            payload: payload
+          }, (res) => {
+            expect(res.statusCode).to.equal(400)
+            expect(res.result.Message).to.include('child "cid-base" fails')
+            done()
+          })
+        })
+      })
     })
 
     describe('/block/get', () => {
@@ -131,13 +170,51 @@ module.exports = (http) => {
           done()
         })
       })
+
+      it('should stat a block and return a base64 encoded CID', (done) => {
+        const form = new FormData()
+        form.append('data', Buffer.from('TEST' + Date.now()))
+        const headers = form.getHeaders()
+
+        streamToPromise(form).then((payload) => {
+          api.inject({
+            method: 'POST',
+            url: '/api/v0/block/put?cid-base=base64',
+            headers: headers,
+            payload: payload
+          }, (res) => {
+            expect(res.statusCode).to.equal(200)
+            expect(multibase.isEncoded(res.result.Key)).to.deep.equal('base64')
+            done()
+          })
+        })
+      })
+
+      it('should not stat a block for invalid cid-base option', (done) => {
+        const form = new FormData()
+        form.append('data', Buffer.from('TEST' + Date.now()))
+        const headers = form.getHeaders()
+
+        streamToPromise(form).then((payload) => {
+          api.inject({
+            method: 'POST',
+            url: '/api/v0/block/put?cid-base=invalid',
+            headers: headers,
+            payload: payload
+          }, (res) => {
+            expect(res.statusCode).to.equal(400)
+            expect(res.result.Message).to.include('child "cid-base" fails')
+            done()
+          })
+        })
+      })
     })
 
-    describe('/block/del', () => {
+    describe('/block/rm', () => {
       it('returns 400 for request without argument', (done) => {
         api.inject({
           method: 'GET',
-          url: '/api/v0/block/del'
+          url: '/api/v0/block/rm'
         }, (res) => {
           expect(res.statusCode).to.equal(400)
           expect(res.result).to.be.a('string')
@@ -148,7 +225,7 @@ module.exports = (http) => {
       it('returns 500 for request with invalid argument', (done) => {
         api.inject({
           method: 'GET',
-          url: '/api/v0/block/del?arg=invalid'
+          url: '/api/v0/block/rm?arg=invalid'
         }, (res) => {
           expect(res.statusCode).to.equal(500)
           expect(res.result.Code).to.equal(0)
@@ -160,7 +237,7 @@ module.exports = (http) => {
       it('returns 200', (done) => {
         api.inject({
           method: 'GET',
-          url: '/api/v0/block/del?arg=QmZjTnYw2TFhn9Nn7tjmPSoTBoY7YRkwPzwSrSbabY24Kp'
+          url: '/api/v0/block/rm?arg=QmZjTnYw2TFhn9Nn7tjmPSoTBoY7YRkwPzwSrSbabY24Kp'
         }, (res) => {
           expect(res.statusCode).to.equal(200)
           done()
diff --git a/test/http-api/inject/files.js b/test/http-api/inject/files.js
index 86c7f7dbcb..66c4e8a1f6 100644
--- a/test/http-api/inject/files.js
+++ b/test/http-api/inject/files.js
@@ -1,8 +1,12 @@
+/* eslint max-nested-callbacks: ["error", 8] */
 /* eslint-env mocha */
 'use strict'
 
 const crypto = require('crypto')
 const expect = require('chai').expect
+const FormData = require('form-data')
+const streamToPromise = require('stream-to-promise')
+const multibase = require('multibase')
 
 module.exports = (http) => {
   describe('/files', () => {
@@ -37,6 +41,46 @@ module.exports = (http) => {
           done()
         })
       })
+
+      // TODO: unskip when we can retrieve data from the repo with a different
+      // version CID then it was added with.
+      it.skip('should add data and return a base64 encoded CID', (done) => {
+        const form = new FormData()
+        form.append('data', Buffer.from('TEST' + Date.now()))
+        const headers = form.getHeaders()
+
+        streamToPromise(form).then((payload) => {
+          api.inject({
+            method: 'POST',
+            url: '/api/v0/add?cid-base=base64',
+            headers: headers,
+            payload: payload
+          }, (res) => {
+            expect(res.statusCode).to.equal(200)
+            expect(multibase.isEncoded(JSON.parse(res.result).Hash)).to.deep.equal('base64')
+            done()
+          })
+        })
+      })
+
+      it('should add data without pinning and return a base64 encoded CID', (done) => {
+        const form = new FormData()
+        form.append('data', Buffer.from('TEST' + Date.now()))
+        const headers = form.getHeaders()
+
+        streamToPromise(form).then((payload) => {
+          api.inject({
+            method: 'POST',
+            url: '/api/v0/add?cid-base=base64&pin=false',
+            headers: headers,
+            payload: payload
+          }, (res) => {
+            expect(res.statusCode).to.equal(200)
+            expect(multibase.isEncoded(JSON.parse(res.result).Hash)).to.deep.equal('base64')
+            done()
+          })
+        })
+      })
     })
 
     describe('/cat', () => {
@@ -78,6 +122,37 @@ module.exports = (http) => {
 
     describe('/get', () => {}) // TODO
 
-    describe('/ls', () => {}) // TODO
+    describe('/ls', () => {
+      it('should list directory contents and return a base64 encoded CIDs', (done) => {
+        const form = new FormData()
+        form.append('file', Buffer.from('TEST' + Date.now()), { filename: 'data.txt' })
+        const headers = form.getHeaders()
+
+        streamToPromise(form).then((payload) => {
+          api.inject({
+            method: 'POST',
+            url: '/api/v0/add?wrap-with-directory=true',
+            headers: headers,
+            payload: payload
+          }, (res) => {
+            expect(res.statusCode).to.equal(200)
+
+            const files = res.result.trim().split('\n').map(r => JSON.parse(r))
+            const dir = files[files.length - 1]
+
+            api.inject({
+              method: 'POST',
+              url: '/api/v0/ls?cid-base=base64&arg=' + dir.Hash
+            }, (res) => {
+              expect(res.statusCode).to.equal(200)
+              res.result.Objects[0].Links.forEach(item => {
+                expect(multibase.isEncoded(item.Hash)).to.deep.equal('base64')
+              })
+              done()
+            })
+          })
+        })
+      })
+    })
   })
 }
diff --git a/test/http-api/inject/object.js b/test/http-api/inject/object.js
index b3bf547c8a..8180b4e8bd 100644
--- a/test/http-api/inject/object.js
+++ b/test/http-api/inject/object.js
@@ -10,6 +10,8 @@ chai.use(dirtyChai)
 const fs = require('fs')
 const FormData = require('form-data')
 const streamToPromise = require('stream-to-promise')
+const multibase = require('multibase')
+const waterfall = require('async/waterfall')
 
 module.exports = (http) => {
   describe('/object', () => {
@@ -32,6 +34,29 @@ module.exports = (http) => {
           done()
         })
       })
+
+      // TODO: unskip after switch to v1 CIDs by default
+      it.skip('should create a new object and return a base64 encoded CID', (done) => {
+        api.inject({
+          method: 'POST',
+          url: '/api/v0/object/new?cid-base=base64'
+        }, (res) => {
+          expect(res.statusCode).to.equal(200)
+          expect(multibase.isEncoded(res.result.Hash)).to.deep.equal('base64')
+          done()
+        })
+      })
+
+      it('should not create a new object for invalid cid-base option', (done) => {
+        api.inject({
+          method: 'POST',
+          url: '/api/v0/object/new?cid-base=invalid'
+        }, (res) => {
+          expect(res.statusCode).to.equal(400)
+          expect(res.result.Message).to.include('child "cid-base" fails')
+          done()
+        })
+      })
     })
 
     describe('/get', () => {
@@ -69,6 +94,43 @@ module.exports = (http) => {
           done()
         })
       })
+
+      // TODO: unskip after switch to v1 CIDs by default
+      it.skip('should get object and return a base64 encoded CID', (done) => {
+        api.inject({
+          method: 'POST',
+          url: '/api/v0/object/new'
+        }, (res) => {
+          expect(res.statusCode).to.equal(200)
+
+          api.inject({
+            method: 'POST',
+            url: '/api/v0/object/get?cid-base=base64&arg=' + res.result.Hash
+          }, (res) => {
+            expect(res.statusCode).to.equal(200)
+            expect(multibase.isEncoded(res.result.Hash)).to.deep.equal('base64')
+            done()
+          })
+        })
+      })
+
+      it('should not get an object for invalid cid-base option', (done) => {
+        api.inject({
+          method: 'POST',
+          url: '/api/v0/object/new'
+        }, (res) => {
+          expect(res.statusCode).to.equal(200)
+
+          api.inject({
+            method: 'POST',
+            url: '/api/v0/object/get?cid-base=invalid&arg=' + res.result.Hash
+          }, (res) => {
+            expect(res.statusCode).to.equal(400)
+            expect(res.result.Message).to.include('child "cid-base" fails')
+            done()
+          })
+        })
+      })
     })
 
     describe('/put', () => {
@@ -138,6 +200,45 @@ module.exports = (http) => {
           })
         })
       })
+
+      // TODO: unskip after switch to v1 CIDs by default
+      it.skip('should put data and return a base64 encoded CID', (done) => {
+        const form = new FormData()
+        form.append('file', JSON.stringify({ Data: 'TEST' + Date.now(), Links: [] }), { filename: 'node.json' })
+        const headers = form.getHeaders()
+
+        streamToPromise(form).then((payload) => {
+          api.inject({
+            method: 'POST',
+            url: '/api/v0/object/put?cid-base=base64',
+            headers: headers,
+            payload: payload
+          }, (res) => {
+            expect(res.statusCode).to.equal(200)
+            expect(multibase.isEncoded(res.result.Hash)).to.deep.equal('base64')
+            done()
+          })
+        })
+      })
+
+      it('should not put data for invalid cid-base option', (done) => {
+        const form = new FormData()
+        form.append('file', JSON.stringify({ Data: 'TEST' + Date.now(), Links: [] }), { filename: 'node.json' })
+        const headers = form.getHeaders()
+
+        streamToPromise(form).then((payload) => {
+          api.inject({
+            method: 'POST',
+            url: '/api/v0/object/put?cid-base=invalid',
+            headers: headers,
+            payload: payload
+          }, (res) => {
+            expect(res.statusCode).to.equal(400)
+            expect(res.result.Message).to.include('child "cid-base" fails')
+            done()
+          })
+        })
+      })
     })
 
     describe('/stat', () => {
@@ -179,6 +280,43 @@ module.exports = (http) => {
           done()
         })
       })
+
+      // TODO: unskip after switch to v1 CIDs by default
+      it.skip('should stat object and return a base64 encoded CID', (done) => {
+        api.inject({
+          method: 'POST',
+          url: '/api/v0/object/new'
+        }, (res) => {
+          expect(res.statusCode).to.equal(200)
+
+          api.inject({
+            method: 'POST',
+            url: '/api/v0/object/stat?cid-base=base64&arg=' + res.result.Hash
+          }, (res) => {
+            expect(res.statusCode).to.equal(200)
+            expect(multibase.isEncoded(res.result.Hash)).to.deep.equal('base64')
+            done()
+          })
+        })
+      })
+
+      it('should not stat object for invalid cid-base option', (done) => {
+        api.inject({
+          method: 'POST',
+          url: '/api/v0/object/new'
+        }, (res) => {
+          expect(res.statusCode).to.equal(200)
+
+          api.inject({
+            method: 'POST',
+            url: '/api/v0/object/stat?cid-base=invalid&arg=' + res.result.Hash
+          }, (res) => {
+            expect(res.statusCode).to.equal(400)
+            expect(res.result.Message).to.include('child "cid-base" fails')
+            done()
+          })
+        })
+      })
     })
 
     describe('/data', () => {
@@ -258,6 +396,99 @@ module.exports = (http) => {
           done()
         })
       })
+
+      // TODO: unskip after switch to v1 CIDs by default
+      it.skip('should list object links and return a base64 encoded CID', (done) => {
+        waterfall([
+          (cb) => {
+            api.inject({
+              method: 'POST',
+              url: '/api/v0/object/new'
+            }, (res) => {
+              expect(res.statusCode).to.equal(200)
+              cb(null, res.result.Hash)
+            })
+          },
+          (linkHash, cb) => {
+            const form = new FormData()
+            form.append('file', JSON.stringify({
+              Data: 'TEST' + Date.now(),
+              Links: [{ Name: 'emptyNode', Hash: linkHash, Size: 8 }]
+            }), { filename: 'node.json' })
+            const headers = form.getHeaders()
+
+            streamToPromise(form).then((payload) => {
+              api.inject({
+                method: 'POST',
+                url: '/api/v0/object/put',
+                headers: headers,
+                payload: payload
+              }, (res) => {
+                expect(res.statusCode).to.equal(200)
+                cb(null, res.result.Hash)
+              })
+            })
+          }
+        ], (err, hash) => {
+          expect(err).to.not.exist()
+
+          api.inject({
+            method: 'POST',
+            url: '/api/v0/object/links?cid-base=base64&arg=' + hash
+          }, (res) => {
+            expect(res.statusCode).to.equal(200)
+            expect(multibase.isEncoded(res.result.Hash)).to.deep.equal('base64')
+            expect(res.result.Links).to.have.length(1)
+            expect(multibase.isEncoded(res.result.Links[0].Hash)).to.deep.equal('base64')
+            done()
+          })
+        })
+      })
+
+      it('should not list object links for invalid cid-base option', (done) => {
+        waterfall([
+          (cb) => {
+            api.inject({
+              method: 'POST',
+              url: '/api/v0/object/new'
+            }, (res) => {
+              expect(res.statusCode).to.equal(200)
+              cb(null, res.result.Hash)
+            })
+          },
+          (linkHash, cb) => {
+            const form = new FormData()
+            form.append('file', JSON.stringify({
+              Data: 'TEST' + Date.now(),
+              Links: [{ Name: 'emptyNode', Hash: linkHash, Size: 8 }]
+            }), { filename: 'node.json' })
+            const headers = form.getHeaders()
+
+            streamToPromise(form).then((payload) => {
+              api.inject({
+                method: 'POST',
+                url: '/api/v0/object/put',
+                headers: headers,
+                payload: payload
+              }, (res) => {
+                expect(res.statusCode).to.equal(200)
+                cb(null, res.result.Hash)
+              })
+            })
+          }
+        ], (err, hash) => {
+          expect(err).to.not.exist()
+
+          api.inject({
+            method: 'POST',
+            url: '/api/v0/object/links?cid-base=invalid&arg=' + hash
+          }, (res) => {
+            expect(res.statusCode).to.equal(400)
+            expect(res.result.Message).to.include('child "cid-base" fails')
+            done()
+          })
+        })
+      })
     })
 
     describe('/patch/append-data', () => {
@@ -333,6 +564,59 @@ module.exports = (http) => {
           })
         })
       })
+
+      // TODO: unskip after switch to v1 CIDs by default
+      it.skip('should append data to object and return a base64 encoded CID', (done) => {
+        api.inject({
+          method: 'POST',
+          url: '/api/v0/object/new'
+        }, (res) => {
+          expect(res.statusCode).to.equal(200)
+
+          const form = new FormData()
+          form.append('data', Buffer.from('TEST' + Date.now()))
+          const headers = form.getHeaders()
+
+          streamToPromise(form).then((payload) => {
+            api.inject({
+              method: 'POST',
+              url: '/api/v0/object/patch/append-data?cid-base=base64&arg=' + res.result.Hash,
+              headers: headers,
+              payload: payload
+            }, (res) => {
+              expect(res.statusCode).to.equal(200)
+              expect(multibase.isEncoded(res.result.Hash)).to.deep.equal('base64')
+              done()
+            })
+          })
+        })
+      })
+
+      it('should not append data to object for invalid cid-base option', (done) => {
+        api.inject({
+          method: 'POST',
+          url: '/api/v0/object/new'
+        }, (res) => {
+          expect(res.statusCode).to.equal(200)
+
+          const form = new FormData()
+          form.append('data', Buffer.from('TEST' + Date.now()))
+          const headers = form.getHeaders()
+
+          streamToPromise(form).then((payload) => {
+            api.inject({
+              method: 'POST',
+              url: '/api/v0/object/patch/append-data?cid-base=invalid&arg=' + res.result.Hash,
+              headers: headers,
+              payload: payload
+            }, (res) => {
+              expect(res.statusCode).to.equal(400)
+              expect(res.result.Message).to.include('child "cid-base" fails')
+              done()
+            })
+          })
+        })
+      })
     })
 
     describe('/patch/set-data', () => {
@@ -406,6 +690,59 @@ module.exports = (http) => {
           })
         })
       })
+
+      // TODO: unskip after switch to v1 CIDs by default
+      it.skip('should set data for object and return a base64 encoded CID', (done) => {
+        api.inject({
+          method: 'POST',
+          url: '/api/v0/object/new'
+        }, (res) => {
+          expect(res.statusCode).to.equal(200)
+
+          const form = new FormData()
+          form.append('data', Buffer.from('TEST' + Date.now()))
+          const headers = form.getHeaders()
+
+          streamToPromise(form).then((payload) => {
+            api.inject({
+              method: 'POST',
+              url: '/api/v0/object/patch/set-data?cid-base=base64&arg=' + res.result.Hash,
+              headers: headers,
+              payload: payload
+            }, (res) => {
+              expect(res.statusCode).to.equal(200)
+              expect(multibase.isEncoded(res.result.Hash)).to.deep.equal('base64')
+              done()
+            })
+          })
+        })
+      })
+
+      it('should not set data for object for invalid cid-base option', (done) => {
+        api.inject({
+          method: 'POST',
+          url: '/api/v0/object/new'
+        }, (res) => {
+          expect(res.statusCode).to.equal(200)
+
+          const form = new FormData()
+          form.append('data', Buffer.from('TEST' + Date.now()))
+          const headers = form.getHeaders()
+
+          streamToPromise(form).then((payload) => {
+            api.inject({
+              method: 'POST',
+              url: '/api/v0/object/patch/set-data?cid-base=invalid&arg=' + res.result.Hash,
+              headers: headers,
+              payload: payload
+            }, (res) => {
+              expect(res.statusCode).to.equal(400)
+              expect(res.result.Message).to.include('child "cid-base" fails')
+              done()
+            })
+          })
+        })
+      })
     })
 
     describe('/patch/add-link', () => {
@@ -470,6 +807,43 @@ module.exports = (http) => {
           done()
         })
       })
+
+      // TODO: unskip after switch to v1 CIDs by default
+      it.skip('should add a link to an object and return a base64 encoded CID', (done) => {
+        api.inject({
+          method: 'POST',
+          url: '/api/v0/object/new'
+        }, (res) => {
+          expect(res.statusCode).to.equal(200)
+
+          api.inject({
+            method: 'POST',
+            url: `/api/v0/object/patch/add-link?cid-base=base64&arg=${res.result.Hash}&arg=test&arg=${res.result.Hash}`
+          }, (res) => {
+            expect(res.statusCode).to.equal(200)
+            expect(multibase.isEncoded(res.result.Hash)).to.deep.equal('base64')
+            done()
+          })
+        })
+      })
+
+      it('should not add a link to an object for invalid cid-base option', (done) => {
+        api.inject({
+          method: 'POST',
+          url: '/api/v0/object/new'
+        }, (res) => {
+          expect(res.statusCode).to.equal(200)
+
+          api.inject({
+            method: 'POST',
+            url: `/api/v0/object/patch/add-link?cid-base=invalid&arg=${res.result.Hash}&arg=test&arg=${res.result.Hash}`
+          }, (res) => {
+            expect(res.statusCode).to.equal(400)
+            expect(res.result.Message).to.include('child "cid-base" fails')
+            done()
+          })
+        })
+      })
     })
 
     describe('/patch/rm-link', () => {
@@ -529,6 +903,101 @@ module.exports = (http) => {
           done()
         })
       })
+
+      // TODO: unskip after switch to v1 CIDs by default
+      it.skip('should remove a link from an object and return a base64 encoded CID', (done) => {
+        const linkName = 'TEST' + Date.now()
+
+        waterfall([
+          (cb) => {
+            api.inject({
+              method: 'POST',
+              url: '/api/v0/object/new'
+            }, (res) => {
+              expect(res.statusCode).to.equal(200)
+              cb(null, res.result.Hash)
+            })
+          },
+          (linkHash, cb) => {
+            const form = new FormData()
+            form.append('file', JSON.stringify({
+              Data: 'TEST' + Date.now(),
+              Links: [{ Name: linkName, Hash: linkHash, Size: 8 }]
+            }), { filename: 'node.json' })
+            const headers = form.getHeaders()
+
+            streamToPromise(form).then((payload) => {
+              api.inject({
+                method: 'POST',
+                url: '/api/v0/object/put',
+                headers: headers,
+                payload: payload
+              }, (res) => {
+                expect(res.statusCode).to.equal(200)
+                cb(null, res.result.Hash, linkHash)
+              })
+            })
+          }
+        ], (err, hash) => {
+          expect(err).to.not.exist()
+
+          api.inject({
+            method: 'POST',
+            url: `/api/v0/object/patch/rm-link?cid-base=base64&arg=${hash}&arg=${linkName}`
+          }, (res) => {
+            expect(res.statusCode).to.equal(200)
+            expect(multibase.isEncoded(res.result.Hash)).to.deep.equal('base64')
+            done()
+          })
+        })
+      })
+
+      it('should not remove a link from an object for invalid cid-base option', (done) => {
+        const linkName = 'TEST' + Date.now()
+
+        waterfall([
+          (cb) => {
+            api.inject({
+              method: 'POST',
+              url: '/api/v0/object/new'
+            }, (res) => {
+              expect(res.statusCode).to.equal(200)
+              cb(null, res.result.Hash)
+            })
+          },
+          (linkHash, cb) => {
+            const form = new FormData()
+            form.append('file', JSON.stringify({
+              Data: 'TEST' + Date.now(),
+              Links: [{ Name: linkName, Hash: linkHash, Size: 8 }]
+            }), { filename: 'node.json' })
+            const headers = form.getHeaders()
+
+            streamToPromise(form).then((payload) => {
+              api.inject({
+                method: 'POST',
+                url: '/api/v0/object/put',
+                headers: headers,
+                payload: payload
+              }, (res) => {
+                expect(res.statusCode).to.equal(200)
+                cb(null, res.result.Hash)
+              })
+            })
+          }
+        ], (err, hash) => {
+          expect(err).to.not.exist()
+
+          api.inject({
+            method: 'POST',
+            url: `/api/v0/object/patch/rm-link?cid-base=invalid&arg=${hash}&arg=${linkName}`
+          }, (res) => {
+            expect(res.statusCode).to.equal(400)
+            expect(res.result.Message).to.include('child "cid-base" fails')
+            done()
+          })
+        })
+      })
     })
   })
 }
diff --git a/test/http-api/inject/pin.js b/test/http-api/inject/pin.js
index e351e721a7..9180533246 100644
--- a/test/http-api/inject/pin.js
+++ b/test/http-api/inject/pin.js
@@ -3,6 +3,9 @@
 'use strict'
 
 const expect = require('chai').expect
+const FormData = require('form-data')
+const streamToPromise = require('stream-to-promise')
+const multibase = require('multibase')
 
 // We use existing pin structure in the go-ipfs-repo fixture
 // so that we don't have to stream a bunch of object/put operations
@@ -75,6 +78,62 @@ module.exports = (http) => {
           })
         })
       })
+
+      it('should remove pin and return base64 encoded CID', done => {
+        const form = new FormData()
+        form.append('data', Buffer.from('TEST' + Date.now()))
+        const headers = form.getHeaders()
+
+        streamToPromise(form).then((payload) => {
+          api.inject({
+            method: 'POST',
+            url: '/api/v0/add',
+            headers: headers,
+            payload: payload
+          }, (res) => {
+            expect(res.statusCode).to.equal(200)
+            const hash = JSON.parse(res.result).Hash
+
+            api.inject({
+              method: 'POST',
+              url: `/api/v0/pin/rm?arg=${hash}&cid-base=base64`
+            }, (res) => {
+              expect(res.statusCode).to.equal(200)
+              res.result.Pins.forEach(cid => {
+                expect(multibase.isEncoded(cid)).to.deep.equal('base64')
+              })
+              done()
+            })
+          })
+        })
+      })
+
+      it('should not remove pin for invalid cid-base option', done => {
+        const form = new FormData()
+        form.append('data', Buffer.from('TEST' + Date.now()))
+        const headers = form.getHeaders()
+
+        streamToPromise(form).then((payload) => {
+          api.inject({
+            method: 'POST',
+            url: '/api/v0/add',
+            headers: headers,
+            payload: payload
+          }, (res) => {
+            expect(res.statusCode).to.equal(200)
+            const hash = JSON.parse(res.result).Hash
+
+            api.inject({
+              method: 'POST',
+              url: `/api/v0/pin/rm?arg=${hash}&cid-base=invalid`
+            }, (res) => {
+              expect(res.statusCode).to.equal(400)
+              expect(res.result.Message).to.include('child "cid-base" fails')
+              done()
+            })
+          })
+        })
+      })
     })
 
     describe('add', () => {
@@ -113,6 +172,62 @@ module.exports = (http) => {
           done()
         })
       })
+
+      it('should add pin and return base64 encoded CID', done => {
+        const form = new FormData()
+        form.append('data', Buffer.from('TEST' + Date.now()))
+        const headers = form.getHeaders()
+
+        streamToPromise(form).then((payload) => {
+          api.inject({
+            method: 'POST',
+            url: '/api/v0/add?pin=false',
+            headers: headers,
+            payload: payload
+          }, (res) => {
+            expect(res.statusCode).to.equal(200)
+            const hash = JSON.parse(res.result).Hash
+
+            api.inject({
+              method: 'POST',
+              url: `/api/v0/pin/add?arg=${hash}&cid-base=base64`
+            }, (res) => {
+              expect(res.statusCode).to.equal(200)
+              res.result.Pins.forEach(cid => {
+                expect(multibase.isEncoded(cid)).to.deep.equal('base64')
+              })
+              done()
+            })
+          })
+        })
+      })
+
+      it('should not add pin for invalid cid-base option', done => {
+        const form = new FormData()
+        form.append('data', Buffer.from('TEST' + Date.now()))
+        const headers = form.getHeaders()
+
+        streamToPromise(form).then((payload) => {
+          api.inject({
+            method: 'POST',
+            url: '/api/v0/add?pin=false',
+            headers: headers,
+            payload: payload
+          }, (res) => {
+            expect(res.statusCode).to.equal(200)
+            const hash = JSON.parse(res.result).Hash
+
+            api.inject({
+              method: 'POST',
+              url: `/api/v0/pin/add?arg=${hash}&cid-base=invalid`
+            }, (res) => {
+              expect(res.statusCode).to.equal(400)
+              expect(res.result.Message).to.include('child "cid-base" fails')
+              done()
+            })
+          })
+        })
+      })
     })
 
     describe('ls', () => {
@@ -161,6 +276,60 @@ module.exports = (http) => {
           done()
         })
       })
+
+      it('should list pins and return base64 encoded CIDs', done => {
+        const form = new FormData()
+        form.append('data', Buffer.from('TEST' + Date.now()))
+        const headers = form.getHeaders()
+
+        streamToPromise(form).then((payload) => {
+          api.inject({
+            method: 'POST',
+            url: '/api/v0/add',
+            headers: headers,
+            payload: payload
+          }, (res) => {
+            expect(res.statusCode).to.equal(200)
+
+            api.inject({
+              method: 'POST',
+              url: `/api/v0/pin/ls?cid-base=base64`
+            }, (res) => {
+              expect(res.statusCode).to.equal(200)
+              Object.keys(res.result.Keys).forEach(cid => {
+                expect(multibase.isEncoded(cid)).to.deep.equal('base64')
+              })
+              done()
+            })
+          })
+        })
+      })
+
+      it('should not list pins for invalid cid-base option', done => {
+        const form = new FormData()
+        form.append('data', Buffer.from('TEST' + Date.now()))
+        const headers = form.getHeaders()
+
+        streamToPromise(form).then((payload) => {
+          api.inject({
+            method: 'POST',
+            url: '/api/v0/add',
+            headers: headers,
+            payload: payload
+          }, (res) => {
+            expect(res.statusCode).to.equal(200)
+
+            api.inject({
+              method: 'POST',
+              url: `/api/v0/pin/ls?cid-base=invalid`
+            }, (res) => {
+              expect(res.statusCode).to.equal(400)
+              expect(res.result.Message).to.include('child "cid-base" fails')
+              done()
+            })
+          })
+        })
+      })
     })
   })
 }
diff --git a/test/http-api/inject/resolve.js b/test/http-api/inject/resolve.js
new file mode 100644
index 0000000000..a9aef87266
--- /dev/null
+++ b/test/http-api/inject/resolve.js
@@ -0,0 +1,72 @@
+/* eslint-env mocha */
+/* eslint max-nested-callbacks: ["error", 8] */
+'use strict'
+
+const expect = require('chai').expect
+const FormData = require('form-data')
+const streamToPromise = require('stream-to-promise')
+const multibase = require('multibase')
+
+module.exports = (http) => {
+  describe('resolve', () => {
+    let api
+
+    before(() => {
+      api = http.api.server.select('API')
+    })
+
+    it('should resolve a path and return a base2 encoded CID', done => {
+      const form = new FormData()
+      form.append('data', Buffer.from('TEST' + Date.now()))
+      const headers = form.getHeaders()
+
+      streamToPromise(form).then((payload) => {
+        api.inject({
+          method: 'POST',
+          url: '/api/v0/add',
+          headers: headers,
+          payload: payload
+        }, (res) => {
+          expect(res.statusCode).to.equal(200)
+          const hash = JSON.parse(res.result).Hash
+
+          api.inject({
+            method: 'POST',
+            url: `/api/v0/resolve?arg=/ipfs/${hash}&cid-base=base2`
+          }, (res) => {
+            expect(res.statusCode).to.equal(200)
+            expect(multibase.isEncoded(res.result.Path.replace('/ipfs/', ''))).to.deep.equal('base2')
+            done()
+          })
+        })
+      })
+    })
+
+    it('should not resolve a path for invalid cid-base option', done => {
+      const form = new FormData()
+      form.append('data', Buffer.from('TEST' + Date.now()))
+      const headers = form.getHeaders()
+
+      streamToPromise(form).then((payload) => {
+        api.inject({
+          method: 'POST',
+          url: '/api/v0/add',
+          headers: headers,
+          payload: payload
+        }, (res) => {
+          expect(res.statusCode).to.equal(200)
+          const hash = JSON.parse(res.result).Hash
+
+          api.inject({
+            method: 'POST',
+            url: `/api/v0/resolve?arg=/ipfs/${hash}&cid-base=invalid`
+          }, (res) => {
+            expect(res.statusCode).to.equal(400)
+            expect(res.result.Message).to.include('child "cid-base" fails')
+            done()
+          })
+        })
+      })
+    })
+  })
+}