ipfs · achingbrain · Sep 24, 2021 · Sep 13, 2021 · Sep 24, 2021 · Sep 24, 2021
diff --git a/packages/interface-ipfs-core/package.json b/packages/interface-ipfs-core/package.json
@@ -68,15 +68,15 @@
     "@types/readable-stream": "^2.3.11",
     "abort-controller": "^3.0.0",
     "aegir": "^35.1.0",
+    "blockstore-core": "^1.0.2",
     "copyfiles": "^2.4.1",
     "delay": "^5.0.0",
     "err-code": "^3.0.1",
-    "interface-blockstore": "^1.0.0",
     "ipfs-core-types": "^0.7.3",
     "ipfs-unixfs": "^6.0.3",
     "ipfs-unixfs-importer": "^9.0.3",
     "ipfs-utils": "^9.0.1",
-    "ipns": "^0.14.0",
+    "ipns": "^0.15.0",
     "is-ipfs": "^6.0.1",
     "iso-random-stream": "^2.0.0",
     "it-all": "^1.0.4",

diff --git a/packages/interface-ipfs-core/src/name-pubsub/pubsub.js b/packages/interface-ipfs-core/src/name-pubsub/pubsub.js
@@ -4,7 +4,7 @@ import { expect } from 'aegir/utils/chai.js'
 import { getDescribe, getIt } from '../utils/mocha.js'
 import PeerId from 'peer-id'
 import { isNode } from 'ipfs-utils/src/env.js'
-import ipns from 'ipns'
+import * as ipns from 'ipns'
 import delay from 'delay'
 import last from 'it-last'
 import waitFor from '../utils/wait-for.js'

diff --git a/packages/interface-ipfs-core/src/utils/blockstore-adapter.js b/packages/interface-ipfs-core/src/utils/blockstore-adapter.js
@@ -1,4 +1,4 @@
-import { BlockstoreAdapter } from 'interface-blockstore'
+import { BaseBlockstore } from 'blockstore-core/base'
 import * as raw from 'multiformats/codecs/raw'
 import * as dagPB from '@ipld/dag-pb'
 import * as dagCBOR from '@ipld/dag-cbor'
@@ -21,7 +21,7 @@ const hashes = {
   [sha256.code]: sha256.name
 }
 
