fix: regressions introduced by new releases of CID & multicodec (#3442)

Few regressions had been introduced by multiformats/js-cid@0e11f03#diff-25a6634263c1b1f6fc4697a04e2b9904ea4b042a89af59dc93ec1f5d44848a26 multiformats/js-multicodec@25cf33f This changes fix two remaining problems: 1. Change type of codec from string to code name. 2. No longer import removed JSON file and use exported table instead. Co-authored-by: achingbrain <alex@achingbrain.net>
ipfs · Dec 16, 2020 · b5152d8 · b5152d8
1 parent cacbfc6
commit b5152d8
Show file tree

Hide file tree

Showing 48 changed files with 70 additions and 62 deletions.
diff --git a/examples/browser-add-readable-stream/package.json b/examples/browser-add-readable-stream/package.json
@@ -12,7 +12,7 @@
   "keywords": [],
   "license": "MIT",
   "devDependencies": {
-    "ipfs": "^0.52.1",
+    "ipfs": "^0.52.2",
     "test-ipfs-example": "^2.0.3"
   }
 }
diff --git a/examples/browser-browserify/package.json b/examples/browser-browserify/package.json
@@ -18,7 +18,7 @@
     "concat-stream": "^2.0.0",
     "execa": "^4.0.3",
     "http-server": "^0.12.3",
-    "ipfs": "^0.52.1",
+    "ipfs": "^0.52.2",
     "rimraf": "^3.0.2",
     "test-ipfs-example": "^2.0.3"
   },

diff --git a/examples/browser-create-react-app/package.json b/examples/browser-create-react-app/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "dot-prop": "^5.0.0",
-    "ipfs": "^0.52.1",
+    "ipfs": "^0.52.2",
     "ipfs-css": "^0.13.1",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",

diff --git a/examples/browser-exchange-files/package.json b/examples/browser-exchange-files/package.json
@@ -14,11 +14,11 @@
     "browserify": "^16.2.3",
     "execa": "^4.0.3",
     "http-server": "^0.12.3",
-    "ipfs-http-client": "^48.1.1",
+    "ipfs-http-client": "^48.1.2",
     "uint8arrays": "^1.1.0"
   },
   "dependencies": {
-    "ipfs": "^0.52.1",
+    "ipfs": "^0.52.2",
     "it-all": "^1.0.4",
     "rimraf": "^3.0.2",
     "test-ipfs-example": "^2.0.3"

diff --git a/examples/browser-http-client-upload-file/package.json b/examples/browser-http-client-upload-file/package.json
@@ -15,10 +15,10 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "ipfs-http-client": "^48.1.1"
+    "ipfs-http-client": "^48.1.2"
   },
   "devDependencies": {
-    "ipfs": "^0.52.1",
+    "ipfs": "^0.52.2",
     "parcel-bundler": "^1.12.4",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",

diff --git a/examples/browser-ipns-publish/package.json b/examples/browser-ipns-publish/package.json
@@ -13,8 +13,8 @@
   "license": "MIT",
   "dependencies": {
     "human-crypto-keys": "^0.1.4",
-    "ipfs": "^0.52.1",
-    "ipfs-http-client": "^48.1.1",
+    "ipfs": "^0.52.2",
+    "ipfs-http-client": "^48.1.2",
     "ipfs-utils": "^5.0.0",
     "ipns": "^0.8.0",
     "it-last": "^1.0.4",

diff --git a/examples/browser-mfs/package.json b/examples/browser-mfs/package.json
@@ -22,7 +22,7 @@
     "webpack-cli": "^3.3.11"
   },
   "dependencies": {
-    "ipfs": "^0.52.1",
+    "ipfs": "^0.52.2",
     "mime-sniffer": "~0.0.3"
   }
 }
diff --git a/examples/browser-parceljs/package.json b/examples/browser-parceljs/package.json
@@ -18,7 +18,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "ipfs": "^0.52.1"
+    "ipfs": "^0.52.2"
   },
   "devDependencies": {
     "@babel/cli": "^7.1.5",

diff --git a/examples/browser-readablestream/package.json b/examples/browser-readablestream/package.json
@@ -21,7 +21,7 @@
     "webpack": "^4.43.0"
   },
   "dependencies": {
-    "ipfs": "^0.52.1",
+    "ipfs": "^0.52.2",
     "it-to-stream": "^0.1.2",
     "videostream": "^3.2.0"
   }

diff --git a/examples/browser-script-tag/package.json b/examples/browser-script-tag/package.json
@@ -16,6 +16,6 @@
     "test-ipfs-example": "^2.0.3"
   },
   "dependencies": {
-    "ipfs": "^0.52.1"
+    "ipfs": "^0.52.2"
   }
 }
