chore: use 0.30 rc

Author: vasco-santos

packages/ipfs-core/package.json

@@ -88,7 +88,7 @@
     "it-first": "^1.0.4",
     "it-last": "^1.0.4",
     "it-pipe": "^1.1.0",
-    "libp2p": "libp2p/js-libp2p#0.30.x",
+    "libp2p": "libp2p/js-libp2p#fix/types-with-dist",
     "libp2p-bootstrap": "^0.12.1",
     "libp2p-crypto": "^0.18.0",
     "libp2p-floodsub": "^0.24.0",

packages/ipfs-core/src/components/index.js

@@ -70,6 +70,8 @@ class IPFS {
     })
     const dns = createDNSAPI()
     const isOnline = createIsOnlineAPI({ network })
+    // @ts-ignore This type check fails as options.
+    // libp2p can be a function, while IPNS router config expects libp2p config
     const ipns = new IPNSAPI(options)
     const dagReader = DagAPI.reader({ ipld, preload })
 

packages/ipfs-core/src/components/is-online.js

@@ -10,5 +10,5 @@ module.exports = ({ network }) =>
    */
   () => {
     const net = network.try()
-    return net != null && net.libp2p.isStarted()
+    return net != null && Boolean(net.libp2p.isStarted())
   }

packages/ipfs-core/src/components/key/export.js

@@ -23,11 +23,10 @@ module.exports = ({ keychain }) => {
    * ```
    * @param {string} name - The name of the key to export
    * @param {string} password - Password to set on the PEM output
-   * @param {import('.').AbortOptions} options
    * @returns {Promise<string>} - The string representation of the key
    */
-  const exportKey = (name, password, options) =>
-    keychain.exportKey(name, password, options)
+  const exportKey = (name, password) =>
+    keychain.exportKey(name, password)
 
   return withTimeoutOption(exportKey)
 }

packages/ipfs-core/src/components/key/import.js

@@ -21,11 +21,10 @@ module.exports = ({ keychain }) => {
    * @param {string} name - The name of the key to import
    * @param {string} pem - The PEM encoded key
    * @param {string} password - The password that protects the PEM key
-   * @param {import('.').AbortOptions} options
    * @returns {Promise<import('.').Key>} - An object that describes the new key
    */
-  const importKey = (name, pem, password, options) => {
-    return keychain.importKey(name, pem, password, options)
+  const importKey = (name, pem, password) => {
+    return keychain.importKey(name, pem, password)
   }
 
   return withTimeoutOption(importKey)

packages/ipfs-core/src/components/key/info.js

@@ -9,10 +9,9 @@ const withTimeoutOption = require('ipfs-core-utils/src/with-timeout-option')
 module.exports = ({ keychain }) => {
   /**
    * @param {string} name
-   * @param {AbortOptions} [options]
    * @returns {Promise<Key>}
    */
-  const info = (name, options = {}) => keychain.findKeyByName(name, options)
+  const info = (name) => keychain.findKeyByName(name)
 
   return withTimeoutOption(info)
 }

packages/ipfs-core/src/components/key/list.js

@@ -23,18 +23,9 @@ module.exports = ({ keychain }) => {
    * // ]
    * ```
    *
-   * @param {AbortOptions} [options]
-   * @returns {Promise<KeyEntry[]>}
+   * @returns {Promise<import('libp2p/src/keychain').KeyInfo[]>}
    */
-  const list = (options = {}) => keychain.listKeys(options)
+  const list = () => keychain.listKeys()
 
   return withTimeoutOption(list)
 }
-
-/**
- * @typedef {Object} KeyEntry
- * @property {string} name - The name of the key
- * @property {string} hash -  The hash of the key
- *
- * @typedef {import('.').AbortOptions} AbortOptions
- */

packages/ipfs-core/src/components/key/rename.js

@@ -22,11 +22,11 @@ module.exports = ({ keychain }) => {
    * ```
    * @param {string} oldName - The current key name
    * @param {string} newName - The desired key name
-   * @param {AbortOptions} [options]
    * @returns {Promise<RenamedKey>}
    */
-  const rename = async (oldName, newName, options = {}) => {
-    const key = await keychain.renameKey(oldName, newName, options)
+  const rename = async (oldName, newName) => {
+    const key = await keychain.renameKey(oldName, newName)
+
     return {
       was: oldName,
       now: key.name,

packages/ipfs-core/src/components/key/rm.js

@@ -20,10 +20,9 @@ module.exports = ({ keychain }) => {
    * ```
    *
    * @param {string} name - The name of the key to remove
-   * @param {import('.').AbortOptions} options
    * @returns {Promise<RemovedKey>} - An object that describes the removed key
    */
-  const rm = (name, options) => keychain.removeKey(name, options)
+  const rm = (name) => keychain.removeKey(name)
 
   return withTimeoutOption(rm)
 }

packages/ipfs-core/src/components/libp2p.js

@@ -164,6 +164,6 @@ function getLibp2pOptions ({ options, config, datastore, keys, keychainConfig, p
  * @typedef {import('.').PeerId} PeerId
  * @typedef {import('.').Options} IPFSOptions
  * @typedef {import('libp2p')} LibP2P
- * @typedef {import('libp2p').Options} Options
+ * @typedef {import('libp2p').Libp2pOptions} Options
  * @typedef {import('.').IPFSConfig} IPFSConfig
  */