-class IPFSBlockstore extends BlockstoreAdapter {
+class IPFSBlockstore extends BaseBlockstore {
   /**
    * @param {import('ipfs-core-types').IPFS} ipfs
    */

diff --git a/packages/ipfs-cli/package.json b/packages/ipfs-cli/package.json
@@ -70,12 +70,12 @@
     "ipfs-core-utils": "^0.10.5",
     "ipfs-daemon": "^0.9.8",
     "ipfs-http-client": "^52.0.5",
-    "ipfs-repo": "^12.0.0",
+    "ipfs-repo": "^13.0.4",
     "ipfs-utils": "^9.0.1",
     "it-all": "^1.0.4",
     "it-concat": "^2.0.0",
     "it-first": "^1.0.4",
-    "it-glob": "1.0.0",
+    "it-glob": "^1.0.0",
     "it-map": "^1.0.5",
     "it-merge": "^1.0.3",
     "it-pipe": "^1.1.0",

diff --git a/packages/ipfs-cli/src/commands/bitswap/stat.js b/packages/ipfs-cli/src/commands/bitswap/stat.js
@@ -1,4 +1,3 @@
-
 import prettyBytes from 'pretty-bytes'
 import parseDuration from 'parse-duration'
 

diff --git a/packages/ipfs-cli/src/commands/bitswap/unwant.js b/packages/ipfs-cli/src/commands/bitswap/unwant.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import { coerceCID } from '../../utils.js'
 

diff --git a/packages/ipfs-cli/src/commands/bitswap/wantlist.js b/packages/ipfs-cli/src/commands/bitswap/wantlist.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 
 export default {

diff --git a/packages/ipfs-cli/src/commands/block/get.js b/packages/ipfs-cli/src/commands/block/get.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import { coerceCID } from '../../utils.js'

diff --git a/packages/ipfs-cli/src/commands/block/put.js b/packages/ipfs-cli/src/commands/block/put.js
@@ -1,4 +1,3 @@
-
 import fs from 'fs'
 import concat from 'it-concat'
 import parseDuration from 'parse-duration'

diff --git a/packages/ipfs-cli/src/commands/block/rm.js b/packages/ipfs-cli/src/commands/block/rm.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import { coerceCIDs } from '../../utils.js'
 

diff --git a/packages/ipfs-cli/src/commands/block/stat.js b/packages/ipfs-cli/src/commands/block/stat.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import { coerceCID } from '../../utils.js'
 

diff --git a/packages/ipfs-cli/src/commands/bootstrap/add.js b/packages/ipfs-cli/src/commands/bootstrap/add.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import { coerceMultiaddr } from '../../utils.js'
 

diff --git a/packages/ipfs-cli/src/commands/bootstrap/list.js b/packages/ipfs-cli/src/commands/bootstrap/list.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 
 export default {

diff --git a/packages/ipfs-cli/src/commands/bootstrap/rm.js b/packages/ipfs-cli/src/commands/bootstrap/rm.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import { coerceMultiaddr } from '../../utils.js'
 

diff --git a/packages/ipfs-cli/src/commands/cat.js b/packages/ipfs-cli/src/commands/cat.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 
 export default {

diff --git a/packages/ipfs-cli/src/commands/cid/base32.js b/packages/ipfs-cli/src/commands/cid/base32.js
@@ -1,4 +1,3 @@
-
 import split from 'it-split'
 import { CID } from 'multiformats/cid'
 import { base32 } from 'multiformats/bases/base32'

diff --git a/packages/ipfs-cli/src/commands/cid/format.js b/packages/ipfs-cli/src/commands/cid/format.js
@@ -1,4 +1,3 @@
-
 import split from 'it-split'
 import { CID } from 'multiformats/cid'
 

diff --git a/packages/ipfs-cli/src/commands/commands.js b/packages/ipfs-cli/src/commands/commands.js
@@ -1,4 +1,3 @@
-
 import path, { dirname } from 'path'
 import glob from 'it-glob'
 import all from 'it-all'

diff --git a/packages/ipfs-cli/src/commands/config/edit.js b/packages/ipfs-cli/src/commands/config/edit.js
@@ -1,4 +1,3 @@
-
 import path from 'path'
 import execa from 'execa'
 

diff --git a/packages/ipfs-cli/src/commands/config/profile/apply.js b/packages/ipfs-cli/src/commands/config/profile/apply.js
@@ -1,4 +1,3 @@
-
 import JSONDiff from 'jsondiffpatch'
 import parseDuration from 'parse-duration'
 

diff --git a/packages/ipfs-cli/src/commands/config/profile/ls.js b/packages/ipfs-cli/src/commands/config/profile/ls.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 
 export default {

diff --git a/packages/ipfs-cli/src/commands/config/replace.js b/packages/ipfs-cli/src/commands/config/replace.js
@@ -1,4 +1,3 @@
-
 import path from 'path'
 import fs from 'fs'
 import parseDuration from 'parse-duration'

diff --git a/packages/ipfs-cli/src/commands/config/show.js b/packages/ipfs-cli/src/commands/config/show.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 
 export default {

diff --git a/packages/ipfs-cli/src/commands/daemon.js b/packages/ipfs-cli/src/commands/daemon.js
@@ -1,4 +1,3 @@
-
 import os from 'os'
 import fs from 'fs'
 // @ts-expect-error no types

diff --git a/packages/ipfs-cli/src/commands/dag/export.js b/packages/ipfs-cli/src/commands/dag/export.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import { CID } from 'multiformats/cid'
 

diff --git a/packages/ipfs-cli/src/commands/dag/get.js b/packages/ipfs-cli/src/commands/dag/get.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import { toCidAndPath } from 'ipfs-core-utils/to-cid-and-path'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'

diff --git a/packages/ipfs-cli/src/commands/dag/import.js b/packages/ipfs-cli/src/commands/dag/import.js
@@ -1,4 +1,3 @@
-
 import fs from 'fs'
 import parseDuration from 'parse-duration'
 

diff --git a/packages/ipfs-cli/src/commands/dag/put.js b/packages/ipfs-cli/src/commands/dag/put.js
@@ -1,4 +1,3 @@
-
 import * as dagCBOR from '@ipld/dag-cbor'
 import * as dagPB from '@ipld/dag-pb'
 import concat from 'it-concat'

diff --git a/packages/ipfs-cli/src/commands/dag/resolve.js b/packages/ipfs-cli/src/commands/dag/resolve.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 
 export default {

diff --git a/packages/ipfs-cli/src/commands/dht/find-peer.js b/packages/ipfs-cli/src/commands/dht/find-peer.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 
 export default {

diff --git a/packages/ipfs-cli/src/commands/dht/find-providers.js b/packages/ipfs-cli/src/commands/dht/find-providers.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import { coerceCID } from '../../utils.js'
 

diff --git a/packages/ipfs-cli/src/commands/dht/get.js b/packages/ipfs-cli/src/commands/dht/get.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import { coerceCID } from '../../utils.js'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'

diff --git a/packages/ipfs-cli/src/commands/dht/provide.js b/packages/ipfs-cli/src/commands/dht/provide.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import { coerceCID } from '../../utils.js'
 

diff --git a/packages/ipfs-cli/src/commands/dht/put.js b/packages/ipfs-cli/src/commands/dht/put.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 

diff --git a/packages/ipfs-cli/src/commands/dht/query.js b/packages/ipfs-cli/src/commands/dht/query.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 
 export default {

diff --git a/packages/ipfs-cli/src/commands/dns.js b/packages/ipfs-cli/src/commands/dns.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import {
   stripControlCharacters

diff --git a/packages/ipfs-cli/src/commands/files/chmod.js b/packages/ipfs-cli/src/commands/files/chmod.js
@@ -1,4 +1,3 @@
-
 import {
   asBoolean
 } from '../../utils.js'

diff --git a/packages/ipfs-cli/src/commands/files/cp.js b/packages/ipfs-cli/src/commands/files/cp.js
@@ -1,4 +1,3 @@
-
 import {
   asBoolean
 } from '../../utils.js'

diff --git a/packages/ipfs-cli/src/commands/files/flush.js b/packages/ipfs-cli/src/commands/files/flush.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 
 export default {

diff --git a/packages/ipfs-cli/src/commands/files/ls.js b/packages/ipfs-cli/src/commands/files/ls.js
@@ -1,4 +1,3 @@
-
 import {
   asBoolean,
   stripControlCharacters

diff --git a/packages/ipfs-cli/src/commands/files/mkdir.js b/packages/ipfs-cli/src/commands/files/mkdir.js
@@ -1,4 +1,3 @@
-
 import {
   asBoolean,
   asOctal,

diff --git a/packages/ipfs-cli/src/commands/files/mv.js b/packages/ipfs-cli/src/commands/files/mv.js
@@ -1,4 +1,3 @@
-
 import {
   asBoolean
 } from '../../utils.js'

diff --git a/packages/ipfs-cli/src/commands/files/read.js b/packages/ipfs-cli/src/commands/files/read.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 
 export default {

diff --git a/packages/ipfs-cli/src/commands/files/rm.js b/packages/ipfs-cli/src/commands/files/rm.js
@@ -1,4 +1,3 @@
-
 import {
   asBoolean
 } from '../../utils.js'

diff --git a/packages/ipfs-cli/src/commands/files/stat.js b/packages/ipfs-cli/src/commands/files/stat.js
@@ -1,4 +1,3 @@
-
 import {
   asBoolean
 } from '../../utils.js'

diff --git a/packages/ipfs-cli/src/commands/files/touch.js b/packages/ipfs-cli/src/commands/files/touch.js
@@ -1,4 +1,3 @@
-
 import {
   asBoolean,
   asMtimeFromSeconds,

diff --git a/packages/ipfs-cli/src/commands/files/write.js b/packages/ipfs-cli/src/commands/files/write.js
@@ -1,4 +1,3 @@
-
 import {
   asBoolean,
   asOctal,

diff --git a/packages/ipfs-cli/src/commands/get.js b/packages/ipfs-cli/src/commands/get.js
@@ -1,4 +1,3 @@
-
 import fs from 'fs'
 import path from 'path'
 // @ts-expect-error no types

diff --git a/packages/ipfs-cli/src/commands/id.js b/packages/ipfs-cli/src/commands/id.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 
 export default {

diff --git a/packages/ipfs-cli/src/commands/init.js b/packages/ipfs-cli/src/commands/init.js
@@ -1,4 +1,3 @@
-
 import fs from 'fs'
 import debug from 'debug'
 import { ipfsPathHelp } from '../utils.js'

diff --git a/packages/ipfs-cli/src/commands/key/export.js b/packages/ipfs-cli/src/commands/key/export.js
@@ -1,4 +1,3 @@
-
 import fs from 'fs'
 import parseDuration from 'parse-duration'
 

diff --git a/packages/ipfs-cli/src/commands/key/gen.js b/packages/ipfs-cli/src/commands/key/gen.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import {
   stripControlCharacters

diff --git a/packages/ipfs-cli/src/commands/key/import.js b/packages/ipfs-cli/src/commands/key/import.js
@@ -1,4 +1,3 @@
-
 import fs from 'fs'
 import parseDuration from 'parse-duration'
 

diff --git a/packages/ipfs-cli/src/commands/key/list.js b/packages/ipfs-cli/src/commands/key/list.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import {
   stripControlCharacters

diff --git a/packages/ipfs-cli/src/commands/key/rename.js b/packages/ipfs-cli/src/commands/key/rename.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import {
   stripControlCharacters

diff --git a/packages/ipfs-cli/src/commands/key/rm.js b/packages/ipfs-cli/src/commands/key/rm.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import {
   stripControlCharacters

diff --git a/packages/ipfs-cli/src/commands/ls.js b/packages/ipfs-cli/src/commands/ls.js
@@ -1,4 +1,3 @@
-
 import { rightpad, stripControlCharacters } from '../utils.js'
 import { formatMode } from 'ipfs-core-utils/files/format-mode'
 import { formatMtime } from 'ipfs-core-utils/files/format-mtime'

diff --git a/packages/ipfs-cli/src/commands/name/publish.js b/packages/ipfs-cli/src/commands/name/publish.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import {
   stripControlCharacters

diff --git a/packages/ipfs-cli/src/commands/name/pubsub/cancel.js b/packages/ipfs-cli/src/commands/name/pubsub/cancel.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 
 export default {

diff --git a/packages/ipfs-cli/src/commands/name/pubsub/state.js b/packages/ipfs-cli/src/commands/name/pubsub/state.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 
 export default {

diff --git a/packages/ipfs-cli/src/commands/name/pubsub/subs.js b/packages/ipfs-cli/src/commands/name/pubsub/subs.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import {
   stripControlCharacters

diff --git a/packages/ipfs-cli/src/commands/name/resolve.js b/packages/ipfs-cli/src/commands/name/resolve.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 
 export default {

diff --git a/packages/ipfs-cli/src/commands/object/data.js b/packages/ipfs-cli/src/commands/object/data.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import { coerceCID } from '../../utils.js'
 

diff --git a/packages/ipfs-cli/src/commands/object/get.js b/packages/ipfs-cli/src/commands/object/get.js
@@ -1,4 +1,3 @@
-
 import * as dagPB from '@ipld/dag-pb'
 import parseDuration from 'parse-duration'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'

diff --git a/packages/ipfs-cli/src/commands/object/links.js b/packages/ipfs-cli/src/commands/object/links.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import {
   stripControlCharacters,

diff --git a/packages/ipfs-cli/src/commands/object/new.js b/packages/ipfs-cli/src/commands/object/new.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 
 export default {

diff --git a/packages/ipfs-cli/src/commands/object/patch/add-link.js b/packages/ipfs-cli/src/commands/object/patch/add-link.js
@@ -1,4 +1,3 @@
-
 import * as dagPB from '@ipld/dag-pb'
 import parseDuration from 'parse-duration'
 import { coerceCID } from '../../../utils.js'

diff --git a/packages/ipfs-cli/src/commands/object/patch/append-data.js b/packages/ipfs-cli/src/commands/object/patch/append-data.js
@@ -1,4 +1,3 @@
-
 import concat from 'it-concat'
 import fs from 'fs'
 import parseDuration from 'parse-duration'

diff --git a/packages/ipfs-cli/src/commands/object/patch/rm-link.js b/packages/ipfs-cli/src/commands/object/patch/rm-link.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import { coerceCID } from '../../../utils.js'
 

diff --git a/packages/ipfs-cli/src/commands/object/patch/set-data.js b/packages/ipfs-cli/src/commands/object/patch/set-data.js
@@ -1,4 +1,3 @@
-
 import fs from 'fs'
 import concat from 'it-concat'
 import parseDuration from 'parse-duration'

diff --git a/packages/ipfs-cli/src/commands/object/put.js b/packages/ipfs-cli/src/commands/object/put.js
@@ -1,4 +1,3 @@
-
 import concat from 'it-concat'
 import * as dagPB from '@ipld/dag-pb'
 import parseDuration from 'parse-duration'

diff --git a/packages/ipfs-cli/src/commands/object/stat.js b/packages/ipfs-cli/src/commands/object/stat.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import { coerceCID } from '../../utils.js'
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		import prettyBytes from 'pretty-bytes'
		import parseDuration from 'parse-duration'

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		import parseDuration from 'parse-duration'
		import { coerceCID } from '../../utils.js'

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		import parseDuration from 'parse-duration'

		export default {
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		import parseDuration from 'parse-duration'
		import { coerceCIDs } from '../../utils.js'

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		import parseDuration from 'parse-duration'
		import { coerceMultiaddr } from '../../utils.js'

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		import split from 'it-split'
		import { CID } from 'multiformats/cid'

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		import path from 'path'
		import execa from 'execa'

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		import JSONDiff from 'jsondiffpatch'
		import parseDuration from 'parse-duration'

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		import fs from 'fs'
		import parseDuration from 'parse-duration'

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		import parseDuration from 'parse-duration'
		import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'

Expand Down