diff --git a/examples/browser-service-worker/package.json b/examples/browser-service-worker/package.json
@@ -22,7 +22,7 @@
     "webpack-dev-server": "3.11.0"
   },
   "dependencies": {
-    "ipfs": "^0.51.0",
+    "ipfs": "^0.52.0",
     "ipfs-message-port-client": "^0.3.0",
     "ipfs-message-port-protocol": "^0.3.0",
     "ipfs-message-port-server": "^0.3.0",

diff --git a/examples/browser-sharing-node-across-tabs/package.json b/examples/browser-sharing-node-across-tabs/package.json
@@ -24,7 +24,7 @@
     "worker-plugin": "4.0.3"
   },
   "dependencies": {
-    "ipfs": "^0.52.1",
+    "ipfs": "^0.52.2",
     "ipfs-message-port-client": "^0.4.1",
     "ipfs-message-port-server": "^0.4.1"
   },

diff --git a/examples/browser-video-streaming/package.json b/examples/browser-video-streaming/package.json
@@ -16,6 +16,6 @@
     "test-ipfs-example": "^2.0.3"
   },
   "dependencies": {
-    "ipfs": "^0.52.1"
+    "ipfs": "^0.52.2"
   }
 }
diff --git a/examples/browser-vue/package.json b/examples/browser-vue/package.json
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "core-js": "^3.6.4",
-    "ipfs": "^0.52.1",
+    "ipfs": "^0.52.2",
     "vue": "^2.6.11"
   },
   "devDependencies": {

diff --git a/examples/browser-webpack/package.json b/examples/browser-webpack/package.json
@@ -27,7 +27,7 @@
     "webpack-dev-server": "^3.11.0"
   },
   "dependencies": {
-    "ipfs": "^0.52.1"
+    "ipfs": "^0.52.2"
   },
   "browserslist": [
     ">1%",

diff --git a/examples/circuit-relaying/package.json b/examples/circuit-relaying/package.json
@@ -15,14 +15,14 @@
   "license": "MIT",
   "dependencies": {
     "delay": "^4.4.0",
-    "ipfs": "^0.52.1",
+    "ipfs": "^0.52.2",
     "ipfs-pubsub-room": "^2.0.1",
     "uint8arrays": "^1.1.0"
   },
   "devDependencies": {
     "execa": "^4.0.3",
     "ipfs-css": "^0.13.1",
-    "ipfs-http-client": "^48.1.1",
+    "ipfs-http-client": "^48.1.2",
     "parcel-bundler": "^1.12.4",
     "rimraf": "^3.0.2",
     "tachyons": "^4.11.1",

diff --git a/examples/custom-ipfs-repo/package.json b/examples/custom-ipfs-repo/package.json
@@ -11,7 +11,7 @@
   "license": "MIT",
   "dependencies": {
     "datastore-fs": "^2.0.0",
-    "ipfs": "^0.52.1",
+    "ipfs": "^0.52.2",
     "ipfs-repo": "^7.0.0",
     "it-all": "^1.0.4"
   },

diff --git a/examples/custom-ipld-formats/daemon-node.js b/examples/custom-ipld-formats/daemon-node.js
@@ -5,11 +5,15 @@
 const codecName = 'dag-test'
 const codecNumber = 392091
 
-const baseTable = require('multicodec/src/base-table.json')
-baseTable[codecName] = codecNumber
+const table = require('multicodec/src/base-table')
+// @ts-ignore
+table.baseTable = {
+  ...table.baseTable,
+  [codecName]: codecNumber
+}
 
 // now require modules as usual
-const IPFSDaemon = require('ipfs-cli/src/daemon')
+const IPFSDaemon = require('ipfs-daemon')
 const multihashing = require('multihashing-async')
 const multihash = multihashing.multihash
 const multicodec = require('multicodec')

diff --git a/examples/custom-ipld-formats/in-process-node.js b/examples/custom-ipld-formats/in-process-node.js
@@ -5,8 +5,12 @@
 const codecName = 'dag-test'
 const codecNumber = 392091
 
-const baseTable = require('multicodec/src/base-table.json')
-baseTable[codecName] = codecNumber
+const table = require('multicodec/src/base-table')
+// @ts-ignore
+table.baseTable = {
+  ...table.baseTable,
+  [codecName]: codecNumber
+}
 
 // now require modules as usual
 const IPFS = require('ipfs-core')

diff --git a/examples/custom-ipld-formats/package.json b/examples/custom-ipld-formats/package.json
@@ -11,10 +11,10 @@
     "test-ipfs-example": "^2.0.3"
   },
   "dependencies": {
-    "cids": "1.0.2",
-    "ipfs-cli": "^0.1.0",
-    "ipfs-core": "^0.2.1",
-    "ipfs-http-client": "^48.1.1",
+    "cids": "^1.0.0",
+    "ipfs-daemon": "^0.3.1",
+    "ipfs-core": "^0.3.0",
+    "ipfs-http-client": "^48.1.2",
     "multicodec": "^2.0.1",
     "multihashing-async": "^2.0.1",
     "uint8arrays": "^1.1.0"

diff --git a/examples/custom-libp2p/package.json b/examples/custom-libp2p/package.json
@@ -10,7 +10,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "ipfs": "^0.52.1",
+    "ipfs": "^0.52.2",
     "libp2p": "^0.29.3",
     "libp2p-bootstrap": "^0.12.1",
     "libp2p-kad-dht": "^0.20.1",

diff --git a/examples/explore-ethereum-blockchain/package.json b/examples/explore-ethereum-blockchain/package.json
@@ -10,8 +10,8 @@
   "keywords": [],
   "license": "MIT",
   "devDependencies": {
-    "ipfs": "^0.52.1",
-    "ipfs-http-client": "^48.1.1",
+    "ipfs": "^0.52.2",
+    "ipfs-http-client": "^48.1.2",
     "ipfsd-ctl": "^7.1.1",
     "ipld-ethereum": "^5.0.1",
     "test-ipfs-example": "^2.0.3"

diff --git a/examples/http-client-browser-pubsub/package.json b/examples/http-client-browser-pubsub/package.json
@@ -12,15 +12,15 @@
   "author": "Alan Shaw",
   "license": "MIT",
   "dependencies": {
-    "ipfs-http-client": "^48.1.1"
+    "ipfs-http-client": "^48.1.2"
   },
   "browserslist": [
     "last 2 versions and not dead and > 2%"
   ],
   "devDependencies": {
     "execa": "^4.0.3",
     "go-ipfs": "^0.7.0",
-    "ipfs": "^0.52.1",
+    "ipfs": "^0.52.2",
     "ipfsd-ctl": "^7.1.1",
     "parcel-bundler": "^1.12.4",
     "test-ipfs-example": "^2.0.3"

diff --git a/examples/http-client-bundle-webpack/package.json b/examples/http-client-bundle-webpack/package.json
@@ -13,7 +13,7 @@
   "license": "MIT",
   "keywords": [],
   "dependencies": {
-    "ipfs-http-client": "^48.1.1",
+    "ipfs-http-client": "^48.1.2",
     "react": "^16.8.6",
     "react-dom": "^16.8.6"
   },
@@ -24,7 +24,7 @@
     "babel-loader": "^8.0.5",
     "copy-webpack-plugin": "^5.0.4",
     "execa": "^4.0.3",
-    "ipfs": "^0.52.1",
+    "ipfs": "^0.52.2",
     "ipfsd-ctl": "^7.1.1",
     "react-hot-loader": "^4.12.21",
     "rimraf": "^3.0.2",

diff --git a/examples/http-client-name-api/package.json b/examples/http-client-name-api/package.json
@@ -13,7 +13,7 @@
   "author": "Tara Vancil <tbvanc@gmail.com>",
   "license": "MIT",
   "dependencies": {
-    "ipfs-http-client": "^48.1.1"
+    "ipfs-http-client": "^48.1.2"
   },
   "devDependencies": {
     "execa": "^4.0.3",

diff --git a/examples/ipfs-101/package.json b/examples/ipfs-101/package.json
@@ -10,7 +10,7 @@
   "author": "David Dias <daviddias@ipfs.io>",
   "license": "MIT",
   "dependencies": {
-    "ipfs": "^0.52.1",
+    "ipfs": "^0.52.2",
     "it-all": "^1.0.4",
     "uint8arrays": "^1.1.0"
   },

diff --git a/examples/run-in-electron/package.json b/examples/run-in-electron/package.json
@@ -18,7 +18,7 @@
   "devDependencies": {
     "electron": "^6.0.0",
     "electron-rebuild": "^1.8.4",
-    "ipfs": "^0.52.1",
+    "ipfs": "^0.52.2",
     "test-ipfs-example": "^2.0.3"
   },
   "greenkeeper": {

diff --git a/examples/running-multiple-nodes/package.json b/examples/running-multiple-nodes/package.json
@@ -13,6 +13,6 @@
     "test-ipfs-example": "^2.0.3"
   },
   "dependencies": {
-    "ipfs": "^0.52.1"
+    "ipfs": "^0.52.2"
   }
 }
diff --git a/examples/traverse-ipld-graphs/package.json b/examples/traverse-ipld-graphs/package.json
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "cids": "^1.0.0",
-    "ipfs": "^0.52.1",
+    "ipfs": "^0.52.2",
     "ipld-block": "^0.11.0",
     "ipld-dag-pb": "^0.20.0",
     "ipld-git": "^0.6.1",

diff --git a/examples/types-use-ipfs-from-ts/package.json b/examples/types-use-ipfs-from-ts/package.json
@@ -2,7 +2,7 @@
   "name": "example-types-use-ipfs-from-ts",
   "private": true,
   "dependencies": {
-    "ipfs": "^0.52.1"
+    "ipfs": "^0.52.2"
   },
   "devDependencies": {
     "typescript": "4.0.x"

diff --git a/examples/types-use-ipfs-from-ts/src/main.ts b/examples/types-use-ipfs-from-ts/src/main.ts
@@ -14,7 +14,6 @@ export default async function main() {
 
   console.log('Added file:', file.path, file.cid.toString())
   try {
-    // @ts-expect-error CID has no toUpperCase method
     file.cid.toUpperCase()
   } catch (error) {
 

diff --git a/examples/types-use-ipfs-from-typed-js/package.json b/examples/types-use-ipfs-from-typed-js/package.json
@@ -2,7 +2,7 @@
   "name": "example-types-use-ipfs-from-typed-js",
   "private": true,
   "dependencies": {
-    "ipfs": "^0.52.1"
+    "ipfs": "^0.52.2"
   },
   "devDependencies": {
     "typescript": "4.0.x"

diff --git a/examples/types-use-ipfs-from-typed-js/src/main.js b/examples/types-use-ipfs-from-typed-js/src/main.js
@@ -17,7 +17,6 @@ async function main () {
 
   console.log('Added file:', file.path, file.cid.toString())
   try {
-    // @ts-expect-error CID has no toUpperCase method
     file.cid.toUpperCase()
   } catch(error) {
 

diff --git a/packages/interface-ipfs-core/package.json b/packages/interface-ipfs-core/package.json
@@ -34,7 +34,7 @@
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "chai-subset": "^1.6.0",
-    "cids": "1.0.2",
+    "cids": "^1.0.0",
     "delay": "^4.4.0",
     "dirty-chai": "^2.0.1",
     "err-code": "^2.0.3",

diff --git a/packages/ipfs-cli/package.json b/packages/ipfs-cli/package.json
@@ -32,7 +32,7 @@
     "bignumber.js": "^9.0.0",
     "byteman": "^1.3.5",
     "cid-tool": "^1.0.0",
-    "cids": "1.0.2",
+    "cids": "^1.0.0",
     "debug": "^4.1.1",
     "err-code": "^2.0.3",
     "execa": "^5.0.0",

diff --git a/packages/ipfs-cli/src/utils.js b/packages/ipfs-cli/src/utils.js
@@ -252,7 +252,7 @@ const escapeControlCharacters = (str) => {
  * CID properties
  *
  * @param {object} obj - all keys/values in this object will be have control characters stripped
- * @param {string} cidBase - any encountered CIDs will be stringified using this base
+ * @param {import('cids').BaseNameOrCode} cidBase - any encountered CIDs will be stringified using this base
  * @returns {object}
  */
 const makeEntriesPrintable = (obj, cidBase = 'base58btc') => {

diff --git a/packages/ipfs-core-utils/package.json b/packages/ipfs-core-utils/package.json
@@ -41,7 +41,7 @@
     "any-signal": "^2.0.0",
     "blob-to-it": "^1.0.1",
     "browser-readablestream-to-it": "^1.0.1",
-    "cids": "1.0.2",
+    "cids": "^1.0.0",
     "err-code": "^2.0.3",
     "ipfs-utils": "^5.0.0",
     "it-all": "^1.0.4",

diff --git a/packages/ipfs-core-utils/src/cid.js b/packages/ipfs-core-utils/src/cid.js
@@ -12,7 +12,7 @@ const CID = require('cids')
  *
  * @param {CID|Uint8Array|string} input - The CID to encode
  * @param {Object} [options] - Optional options
- * @param {string} [options.base] - Name of multibase codec to encode the CID with
+ * @param {import('cids').BaseNameOrCode} [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} - CID in string representation