diff --git a/packages/interface-ipfs-core/package.json b/packages/interface-ipfs-core/package.json
index 523661f8b2..286b2d7617 100644
--- 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
index 615e5651ac..8a99748a2f 100644
--- 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
index e6f658fc68..07733571fa 100644
--- 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
index 1fe0d39a7a..80dcbf0808 100644
--- 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
index b94fa0dafe..ef759d86c8 100644
--- 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
index 485b0acec3..a0ae111f40 100644
--- 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
index 9da3695d71..1263886a53 100644
--- 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
index 406fb733ee..e717a898dc 100644
--- 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
index f87fa1c880..35e1165d61 100644
--- 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
index 0d3f5127fc..031052da39 100644
--- 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
index 2c15e8c70f..3885b7ee0f 100644
--- 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
index dc87cb546b..16414f4698 100644
--- 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
index 08ad93dca6..47cae16a56 100644
--- 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
index 838956f024..71e6dd14dd 100644
--- 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
index 221493dbce..edd03bc683 100644
--- 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
index 6b42133e5f..e1a7c802e0 100644
--- 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
index acb580e170..730e9a86a0 100644
--- 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
index 762342cbf3..3a2d69c1a5 100644
--- 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
index 589fe71c7e..f1040b1dd5 100644
--- 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
index 3a12f8d568..f4a5a7eb76 100644
--- 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
index cc372af23b..33fa0ce7e4 100644
--- 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
index 4a1c765d90..1f55d4069a 100644
--- 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
index 9b405f584a..31377cc3e5 100644
--- 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
index 1cdfb1b3fe..5f826ed1d0 100644
--- 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
index c073f21b1e..bfaa61b014 100644
--- 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
index 5b01cfe197..ec37667cf3 100644
--- 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
index f084d1ca5e..d49c941627 100644
--- 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
index fa14c29490..f2e9efdea6 100644
--- 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
index 0b6930e836..4680fde036 100644
--- 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
index 494cb145f0..f0b91aada7 100644
--- 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
index b5aac19506..70a57d592a 100644
--- 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
index 9107610d57..221c0c2d59 100644
--- 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
index 52bea3a1b2..8ad7cb33bb 100644
--- 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
index ba57b61dfe..f290867226 100644
--- 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
index 1c98a1b149..06c7a64919 100644
--- 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
index 53326882a8..dd1394ed70 100644
--- 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
index 5fc00e6982..e5031ae1a8 100644
--- 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
index 4c6fe298cb..d84120c49a 100644
--- 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
index 4a767122f7..9113070e24 100644
--- 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
index 818b566d50..eb65e08123 100644
--- 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
index e1521a853e..2fb5b1cefd 100644
--- 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
index 3e3a2391ed..d3e6909745 100644
--- 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
index f0901b5028..6321514bb7 100644
--- 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
index 8fb2a45f76..0f2ee6f5a8 100644
--- 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
index c66b550ac3..3cd1c7e0e6 100644
--- 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
index 83101956da..de422ca0fa 100644
--- 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
index 53648fd9e5..8e6a953f30 100644
--- 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
index 7af7c99341..375d5c7de9 100644
--- 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
index de921e049e..27ba9d5613 100644
--- 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
index db538cfc00..1d768f92c4 100644
--- 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
index 7d68280f72..ae63c8746e 100644
--- 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
index 2bcb17c791..55087da4c9 100644
--- 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
index 6caab91a43..8489c4cf02 100644
--- 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
index 42af67185b..2177d7e499 100644
--- 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
index 6db55e976b..4928cc823d 100644
--- 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
index 40a0904147..259bb7ed44 100644
--- 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
index 5c01190366..813a52fe14 100644
--- 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
index 81d7b6aa6e..9e50d64b19 100644
--- 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
index 1e55ac538d..db386a1083 100644
--- 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
index e0dd931375..4097a93ba4 100644
--- 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
index 3a6968ac6e..d0f708334f 100644
--- 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
index c819b48a89..b016382644 100644
--- 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
index ab45a1e590..c3d66fd84c 100644
--- 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
index dcf5631ee2..00038d3ada 100644
--- 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
index b00de012f0..0dbf1edde3 100644
--- 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
index 42eee7e1e6..eca8009337 100644
--- 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
index 7ab9060a2f..728ffdccc2 100644
--- 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
index 53af8e094d..76b5e9abc3 100644
--- 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
index a4ba6dd8f4..07914e26b9 100644
--- 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
index d6f16562cc..db378918da 100644
--- 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
index c1766f299b..91f6774740 100644
--- 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
index f5f20afe44..03de4b8a4e 100644
--- 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'
 
diff --git a/packages/ipfs-cli/src/commands/pin/add.js b/packages/ipfs-cli/src/commands/pin/add.js
index 4c5aa326c6..7d7277f18f 100644
--- a/packages/ipfs-cli/src/commands/pin/add.js
+++ b/packages/ipfs-cli/src/commands/pin/add.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 
 export default {
diff --git a/packages/ipfs-cli/src/commands/pin/ls.js b/packages/ipfs-cli/src/commands/pin/ls.js
index e3478e796e..83af72ac04 100644
--- a/packages/ipfs-cli/src/commands/pin/ls.js
+++ b/packages/ipfs-cli/src/commands/pin/ls.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import {
   makeEntriesPrintable
diff --git a/packages/ipfs-cli/src/commands/pin/rm.js b/packages/ipfs-cli/src/commands/pin/rm.js
index 10e28e4e3d..7fe9598274 100644
--- a/packages/ipfs-cli/src/commands/pin/rm.js
+++ b/packages/ipfs-cli/src/commands/pin/rm.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 
 export default {
diff --git a/packages/ipfs-cli/src/commands/ping.js b/packages/ipfs-cli/src/commands/ping.js
index 7dab02beba..782ea0b94d 100644
--- a/packages/ipfs-cli/src/commands/ping.js
+++ b/packages/ipfs-cli/src/commands/ping.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 
 export default {
diff --git a/packages/ipfs-cli/src/commands/pubsub/ls.js b/packages/ipfs-cli/src/commands/pubsub/ls.js
index cc5fac14aa..747ab1eb6b 100644
--- a/packages/ipfs-cli/src/commands/pubsub/ls.js
+++ b/packages/ipfs-cli/src/commands/pubsub/ls.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import {
   stripControlCharacters
diff --git a/packages/ipfs-cli/src/commands/pubsub/peers.js b/packages/ipfs-cli/src/commands/pubsub/peers.js
index 675ae97717..25080500fb 100644
--- a/packages/ipfs-cli/src/commands/pubsub/peers.js
+++ b/packages/ipfs-cli/src/commands/pubsub/peers.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 
 export default {
diff --git a/packages/ipfs-cli/src/commands/pubsub/pub.js b/packages/ipfs-cli/src/commands/pubsub/pub.js
index 8a9e422515..c41b1bb496 100644
--- a/packages/ipfs-cli/src/commands/pubsub/pub.js
+++ b/packages/ipfs-cli/src/commands/pubsub/pub.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import { coerceUint8Array } from '../../utils.js'
 
diff --git a/packages/ipfs-cli/src/commands/pubsub/sub.js b/packages/ipfs-cli/src/commands/pubsub/sub.js
index 88c81be63d..2c92b914cf 100644
--- a/packages/ipfs-cli/src/commands/pubsub/sub.js
+++ b/packages/ipfs-cli/src/commands/pubsub/sub.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 
 export default {
diff --git a/packages/ipfs-cli/src/commands/refs-local.js b/packages/ipfs-cli/src/commands/refs-local.js
index 2c13ad47e2..18a7f6866f 100644
--- a/packages/ipfs-cli/src/commands/refs-local.js
+++ b/packages/ipfs-cli/src/commands/refs-local.js
@@ -1,4 +1,3 @@
-
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import parseDuration from 'parse-duration'
 import { base32 } from 'multiformats/bases/base32'
diff --git a/packages/ipfs-cli/src/commands/refs.js b/packages/ipfs-cli/src/commands/refs.js
index ad6d643ed1..f415ff3795 100644
--- a/packages/ipfs-cli/src/commands/refs.js
+++ b/packages/ipfs-cli/src/commands/refs.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 
 export default {
diff --git a/packages/ipfs-cli/src/commands/repo/gc.js b/packages/ipfs-cli/src/commands/repo/gc.js
index 65319f3fe6..294ef78ab4 100644
--- a/packages/ipfs-cli/src/commands/repo/gc.js
+++ b/packages/ipfs-cli/src/commands/repo/gc.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 
 export default {
diff --git a/packages/ipfs-cli/src/commands/repo/stat.js b/packages/ipfs-cli/src/commands/repo/stat.js
index a880bc0400..f28d9b1fce 100644
--- a/packages/ipfs-cli/src/commands/repo/stat.js
+++ b/packages/ipfs-cli/src/commands/repo/stat.js
@@ -1,4 +1,3 @@
-
 import prettyBytes from 'pretty-bytes'
 import parseDuration from 'parse-duration'
 
diff --git a/packages/ipfs-cli/src/commands/repo/version.js b/packages/ipfs-cli/src/commands/repo/version.js
index dac5a52964..fb4a382da2 100644
--- a/packages/ipfs-cli/src/commands/repo/version.js
+++ b/packages/ipfs-cli/src/commands/repo/version.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 
 export default {
diff --git a/packages/ipfs-cli/src/commands/resolve.js b/packages/ipfs-cli/src/commands/resolve.js
index f3e0b5ec44..d14740417b 100644
--- a/packages/ipfs-cli/src/commands/resolve.js
+++ b/packages/ipfs-cli/src/commands/resolve.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import {
   stripControlCharacters
diff --git a/packages/ipfs-cli/src/commands/shutdown.js b/packages/ipfs-cli/src/commands/shutdown.js
index aa4031be78..2e1f7b68e6 100644
--- a/packages/ipfs-cli/src/commands/shutdown.js
+++ b/packages/ipfs-cli/src/commands/shutdown.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 
 export default {
diff --git a/packages/ipfs-cli/src/commands/stats/bitswap.js b/packages/ipfs-cli/src/commands/stats/bitswap.js
index 91879ffb5a..8aac8ea034 100644
--- a/packages/ipfs-cli/src/commands/stats/bitswap.js
+++ b/packages/ipfs-cli/src/commands/stats/bitswap.js
@@ -1,4 +1,3 @@
-
 import bitswapStat from '../bitswap/stat.js'
 
 // This is an alias for `bitswap stat`.
diff --git a/packages/ipfs-cli/src/commands/stats/bw.js b/packages/ipfs-cli/src/commands/stats/bw.js
index c6e02ed759..9e84f1eeb0 100644
--- a/packages/ipfs-cli/src/commands/stats/bw.js
+++ b/packages/ipfs-cli/src/commands/stats/bw.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 
 export default {
diff --git a/packages/ipfs-cli/src/commands/swarm/addrs/local.js b/packages/ipfs-cli/src/commands/swarm/addrs/local.js
index 137cd97d45..a74c36f9bf 100644
--- a/packages/ipfs-cli/src/commands/swarm/addrs/local.js
+++ b/packages/ipfs-cli/src/commands/swarm/addrs/local.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 
 export default {
diff --git a/packages/ipfs-cli/src/commands/swarm/connect.js b/packages/ipfs-cli/src/commands/swarm/connect.js
index 6abcc14917..7c7a1b1d06 100644
--- a/packages/ipfs-cli/src/commands/swarm/connect.js
+++ b/packages/ipfs-cli/src/commands/swarm/connect.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import {
   coerceMultiaddr
diff --git a/packages/ipfs-cli/src/commands/swarm/disconnect.js b/packages/ipfs-cli/src/commands/swarm/disconnect.js
index 28d6737586..39927071e7 100644
--- a/packages/ipfs-cli/src/commands/swarm/disconnect.js
+++ b/packages/ipfs-cli/src/commands/swarm/disconnect.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import {
   coerceMultiaddr
diff --git a/packages/ipfs-cli/src/commands/swarm/peers.js b/packages/ipfs-cli/src/commands/swarm/peers.js
index 69eff3f476..c20e83f550 100644
--- a/packages/ipfs-cli/src/commands/swarm/peers.js
+++ b/packages/ipfs-cli/src/commands/swarm/peers.js
@@ -1,4 +1,3 @@
-
 import mafmt from 'mafmt'
 import { Multiaddr } from 'multiaddr'
 import parseDuration from 'parse-duration'
diff --git a/packages/ipfs-cli/src/commands/version.js b/packages/ipfs-cli/src/commands/version.js
index 4f9d906b75..36ae4a51ec 100644
--- a/packages/ipfs-cli/src/commands/version.js
+++ b/packages/ipfs-cli/src/commands/version.js
@@ -1,4 +1,3 @@
-
 import os from 'os'
 import parseDuration from 'parse-duration'
 
diff --git a/packages/ipfs-cli/test/general.spec.js b/packages/ipfs-cli/test/general.spec.js
index d583fee874..6195f4ee03 100644
--- a/packages/ipfs-cli/test/general.spec.js
+++ b/packages/ipfs-cli/test/general.spec.js
@@ -9,14 +9,13 @@ import { promisify } from 'util'
 import { fail } from './utils/cli.js'
 import sinon from 'sinon'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import IPFSRepo from 'ipfs-repo'
+import { repoVersion } from 'ipfs-repo/constants'
 import ncpCb from 'ncp'
 import { ipfsExec } from './utils/ipfs-exec.js'
 import { clean } from './utils/clean.js'
 import { isWindows } from './utils/platforms.js'
 import { fileURLToPath } from 'url'
 
-const { repoVersion } = IPFSRepo
 const ncp = promisify(ncpCb)
 
 // @ts-ignore need to set module to es2020 to use import.meta.url, which we do,
diff --git a/packages/ipfs-client/src/index.js b/packages/ipfs-client/src/index.js
index bcce80d9e0..f839da278f 100644
--- a/packages/ipfs-client/src/index.js
+++ b/packages/ipfs-client/src/index.js
@@ -1,4 +1,3 @@
-
 import { create as httpClient } from 'ipfs-http-client'
 import { create as grpcClient } from 'ipfs-grpc-client'
 import mergeOpts from 'merge-options'
diff --git a/packages/ipfs-core-config/package.json b/packages/ipfs-core-config/package.json
index b59daa7cf3..2b99cde753 100644
--- a/packages/ipfs-core-config/package.json
+++ b/packages/ipfs-core-config/package.json
@@ -80,22 +80,22 @@
   "license": "MIT",
   "dependencies": {
     "@chainsafe/libp2p-noise": "^4.0.0",
-    "blockstore-datastore-adapter": "^1.0.2",
-    "datastore-core": "^5.0.1",
-    "datastore-fs": "^5.0.2",
-    "datastore-level": "^6.0.2",
+    "blockstore-datastore-adapter": "^2.0.2",
+    "datastore-core": "^6.0.7",
+    "datastore-fs": "^6.0.1",
+    "datastore-level": "^7.0.1",
     "debug": "^4.1.1",
     "err-code": "^3.0.1",
     "hashlru": "^2.3.0",
-    "ipfs-repo": "^12.0.0",
+    "ipfs-repo": "^13.0.4",
     "ipfs-utils": "^9.0.1",
-    "ipns": "^0.14.0",
+    "ipns": "^0.15.0",
     "is-ipfs": "^6.0.1",
     "it-all": "^1.0.4",
     "it-drain": "^1.0.3",
     "libp2p-floodsub": "^0.27.0",
     "libp2p-gossipsub": "^0.11.1",
-    "libp2p-kad-dht": "^0.24.2",
+    "libp2p-kad-dht": "^0.25.0",
     "libp2p-mdns": "^0.17.0",
     "libp2p-mplex": "^0.10.2",
     "libp2p-tcp": "^0.17.1",
diff --git a/packages/ipfs-core-config/src/libp2p-pubsub-routers.browser.js b/packages/ipfs-core-config/src/libp2p-pubsub-routers.browser.js
index 4dc5bb4152..d38c0a0b41 100644
--- a/packages/ipfs-core-config/src/libp2p-pubsub-routers.browser.js
+++ b/packages/ipfs-core-config/src/libp2p-pubsub-routers.browser.js
@@ -1,4 +1,3 @@
-
 import libp2pGossipsub from 'libp2p-gossipsub'
 
 export const routers = {
diff --git a/packages/ipfs-core-config/src/libp2p-pubsub-routers.js b/packages/ipfs-core-config/src/libp2p-pubsub-routers.js
index 0c008da727..6065c4b45b 100644
--- a/packages/ipfs-core-config/src/libp2p-pubsub-routers.js
+++ b/packages/ipfs-core-config/src/libp2p-pubsub-routers.js
@@ -1,4 +1,3 @@
-
 import libp2pGossipsub from 'libp2p-gossipsub'
 import libp2pFloodsub from 'libp2p-floodsub'
 
diff --git a/packages/ipfs-core-config/src/libp2p.js b/packages/ipfs-core-config/src/libp2p.js
index c66c39608d..68b78cfd70 100644
--- a/packages/ipfs-core-config/src/libp2p.js
+++ b/packages/ipfs-core-config/src/libp2p.js
@@ -1,4 +1,3 @@
-
 import TCP from 'libp2p-tcp'
 // @ts-expect-error - no types
 import MulticastDNS from 'libp2p-mdns'
diff --git a/packages/ipfs-core-config/src/preload.js b/packages/ipfs-core-config/src/preload.js
index 7daf3eb7c1..a7e38f9534 100644
--- a/packages/ipfs-core-config/src/preload.js
+++ b/packages/ipfs-core-config/src/preload.js
@@ -1,4 +1,3 @@
-
 import HTTP from 'ipfs-utils/src/http.js'
 import debug from 'debug'
 import drain from 'it-drain'
diff --git a/packages/ipfs-core-config/src/repo.browser.js b/packages/ipfs-core-config/src/repo.browser.js
index 744d7f8b4e..5438e44160 100644
--- a/packages/ipfs-core-config/src/repo.browser.js
+++ b/packages/ipfs-core-config/src/repo.browser.js
@@ -1,7 +1,7 @@
-
 import { createRepo as create } from 'ipfs-repo'
-import DatastoreLevel from 'datastore-level'
-import BlockstoreDatastoreAdapter from 'blockstore-datastore-adapter'
+import { LevelDatastore } from 'datastore-level'
+import { BlockstoreDatastoreAdapter } from 'blockstore-datastore-adapter'
+import { MemoryLock } from 'ipfs-repo/locks/memory'
 
 /**
  * @typedef {import('ipfs-repo-migrations').ProgressCallback} MigrationProgressCallback
@@ -19,30 +19,31 @@ export function createRepo (print, codecs, options) {
   const repoPath = options.path || 'ipfs'
 
   return create(repoPath, (codeOrName) => codecs.getCodec(codeOrName), {
-    root: new DatastoreLevel(repoPath, {
+    root: new LevelDatastore(repoPath, {
       prefix: '',
       version: 2
     }),
     blocks: new BlockstoreDatastoreAdapter(
-      new DatastoreLevel(`${repoPath}/blocks`, {
+      new LevelDatastore(`${repoPath}/blocks`, {
         prefix: '',
         version: 2
       })
     ),
-    datastore: new DatastoreLevel(`${repoPath}/datastore`, {
+    datastore: new LevelDatastore(`${repoPath}/datastore`, {
       prefix: '',
       version: 2
     }),
-    keys: new DatastoreLevel(`${repoPath}/keys`, {
+    keys: new LevelDatastore(`${repoPath}/keys`, {
       prefix: '',
       version: 2
     }),
-    pins: new DatastoreLevel(`${repoPath}/pins`, {
+    pins: new LevelDatastore(`${repoPath}/pins`, {
       prefix: '',
       version: 2
     })
   }, {
     autoMigrate: options.autoMigrate,
-    onMigrationProgress: options.onMigrationProgress || print
+    onMigrationProgress: options.onMigrationProgress || print,
+    repoLock: MemoryLock
   })
 }
diff --git a/packages/ipfs-core-config/src/repo.js b/packages/ipfs-core-config/src/repo.js
index 030b77a30f..3f6bd6b2b3 100644
--- a/packages/ipfs-core-config/src/repo.js
+++ b/packages/ipfs-core-config/src/repo.js
@@ -1,13 +1,12 @@
-
 import os from 'os'
 import { createRepo as create } from 'ipfs-repo'
 import path from 'path'
-import DatastoreFS from 'datastore-fs'
-import DatastoreLevel from 'datastore-level'
-import BlockstoreDatastoreAdapter from 'blockstore-datastore-adapter'
-import { ShardingDatastore, shard } from 'datastore-core'
-
-const { NextToLast } = shard
+import { FsDatastore } from 'datastore-fs'
+import { LevelDatastore } from 'datastore-level'
+import { BlockstoreDatastoreAdapter } from 'blockstore-datastore-adapter'
+import { ShardingDatastore } from 'datastore-core/sharding'
+import { NextToLast } from 'datastore-core/shard'
+import { FSLock } from 'ipfs-repo/locks/fs'
 
 /**
  * @typedef {import('ipfs-repo-migrations').ProgressCallback} MigrationProgressCallback
@@ -42,22 +41,23 @@ export function createRepo (print, codecs, options = {}) {
   }
 
   return create(repoPath, (codeOrName) => codecs.getCodec(codeOrName), {
-    root: new DatastoreFS(repoPath, {
+    root: new FsDatastore(repoPath, {
       extension: ''
     }),
     blocks: new BlockstoreDatastoreAdapter(
       new ShardingDatastore(
-        new DatastoreFS(`${repoPath}/blocks`, {
+        new FsDatastore(`${repoPath}/blocks`, {
           extension: '.data'
         }),
         new NextToLast(2)
       )
     ),
-    datastore: new DatastoreLevel(`${repoPath}/datastore`),
-    keys: new DatastoreFS(`${repoPath}/keys`),
-    pins: new DatastoreLevel(`${repoPath}/pins`)
+    datastore: new LevelDatastore(`${repoPath}/datastore`),
+    keys: new FsDatastore(`${repoPath}/keys`),
+    pins: new LevelDatastore(`${repoPath}/pins`)
   }, {
     autoMigrate: options.autoMigrate != null ? options.autoMigrate : true,
-    onMigrationProgress: onMigrationProgress
+    onMigrationProgress: onMigrationProgress,
+    repoLock: FSLock
   })
 }
diff --git a/packages/ipfs-core-config/src/utils/ipns.js b/packages/ipfs-core-config/src/utils/ipns.js
index 8e9569e0ee..de1644122e 100644
--- a/packages/ipfs-core-config/src/utils/ipns.js
+++ b/packages/ipfs-core-config/src/utils/ipns.js
@@ -1,5 +1,4 @@
-
-import ipns from 'ipns'
+import * as ipns from 'ipns'
 
 export const validator = {
   /**
diff --git a/packages/ipfs-core-types/package.json b/packages/ipfs-core-types/package.json
index e453648072..d68b2b14bd 100644
--- a/packages/ipfs-core-types/package.json
+++ b/packages/ipfs-core-types/package.json
@@ -44,7 +44,7 @@
   ],
   "license": "(Apache-2.0 OR MIT)",
   "dependencies": {
-    "interface-datastore": "^5.2.0",
+    "interface-datastore": "^6.0.2",
     "multiaddr": "^10.0.0",
     "multiformats": "^9.4.1"
   },
diff --git a/packages/ipfs-core-utils/package.json b/packages/ipfs-core-utils/package.json
index cd7c00f1c3..f2c1dca894 100644
--- a/packages/ipfs-core-utils/package.json
+++ b/packages/ipfs-core-utils/package.json
@@ -109,6 +109,7 @@
     "any-signal": "^2.1.2",
     "blob-to-it": "^1.0.1",
     "browser-readablestream-to-it": "^1.0.1",
+    "debug": "^4.1.1",
     "err-code": "^3.0.1",
     "ipfs-core-types": "^0.7.3",
     "ipfs-unixfs": "^6.0.3",
diff --git a/packages/ipfs-core-utils/src/multipart-request.js b/packages/ipfs-core-utils/src/multipart-request.js
index 4b86ca16f4..e46fdd4780 100644
--- a/packages/ipfs-core-utils/src/multipart-request.js
+++ b/packages/ipfs-core-utils/src/multipart-request.js
@@ -1,4 +1,3 @@
-
 import { isElectronRenderer } from 'ipfs-utils/src/env.js'
 import { multipartRequest as multipartRequestNode } from './multipart-request.node.js'
 import { multipartRequest as multipartRequestBrowser } from './multipart-request.browser.js'
diff --git a/packages/ipfs-core-utils/src/multipart-request.node.js b/packages/ipfs-core-utils/src/multipart-request.node.js
index 47ff788e21..fda8a74246 100644
--- a/packages/ipfs-core-utils/src/multipart-request.node.js
+++ b/packages/ipfs-core-utils/src/multipart-request.node.js
@@ -1,12 +1,13 @@
-
 import { normaliseInput } from './files/normalise-input.js'
 import { nanoid } from 'nanoid'
 import { modeToString } from './mode-to-string.js'
 import mergeOpts from 'merge-options'
 // @ts-expect-error no types
 import toStream from 'it-to-stream'
+import debug from 'debug'
 
 const merge = mergeOpts.bind({ ignoreUndefined: true })
+const log = debug('ipfs:core-utils:multipart-request')
 
 /**
  * @typedef {import('ipfs-core-types/src/utils').ImportCandidateStream} ImportCandidateStream
@@ -70,7 +71,8 @@ export async function multipartRequest (source, abortController, headers = {}, b
 
         index++
       }
-    } catch {
+    } catch (err) {
+      log(err)
       // workaround for https://github.com/node-fetch/node-fetch/issues/753
       abortController.abort()
     } finally {
diff --git a/packages/ipfs-core/package.json b/packages/ipfs-core/package.json
index 3947c59704..cbc0c4ce46 100644
--- a/packages/ipfs-core/package.json
+++ b/packages/ipfs-core/package.json
@@ -62,7 +62,7 @@
     "test:electron-renderer": "aegir build --esm-tests && aegir test -t electron-renderer -f ./dist/cjs/browser-test/*.spec.js",
     "test:bootstrapers": "IPFS_TEST=bootstrapers aegir test -t browser -f test/bootstrapers.js",
     "clean": "rimraf ./dist",
-    "dep-check": "aegir dep-check -i interface-ipfs-core -i ipfs-core-types -i abort-controller -i npm-run-all"
+    "dep-check": "aegir dep-check -i interface-ipfs-core -i ipfs-core-types -i abort-controller -i npm-run-all --i interface-blockstore"
   },
   "dependencies": {
     "@chainsafe/libp2p-noise": "^4.0.0",
@@ -72,27 +72,28 @@
     "@multiformats/murmur3": "^1.0.1",
     "any-signal": "^2.1.2",
     "array-shuffle": "^2.0.0",
-    "blockstore-datastore-adapter": "^1.0.2",
-    "datastore-core": "^5.0.1",
-    "datastore-pubsub": "^0.7.0",
+    "blockstore-core": "^1.0.2",
+    "blockstore-datastore-adapter": "^2.0.2",
+    "datastore-core": "^6.0.7",
+    "datastore-pubsub": "^1.0.0",
     "debug": "^4.1.1",
     "dlv": "^1.1.3",
     "err-code": "^3.0.1",
     "hamt-sharding": "^2.0.0",
     "hashlru": "^2.3.0",
-    "interface-blockstore": "^1.0.0",
-    "interface-datastore": "^5.2.0",
-    "ipfs-bitswap": "^6.0.0",
+    "interface-blockstore": "^2.0.2",
+    "interface-datastore": "^6.0.2",
+    "ipfs-bitswap": "^7.0.0",
     "ipfs-core-config": "^0.0.1",
     "ipfs-core-types": "^0.7.3",
     "ipfs-core-utils": "^0.10.5",
     "ipfs-http-client": "^52.0.5",
-    "ipfs-repo": "^12.0.0",
+    "ipfs-repo": "^13.0.4",
     "ipfs-unixfs": "^6.0.3",
     "ipfs-unixfs-exporter": "^7.0.3",
     "ipfs-unixfs-importer": "^9.0.3",
-    "ipfs-utils": "^9.0.1",
-    "ipns": "^0.14.0",
+    "ipfs-utils": "^8.1.4",
+    "ipns": "^0.15.0",
     "is-domain-name": "^1.0.1",
     "is-ipfs": "^6.0.1",
     "it-all": "^1.0.4",
@@ -109,12 +110,11 @@
     "it-tar": "^4.0.0",
     "it-to-buffer": "^2.0.0",
     "just-safe-set": "^2.2.1",
-    "libp2p": "^0.32.0",
+    "libp2p": "^0.33.0",
     "libp2p-bootstrap": "^0.13.0",
     "libp2p-crypto": "^0.19.7",
     "libp2p-delegated-content-routing": "^0.11.0",
     "libp2p-delegated-peer-routing": "^0.10.0",
-    "libp2p-gossipsub": "^0.11.1",
     "libp2p-record": "^0.10.3",
     "mafmt": "^10.0.0",
     "merge-options": "^3.0.4",
@@ -136,10 +136,11 @@
     "aegir": "^35.1.0",
     "delay": "^5.0.0",
     "go-ipfs": "0.9.1",
-    "interface-blockstore-tests": "^1.0.0",
+    "interface-blockstore-tests": "^2.0.1",
     "interface-ipfs-core": "^0.150.4",
     "ipfsd-ctl": "^10.0.3",
     "iso-url": "^1.0.0",
+    "libp2p-gossipsub": "^0.11.1",
     "nanoid": "^3.1.23",
     "npm-run-all": "^4.1.5",
     "p-defer": "^3.0.0",
diff --git a/packages/ipfs-core/src/block-storage.js b/packages/ipfs-core/src/block-storage.js
index 2b7f7a2cb7..a958a86fd4 100644
--- a/packages/ipfs-core/src/block-storage.js
+++ b/packages/ipfs-core/src/block-storage.js
@@ -1,5 +1,4 @@
-
-import { BlockstoreAdapter } from 'interface-blockstore'
+import { BaseBlockstore } from 'blockstore-core'
 import merge from 'it-merge'
 import pushable from 'it-pushable'
 import filter from 'it-filter'
@@ -21,7 +20,7 @@ import filter from 'it-filter'
  *
  * @implements {Blockstore}
  */
-export class BlockStorage extends BlockstoreAdapter {
+export class BlockStorage extends BaseBlockstore {
   /**
    * Create a new BlockStorage
    *
diff --git a/packages/ipfs-core/src/components/add-all/index.js b/packages/ipfs-core/src/components/add-all/index.js
index 5926675061..a0f765d2dc 100644
--- a/packages/ipfs-core/src/components/add-all/index.js
+++ b/packages/ipfs-core/src/components/add-all/index.js
@@ -1,4 +1,3 @@
-
 import { importer } from 'ipfs-unixfs-importer'
 import { normaliseInput } from 'ipfs-core-utils/files/normalise-input'
 import { parseChunkerString } from './utils.js'
diff --git a/packages/ipfs-core/src/components/add.js b/packages/ipfs-core/src/components/add.js
index 79f47dd922..2a2c500eab 100644
--- a/packages/ipfs-core/src/components/add.js
+++ b/packages/ipfs-core/src/components/add.js
@@ -1,4 +1,3 @@
-
 import last from 'it-last'
 
 /**
diff --git a/packages/ipfs-core/src/components/bitswap/index.js b/packages/ipfs-core/src/components/bitswap/index.js
index d12c9299ca..f388a6f57d 100644
--- a/packages/ipfs-core/src/components/bitswap/index.js
+++ b/packages/ipfs-core/src/components/bitswap/index.js
@@ -1,4 +1,3 @@
-
 import { createWantlist } from './wantlist.js'
 import { createWantlistForPeer } from './wantlist-for-peer.js'
 import { createUnwant } from './unwant.js'
diff --git a/packages/ipfs-core/src/components/bitswap/stat.js b/packages/ipfs-core/src/components/bitswap/stat.js
index b3335e7527..097cb74293 100644
--- a/packages/ipfs-core/src/components/bitswap/stat.js
+++ b/packages/ipfs-core/src/components/bitswap/stat.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
 /**
diff --git a/packages/ipfs-core/src/components/bitswap/unwant.js b/packages/ipfs-core/src/components/bitswap/unwant.js
index f8db1e67d0..2243f2b8cc 100644
--- a/packages/ipfs-core/src/components/bitswap/unwant.js
+++ b/packages/ipfs-core/src/components/bitswap/unwant.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
 /**
diff --git a/packages/ipfs-core/src/components/bitswap/wantlist-for-peer.js b/packages/ipfs-core/src/components/bitswap/wantlist-for-peer.js
index 9440575e5b..22a56f9d41 100644
--- a/packages/ipfs-core/src/components/bitswap/wantlist-for-peer.js
+++ b/packages/ipfs-core/src/components/bitswap/wantlist-for-peer.js
@@ -1,4 +1,3 @@
-
 import PeerId from 'peer-id'
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
diff --git a/packages/ipfs-core/src/components/bitswap/wantlist.js b/packages/ipfs-core/src/components/bitswap/wantlist.js
index 958d82bdef..d926ec6e4f 100644
--- a/packages/ipfs-core/src/components/bitswap/wantlist.js
+++ b/packages/ipfs-core/src/components/bitswap/wantlist.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
 /**
diff --git a/packages/ipfs-core/src/components/block/get.js b/packages/ipfs-core/src/components/block/get.js
index af67f88955..cc7f26f446 100644
--- a/packages/ipfs-core/src/components/block/get.js
+++ b/packages/ipfs-core/src/components/block/get.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
 /**
diff --git a/packages/ipfs-core/src/components/block/index.js b/packages/ipfs-core/src/components/block/index.js
index 3629898f4e..06d0197c4f 100644
--- a/packages/ipfs-core/src/components/block/index.js
+++ b/packages/ipfs-core/src/components/block/index.js
@@ -1,4 +1,3 @@
-
 import { createGet } from './get.js'
 import { createPut } from './put.js'
 import { createRm } from './rm.js'
diff --git a/packages/ipfs-core/src/components/block/put.js b/packages/ipfs-core/src/components/block/put.js
index 23dfe8c93e..1d628dad8d 100644
--- a/packages/ipfs-core/src/components/block/put.js
+++ b/packages/ipfs-core/src/components/block/put.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
diff --git a/packages/ipfs-core/src/components/block/rm.js b/packages/ipfs-core/src/components/block/rm.js
index 5143dc2839..d34774e26e 100644
--- a/packages/ipfs-core/src/components/block/rm.js
+++ b/packages/ipfs-core/src/components/block/rm.js
@@ -1,4 +1,3 @@
-
 import errCode from 'err-code'
 import parallel from 'it-parallel'
 import map from 'it-map'
diff --git a/packages/ipfs-core/src/components/block/stat.js b/packages/ipfs-core/src/components/block/stat.js
index 1cb4236d2f..206e09777f 100644
--- a/packages/ipfs-core/src/components/block/stat.js
+++ b/packages/ipfs-core/src/components/block/stat.js
@@ -1,4 +1,3 @@
-
 import { cleanCid } from './utils.js'
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
diff --git a/packages/ipfs-core/src/components/block/utils.js b/packages/ipfs-core/src/components/block/utils.js
index 2af921a3ea..2bc83d109b 100644
--- a/packages/ipfs-core/src/components/block/utils.js
+++ b/packages/ipfs-core/src/components/block/utils.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 
 /**
diff --git a/packages/ipfs-core/src/components/bootstrap/add.js b/packages/ipfs-core/src/components/bootstrap/add.js
index aa47a0b56e..ec5680b725 100644
--- a/packages/ipfs-core/src/components/bootstrap/add.js
+++ b/packages/ipfs-core/src/components/bootstrap/add.js
@@ -1,4 +1,3 @@
-
 import { isValidMultiaddr } from './utils.js'
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
diff --git a/packages/ipfs-core/src/components/bootstrap/clear.js b/packages/ipfs-core/src/components/bootstrap/clear.js
index 9a58430c09..3ace296865 100644
--- a/packages/ipfs-core/src/components/bootstrap/clear.js
+++ b/packages/ipfs-core/src/components/bootstrap/clear.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 import { Multiaddr } from 'multiaddr'
 
diff --git a/packages/ipfs-core/src/components/bootstrap/index.js b/packages/ipfs-core/src/components/bootstrap/index.js
index 0df86b7ba7..7fe18e7b98 100644
--- a/packages/ipfs-core/src/components/bootstrap/index.js
+++ b/packages/ipfs-core/src/components/bootstrap/index.js
@@ -1,4 +1,3 @@
-
 import { createAdd } from './add.js'
 import { createClear } from './clear.js'
 import { createList } from './list.js'
diff --git a/packages/ipfs-core/src/components/bootstrap/list.js b/packages/ipfs-core/src/components/bootstrap/list.js
index 0aba642b8b..909b80f968 100644
--- a/packages/ipfs-core/src/components/bootstrap/list.js
+++ b/packages/ipfs-core/src/components/bootstrap/list.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 import { Multiaddr } from 'multiaddr'
 
diff --git a/packages/ipfs-core/src/components/bootstrap/reset.js b/packages/ipfs-core/src/components/bootstrap/reset.js
index 5b9015417a..bf34a6ecab 100644
--- a/packages/ipfs-core/src/components/bootstrap/reset.js
+++ b/packages/ipfs-core/src/components/bootstrap/reset.js
@@ -1,4 +1,3 @@
-
 import defaultConfig from 'ipfs-core-config/config'
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 import { Multiaddr } from 'multiaddr'
diff --git a/packages/ipfs-core/src/components/bootstrap/rm.js b/packages/ipfs-core/src/components/bootstrap/rm.js
index daa0cd211f..33564d9ce3 100644
--- a/packages/ipfs-core/src/components/bootstrap/rm.js
+++ b/packages/ipfs-core/src/components/bootstrap/rm.js
@@ -1,4 +1,3 @@
-
 import { isValidMultiaddr } from './utils.js'
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
diff --git a/packages/ipfs-core/src/components/bootstrap/utils.js b/packages/ipfs-core/src/components/bootstrap/utils.js
index ebd80b5a5d..c70ac70cb8 100644
--- a/packages/ipfs-core/src/components/bootstrap/utils.js
+++ b/packages/ipfs-core/src/components/bootstrap/utils.js
@@ -1,4 +1,3 @@
-
 import mafmt from 'mafmt'
 
 /**
diff --git a/packages/ipfs-core/src/components/cat.js b/packages/ipfs-core/src/components/cat.js
index 83d619426c..d0110f0b18 100644
--- a/packages/ipfs-core/src/components/cat.js
+++ b/packages/ipfs-core/src/components/cat.js
@@ -1,4 +1,3 @@
-
 import { exporter } from 'ipfs-unixfs-exporter'
 import { normalizeCidPath } from '../utils.js'
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
diff --git a/packages/ipfs-core/src/components/dag/export.js b/packages/ipfs-core/src/components/dag/export.js
index 0715036070..cb95248719 100644
--- a/packages/ipfs-core/src/components/dag/export.js
+++ b/packages/ipfs-core/src/components/dag/export.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { createUnsafe } from 'multiformats/block'
 import { base58btc } from 'multiformats/bases/base58'
diff --git a/packages/ipfs-core/src/components/dag/get.js b/packages/ipfs-core/src/components/dag/get.js
index a20e37f78b..c64932be48 100644
--- a/packages/ipfs-core/src/components/dag/get.js
+++ b/packages/ipfs-core/src/components/dag/get.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 import first from 'it-first'
 import last from 'it-last'
diff --git a/packages/ipfs-core/src/components/dag/import.js b/packages/ipfs-core/src/components/dag/import.js
index d91b3ed1b8..38386e5349 100644
--- a/packages/ipfs-core/src/components/dag/import.js
+++ b/packages/ipfs-core/src/components/dag/import.js
@@ -1,4 +1,3 @@
-
 import { CarBlockIterator } from '@ipld/car/iterator'
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 import itPeekable from 'it-peekable'
diff --git a/packages/ipfs-core/src/components/dag/index.js b/packages/ipfs-core/src/components/dag/index.js
index 1ff2bccd8a..c15e3789de 100644
--- a/packages/ipfs-core/src/components/dag/index.js
+++ b/packages/ipfs-core/src/components/dag/index.js
@@ -1,4 +1,3 @@
-
 import { createExport } from './export.js'
 import { createGet } from './get.js'
 import { createImport } from './import.js'
diff --git a/packages/ipfs-core/src/components/dag/put.js b/packages/ipfs-core/src/components/dag/put.js
index 560791c275..d417dbb9c8 100644
--- a/packages/ipfs-core/src/components/dag/put.js
+++ b/packages/ipfs-core/src/components/dag/put.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
diff --git a/packages/ipfs-core/src/components/dag/resolve.js b/packages/ipfs-core/src/components/dag/resolve.js
index 8d505d401f..e30e34d0f0 100644
--- a/packages/ipfs-core/src/components/dag/resolve.js
+++ b/packages/ipfs-core/src/components/dag/resolve.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 import { toCidAndPath } from 'ipfs-core-utils/to-cid-and-path'
 import { resolvePath } from '../../utils.js'
diff --git a/packages/ipfs-core/src/components/dht.js b/packages/ipfs-core/src/components/dht.js
index ddd6ffe021..1f47f6d17e 100644
--- a/packages/ipfs-core/src/components/dht.js
+++ b/packages/ipfs-core/src/components/dht.js
@@ -1,4 +1,3 @@
-
 import PeerId from 'peer-id'
 import errCode from 'err-code'
 import { NotEnabledError } from '../errors.js'
diff --git a/packages/ipfs-core/src/components/files/chmod.js b/packages/ipfs-core/src/components/files/chmod.js
index 0803e3f1db..ea932ee94e 100644
--- a/packages/ipfs-core/src/components/files/chmod.js
+++ b/packages/ipfs-core/src/components/files/chmod.js
@@ -1,4 +1,3 @@
-
 import mergeOpts from 'merge-options'
 import { toMfsPath } from './utils/to-mfs-path.js'
 import debug from 'debug'
diff --git a/packages/ipfs-core/src/components/files/cp.js b/packages/ipfs-core/src/components/files/cp.js
index 13e85c3f4c..90d0beec0b 100644
--- a/packages/ipfs-core/src/components/files/cp.js
+++ b/packages/ipfs-core/src/components/files/cp.js
@@ -1,4 +1,3 @@
-
 import { createMkdir } from './mkdir.js'
 import { createStat } from './stat.js'
 import debug from 'debug'
diff --git a/packages/ipfs-core/src/components/files/flush.js b/packages/ipfs-core/src/components/files/flush.js
index 5d03e38a6c..5a74851b99 100644
--- a/packages/ipfs-core/src/components/files/flush.js
+++ b/packages/ipfs-core/src/components/files/flush.js
@@ -1,4 +1,3 @@
-
 import { createStat } from './stat.js'
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 import mergeOpts from 'merge-options'
diff --git a/packages/ipfs-core/src/components/files/index.js b/packages/ipfs-core/src/components/files/index.js
index b8be9191bd..6c282b864a 100644
--- a/packages/ipfs-core/src/components/files/index.js
+++ b/packages/ipfs-core/src/components/files/index.js
@@ -1,4 +1,3 @@
-
 import { createLock } from './utils/create-lock.js'
 import isIpfs from 'is-ipfs'
 import { createStat } from './stat.js'
diff --git a/packages/ipfs-core/src/components/files/ls.js b/packages/ipfs-core/src/components/files/ls.js
index 7ab1728748..6b99241d58 100644
--- a/packages/ipfs-core/src/components/files/ls.js
+++ b/packages/ipfs-core/src/components/files/ls.js
@@ -1,4 +1,3 @@
-
 import { exporter } from 'ipfs-unixfs-exporter'
 import { toMfsPath } from './utils/to-mfs-path.js'
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
diff --git a/packages/ipfs-core/src/components/files/mkdir.js b/packages/ipfs-core/src/components/files/mkdir.js
index a0d74aa0e3..667e19781a 100644
--- a/packages/ipfs-core/src/components/files/mkdir.js
+++ b/packages/ipfs-core/src/components/files/mkdir.js
@@ -1,4 +1,3 @@
-
 import errCode from 'err-code'
 import debug from 'debug'
 import { exporter } from 'ipfs-unixfs-exporter'
diff --git a/packages/ipfs-core/src/components/files/mv.js b/packages/ipfs-core/src/components/files/mv.js
index ab0b7f25fe..1c1b6b5f83 100644
--- a/packages/ipfs-core/src/components/files/mv.js
+++ b/packages/ipfs-core/src/components/files/mv.js
@@ -1,4 +1,3 @@
-
 import { createCp } from './cp.js'
 import { createRm } from './rm.js'
 import mergeOpts from 'merge-options'
diff --git a/packages/ipfs-core/src/components/files/read.js b/packages/ipfs-core/src/components/files/read.js
index 51718d86ce..33d275054b 100644
--- a/packages/ipfs-core/src/components/files/read.js
+++ b/packages/ipfs-core/src/components/files/read.js
@@ -1,4 +1,3 @@
-
 import { exporter } from 'ipfs-unixfs-exporter'
 import mergeOpts from 'merge-options'
 import { toMfsPath } from './utils/to-mfs-path.js'
diff --git a/packages/ipfs-core/src/components/files/rm.js b/packages/ipfs-core/src/components/files/rm.js
index f25b1e1136..c78e71badc 100644
--- a/packages/ipfs-core/src/components/files/rm.js
+++ b/packages/ipfs-core/src/components/files/rm.js
@@ -1,4 +1,3 @@
-
 import errCode from 'err-code'
 import { updateTree } from './utils/update-tree.js'
 import { updateMfsRoot } from './utils/update-mfs-root.js'
diff --git a/packages/ipfs-core/src/components/files/stat.js b/packages/ipfs-core/src/components/files/stat.js
index b9d0104481..2361dd6025 100644
--- a/packages/ipfs-core/src/components/files/stat.js
+++ b/packages/ipfs-core/src/components/files/stat.js
@@ -1,4 +1,3 @@
-
 import mergeOpts from 'merge-options'
 import { toMfsPath } from './utils/to-mfs-path.js'
 import { exporter } from 'ipfs-unixfs-exporter'
diff --git a/packages/ipfs-core/src/components/files/touch.js b/packages/ipfs-core/src/components/files/touch.js
index fa4b23ee60..e5c22d6035 100644
--- a/packages/ipfs-core/src/components/files/touch.js
+++ b/packages/ipfs-core/src/components/files/touch.js
@@ -1,4 +1,3 @@
-
 import mergeOpts from 'merge-options'
 import { toMfsPath } from './utils/to-mfs-path.js'
 import debug from 'debug'
diff --git a/packages/ipfs-core/src/components/files/utils/add-link.js b/packages/ipfs-core/src/components/files/utils/add-link.js
index ab7f1882d1..af3658e93a 100644
--- a/packages/ipfs-core/src/components/files/utils/add-link.js
+++ b/packages/ipfs-core/src/components/files/utils/add-link.js
@@ -1,4 +1,3 @@
-
 import * as dagPB from '@ipld/dag-pb'
 import { CID } from 'multiformats/cid'
 import debug from 'debug'
diff --git a/packages/ipfs-core/src/components/files/utils/create-node.js b/packages/ipfs-core/src/components/files/utils/create-node.js
index 84c290c392..4c552f629f 100644
--- a/packages/ipfs-core/src/components/files/utils/create-node.js
+++ b/packages/ipfs-core/src/components/files/utils/create-node.js
@@ -1,4 +1,3 @@
-
 import { UnixFS } from 'ipfs-unixfs'
 import * as dagPB from '@ipld/dag-pb'
 import { CID } from 'multiformats/cid'
diff --git a/packages/ipfs-core/src/components/files/utils/dir-sharded.js b/packages/ipfs-core/src/components/files/utils/dir-sharded.js
index 063e7e5969..81cd48043b 100644
--- a/packages/ipfs-core/src/components/files/utils/dir-sharded.js
+++ b/packages/ipfs-core/src/components/files/utils/dir-sharded.js
@@ -1,4 +1,3 @@
-
 import { encode, prepare } from '@ipld/dag-pb'
 import { UnixFS } from 'ipfs-unixfs'
 import { persist } from './persist.js'
diff --git a/packages/ipfs-core/src/components/files/utils/hamt-constants.js b/packages/ipfs-core/src/components/files/utils/hamt-constants.js
index 7e8af9a87f..9a3c4eabfb 100644
--- a/packages/ipfs-core/src/components/files/utils/hamt-constants.js
+++ b/packages/ipfs-core/src/components/files/utils/hamt-constants.js
@@ -1,4 +1,3 @@
-
 import { murmur3128 } from '@multiformats/murmur3'
 
 export const hamtHashCode = murmur3128.code
diff --git a/packages/ipfs-core/src/components/files/utils/hamt-utils.js b/packages/ipfs-core/src/components/files/utils/hamt-utils.js
index 6daaee7df6..8bc22937b1 100644
--- a/packages/ipfs-core/src/components/files/utils/hamt-utils.js
+++ b/packages/ipfs-core/src/components/files/utils/hamt-utils.js
@@ -1,4 +1,3 @@
-
 import * as dagPB from '@ipld/dag-pb'
 import {
   Bucket,
diff --git a/packages/ipfs-core/src/components/files/utils/persist.js b/packages/ipfs-core/src/components/files/utils/persist.js
index 1c77dc3c11..0d8c6bbcc9 100644
--- a/packages/ipfs-core/src/components/files/utils/persist.js
+++ b/packages/ipfs-core/src/components/files/utils/persist.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import * as dagPB from '@ipld/dag-pb'
 import { sha256 } from 'multiformats/hashes/sha2'
diff --git a/packages/ipfs-core/src/components/files/utils/to-async-iterator.js b/packages/ipfs-core/src/components/files/utils/to-async-iterator.js
index cd4ce78a61..a7f19d0381 100644
--- a/packages/ipfs-core/src/components/files/utils/to-async-iterator.js
+++ b/packages/ipfs-core/src/components/files/utils/to-async-iterator.js
@@ -1,4 +1,3 @@
-
 import errCode from 'err-code'
 import debug from 'debug'
 import {
diff --git a/packages/ipfs-core/src/components/files/utils/to-mfs-path.js b/packages/ipfs-core/src/components/files/utils/to-mfs-path.js
index f1c947b6e3..79f95e841a 100644
--- a/packages/ipfs-core/src/components/files/utils/to-mfs-path.js
+++ b/packages/ipfs-core/src/components/files/utils/to-mfs-path.js
@@ -1,4 +1,3 @@
-
 import { loadMfsRoot } from './with-mfs-root.js'
 import { toPathComponents } from './to-path-components.js'
 import { exporter } from 'ipfs-unixfs-exporter'
diff --git a/packages/ipfs-core/src/components/files/utils/to-trail.js b/packages/ipfs-core/src/components/files/utils/to-trail.js
index 71a9d712f8..78e3e0eb3d 100644
--- a/packages/ipfs-core/src/components/files/utils/to-trail.js
+++ b/packages/ipfs-core/src/components/files/utils/to-trail.js
@@ -1,4 +1,3 @@
-
 import { walkPath } from 'ipfs-unixfs-exporter'
 import debug from 'debug'
 
diff --git a/packages/ipfs-core/src/components/files/utils/update-mfs-root.js b/packages/ipfs-core/src/components/files/utils/update-mfs-root.js
index 7d71450c24..6dc8c1820a 100644
--- a/packages/ipfs-core/src/components/files/utils/update-mfs-root.js
+++ b/packages/ipfs-core/src/components/files/utils/update-mfs-root.js
@@ -1,4 +1,3 @@
-
 import debug from 'debug'
 import {
   MFS_ROOT_KEY
diff --git a/packages/ipfs-core/src/components/files/utils/update-tree.js b/packages/ipfs-core/src/components/files/utils/update-tree.js
index 2517acea62..cfc1749239 100644
--- a/packages/ipfs-core/src/components/files/utils/update-tree.js
+++ b/packages/ipfs-core/src/components/files/utils/update-tree.js
@@ -1,4 +1,3 @@
-
 import debug from 'debug'
 import { addLink } from './add-link.js'
 import {
diff --git a/packages/ipfs-core/src/components/files/utils/with-mfs-root.js b/packages/ipfs-core/src/components/files/utils/with-mfs-root.js
index 80c31e9d45..c94a091366 100644
--- a/packages/ipfs-core/src/components/files/utils/with-mfs-root.js
+++ b/packages/ipfs-core/src/components/files/utils/with-mfs-root.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { UnixFS } from 'ipfs-unixfs'
 import * as dagPB from '@ipld/dag-pb'
diff --git a/packages/ipfs-core/src/components/files/write.js b/packages/ipfs-core/src/components/files/write.js
index 6d5f3b5c88..0c6293865d 100644
--- a/packages/ipfs-core/src/components/files/write.js
+++ b/packages/ipfs-core/src/components/files/write.js
@@ -1,4 +1,3 @@
-
 import debug from 'debug'
 import { importer } from 'ipfs-unixfs-importer'
 import {
diff --git a/packages/ipfs-core/src/components/get.js b/packages/ipfs-core/src/components/get.js
index 7dd7154fe6..189639dc83 100644
--- a/packages/ipfs-core/src/components/get.js
+++ b/packages/ipfs-core/src/components/get.js
@@ -1,4 +1,3 @@
-
 import { exporter, recursive } from 'ipfs-unixfs-exporter'
 import errCode from 'err-code'
 import { normalizeCidPath } from '../utils.js'
diff --git a/packages/ipfs-core/src/components/id.js b/packages/ipfs-core/src/components/id.js
index 55591fddd0..af3ae4681e 100644
--- a/packages/ipfs-core/src/components/id.js
+++ b/packages/ipfs-core/src/components/id.js
@@ -1,4 +1,3 @@
-
 import { ipfsCore as pkgversion } from '../version.js'
 import { Multiaddr } from 'multiaddr'
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
diff --git a/packages/ipfs-core/src/components/ipns.js b/packages/ipfs-core/src/components/ipns.js
index 8a5c23a248..ddbf608871 100644
--- a/packages/ipfs-core/src/components/ipns.js
+++ b/packages/ipfs-core/src/components/ipns.js
@@ -1,4 +1,3 @@
-
 import { IPNS } from '../ipns/index.js'
 import { createRouting } from '../ipns/routing/config.js'
 import { OfflineDatastore } from '../ipns/routing/offline-datastore.js'
diff --git a/packages/ipfs-core/src/components/key/export.js b/packages/ipfs-core/src/components/key/export.js
index ff227f30ec..4b7bf1e884 100644
--- a/packages/ipfs-core/src/components/key/export.js
+++ b/packages/ipfs-core/src/components/key/export.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
 /**
diff --git a/packages/ipfs-core/src/components/key/gen.js b/packages/ipfs-core/src/components/key/gen.js
index 774c20fcb4..31c7be0140 100644
--- a/packages/ipfs-core/src/components/key/gen.js
+++ b/packages/ipfs-core/src/components/key/gen.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
 const DEFAULT_KEY_TYPE = 'ed25519'
diff --git a/packages/ipfs-core/src/components/key/import.js b/packages/ipfs-core/src/components/key/import.js
index 556342b7a5..ba4a008ec4 100644
--- a/packages/ipfs-core/src/components/key/import.js
+++ b/packages/ipfs-core/src/components/key/import.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
 /**
diff --git a/packages/ipfs-core/src/components/key/index.js b/packages/ipfs-core/src/components/key/index.js
index a081632668..0dc52a2b71 100644
--- a/packages/ipfs-core/src/components/key/index.js
+++ b/packages/ipfs-core/src/components/key/index.js
@@ -1,4 +1,3 @@
-
 import { createExport } from './export.js'
 import { createGen } from './gen.js'
 import { createImport } from './import.js'
diff --git a/packages/ipfs-core/src/components/key/info.js b/packages/ipfs-core/src/components/key/info.js
index e62be179cb..6104209f25 100644
--- a/packages/ipfs-core/src/components/key/info.js
+++ b/packages/ipfs-core/src/components/key/info.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
 /**
diff --git a/packages/ipfs-core/src/components/key/list.js b/packages/ipfs-core/src/components/key/list.js
index 89a7e86bfe..dfc9050d59 100644
--- a/packages/ipfs-core/src/components/key/list.js
+++ b/packages/ipfs-core/src/components/key/list.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
 /**
diff --git a/packages/ipfs-core/src/components/key/rename.js b/packages/ipfs-core/src/components/key/rename.js
index 89dd81bfc6..45a2a63c84 100644
--- a/packages/ipfs-core/src/components/key/rename.js
+++ b/packages/ipfs-core/src/components/key/rename.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
 /**
diff --git a/packages/ipfs-core/src/components/key/rm.js b/packages/ipfs-core/src/components/key/rm.js
index 2fc89f8a6c..1592d310b4 100644
--- a/packages/ipfs-core/src/components/key/rm.js
+++ b/packages/ipfs-core/src/components/key/rm.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
 /**
diff --git a/packages/ipfs-core/src/components/libp2p.js b/packages/ipfs-core/src/components/libp2p.js
index 040ae0824c..44171a7852 100644
--- a/packages/ipfs-core/src/components/libp2p.js
+++ b/packages/ipfs-core/src/components/libp2p.js
@@ -1,4 +1,3 @@
-
 import get from 'dlv'
 import mergeOpts from 'merge-options'
 import errCode from 'err-code'
diff --git a/packages/ipfs-core/src/components/ls.js b/packages/ipfs-core/src/components/ls.js
index b8db8de371..572bd28853 100644
--- a/packages/ipfs-core/src/components/ls.js
+++ b/packages/ipfs-core/src/components/ls.js
@@ -1,4 +1,3 @@
-
 import { exporter } from 'ipfs-unixfs-exporter'
 import errCode from 'err-code'
 import { normalizeCidPath, mapFile } from '../utils.js'
diff --git a/packages/ipfs-core/src/components/name/index.js b/packages/ipfs-core/src/components/name/index.js
index d0c901f346..e8c20f087b 100644
--- a/packages/ipfs-core/src/components/name/index.js
+++ b/packages/ipfs-core/src/components/name/index.js
@@ -1,4 +1,3 @@
-
 import { createPublish } from './publish.js'
 import { createResolve } from './resolve.js'
 import { PubSubAPI } from './pubsub/index.js'
diff --git a/packages/ipfs-core/src/components/name/publish.js b/packages/ipfs-core/src/components/name/publish.js
index 8378642894..5f68214e8a 100644
--- a/packages/ipfs-core/src/components/name/publish.js
+++ b/packages/ipfs-core/src/components/name/publish.js
@@ -1,4 +1,3 @@
-
 import debug from 'debug'
 import parseDuration from 'parse-duration'
 import crypto from 'libp2p-crypto'
diff --git a/packages/ipfs-core/src/components/name/pubsub/index.js b/packages/ipfs-core/src/components/name/pubsub/index.js
index 316bf5a619..b4c52282f0 100644
--- a/packages/ipfs-core/src/components/name/pubsub/index.js
+++ b/packages/ipfs-core/src/components/name/pubsub/index.js
@@ -1,4 +1,3 @@
-
 import { createCancel } from './cancel.js'
 import { createState } from './state.js'
 import { createSubs } from './subs.js'
diff --git a/packages/ipfs-core/src/components/name/pubsub/subs.js b/packages/ipfs-core/src/components/name/pubsub/subs.js
index 6b4bcadaf6..b66e7db5b3 100644
--- a/packages/ipfs-core/src/components/name/pubsub/subs.js
+++ b/packages/ipfs-core/src/components/name/pubsub/subs.js
@@ -1,4 +1,3 @@
-
 import { getPubsubRouting } from './utils.js'
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
diff --git a/packages/ipfs-core/src/components/name/pubsub/utils.js b/packages/ipfs-core/src/components/name/pubsub/utils.js
index 0e21a92be5..768eacaee7 100644
--- a/packages/ipfs-core/src/components/name/pubsub/utils.js
+++ b/packages/ipfs-core/src/components/name/pubsub/utils.js
@@ -1,4 +1,3 @@
-
 import { IpnsPubsubDatastore } from '../../../ipns/routing/pubsub-datastore.js'
 import errcode from 'err-code'
 
diff --git a/packages/ipfs-core/src/components/name/resolve.js b/packages/ipfs-core/src/components/name/resolve.js
index bc647c1b39..9f7aff7f1b 100644
--- a/packages/ipfs-core/src/components/name/resolve.js
+++ b/packages/ipfs-core/src/components/name/resolve.js
@@ -1,4 +1,3 @@
-
 import debug from 'debug'
 import errcode from 'err-code'
 import mergeOpts from 'merge-options'
diff --git a/packages/ipfs-core/src/components/network.js b/packages/ipfs-core/src/components/network.js
index e1721a9b2c..08f3e53a12 100644
--- a/packages/ipfs-core/src/components/network.js
+++ b/packages/ipfs-core/src/components/network.js
@@ -1,4 +1,3 @@
-
 import { createBitswap } from 'ipfs-bitswap'
 import { createLibp2p } from './libp2p.js'
 import { Multiaddr } from 'multiaddr'
diff --git a/packages/ipfs-core/src/components/object/data.js b/packages/ipfs-core/src/components/object/data.js
index c2712dd990..f890f4e7b1 100644
--- a/packages/ipfs-core/src/components/object/data.js
+++ b/packages/ipfs-core/src/components/object/data.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 import { createGet } from './get.js'
 
diff --git a/packages/ipfs-core/src/components/object/get.js b/packages/ipfs-core/src/components/object/get.js
index 473f92d6b3..f68e848cd3 100644
--- a/packages/ipfs-core/src/components/object/get.js
+++ b/packages/ipfs-core/src/components/object/get.js
@@ -1,4 +1,3 @@
-
 import * as dagPB from '@ipld/dag-pb'
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
diff --git a/packages/ipfs-core/src/components/object/index.js b/packages/ipfs-core/src/components/object/index.js
index 82354c9c1b..3a7bff3560 100644
--- a/packages/ipfs-core/src/components/object/index.js
+++ b/packages/ipfs-core/src/components/object/index.js
@@ -1,4 +1,3 @@
-
 import { createData } from './data.js'
 import { createGet } from './get.js'
 import { createLinks } from './links.js'
diff --git a/packages/ipfs-core/src/components/object/links.js b/packages/ipfs-core/src/components/object/links.js
index 27cbc6ee95..eea79bec25 100644
--- a/packages/ipfs-core/src/components/object/links.js
+++ b/packages/ipfs-core/src/components/object/links.js
@@ -1,4 +1,3 @@
-
 import * as dagPB from '@ipld/dag-pb'
 import * as dagCBOR from '@ipld/dag-cbor'
 import * as raw from 'multiformats/codecs/raw'
diff --git a/packages/ipfs-core/src/components/object/new.js b/packages/ipfs-core/src/components/object/new.js
index 9bc0f58510..0fac9a6d12 100644
--- a/packages/ipfs-core/src/components/object/new.js
+++ b/packages/ipfs-core/src/components/object/new.js
@@ -1,4 +1,3 @@
-
 import * as dagPB from '@ipld/dag-pb'
 import { sha256 } from 'multiformats/hashes/sha2'
 import { UnixFS } from 'ipfs-unixfs'
diff --git a/packages/ipfs-core/src/components/object/patch/add-link.js b/packages/ipfs-core/src/components/object/patch/add-link.js
index fb11091c30..620a859d06 100644
--- a/packages/ipfs-core/src/components/object/patch/add-link.js
+++ b/packages/ipfs-core/src/components/object/patch/add-link.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 import { createGet } from '../get.js'
 import { createPut } from '../put.js'
diff --git a/packages/ipfs-core/src/components/object/patch/append-data.js b/packages/ipfs-core/src/components/object/patch/append-data.js
index 4d1f3d81cf..e6e1272392 100644
--- a/packages/ipfs-core/src/components/object/patch/append-data.js
+++ b/packages/ipfs-core/src/components/object/patch/append-data.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 import { concat as uint8ArrayConcat } from 'uint8arrays/concat'
 import { createGet } from '../get.js'
diff --git a/packages/ipfs-core/src/components/object/patch/index.js b/packages/ipfs-core/src/components/object/patch/index.js
index e808a6b84f..a86eaf2cc1 100644
--- a/packages/ipfs-core/src/components/object/patch/index.js
+++ b/packages/ipfs-core/src/components/object/patch/index.js
@@ -1,4 +1,3 @@
-
 import { createAddLink } from './add-link.js'
 import { createAppendData } from './append-data.js'
 import { createRmLink } from './rm-link.js'
diff --git a/packages/ipfs-core/src/components/object/patch/rm-link.js b/packages/ipfs-core/src/components/object/patch/rm-link.js
index 38f5563f2a..b351f630ef 100644
--- a/packages/ipfs-core/src/components/object/patch/rm-link.js
+++ b/packages/ipfs-core/src/components/object/patch/rm-link.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 import { createGet } from '../get.js'
 import { createPut } from '../put.js'
diff --git a/packages/ipfs-core/src/components/object/patch/set-data.js b/packages/ipfs-core/src/components/object/patch/set-data.js
index f505fa2cc1..e8044e7e29 100644
--- a/packages/ipfs-core/src/components/object/patch/set-data.js
+++ b/packages/ipfs-core/src/components/object/patch/set-data.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 import { createGet } from '../get.js'
 import { createPut } from '../put.js'
diff --git a/packages/ipfs-core/src/components/object/put.js b/packages/ipfs-core/src/components/object/put.js
index 3d9db8f1b8..42e732d133 100644
--- a/packages/ipfs-core/src/components/object/put.js
+++ b/packages/ipfs-core/src/components/object/put.js
@@ -1,4 +1,3 @@
-
 import * as dagPB from '@ipld/dag-pb'
 import { CID } from 'multiformats/cid'
 import { sha256 } from 'multiformats/hashes/sha2'
diff --git a/packages/ipfs-core/src/components/object/stat.js b/packages/ipfs-core/src/components/object/stat.js
index 92a388ef76..78dd15a37e 100644
--- a/packages/ipfs-core/src/components/object/stat.js
+++ b/packages/ipfs-core/src/components/object/stat.js
@@ -1,4 +1,3 @@
-
 import * as dagPB from '@ipld/dag-pb'
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 import { createGet } from './get.js'
diff --git a/packages/ipfs-core/src/components/pin/add-all.js b/packages/ipfs-core/src/components/pin/add-all.js
index 50afad5fe9..dd2b6852dd 100644
--- a/packages/ipfs-core/src/components/pin/add-all.js
+++ b/packages/ipfs-core/src/components/pin/add-all.js
@@ -3,9 +3,7 @@
 import { resolvePath } from '../../utils.js'
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 import { normaliseInput } from 'ipfs-core-utils/pins/normalise-input'
-import IpfsRepo from 'ipfs-repo'
-
-const { PinTypes } = IpfsRepo
+import { PinTypes } from 'ipfs-repo/pin-types'
 
 /**
  * @typedef {import('ipfs-core-utils/src/pins/normalise-input').Source} Source
diff --git a/packages/ipfs-core/src/components/pin/ls.js b/packages/ipfs-core/src/components/pin/ls.js
index 8bc591b804..6b0aec728f 100644
--- a/packages/ipfs-core/src/components/pin/ls.js
+++ b/packages/ipfs-core/src/components/pin/ls.js
@@ -4,9 +4,7 @@ import { normaliseInput } from 'ipfs-core-utils/pins/normalise-input'
 import { resolvePath } from '../../utils.js'
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 import errCode from 'err-code'
-import IpfsRepo from 'ipfs-repo'
-
-const { PinTypes } = IpfsRepo
+import { PinTypes } from 'ipfs-repo/pin-types'
 
 /**
  * @typedef {import('multiformats/cid').CID} CID
diff --git a/packages/ipfs-core/src/components/pin/rm-all.js b/packages/ipfs-core/src/components/pin/rm-all.js
index 2302b02adb..be0cb5b2f3 100644
--- a/packages/ipfs-core/src/components/pin/rm-all.js
+++ b/packages/ipfs-core/src/components/pin/rm-all.js
@@ -1,9 +1,7 @@
 import { normaliseInput } from 'ipfs-core-utils/pins/normalise-input'
 import { resolvePath } from '../../utils.js'
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
-import IpfsRepo from 'ipfs-repo'
-
-const { PinTypes } = IpfsRepo
+import { PinTypes } from 'ipfs-repo/pin-types'
 
 /**
  * @param {Object} config
diff --git a/packages/ipfs-core/src/components/ping.js b/packages/ipfs-core/src/components/ping.js
index c1b02b157e..cd8412bb60 100644
--- a/packages/ipfs-core/src/components/ping.js
+++ b/packages/ipfs-core/src/components/ping.js
@@ -1,4 +1,3 @@
-
 import PeerId from 'peer-id'
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
diff --git a/packages/ipfs-core/src/components/pubsub.js b/packages/ipfs-core/src/components/pubsub.js
index 9f60e39e22..589f89edab 100644
--- a/packages/ipfs-core/src/components/pubsub.js
+++ b/packages/ipfs-core/src/components/pubsub.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 import errCode from 'err-code'
 import { NotEnabledError } from '../errors.js'
diff --git a/packages/ipfs-core/src/components/refs/index.js b/packages/ipfs-core/src/components/refs/index.js
index 7855854542..6348808335 100644
--- a/packages/ipfs-core/src/components/refs/index.js
+++ b/packages/ipfs-core/src/components/refs/index.js
@@ -1,13 +1,12 @@
-
 import * as dagPB from '@ipld/dag-pb'
-import { Errors } from 'interface-datastore'
+import { notFoundError } from 'datastore-core/errors'
 import { toCidAndPath } from 'ipfs-core-utils/to-cid-and-path'
 import { CID } from 'multiformats/cid'
 // @ts-expect-error no types
 import TimeoutController from 'timeout-abort-controller'
 import { anySignal } from 'any-signal'
 
-const ERR_NOT_FOUND = Errors.notFoundError().code
+const ERR_NOT_FOUND = notFoundError().code
 
 export const Format = {
   default: '<dst>',
diff --git a/packages/ipfs-core/src/components/refs/local.js b/packages/ipfs-core/src/components/refs/local.js
index 4ec6d225e6..fdbbca6bd1 100644
--- a/packages/ipfs-core/src/components/refs/local.js
+++ b/packages/ipfs-core/src/components/refs/local.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
 /**
diff --git a/packages/ipfs-core/src/components/repo/gc.js b/packages/ipfs-core/src/components/repo/gc.js
index 389f3a6274..ef7c1a30d7 100644
--- a/packages/ipfs-core/src/components/repo/gc.js
+++ b/packages/ipfs-core/src/components/repo/gc.js
@@ -1,4 +1,3 @@
-
 import debug from 'debug'
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 import { loadMfsRoot } from '../files/utils/with-mfs-root.js'
diff --git a/packages/ipfs-core/src/components/repo/index.js b/packages/ipfs-core/src/components/repo/index.js
index 789b7c05e3..6f5694da4b 100644
--- a/packages/ipfs-core/src/components/repo/index.js
+++ b/packages/ipfs-core/src/components/repo/index.js
@@ -1,4 +1,3 @@
-
 import { createGc } from './gc.js'
 import { createStat } from './stat.js'
 import { createVersion } from './version.js'
diff --git a/packages/ipfs-core/src/components/repo/stat.js b/packages/ipfs-core/src/components/repo/stat.js
index f681fa848f..00f6b0b31f 100644
--- a/packages/ipfs-core/src/components/repo/stat.js
+++ b/packages/ipfs-core/src/components/repo/stat.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
 /**
diff --git a/packages/ipfs-core/src/components/repo/version.js b/packages/ipfs-core/src/components/repo/version.js
index 39efb35855..9e8d0e2535 100644
--- a/packages/ipfs-core/src/components/repo/version.js
+++ b/packages/ipfs-core/src/components/repo/version.js
@@ -1,8 +1,5 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
-import IpfsRepo from 'ipfs-repo'
-
-const { repoVersion } = IpfsRepo
+import { repoVersion } from 'ipfs-repo/constants'
 
 /**
  * @param {Object} config
diff --git a/packages/ipfs-core/src/components/resolve.js b/packages/ipfs-core/src/components/resolve.js
index 464067458d..f1748d0be1 100644
--- a/packages/ipfs-core/src/components/resolve.js
+++ b/packages/ipfs-core/src/components/resolve.js
@@ -1,4 +1,3 @@
-
 import isIpfs from 'is-ipfs'
 import { CID } from 'multiformats/cid'
 import PeerId from 'peer-id'
diff --git a/packages/ipfs-core/src/components/root.js b/packages/ipfs-core/src/components/root.js
index c2ddd76305..1469dcf82d 100644
--- a/packages/ipfs-core/src/components/root.js
+++ b/packages/ipfs-core/src/components/root.js
@@ -1,4 +1,3 @@
-
 import { createAdd } from './add.js'
 import { createAddAll } from './add-all/index.js'
 import { createCat } from './cat.js'
diff --git a/packages/ipfs-core/src/components/stats/bw.js b/packages/ipfs-core/src/components/stats/bw.js
index 2659539088..815036aa81 100644
--- a/packages/ipfs-core/src/components/stats/bw.js
+++ b/packages/ipfs-core/src/components/stats/bw.js
@@ -1,4 +1,3 @@
-
 import parseDuration from 'parse-duration'
 import errCode from 'err-code'
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
diff --git a/packages/ipfs-core/src/components/stats/index.js b/packages/ipfs-core/src/components/stats/index.js
index 31b4d2aed5..1d0542a534 100644
--- a/packages/ipfs-core/src/components/stats/index.js
+++ b/packages/ipfs-core/src/components/stats/index.js
@@ -1,4 +1,3 @@
-
 import { createBw } from './bw.js'
 import { createStat as createRepo } from '../repo/stat.js'
 import { createStat as createBitswap } from '../bitswap/stat.js'
diff --git a/packages/ipfs-core/src/components/storage.js b/packages/ipfs-core/src/components/storage.js
index e673da70c4..8a3696b817 100644
--- a/packages/ipfs-core/src/components/storage.js
+++ b/packages/ipfs-core/src/components/storage.js
@@ -1,4 +1,3 @@
-
 import debug from 'debug'
 import { createRepo } from 'ipfs-core-config/repo'
 import getDefaultConfig from 'ipfs-core-config/config'
@@ -9,9 +8,7 @@ import mergeOpts from 'merge-options'
 import { profiles as configProfiles } from './config/profiles.js'
 import { NotEnabledError, NotInitializedError } from '../errors.js'
 import { createLibp2p } from './libp2p.js'
-import IpfsRepo from 'ipfs-repo'
-
-const { errors } = IpfsRepo
+import { ERR_REPO_NOT_INITIALIZED } from 'ipfs-repo/errors'
 
 const mergeOptions = mergeOpts.bind({ ignoreUndefined: true })
 const log = debug('ipfs:components:peer:storage')
@@ -83,7 +80,7 @@ const loadRepo = async (print, repo, options) => {
 
     return { ...await configureRepo(repo, options), isNew: false }
   } catch (/** @type {any} */ err) {
-    if (err.code !== errors.ERR_REPO_NOT_INITIALIZED) {
+    if (err.code !== ERR_REPO_NOT_INITIALIZED) {
       throw err
     }
 
diff --git a/packages/ipfs-core/src/components/swarm/addrs.js b/packages/ipfs-core/src/components/swarm/addrs.js
index 9eace9a705..dd20ad1c09 100644
--- a/packages/ipfs-core/src/components/swarm/addrs.js
+++ b/packages/ipfs-core/src/components/swarm/addrs.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
 /**
diff --git a/packages/ipfs-core/src/components/swarm/connect.js b/packages/ipfs-core/src/components/swarm/connect.js
index 41a3b8ea11..b6a01be183 100644
--- a/packages/ipfs-core/src/components/swarm/connect.js
+++ b/packages/ipfs-core/src/components/swarm/connect.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
 /**
diff --git a/packages/ipfs-core/src/components/swarm/disconnect.js b/packages/ipfs-core/src/components/swarm/disconnect.js
index 2ef1dfb7b3..c023b616a7 100644
--- a/packages/ipfs-core/src/components/swarm/disconnect.js
+++ b/packages/ipfs-core/src/components/swarm/disconnect.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
 /**
diff --git a/packages/ipfs-core/src/components/swarm/index.js b/packages/ipfs-core/src/components/swarm/index.js
index 0f2f1edcff..5dbaaef40f 100644
--- a/packages/ipfs-core/src/components/swarm/index.js
+++ b/packages/ipfs-core/src/components/swarm/index.js
@@ -1,4 +1,3 @@
-
 import { createAddrs } from './addrs.js'
 import { createConnect } from './connect.js'
 import { createDisconnect } from './disconnect.js'
diff --git a/packages/ipfs-core/src/components/swarm/local-addrs.js b/packages/ipfs-core/src/components/swarm/local-addrs.js
index 71be81dd8d..61011be995 100644
--- a/packages/ipfs-core/src/components/swarm/local-addrs.js
+++ b/packages/ipfs-core/src/components/swarm/local-addrs.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
 /**
diff --git a/packages/ipfs-core/src/components/swarm/peers.js b/packages/ipfs-core/src/components/swarm/peers.js
index b35c627682..322b029501 100644
--- a/packages/ipfs-core/src/components/swarm/peers.js
+++ b/packages/ipfs-core/src/components/swarm/peers.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 
 /**
diff --git a/packages/ipfs-core/src/ipns/index.js b/packages/ipfs-core/src/ipns/index.js
index 96a90eea1d..95c0cb2f0e 100644
--- a/packages/ipfs-core/src/ipns/index.js
+++ b/packages/ipfs-core/src/ipns/index.js
@@ -1,4 +1,3 @@
-
 import { createFromPrivKey } from 'peer-id'
 import errcode from 'err-code'
 import debug from 'debug'
diff --git a/packages/ipfs-core/src/ipns/publisher.js b/packages/ipfs-core/src/ipns/publisher.js
index 3429d4e66b..9e2a07cc98 100644
--- a/packages/ipfs-core/src/ipns/publisher.js
+++ b/packages/ipfs-core/src/ipns/publisher.js
@@ -1,10 +1,11 @@
 import PeerId from 'peer-id'
-import { Key, Errors } from 'interface-datastore'
+import { Key } from 'interface-datastore/key'
+import { notFoundError } from 'datastore-core/errors'
 import errcode from 'err-code'
 import debug from 'debug'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import { equals as uint8ArrayEquals } from 'uint8arrays/equals'
-import ipns from 'ipns'
+import * as ipns from 'ipns'
 
 const log = Object.assign(debug('ipfs:ipns:publisher'), {
   error: debug('ipfs:ipns:publisher:error')
@@ -16,7 +17,7 @@ const log = Object.assign(debug('ipfs:ipns:publisher'), {
  * @typedef {import('ipns').IPNSEntry} IPNSEntry
  */
 
-const ERR_NOT_FOUND = Errors.notFoundError().code
+const ERR_NOT_FOUND = notFoundError().code
 const defaultRecordLifetime = 60 * 60 * 1000
 
 // IpnsPublisher is capable of publishing and resolving names to the IPFS routing system.
diff --git a/packages/ipfs-core/src/ipns/republisher.js b/packages/ipfs-core/src/ipns/republisher.js
index ebfa875fa0..4e51f1e7fd 100644
--- a/packages/ipfs-core/src/ipns/republisher.js
+++ b/packages/ipfs-core/src/ipns/republisher.js
@@ -1,4 +1,4 @@
-import ipns from 'ipns'
+import * as ipns from 'ipns'
 import crypto from 'libp2p-crypto'
 import PeerId from 'peer-id'
 import errcode from 'err-code'
diff --git a/packages/ipfs-core/src/ipns/resolver.js b/packages/ipfs-core/src/ipns/resolver.js
index 66267b9f74..8036d96f0c 100644
--- a/packages/ipfs-core/src/ipns/resolver.js
+++ b/packages/ipfs-core/src/ipns/resolver.js
@@ -1,10 +1,9 @@
-
-import ipns from 'ipns'
+import * as ipns from 'ipns'
 import PeerId from 'peer-id'
 import errcode from 'err-code'
 import debug from 'debug'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import { Errors } from 'interface-datastore'
+import * as Errors from 'datastore-core/errors'
 
 const log = Object.assign(debug('ipfs:ipns:resolver'), {
   error: debug('ipfs:ipns:resolver:error')
diff --git a/packages/ipfs-core/src/ipns/routing/config.js b/packages/ipfs-core/src/ipns/routing/config.js
index 3e6fb1c681..070d0ab5ee 100644
--- a/packages/ipfs-core/src/ipns/routing/config.js
+++ b/packages/ipfs-core/src/ipns/routing/config.js
@@ -1,5 +1,4 @@
-
-import { TieredDatastore } from 'datastore-core'
+import { TieredDatastore } from 'datastore-core/tiered'
 import get from 'dlv'
 import { IpnsPubsubDatastore } from './pubsub-datastore.js'
 import { OfflineDatastore } from './offline-datastore.js'
diff --git a/packages/ipfs-core/src/ipns/routing/offline-datastore.js b/packages/ipfs-core/src/ipns/routing/offline-datastore.js
index 9e1b502788..31a39ac31b 100644
--- a/packages/ipfs-core/src/ipns/routing/offline-datastore.js
+++ b/packages/ipfs-core/src/ipns/routing/offline-datastore.js
@@ -1,5 +1,4 @@
-
-import { Key } from 'interface-datastore'
+import { Key } from 'interface-datastore/key'
 import { Record } from 'libp2p-record'
 import errcode from 'err-code'
 import debug from 'debug'
diff --git a/packages/ipfs-core/src/ipns/routing/pubsub-datastore.js b/packages/ipfs-core/src/ipns/routing/pubsub-datastore.js
index 58c4d1ce58..3a367b7b4d 100644
--- a/packages/ipfs-core/src/ipns/routing/pubsub-datastore.js
+++ b/packages/ipfs-core/src/ipns/routing/pubsub-datastore.js
@@ -1,11 +1,11 @@
-
-import ipns from 'ipns'
+import * as ipns from 'ipns'
 import { base58btc } from 'multiformats/bases/base58'
-import PubsubDatastore from 'datastore-pubsub'
+import { PubsubDatastore } from 'datastore-pubsub'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import errcode from 'err-code'
 import debug from 'debug'
+
 const log = Object.assign(debug('ipfs:ipns:pubsub'), {
   error: debug('ipfs:ipns:pubsub:error')
 })
diff --git a/packages/ipfs-core/src/mfs-preload.js b/packages/ipfs-core/src/mfs-preload.js
index 7a2affcb3c..15b95a9fef 100644
--- a/packages/ipfs-core/src/mfs-preload.js
+++ b/packages/ipfs-core/src/mfs-preload.js
@@ -1,4 +1,3 @@
-
 import debug from 'debug'
 const log = Object.assign(debug('ipfs:mfs-preload'), {
   error: debug('ipfs:mfs-preload:error')
diff --git a/packages/ipfs-core/src/utils.js b/packages/ipfs-core/src/utils.js
index 7f0526f944..6336d3681b 100644
--- a/packages/ipfs-core/src/utils.js
+++ b/packages/ipfs-core/src/utils.js
@@ -2,7 +2,7 @@
 
 import isIpfs from 'is-ipfs'
 import { CID } from 'multiformats/cid'
-import { Key } from 'interface-datastore'
+import { Key } from 'interface-datastore/key'
 import errCode from 'err-code'
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 import { toCidAndPath } from 'ipfs-core-utils/to-cid-and-path'
diff --git a/packages/ipfs-core/src/utils/service.js b/packages/ipfs-core/src/utils/service.js
index b74dd57ef0..747df11cca 100644
--- a/packages/ipfs-core/src/utils/service.js
+++ b/packages/ipfs-core/src/utils/service.js
@@ -1,4 +1,3 @@
-
 import { NotStartedError, AlreadyStartingError, AlreadyStartedError } from '../errors.js'
 import { withTimeout } from '../utils.js'
 
diff --git a/packages/ipfs-core/test/block-storage.spec.js b/packages/ipfs-core/test/block-storage.spec.js
index 0db34b3684..cd5fc60521 100644
--- a/packages/ipfs-core/test/block-storage.spec.js
+++ b/packages/ipfs-core/test/block-storage.spec.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 
-import { MemoryBlockstore } from 'interface-blockstore'
-import suite from 'interface-blockstore-tests'
+import { MemoryBlockstore } from 'blockstore-core/memory'
+import { interfaceBlockstoreTests } from 'interface-blockstore-tests'
 import { BlockStorage } from '../src/block-storage.js'
 
 /**
@@ -22,7 +22,7 @@ class MockBitswap extends MemoryBlockstore {
 
 describe('block-storage', () => {
   describe('interface-blockstore (bitswap online)', () => {
-    suite({
+    interfaceBlockstoreTests({
       setup: () => {
         // bitswap forwards on to the blockstore so just
         // use the same instance to represent both
@@ -36,7 +36,7 @@ describe('block-storage', () => {
   })
 
   describe('interface-blockstore (bitswap offline)', () => {
-    suite({
+    interfaceBlockstoreTests({
       setup: () => {
         // bitswap forwards on to the blockstore so just
         // use the same instance to represent both
diff --git a/packages/ipfs-core/test/libp2p.spec.js b/packages/ipfs-core/test/libp2p.spec.js
index 2e664dacdd..4d93830ddf 100644
--- a/packages/ipfs-core/test/libp2p.spec.js
+++ b/packages/ipfs-core/test/libp2p.spec.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 
 import { expect } from 'aegir/utils/chai.js'
-import { MemoryDatastore } from 'interface-datastore'
+import { MemoryDatastore } from 'datastore-core/memory'
 import PeerId from 'peer-id'
 import Libp2p from 'libp2p'
 import { EventEmitter } from 'events'
diff --git a/packages/ipfs-core/test/name.spec.js b/packages/ipfs-core/test/name.spec.js
index ec84f76ba0..0211465158 100644
--- a/packages/ipfs-core/test/name.spec.js
+++ b/packages/ipfs-core/test/name.spec.js
@@ -5,7 +5,7 @@ import sinon from 'sinon'
 import delay from 'delay'
 import PeerId from 'peer-id'
 import errCode from 'err-code'
-import ipns from 'ipns'
+import * as ipns from 'ipns'
 import { createRouting } from '../src/ipns/routing/config.js'
 import { IpnsPublisher } from '../src/ipns/publisher.js'
 import { IpnsRepublisher } from '../src/ipns/republisher.js'
diff --git a/packages/ipfs-core/test/utils/create-backend.js b/packages/ipfs-core/test/utils/create-backend.js
index 997e844910..319499f919 100644
--- a/packages/ipfs-core/test/utils/create-backend.js
+++ b/packages/ipfs-core/test/utils/create-backend.js
@@ -1,6 +1,5 @@
-
-import { MemoryDatastore } from 'interface-datastore'
-import BlockstoreDatastoreAdapter from 'blockstore-datastore-adapter'
+import { MemoryDatastore } from 'datastore-core/memory'
+import { BlockstoreDatastoreAdapter } from 'blockstore-datastore-adapter'
 
 export function createBackend (overrides = {}) {
   return {
diff --git a/packages/ipfs-core/test/utils/create-repo.js b/packages/ipfs-core/test/utils/create-repo.js
index 4f0ee69c24..0995d0b0c3 100644
--- a/packages/ipfs-core/test/utils/create-repo.js
+++ b/packages/ipfs-core/test/utils/create-repo.js
@@ -2,12 +2,9 @@
 import { nanoid } from 'nanoid'
 import { codecs } from './codecs.js'
 import { createBackend } from './create-backend.js'
-import { Key } from 'interface-datastore'
-import IpfsRepo from 'ipfs-repo'
-
-// @ts-expect-error locks is missing from types?
-const { createRepo, locks } = IpfsRepo
-const memory = locks.memory
+import { Key } from 'interface-datastore/key'
+import { createRepo } from 'ipfs-repo'
+import { MemoryLock } from 'ipfs-repo/locks/memory'
 
 /**
  * @param {object} options
@@ -43,7 +40,7 @@ export async function createTempRepo (options = {}) {
   }
 
   return createRepo(path, (codeOrName) => codecs.getCodec(codeOrName), backend, {
-    repoLock: memory,
+    repoLock: MemoryLock,
     autoMigrate: options.autoMigrate,
     onMigrationProgress: options.onMigrationProgress
   })
diff --git a/packages/ipfs-daemon/package.json b/packages/ipfs-daemon/package.json
index 00219b5b80..1647c789cc 100644
--- a/packages/ipfs-daemon/package.json
+++ b/packages/ipfs-daemon/package.json
@@ -52,7 +52,7 @@
     "ipfs-http-server": "^0.7.6",
     "ipfs-utils": "^9.0.1",
     "just-safe-set": "^2.2.1",
-    "libp2p": "^0.32.0",
+    "libp2p": "^0.33.0",
     "libp2p-webrtc-star": "^0.23.0"
   },
   "devDependencies": {
diff --git a/packages/ipfs-daemon/src/index.js b/packages/ipfs-daemon/src/index.js
index 9625f604ed..f914384baa 100644
--- a/packages/ipfs-daemon/src/index.js
+++ b/packages/ipfs-daemon/src/index.js
@@ -1,4 +1,3 @@
-
 import debug from 'debug'
 import set from 'just-safe-set'
 // @ts-expect-error - no types
diff --git a/packages/ipfs-grpc-client/src/core-api/files/ls.js b/packages/ipfs-grpc-client/src/core-api/files/ls.js
index c5b999b08f..02dc92b0d0 100644
--- a/packages/ipfs-grpc-client/src/core-api/files/ls.js
+++ b/packages/ipfs-grpc-client/src/core-api/files/ls.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { serverStreamToIterator } from '../../utils/server-stream-to-iterator.js'
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
diff --git a/packages/ipfs-grpc-client/src/core-api/files/write.js b/packages/ipfs-grpc-client/src/core-api/files/write.js
index 74c851c19a..324a35cf49 100644
--- a/packages/ipfs-grpc-client/src/core-api/files/write.js
+++ b/packages/ipfs-grpc-client/src/core-api/files/write.js
@@ -1,4 +1,3 @@
-
 import { clientStreamToPromise } from '../../utils/client-stream-to-promise.js'
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 import { normaliseContent } from 'ipfs-core-utils/files/normalise-content'
diff --git a/packages/ipfs-grpc-client/src/core-api/id.js b/packages/ipfs-grpc-client/src/core-api/id.js
index 4dd0d9b248..b4ff3c5160 100644
--- a/packages/ipfs-grpc-client/src/core-api/id.js
+++ b/packages/ipfs-grpc-client/src/core-api/id.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 import { toHeaders } from '../utils/to-headers.js'
 import { unaryToPromise } from '../utils/unary-to-promise.js'
diff --git a/packages/ipfs-grpc-client/src/core-api/pubsub/subscribe.js b/packages/ipfs-grpc-client/src/core-api/pubsub/subscribe.js
index 5f83a8ee2f..3f37669f53 100644
--- a/packages/ipfs-grpc-client/src/core-api/pubsub/subscribe.js
+++ b/packages/ipfs-grpc-client/src/core-api/pubsub/subscribe.js
@@ -1,4 +1,3 @@
-
 import { serverStreamToIterator } from '../../utils/server-stream-to-iterator.js'
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 import { subscriptions } from './subscriptions.js'
diff --git a/packages/ipfs-grpc-client/src/core-api/pubsub/unsubscribe.js b/packages/ipfs-grpc-client/src/core-api/pubsub/unsubscribe.js
index 5215073f86..6cde404225 100644
--- a/packages/ipfs-grpc-client/src/core-api/pubsub/unsubscribe.js
+++ b/packages/ipfs-grpc-client/src/core-api/pubsub/unsubscribe.js
@@ -1,4 +1,3 @@
-
 import { withTimeoutOption } from 'ipfs-core-utils/with-timeout-option'
 import { toHeaders } from '../../utils/to-headers.js'
 import { unaryToPromise } from '../../utils/unary-to-promise.js'
diff --git a/packages/ipfs-grpc-client/src/grpc/transport.browser.js b/packages/ipfs-grpc-client/src/grpc/transport.browser.js
index e4ce805398..6093f9bacc 100644
--- a/packages/ipfs-grpc-client/src/grpc/transport.browser.js
+++ b/packages/ipfs-grpc-client/src/grpc/transport.browser.js
@@ -1,4 +1,3 @@
-
 import grpcWeb from '@improbable-eng/grpc-web'
 
 export const transport = () => grpcWeb.grpc.WebsocketTransport
diff --git a/packages/ipfs-grpc-client/src/index.js b/packages/ipfs-grpc-client/src/index.js
index d38a9d46b9..48eea10903 100644
--- a/packages/ipfs-grpc-client/src/index.js
+++ b/packages/ipfs-grpc-client/src/index.js
@@ -1,4 +1,3 @@
-
 import { toUrlString } from 'ipfs-core-utils/to-url-string'
 import { loadServices } from './utils/load-services.js'
 import grpcWeb from '@improbable-eng/grpc-web'
diff --git a/packages/ipfs-grpc-client/src/utils/bidi-to-duplex.js b/packages/ipfs-grpc-client/src/utils/bidi-to-duplex.js
index 7d178a94af..c87e98bc0d 100644
--- a/packages/ipfs-grpc-client/src/utils/bidi-to-duplex.js
+++ b/packages/ipfs-grpc-client/src/utils/bidi-to-duplex.js
@@ -1,4 +1,3 @@
-
 import pushable from 'it-pushable'
 import errCode from 'err-code'
 import { toUrlString } from 'ipfs-core-utils/to-url-string'
diff --git a/packages/ipfs-grpc-client/src/utils/client-stream-to-promise.js b/packages/ipfs-grpc-client/src/utils/client-stream-to-promise.js
index 156fdf566f..0322f2f765 100644
--- a/packages/ipfs-grpc-client/src/utils/client-stream-to-promise.js
+++ b/packages/ipfs-grpc-client/src/utils/client-stream-to-promise.js
@@ -1,4 +1,3 @@
-
 import first from 'it-first'
 import { bidiToDuplex } from './bidi-to-duplex.js'
 
diff --git a/packages/ipfs-grpc-client/src/utils/server-stream-to-iterator.js b/packages/ipfs-grpc-client/src/utils/server-stream-to-iterator.js
index 0dba3b8019..3e4b680d02 100644
--- a/packages/ipfs-grpc-client/src/utils/server-stream-to-iterator.js
+++ b/packages/ipfs-grpc-client/src/utils/server-stream-to-iterator.js
@@ -1,4 +1,3 @@
-
 import { bidiToDuplex } from './bidi-to-duplex.js'
 
 /**
diff --git a/packages/ipfs-grpc-client/src/utils/to-headers.js b/packages/ipfs-grpc-client/src/utils/to-headers.js
index 3d29597b39..98b23f1e3a 100644
--- a/packages/ipfs-grpc-client/src/utils/to-headers.js
+++ b/packages/ipfs-grpc-client/src/utils/to-headers.js
@@ -1,4 +1,3 @@
-
 import { paramCase } from 'change-case'
 
 /**
diff --git a/packages/ipfs-grpc-client/src/utils/unary-to-promise.js b/packages/ipfs-grpc-client/src/utils/unary-to-promise.js
index 9088fefdee..abb9d5349f 100644
--- a/packages/ipfs-grpc-client/src/utils/unary-to-promise.js
+++ b/packages/ipfs-grpc-client/src/utils/unary-to-promise.js
@@ -1,4 +1,3 @@
-
 import first from 'it-first'
 import { bidiToDuplex } from './bidi-to-duplex.js'
 
diff --git a/packages/ipfs-grpc-server/src/endpoints/add.js b/packages/ipfs-grpc-server/src/endpoints/add.js
index 90c25c844f..cb2e8fe497 100644
--- a/packages/ipfs-grpc-server/src/endpoints/add.js
+++ b/packages/ipfs-grpc-server/src/endpoints/add.js
@@ -1,4 +1,3 @@
-
 import pushable from 'it-pushable'
 import { pipe } from 'it-pipe'
 import { encodeMtime } from '../utils/encode-mtime.js'
diff --git a/packages/ipfs-grpc-server/src/endpoints/id.js b/packages/ipfs-grpc-server/src/endpoints/id.js
index 19e4c33ec3..585586338a 100644
--- a/packages/ipfs-grpc-server/src/endpoints/id.js
+++ b/packages/ipfs-grpc-server/src/endpoints/id.js
@@ -1,4 +1,3 @@
-
 import { callbackify } from 'util'
 
 /**
diff --git a/packages/ipfs-grpc-server/src/endpoints/mfs/ls.js b/packages/ipfs-grpc-server/src/endpoints/mfs/ls.js
index d36834505c..c323ac15fd 100644
--- a/packages/ipfs-grpc-server/src/endpoints/mfs/ls.js
+++ b/packages/ipfs-grpc-server/src/endpoints/mfs/ls.js
@@ -1,4 +1,3 @@
-
 import { encodeMtime } from '../../utils/encode-mtime.js'
 
 /**
diff --git a/packages/ipfs-grpc-server/src/endpoints/mfs/write.js b/packages/ipfs-grpc-server/src/endpoints/mfs/write.js
index df6a830e10..b7aaf16fe2 100644
--- a/packages/ipfs-grpc-server/src/endpoints/mfs/write.js
+++ b/packages/ipfs-grpc-server/src/endpoints/mfs/write.js
@@ -1,4 +1,3 @@
-
 import peekable from 'it-peekable'
 import map from 'it-map'
 import { callbackify } from 'util'
diff --git a/packages/ipfs-grpc-server/src/endpoints/pubsub/subscribe.js b/packages/ipfs-grpc-server/src/endpoints/pubsub/subscribe.js
index fbbb5877e9..0d6c69749d 100644
--- a/packages/ipfs-grpc-server/src/endpoints/pubsub/subscribe.js
+++ b/packages/ipfs-grpc-server/src/endpoints/pubsub/subscribe.js
@@ -1,4 +1,3 @@
-
 import { subscriptions } from './subscriptions.js'
 import { nanoid } from 'nanoid'
 
diff --git a/packages/ipfs-grpc-server/src/endpoints/pubsub/unsubscribe.js b/packages/ipfs-grpc-server/src/endpoints/pubsub/unsubscribe.js
index d7af8aeb24..4056079d4a 100644
--- a/packages/ipfs-grpc-server/src/endpoints/pubsub/unsubscribe.js
+++ b/packages/ipfs-grpc-server/src/endpoints/pubsub/unsubscribe.js
@@ -1,4 +1,3 @@
-
 import { subscriptions } from './subscriptions.js'
 import { callbackify } from 'util'
 
diff --git a/packages/ipfs-grpc-server/src/index.js b/packages/ipfs-grpc-server/src/index.js
index 8912e7d1f2..25c09b04e3 100644
--- a/packages/ipfs-grpc-server/src/index.js
+++ b/packages/ipfs-grpc-server/src/index.js
@@ -1,4 +1,3 @@
-
 import grpc from '@grpc/grpc-js'
 import first from 'it-first'
 import debug from 'debug'
diff --git a/packages/ipfs-grpc-server/src/utils/web-socket-message-channel.js b/packages/ipfs-grpc-server/src/utils/web-socket-message-channel.js
index 6c5b4c688e..97de8cb95f 100644
--- a/packages/ipfs-grpc-server/src/utils/web-socket-message-channel.js
+++ b/packages/ipfs-grpc-server/src/utils/web-socket-message-channel.js
@@ -1,4 +1,3 @@
-
 import pushable from 'it-pushable'
 import { paramCase } from 'change-case'
 
diff --git a/packages/ipfs-grpc-server/src/utils/web-socket-server.js b/packages/ipfs-grpc-server/src/utils/web-socket-server.js
index a3da284a9b..16533a30d4 100644
--- a/packages/ipfs-grpc-server/src/utils/web-socket-server.js
+++ b/packages/ipfs-grpc-server/src/utils/web-socket-server.js
@@ -1,4 +1,3 @@
-
 import WS from 'ws'
 import { EventEmitter } from 'events'
 import { WebSocketMessageChannel } from './web-socket-message-channel.js'
diff --git a/packages/ipfs-http-client/src/add-all.js b/packages/ipfs-http-client/src/add-all.js
index a92f473f66..d15cfa1b3d 100644
--- a/packages/ipfs-http-client/src/add-all.js
+++ b/packages/ipfs-http-client/src/add-all.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { objectToCamel } from './lib/object-to-camel.js'
 import { configure } from './lib/configure.js'
diff --git a/packages/ipfs-http-client/src/add.js b/packages/ipfs-http-client/src/add.js
index 402c841c85..d668440b7c 100644
--- a/packages/ipfs-http-client/src/add.js
+++ b/packages/ipfs-http-client/src/add.js
@@ -1,4 +1,3 @@
-
 import { createAddAll } from './add-all.js'
 import last from 'it-last'
 import { configure } from './lib/configure.js'
diff --git a/packages/ipfs-http-client/src/bitswap/stat.js b/packages/ipfs-http-client/src/bitswap/stat.js
index 9cb56cbbb3..fd5fff6659 100644
--- a/packages/ipfs-http-client/src/bitswap/stat.js
+++ b/packages/ipfs-http-client/src/bitswap/stat.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/bitswap/unwant.js b/packages/ipfs-http-client/src/bitswap/unwant.js
index 392ff293dd..d2e93f8b1f 100644
--- a/packages/ipfs-http-client/src/bitswap/unwant.js
+++ b/packages/ipfs-http-client/src/bitswap/unwant.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/bitswap/wantlist-for-peer.js b/packages/ipfs-http-client/src/bitswap/wantlist-for-peer.js
index e944da5833..8a7a9fd15f 100644
--- a/packages/ipfs-http-client/src/bitswap/wantlist-for-peer.js
+++ b/packages/ipfs-http-client/src/bitswap/wantlist-for-peer.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/bitswap/wantlist.js b/packages/ipfs-http-client/src/bitswap/wantlist.js
index 91f240f5a9..268327ca3b 100644
--- a/packages/ipfs-http-client/src/bitswap/wantlist.js
+++ b/packages/ipfs-http-client/src/bitswap/wantlist.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/block/get.js b/packages/ipfs-http-client/src/block/get.js
index d821307dcc..07764a143a 100644
--- a/packages/ipfs-http-client/src/block/get.js
+++ b/packages/ipfs-http-client/src/block/get.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/block/index.js b/packages/ipfs-http-client/src/block/index.js
index 67e96c2d49..c57e668dbb 100644
--- a/packages/ipfs-http-client/src/block/index.js
+++ b/packages/ipfs-http-client/src/block/index.js
@@ -1,4 +1,3 @@
-
 import { createGet } from './get.js'
 import { createPut } from './put.js'
 import { createRm } from './rm.js'
diff --git a/packages/ipfs-http-client/src/block/put.js b/packages/ipfs-http-client/src/block/put.js
index 90b1f98d01..36ad65d1ae 100644
--- a/packages/ipfs-http-client/src/block/put.js
+++ b/packages/ipfs-http-client/src/block/put.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { multipartRequest } from 'ipfs-core-utils/multipart-request'
 import { configure } from '../lib/configure.js'
diff --git a/packages/ipfs-http-client/src/block/rm.js b/packages/ipfs-http-client/src/block/rm.js
index aaa17cf4ac..0f2b930ede 100644
--- a/packages/ipfs-http-client/src/block/rm.js
+++ b/packages/ipfs-http-client/src/block/rm.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/block/stat.js b/packages/ipfs-http-client/src/block/stat.js
index b1ddb3fb7a..f136525d92 100644
--- a/packages/ipfs-http-client/src/block/stat.js
+++ b/packages/ipfs-http-client/src/block/stat.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/bootstrap/add.js b/packages/ipfs-http-client/src/bootstrap/add.js
index 037f975996..168e74af70 100644
--- a/packages/ipfs-http-client/src/bootstrap/add.js
+++ b/packages/ipfs-http-client/src/bootstrap/add.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 import { Multiaddr } from 'multiaddr'
diff --git a/packages/ipfs-http-client/src/bootstrap/clear.js b/packages/ipfs-http-client/src/bootstrap/clear.js
index e9a07804bc..425d66be3f 100644
--- a/packages/ipfs-http-client/src/bootstrap/clear.js
+++ b/packages/ipfs-http-client/src/bootstrap/clear.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 import { Multiaddr } from 'multiaddr'
diff --git a/packages/ipfs-http-client/src/bootstrap/index.js b/packages/ipfs-http-client/src/bootstrap/index.js
index 7e5d5bd2ec..bf5d2f4821 100644
--- a/packages/ipfs-http-client/src/bootstrap/index.js
+++ b/packages/ipfs-http-client/src/bootstrap/index.js
@@ -1,4 +1,3 @@
-
 import { createAdd } from './add.js'
 import { createClear } from './clear.js'
 import { createList } from './list.js'
diff --git a/packages/ipfs-http-client/src/bootstrap/list.js b/packages/ipfs-http-client/src/bootstrap/list.js
index 3bdb5d3acb..7913370dcb 100644
--- a/packages/ipfs-http-client/src/bootstrap/list.js
+++ b/packages/ipfs-http-client/src/bootstrap/list.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 import { Multiaddr } from 'multiaddr'
diff --git a/packages/ipfs-http-client/src/bootstrap/reset.js b/packages/ipfs-http-client/src/bootstrap/reset.js
index bf18a86695..3f70473f1f 100644
--- a/packages/ipfs-http-client/src/bootstrap/reset.js
+++ b/packages/ipfs-http-client/src/bootstrap/reset.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 import { Multiaddr } from 'multiaddr'
diff --git a/packages/ipfs-http-client/src/bootstrap/rm.js b/packages/ipfs-http-client/src/bootstrap/rm.js
index 14adf8f841..8073232919 100644
--- a/packages/ipfs-http-client/src/bootstrap/rm.js
+++ b/packages/ipfs-http-client/src/bootstrap/rm.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 import { Multiaddr } from 'multiaddr'
diff --git a/packages/ipfs-http-client/src/cat.js b/packages/ipfs-http-client/src/cat.js
index a6eab244ef..b28e3df123 100644
--- a/packages/ipfs-http-client/src/cat.js
+++ b/packages/ipfs-http-client/src/cat.js
@@ -1,4 +1,3 @@
-
 import { configure } from './lib/configure.js'
 import { toUrlSearchParams } from './lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/commands.js b/packages/ipfs-http-client/src/commands.js
index 6593a65ebb..9949f864b7 100644
--- a/packages/ipfs-http-client/src/commands.js
+++ b/packages/ipfs-http-client/src/commands.js
@@ -1,4 +1,3 @@
-
 import { configure } from './lib/configure.js'
 import { toUrlSearchParams } from './lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/config/get-all.js b/packages/ipfs-http-client/src/config/get-all.js
index 1c0d7a30d4..efd5478325 100644
--- a/packages/ipfs-http-client/src/config/get-all.js
+++ b/packages/ipfs-http-client/src/config/get-all.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/config/get.js b/packages/ipfs-http-client/src/config/get.js
index 0e55bb6338..dc422247f4 100644
--- a/packages/ipfs-http-client/src/config/get.js
+++ b/packages/ipfs-http-client/src/config/get.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/config/profiles/apply.js b/packages/ipfs-http-client/src/config/profiles/apply.js
index 63cfba9f9f..2e8ac2a6bb 100644
--- a/packages/ipfs-http-client/src/config/profiles/apply.js
+++ b/packages/ipfs-http-client/src/config/profiles/apply.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../../lib/configure.js'
 import { toUrlSearchParams } from '../../lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/config/profiles/index.js b/packages/ipfs-http-client/src/config/profiles/index.js
index 62ab997684..d8f41a7904 100644
--- a/packages/ipfs-http-client/src/config/profiles/index.js
+++ b/packages/ipfs-http-client/src/config/profiles/index.js
@@ -1,4 +1,3 @@
-
 import { createApply } from './apply.js'
 import { createList } from './list.js'
 
diff --git a/packages/ipfs-http-client/src/config/profiles/list.js b/packages/ipfs-http-client/src/config/profiles/list.js
index 97989a4770..5692245cfb 100644
--- a/packages/ipfs-http-client/src/config/profiles/list.js
+++ b/packages/ipfs-http-client/src/config/profiles/list.js
@@ -1,4 +1,3 @@
-
 import { objectToCamel } from '../../lib/object-to-camel.js'
 import { configure } from '../../lib/configure.js'
 import { toUrlSearchParams } from '../../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/config/replace.js b/packages/ipfs-http-client/src/config/replace.js
index 410b594a57..196288a443 100644
--- a/packages/ipfs-http-client/src/config/replace.js
+++ b/packages/ipfs-http-client/src/config/replace.js
@@ -1,4 +1,3 @@
-
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { multipartRequest } from 'ipfs-core-utils/multipart-request'
 import { configure } from '../lib/configure.js'
diff --git a/packages/ipfs-http-client/src/config/set.js b/packages/ipfs-http-client/src/config/set.js
index df17aa68b5..7c4910f0fd 100644
--- a/packages/ipfs-http-client/src/config/set.js
+++ b/packages/ipfs-http-client/src/config/set.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/dag/export.js b/packages/ipfs-http-client/src/dag/export.js
index f9b750bacf..eb66d26559 100644
--- a/packages/ipfs-http-client/src/dag/export.js
+++ b/packages/ipfs-http-client/src/dag/export.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/dag/get.js b/packages/ipfs-http-client/src/dag/get.js
index e14d5f8b7c..6d2def0b05 100644
--- a/packages/ipfs-http-client/src/dag/get.js
+++ b/packages/ipfs-http-client/src/dag/get.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { resolve } from '../lib/resolve.js'
 import first from 'it-first'
diff --git a/packages/ipfs-http-client/src/dag/import.js b/packages/ipfs-http-client/src/dag/import.js
index eaeeaa1cd3..1c60c57768 100644
--- a/packages/ipfs-http-client/src/dag/import.js
+++ b/packages/ipfs-http-client/src/dag/import.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 import { abortSignal } from '../lib/abort-signal.js'
diff --git a/packages/ipfs-http-client/src/dag/put.js b/packages/ipfs-http-client/src/dag/put.js
index 0aae4dc418..ded70c968d 100644
--- a/packages/ipfs-http-client/src/dag/put.js
+++ b/packages/ipfs-http-client/src/dag/put.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { configure } from '../lib/configure.js'
 import { multipartRequest } from 'ipfs-core-utils/multipart-request'
diff --git a/packages/ipfs-http-client/src/dag/resolve.js b/packages/ipfs-http-client/src/dag/resolve.js
index 59d189aa1c..8fcc663e26 100644
--- a/packages/ipfs-http-client/src/dag/resolve.js
+++ b/packages/ipfs-http-client/src/dag/resolve.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/dht/find-peer.js b/packages/ipfs-http-client/src/dht/find-peer.js
index c35cf22e86..7077095f6a 100644
--- a/packages/ipfs-http-client/src/dht/find-peer.js
+++ b/packages/ipfs-http-client/src/dht/find-peer.js
@@ -1,4 +1,3 @@
-
 import { Multiaddr } from 'multiaddr'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/dht/find-provs.js b/packages/ipfs-http-client/src/dht/find-provs.js
index df9159c1bc..915d511ea9 100644
--- a/packages/ipfs-http-client/src/dht/find-provs.js
+++ b/packages/ipfs-http-client/src/dht/find-provs.js
@@ -1,4 +1,3 @@
-
 import { Multiaddr } from 'multiaddr'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/dht/get.js b/packages/ipfs-http-client/src/dht/get.js
index af7e710b3f..651978692d 100644
--- a/packages/ipfs-http-client/src/dht/get.js
+++ b/packages/ipfs-http-client/src/dht/get.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 import { Value } from './response-types.js'
diff --git a/packages/ipfs-http-client/src/dht/provide.js b/packages/ipfs-http-client/src/dht/provide.js
index 49a59dfb83..71b23e5036 100644
--- a/packages/ipfs-http-client/src/dht/provide.js
+++ b/packages/ipfs-http-client/src/dht/provide.js
@@ -1,4 +1,3 @@
-
 import { Multiaddr } from 'multiaddr'
 import { objectToCamel } from '../lib/object-to-camel.js'
 import { configure } from '../lib/configure.js'
diff --git a/packages/ipfs-http-client/src/dht/put.js b/packages/ipfs-http-client/src/dht/put.js
index 7d7805eb64..536e1099d1 100644
--- a/packages/ipfs-http-client/src/dht/put.js
+++ b/packages/ipfs-http-client/src/dht/put.js
@@ -1,4 +1,3 @@
-
 import { Multiaddr } from 'multiaddr'
 import { objectToCamel } from '../lib/object-to-camel.js'
 import { configure } from '../lib/configure.js'
diff --git a/packages/ipfs-http-client/src/dht/query.js b/packages/ipfs-http-client/src/dht/query.js
index 8beca79c8c..0923f44bba 100644
--- a/packages/ipfs-http-client/src/dht/query.js
+++ b/packages/ipfs-http-client/src/dht/query.js
@@ -1,4 +1,3 @@
-
 import { Multiaddr } from 'multiaddr'
 import { objectToCamel } from '../lib/object-to-camel.js'
 import { configure } from '../lib/configure.js'
diff --git a/packages/ipfs-http-client/src/diag/cmds.js b/packages/ipfs-http-client/src/diag/cmds.js
index bf0b36621c..2917639087 100644
--- a/packages/ipfs-http-client/src/diag/cmds.js
+++ b/packages/ipfs-http-client/src/diag/cmds.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/diag/net.js b/packages/ipfs-http-client/src/diag/net.js
index 7fa93a12ab..a4cad916e8 100644
--- a/packages/ipfs-http-client/src/diag/net.js
+++ b/packages/ipfs-http-client/src/diag/net.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/diag/sys.js b/packages/ipfs-http-client/src/diag/sys.js
index 9e73423eec..c7500be06d 100644
--- a/packages/ipfs-http-client/src/diag/sys.js
+++ b/packages/ipfs-http-client/src/diag/sys.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/dns.js b/packages/ipfs-http-client/src/dns.js
index 4b7a4193ac..89c4a2f6eb 100644
--- a/packages/ipfs-http-client/src/dns.js
+++ b/packages/ipfs-http-client/src/dns.js
@@ -1,4 +1,3 @@
-
 import { configure } from './lib/configure.js'
 import { toUrlSearchParams } from './lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/files/chmod.js b/packages/ipfs-http-client/src/files/chmod.js
index 69342940dc..d5317969e1 100644
--- a/packages/ipfs-http-client/src/files/chmod.js
+++ b/packages/ipfs-http-client/src/files/chmod.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/files/cp.js b/packages/ipfs-http-client/src/files/cp.js
index 77684df8f2..15086e6f42 100644
--- a/packages/ipfs-http-client/src/files/cp.js
+++ b/packages/ipfs-http-client/src/files/cp.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/files/flush.js b/packages/ipfs-http-client/src/files/flush.js
index 77c8ede5ea..1784353162 100644
--- a/packages/ipfs-http-client/src/files/flush.js
+++ b/packages/ipfs-http-client/src/files/flush.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/files/ls.js b/packages/ipfs-http-client/src/files/ls.js
index 3567c7544e..cd125f192e 100644
--- a/packages/ipfs-http-client/src/files/ls.js
+++ b/packages/ipfs-http-client/src/files/ls.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { objectToCamelWithMetadata } from '../lib/object-to-camel-with-metadata.js'
 import { configure } from '../lib/configure.js'
diff --git a/packages/ipfs-http-client/src/files/mkdir.js b/packages/ipfs-http-client/src/files/mkdir.js
index 6bbe75357e..a81344c54a 100644
--- a/packages/ipfs-http-client/src/files/mkdir.js
+++ b/packages/ipfs-http-client/src/files/mkdir.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/files/mv.js b/packages/ipfs-http-client/src/files/mv.js
index 5969ce82a2..2a2ac1aa94 100644
--- a/packages/ipfs-http-client/src/files/mv.js
+++ b/packages/ipfs-http-client/src/files/mv.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/files/rm.js b/packages/ipfs-http-client/src/files/rm.js
index 24e097de17..8f4ec45817 100644
--- a/packages/ipfs-http-client/src/files/rm.js
+++ b/packages/ipfs-http-client/src/files/rm.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/files/stat.js b/packages/ipfs-http-client/src/files/stat.js
index 8014872ff9..83381b265d 100644
--- a/packages/ipfs-http-client/src/files/stat.js
+++ b/packages/ipfs-http-client/src/files/stat.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { objectToCamelWithMetadata } from '../lib/object-to-camel-with-metadata.js'
 import { configure } from '../lib/configure.js'
diff --git a/packages/ipfs-http-client/src/files/touch.js b/packages/ipfs-http-client/src/files/touch.js
index ed81dc2f6b..8a004f7c90 100644
--- a/packages/ipfs-http-client/src/files/touch.js
+++ b/packages/ipfs-http-client/src/files/touch.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/files/write.js b/packages/ipfs-http-client/src/files/write.js
index 4da99ffd3f..8fd918589f 100644
--- a/packages/ipfs-http-client/src/files/write.js
+++ b/packages/ipfs-http-client/src/files/write.js
@@ -1,4 +1,3 @@
-
 import { modeToString } from '../lib/mode-to-string.js'
 import { parseMtime } from '../lib/parse-mtime.js'
 import { configure } from '../lib/configure.js'
diff --git a/packages/ipfs-http-client/src/get-endpoint-config.js b/packages/ipfs-http-client/src/get-endpoint-config.js
index 466b655934..69fb516c94 100644
--- a/packages/ipfs-http-client/src/get-endpoint-config.js
+++ b/packages/ipfs-http-client/src/get-endpoint-config.js
@@ -1,4 +1,3 @@
-
 import { configure } from './lib/configure.js'
 
 export const createGetEndpointConfig = configure(api => {
diff --git a/packages/ipfs-http-client/src/get.js b/packages/ipfs-http-client/src/get.js
index 7497cec39b..d01d23fcd7 100644
--- a/packages/ipfs-http-client/src/get.js
+++ b/packages/ipfs-http-client/src/get.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { configure } from './lib/configure.js'
 import { toUrlSearchParams } from './lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/id.js b/packages/ipfs-http-client/src/id.js
index de08e12a2e..3a350380f8 100644
--- a/packages/ipfs-http-client/src/id.js
+++ b/packages/ipfs-http-client/src/id.js
@@ -1,4 +1,3 @@
-
 import { objectToCamel } from './lib/object-to-camel.js'
 import { Multiaddr } from 'multiaddr'
 import { configure } from './lib/configure.js'
diff --git a/packages/ipfs-http-client/src/is-online.js b/packages/ipfs-http-client/src/is-online.js
index 9c7c2f26cc..bd42683b0b 100644
--- a/packages/ipfs-http-client/src/is-online.js
+++ b/packages/ipfs-http-client/src/is-online.js
@@ -1,4 +1,3 @@
-
 import { createId } from './id.js'
 
 /**
diff --git a/packages/ipfs-http-client/src/key/export.js b/packages/ipfs-http-client/src/key/export.js
index 7f26853567..3afb13a43e 100644
--- a/packages/ipfs-http-client/src/key/export.js
+++ b/packages/ipfs-http-client/src/key/export.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import errCode from 'err-code'
 
diff --git a/packages/ipfs-http-client/src/key/gen.js b/packages/ipfs-http-client/src/key/gen.js
index 235e73c135..d6c50d21f2 100644
--- a/packages/ipfs-http-client/src/key/gen.js
+++ b/packages/ipfs-http-client/src/key/gen.js
@@ -1,4 +1,3 @@
-
 import { objectToCamel } from '../lib/object-to-camel.js'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/key/import.js b/packages/ipfs-http-client/src/key/import.js
index e16c951774..fa745f2900 100644
--- a/packages/ipfs-http-client/src/key/import.js
+++ b/packages/ipfs-http-client/src/key/import.js
@@ -1,4 +1,3 @@
-
 import { objectToCamel } from '../lib/object-to-camel.js'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/key/info.js b/packages/ipfs-http-client/src/key/info.js
index 0250ec853a..8e86029684 100644
--- a/packages/ipfs-http-client/src/key/info.js
+++ b/packages/ipfs-http-client/src/key/info.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import errCode from 'err-code'
 
diff --git a/packages/ipfs-http-client/src/key/list.js b/packages/ipfs-http-client/src/key/list.js
index 63887a97da..9d5ba864e3 100644
--- a/packages/ipfs-http-client/src/key/list.js
+++ b/packages/ipfs-http-client/src/key/list.js
@@ -1,4 +1,3 @@
-
 import { objectToCamel } from '../lib/object-to-camel.js'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/key/rename.js b/packages/ipfs-http-client/src/key/rename.js
index 1f6ebab4e2..2dcdd995ec 100644
--- a/packages/ipfs-http-client/src/key/rename.js
+++ b/packages/ipfs-http-client/src/key/rename.js
@@ -1,4 +1,3 @@
-
 import { objectToCamel } from '../lib/object-to-camel.js'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/key/rm.js b/packages/ipfs-http-client/src/key/rm.js
index e4f9226867..3a51313fbc 100644
--- a/packages/ipfs-http-client/src/key/rm.js
+++ b/packages/ipfs-http-client/src/key/rm.js
@@ -1,4 +1,3 @@
-
 import { objectToCamel } from '../lib/object-to-camel.js'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/lib/abort-signal.js b/packages/ipfs-http-client/src/lib/abort-signal.js
index 5b93ffd015..677a1f40df 100644
--- a/packages/ipfs-http-client/src/lib/abort-signal.js
+++ b/packages/ipfs-http-client/src/lib/abort-signal.js
@@ -1,4 +1,3 @@
-
 import { anySignal } from 'any-signal'
 
 /**
diff --git a/packages/ipfs-http-client/src/lib/object-to-camel-with-metadata.js b/packages/ipfs-http-client/src/lib/object-to-camel-with-metadata.js
index f7bef6d918..3e72a17a9a 100644
--- a/packages/ipfs-http-client/src/lib/object-to-camel-with-metadata.js
+++ b/packages/ipfs-http-client/src/lib/object-to-camel-with-metadata.js
@@ -1,4 +1,3 @@
-
 import { objectToCamel } from './object-to-camel.js'
 
 /**
diff --git a/packages/ipfs-http-client/src/lib/parse-mtime.js b/packages/ipfs-http-client/src/lib/parse-mtime.js
index 90b2597f37..89a30164c6 100644
--- a/packages/ipfs-http-client/src/lib/parse-mtime.js
+++ b/packages/ipfs-http-client/src/lib/parse-mtime.js
@@ -1,4 +1,3 @@
-
 import errCode from 'err-code'
 
 /**
diff --git a/packages/ipfs-http-client/src/lib/resolve.js b/packages/ipfs-http-client/src/lib/resolve.js
index 32b98387cc..33dd67d5e0 100644
--- a/packages/ipfs-http-client/src/lib/resolve.js
+++ b/packages/ipfs-http-client/src/lib/resolve.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import errCode from 'err-code'
 
diff --git a/packages/ipfs-http-client/src/lib/to-url-search-params.js b/packages/ipfs-http-client/src/lib/to-url-search-params.js
index 359a51aef1..3e226546ce 100644
--- a/packages/ipfs-http-client/src/lib/to-url-search-params.js
+++ b/packages/ipfs-http-client/src/lib/to-url-search-params.js
@@ -1,4 +1,3 @@
-
 import { modeToString } from './mode-to-string.js'
 import { parseMtime } from '../lib/parse-mtime.js'
 
diff --git a/packages/ipfs-http-client/src/log/level.js b/packages/ipfs-http-client/src/log/level.js
index 8e1a572b7b..f27906932c 100644
--- a/packages/ipfs-http-client/src/log/level.js
+++ b/packages/ipfs-http-client/src/log/level.js
@@ -1,4 +1,3 @@
-
 import { objectToCamel } from '../lib/object-to-camel.js'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/log/ls.js b/packages/ipfs-http-client/src/log/ls.js
index 63ec48986b..8118cb5f13 100644
--- a/packages/ipfs-http-client/src/log/ls.js
+++ b/packages/ipfs-http-client/src/log/ls.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/log/tail.js b/packages/ipfs-http-client/src/log/tail.js
index c63833dec5..a52dd9f6c5 100644
--- a/packages/ipfs-http-client/src/log/tail.js
+++ b/packages/ipfs-http-client/src/log/tail.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/ls.js b/packages/ipfs-http-client/src/ls.js
index 4b4f300f26..f2f4083fc7 100644
--- a/packages/ipfs-http-client/src/ls.js
+++ b/packages/ipfs-http-client/src/ls.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { configure } from './lib/configure.js'
 import { toUrlSearchParams } from './lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/mount.js b/packages/ipfs-http-client/src/mount.js
index 84a2d56869..1714611742 100644
--- a/packages/ipfs-http-client/src/mount.js
+++ b/packages/ipfs-http-client/src/mount.js
@@ -1,4 +1,3 @@
-
 import { objectToCamel } from './lib/object-to-camel.js'
 import { configure } from './lib/configure.js'
 import { toUrlSearchParams } from './lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/name/publish.js b/packages/ipfs-http-client/src/name/publish.js
index 5f1c542203..dba180da64 100644
--- a/packages/ipfs-http-client/src/name/publish.js
+++ b/packages/ipfs-http-client/src/name/publish.js
@@ -1,4 +1,3 @@
-
 import { objectToCamel } from '../lib/object-to-camel.js'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/name/pubsub/cancel.js b/packages/ipfs-http-client/src/name/pubsub/cancel.js
index 3caa5d66fa..e2e0bb73dd 100644
--- a/packages/ipfs-http-client/src/name/pubsub/cancel.js
+++ b/packages/ipfs-http-client/src/name/pubsub/cancel.js
@@ -1,4 +1,3 @@
-
 import { objectToCamel } from '../../lib/object-to-camel.js'
 import { configure } from '../../lib/configure.js'
 import { toUrlSearchParams } from '../../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/name/pubsub/state.js b/packages/ipfs-http-client/src/name/pubsub/state.js
index efcbc07e31..db6d374771 100644
--- a/packages/ipfs-http-client/src/name/pubsub/state.js
+++ b/packages/ipfs-http-client/src/name/pubsub/state.js
@@ -1,4 +1,3 @@
-
 import { objectToCamel } from '../../lib/object-to-camel.js'
 import { configure } from '../../lib/configure.js'
 import { toUrlSearchParams } from '../../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/name/pubsub/subs.js b/packages/ipfs-http-client/src/name/pubsub/subs.js
index 2de33fe38c..5fef0dff54 100644
--- a/packages/ipfs-http-client/src/name/pubsub/subs.js
+++ b/packages/ipfs-http-client/src/name/pubsub/subs.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../../lib/configure.js'
 import { toUrlSearchParams } from '../../lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/name/resolve.js b/packages/ipfs-http-client/src/name/resolve.js
index 896a6db4fe..92d90548a3 100644
--- a/packages/ipfs-http-client/src/name/resolve.js
+++ b/packages/ipfs-http-client/src/name/resolve.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/object/data.js b/packages/ipfs-http-client/src/object/data.js
index 4581e9e632..d4760cf3bb 100644
--- a/packages/ipfs-http-client/src/object/data.js
+++ b/packages/ipfs-http-client/src/object/data.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/object/get.js b/packages/ipfs-http-client/src/object/get.js
index 751eb2263c..0e091a0e2b 100644
--- a/packages/ipfs-http-client/src/object/get.js
+++ b/packages/ipfs-http-client/src/object/get.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/object/links.js b/packages/ipfs-http-client/src/object/links.js
index abfbff06f3..5d707e39bb 100644
--- a/packages/ipfs-http-client/src/object/links.js
+++ b/packages/ipfs-http-client/src/object/links.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/object/new.js b/packages/ipfs-http-client/src/object/new.js
index a5ab0e7b82..5dc6b9b5be 100644
--- a/packages/ipfs-http-client/src/object/new.js
+++ b/packages/ipfs-http-client/src/object/new.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/object/patch/add-link.js b/packages/ipfs-http-client/src/object/patch/add-link.js
index 41e026600d..cebaf42e18 100644
--- a/packages/ipfs-http-client/src/object/patch/add-link.js
+++ b/packages/ipfs-http-client/src/object/patch/add-link.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { configure } from '../../lib/configure.js'
 import { toUrlSearchParams } from '../../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/object/patch/append-data.js b/packages/ipfs-http-client/src/object/patch/append-data.js
index e70b40e143..2e4f17bd4a 100644
--- a/packages/ipfs-http-client/src/object/patch/append-data.js
+++ b/packages/ipfs-http-client/src/object/patch/append-data.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { multipartRequest } from 'ipfs-core-utils/multipart-request'
 import { configure } from '../../lib/configure.js'
diff --git a/packages/ipfs-http-client/src/object/patch/rm-link.js b/packages/ipfs-http-client/src/object/patch/rm-link.js
index afa4c03e47..f3b1d76ced 100644
--- a/packages/ipfs-http-client/src/object/patch/rm-link.js
+++ b/packages/ipfs-http-client/src/object/patch/rm-link.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { configure } from '../../lib/configure.js'
 import { toUrlSearchParams } from '../../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/object/patch/set-data.js b/packages/ipfs-http-client/src/object/patch/set-data.js
index b37ee4bf50..fcc9037711 100644
--- a/packages/ipfs-http-client/src/object/patch/set-data.js
+++ b/packages/ipfs-http-client/src/object/patch/set-data.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { multipartRequest } from 'ipfs-core-utils/multipart-request'
 import { configure } from '../../lib/configure.js'
diff --git a/packages/ipfs-http-client/src/object/put.js b/packages/ipfs-http-client/src/object/put.js
index 39b58571af..66b59653bb 100644
--- a/packages/ipfs-http-client/src/object/put.js
+++ b/packages/ipfs-http-client/src/object/put.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { createPut as createDagPut } from '../dag/put.js'
 
diff --git a/packages/ipfs-http-client/src/object/stat.js b/packages/ipfs-http-client/src/object/stat.js
index e85c66b6f9..bfc6b9024f 100644
--- a/packages/ipfs-http-client/src/object/stat.js
+++ b/packages/ipfs-http-client/src/object/stat.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/pin/add-all.js b/packages/ipfs-http-client/src/pin/add-all.js
index e238ae6a04..46540b8d1b 100644
--- a/packages/ipfs-http-client/src/pin/add-all.js
+++ b/packages/ipfs-http-client/src/pin/add-all.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { configure } from '../lib/configure.js'
 import { normaliseInput } from 'ipfs-core-utils/pins/normalise-input'
diff --git a/packages/ipfs-http-client/src/pin/add.js b/packages/ipfs-http-client/src/pin/add.js
index 8abc6e75c7..3b4dbf99e9 100644
--- a/packages/ipfs-http-client/src/pin/add.js
+++ b/packages/ipfs-http-client/src/pin/add.js
@@ -1,4 +1,3 @@
-
 import { createAddAll } from './add-all.js'
 import last from 'it-last'
 import { configure } from '../lib/configure.js'
diff --git a/packages/ipfs-http-client/src/pin/ls.js b/packages/ipfs-http-client/src/pin/ls.js
index 8754c85e26..648631c3af 100644
--- a/packages/ipfs-http-client/src/pin/ls.js
+++ b/packages/ipfs-http-client/src/pin/ls.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/pin/rm-all.js b/packages/ipfs-http-client/src/pin/rm-all.js
index eee5599dec..d18446be42 100644
--- a/packages/ipfs-http-client/src/pin/rm-all.js
+++ b/packages/ipfs-http-client/src/pin/rm-all.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { configure } from '../lib/configure.js'
 import { normaliseInput } from 'ipfs-core-utils/pins/normalise-input'
diff --git a/packages/ipfs-http-client/src/pin/rm.js b/packages/ipfs-http-client/src/pin/rm.js
index 05b20b4a01..b966be7129 100644
--- a/packages/ipfs-http-client/src/pin/rm.js
+++ b/packages/ipfs-http-client/src/pin/rm.js
@@ -1,4 +1,3 @@
-
 import { createRmAll } from './rm-all.js'
 import last from 'it-last'
 import { configure } from '../lib/configure.js'
diff --git a/packages/ipfs-http-client/src/ping.js b/packages/ipfs-http-client/src/ping.js
index cc2c8ff3b1..7b119b124b 100644
--- a/packages/ipfs-http-client/src/ping.js
+++ b/packages/ipfs-http-client/src/ping.js
@@ -1,4 +1,3 @@
-
 import { objectToCamel } from './lib/object-to-camel.js'
 import { configure } from './lib/configure.js'
 import { toUrlSearchParams } from './lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/pubsub/ls.js b/packages/ipfs-http-client/src/pubsub/ls.js
index d1d1c90143..920e986c64 100644
--- a/packages/ipfs-http-client/src/pubsub/ls.js
+++ b/packages/ipfs-http-client/src/pubsub/ls.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/pubsub/peers.js b/packages/ipfs-http-client/src/pubsub/peers.js
index 3da77f42d7..33a0009f59 100644
--- a/packages/ipfs-http-client/src/pubsub/peers.js
+++ b/packages/ipfs-http-client/src/pubsub/peers.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/pubsub/publish.js b/packages/ipfs-http-client/src/pubsub/publish.js
index 78207f0cd3..53191f4c69 100644
--- a/packages/ipfs-http-client/src/pubsub/publish.js
+++ b/packages/ipfs-http-client/src/pubsub/publish.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 import { multipartRequest } from 'ipfs-core-utils/multipart-request'
diff --git a/packages/ipfs-http-client/src/pubsub/subscribe.js b/packages/ipfs-http-client/src/pubsub/subscribe.js
index 2a4694fbc6..7ae5b97a9e 100644
--- a/packages/ipfs-http-client/src/pubsub/subscribe.js
+++ b/packages/ipfs-http-client/src/pubsub/subscribe.js
@@ -1,4 +1,3 @@
-
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import debug from 'debug'
diff --git a/packages/ipfs-http-client/src/pubsub/subscription-tracker.js b/packages/ipfs-http-client/src/pubsub/subscription-tracker.js
index ec074dd30d..33476ccf02 100644
--- a/packages/ipfs-http-client/src/pubsub/subscription-tracker.js
+++ b/packages/ipfs-http-client/src/pubsub/subscription-tracker.js
@@ -1,4 +1,3 @@
-
 import { AbortController } from 'native-abort-controller'
 
 /**
diff --git a/packages/ipfs-http-client/src/refs/index.js b/packages/ipfs-http-client/src/refs/index.js
index d2a30dc2fa..61905df61f 100644
--- a/packages/ipfs-http-client/src/refs/index.js
+++ b/packages/ipfs-http-client/src/refs/index.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { objectToCamel } from '../lib/object-to-camel.js'
 import { configure } from '../lib/configure.js'
diff --git a/packages/ipfs-http-client/src/refs/local.js b/packages/ipfs-http-client/src/refs/local.js
index 6bc60f2426..85170698f1 100644
--- a/packages/ipfs-http-client/src/refs/local.js
+++ b/packages/ipfs-http-client/src/refs/local.js
@@ -1,4 +1,3 @@
-
 import { objectToCamel } from '../lib/object-to-camel.js'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/repo/gc.js b/packages/ipfs-http-client/src/repo/gc.js
index c03665fb41..3312a458ce 100644
--- a/packages/ipfs-http-client/src/repo/gc.js
+++ b/packages/ipfs-http-client/src/repo/gc.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/repo/stat.js b/packages/ipfs-http-client/src/repo/stat.js
index 495554c927..6b42e73046 100644
--- a/packages/ipfs-http-client/src/repo/stat.js
+++ b/packages/ipfs-http-client/src/repo/stat.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/repo/version.js b/packages/ipfs-http-client/src/repo/version.js
index 7e181d6c61..62ed3198c9 100644
--- a/packages/ipfs-http-client/src/repo/version.js
+++ b/packages/ipfs-http-client/src/repo/version.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/resolve.js b/packages/ipfs-http-client/src/resolve.js
index 1e14b5cf07..93fbb7f3d6 100644
--- a/packages/ipfs-http-client/src/resolve.js
+++ b/packages/ipfs-http-client/src/resolve.js
@@ -1,4 +1,3 @@
-
 import { configure } from './lib/configure.js'
 import { toUrlSearchParams } from './lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/start.js b/packages/ipfs-http-client/src/start.js
index 808258070a..c0b6aecd2a 100644
--- a/packages/ipfs-http-client/src/start.js
+++ b/packages/ipfs-http-client/src/start.js
@@ -1,4 +1,3 @@
-
 import { configure } from './lib/configure.js'
 import errCode from 'err-code'
 
diff --git a/packages/ipfs-http-client/src/stats/bw.js b/packages/ipfs-http-client/src/stats/bw.js
index e9819bcb57..086b178111 100644
--- a/packages/ipfs-http-client/src/stats/bw.js
+++ b/packages/ipfs-http-client/src/stats/bw.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/stop.js b/packages/ipfs-http-client/src/stop.js
index 8356c3af31..4948580bc1 100644
--- a/packages/ipfs-http-client/src/stop.js
+++ b/packages/ipfs-http-client/src/stop.js
@@ -1,4 +1,3 @@
-
 import { configure } from './lib/configure.js'
 import { toUrlSearchParams } from './lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/swarm/addrs.js b/packages/ipfs-http-client/src/swarm/addrs.js
index 2db7df2ffc..94d3e1f298 100644
--- a/packages/ipfs-http-client/src/swarm/addrs.js
+++ b/packages/ipfs-http-client/src/swarm/addrs.js
@@ -1,4 +1,3 @@
-
 import { Multiaddr } from 'multiaddr'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/swarm/connect.js b/packages/ipfs-http-client/src/swarm/connect.js
index e8369117da..0b61a99e26 100644
--- a/packages/ipfs-http-client/src/swarm/connect.js
+++ b/packages/ipfs-http-client/src/swarm/connect.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/swarm/disconnect.js b/packages/ipfs-http-client/src/swarm/disconnect.js
index 610487da7e..97f45a2688 100644
--- a/packages/ipfs-http-client/src/swarm/disconnect.js
+++ b/packages/ipfs-http-client/src/swarm/disconnect.js
@@ -1,4 +1,3 @@
-
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
 
diff --git a/packages/ipfs-http-client/src/swarm/local-addrs.js b/packages/ipfs-http-client/src/swarm/local-addrs.js
index df8c422097..c25a5771f8 100644
--- a/packages/ipfs-http-client/src/swarm/local-addrs.js
+++ b/packages/ipfs-http-client/src/swarm/local-addrs.js
@@ -1,4 +1,3 @@
-
 import { Multiaddr } from 'multiaddr'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/swarm/peers.js b/packages/ipfs-http-client/src/swarm/peers.js
index ab7b2ca15a..446269f9c1 100644
--- a/packages/ipfs-http-client/src/swarm/peers.js
+++ b/packages/ipfs-http-client/src/swarm/peers.js
@@ -1,4 +1,3 @@
-
 import { Multiaddr } from 'multiaddr'
 import { configure } from '../lib/configure.js'
 import { toUrlSearchParams } from '../lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-client/src/version.js b/packages/ipfs-http-client/src/version.js
index fd371fb53f..c8000a9b07 100644
--- a/packages/ipfs-http-client/src/version.js
+++ b/packages/ipfs-http-client/src/version.js
@@ -1,4 +1,3 @@
-
 import { objectToCamel } from './lib/object-to-camel.js'
 import { configure } from './lib/configure.js'
 import { toUrlSearchParams } from './lib/to-url-search-params.js'
diff --git a/packages/ipfs-http-gateway/src/index.js b/packages/ipfs-http-gateway/src/index.js
index a3cfe00fa8..8a69ef5ecc 100644
--- a/packages/ipfs-http-gateway/src/index.js
+++ b/packages/ipfs-http-gateway/src/index.js
@@ -1,4 +1,3 @@
-
 import Hapi from '@hapi/hapi'
 import Pino from 'hapi-pino'
 import debug from 'debug'
diff --git a/packages/ipfs-http-gateway/src/resources/gateway.js b/packages/ipfs-http-gateway/src/resources/gateway.js
index c4efc90284..e805fc155e 100644
--- a/packages/ipfs-http-gateway/src/resources/gateway.js
+++ b/packages/ipfs-http-gateway/src/resources/gateway.js
@@ -1,4 +1,3 @@
-
 import debug from 'debug'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import Boom from '@hapi/boom'
diff --git a/packages/ipfs-http-gateway/src/resources/index.js b/packages/ipfs-http-gateway/src/resources/index.js
index 8e4fe8f32f..5b6e17206b 100644
--- a/packages/ipfs-http-gateway/src/resources/index.js
+++ b/packages/ipfs-http-gateway/src/resources/index.js
@@ -1,4 +1,3 @@
-
 import { Gateway } from './gateway.js'
 
 export default {
diff --git a/packages/ipfs-http-gateway/src/routes/gateway.js b/packages/ipfs-http-gateway/src/routes/gateway.js
index d31bb1d30c..64bf29ac2b 100644
--- a/packages/ipfs-http-gateway/src/routes/gateway.js
+++ b/packages/ipfs-http-gateway/src/routes/gateway.js
@@ -1,4 +1,3 @@
-
 import Joi from 'joi'
 import resources from '../resources/index.js'
 
diff --git a/packages/ipfs-http-gateway/src/routes/index.js b/packages/ipfs-http-gateway/src/routes/index.js
index bb449272ce..673f57c034 100644
--- a/packages/ipfs-http-gateway/src/routes/index.js
+++ b/packages/ipfs-http-gateway/src/routes/index.js
@@ -1,4 +1,3 @@
-
 import Gateway from './gateway.js'
 
 export default {
diff --git a/packages/ipfs-http-server/src/api/resources/bitswap.js b/packages/ipfs-http-server/src/api/resources/bitswap.js
index a90eb1e338..e25cc77b41 100644
--- a/packages/ipfs-http-server/src/api/resources/bitswap.js
+++ b/packages/ipfs-http-server/src/api/resources/bitswap.js
@@ -1,4 +1,3 @@
-
 import Joi from '../../utils/joi.js'
 
 export const wantlistResource = {
diff --git a/packages/ipfs-http-server/src/api/resources/block.js b/packages/ipfs-http-server/src/api/resources/block.js
index 65111dee05..a4a4992efe 100644
--- a/packages/ipfs-http-server/src/api/resources/block.js
+++ b/packages/ipfs-http-server/src/api/resources/block.js
@@ -1,4 +1,3 @@
-
 import { multipartRequestParser } from '../../utils/multipart-request-parser.js'
 import Joi from '../../utils/joi.js'
 import Boom from '@hapi/boom'
diff --git a/packages/ipfs-http-server/src/api/resources/bootstrap.js b/packages/ipfs-http-server/src/api/resources/bootstrap.js
index df95810ab6..b2a8b4b3d7 100644
--- a/packages/ipfs-http-server/src/api/resources/bootstrap.js
+++ b/packages/ipfs-http-server/src/api/resources/bootstrap.js
@@ -1,4 +1,3 @@
-
 import Boom from '@hapi/boom'
 import Joi from '../../utils/joi.js'
 
diff --git a/packages/ipfs-http-server/src/api/resources/config.js b/packages/ipfs-http-server/src/api/resources/config.js
index a6c3f8a53d..05f1c58fdd 100644
--- a/packages/ipfs-http-server/src/api/resources/config.js
+++ b/packages/ipfs-http-server/src/api/resources/config.js
@@ -1,4 +1,3 @@
-
 import debug from 'debug'
 import get from 'dlv'
 import set from 'just-safe-set'
diff --git a/packages/ipfs-http-server/src/api/resources/dag.js b/packages/ipfs-http-server/src/api/resources/dag.js
index 7b49ade8bf..062ccb8dd7 100644
--- a/packages/ipfs-http-server/src/api/resources/dag.js
+++ b/packages/ipfs-http-server/src/api/resources/dag.js
@@ -1,4 +1,3 @@
-
 import { multipartRequestParser } from '../../utils/multipart-request-parser.js'
 import { streamResponse } from '../../utils/stream-response.js'
 import Joi from '../../utils/joi.js'
diff --git a/packages/ipfs-http-server/src/api/resources/dht.js b/packages/ipfs-http-server/src/api/resources/dht.js
index d8449c2d15..3ed16e8c17 100644
--- a/packages/ipfs-http-server/src/api/resources/dht.js
+++ b/packages/ipfs-http-server/src/api/resources/dht.js
@@ -1,4 +1,3 @@
-
 import Joi from '../../utils/joi.js'
 import Boom from '@hapi/boom'
 import { pipe } from 'it-pipe'
diff --git a/packages/ipfs-http-server/src/api/resources/dns.js b/packages/ipfs-http-server/src/api/resources/dns.js
index dea913cb13..cb5eed1121 100644
--- a/packages/ipfs-http-server/src/api/resources/dns.js
+++ b/packages/ipfs-http-server/src/api/resources/dns.js
@@ -1,4 +1,3 @@
-
 import Joi from '../../utils/joi.js'
 
 export const dnsResource = {
diff --git a/packages/ipfs-http-server/src/api/resources/files-regular.js b/packages/ipfs-http-server/src/api/resources/files-regular.js
index de4a192bd9..808e8b27a8 100644
--- a/packages/ipfs-http-server/src/api/resources/files-regular.js
+++ b/packages/ipfs-http-server/src/api/resources/files-regular.js
@@ -1,4 +1,3 @@
-
 import { multipartRequestParser } from '../../utils/multipart-request-parser.js'
 import Joi from '../../utils/joi.js'
 import Boom from '@hapi/boom'
diff --git a/packages/ipfs-http-server/src/api/resources/files/chmod.js b/packages/ipfs-http-server/src/api/resources/files/chmod.js
index 1656980023..f719057f9b 100644
--- a/packages/ipfs-http-server/src/api/resources/files/chmod.js
+++ b/packages/ipfs-http-server/src/api/resources/files/chmod.js
@@ -1,4 +1,3 @@
-
 import Joi from '../../../utils/joi.js'
 
 export const chmodResource = {
diff --git a/packages/ipfs-http-server/src/api/resources/files/cp.js b/packages/ipfs-http-server/src/api/resources/files/cp.js
index cdf292e9d6..7d8e2ffbd7 100644
--- a/packages/ipfs-http-server/src/api/resources/files/cp.js
+++ b/packages/ipfs-http-server/src/api/resources/files/cp.js
@@ -1,4 +1,3 @@
-
 import Joi from '../../../utils/joi.js'
 
 export const cpResource = {
diff --git a/packages/ipfs-http-server/src/api/resources/files/flush.js b/packages/ipfs-http-server/src/api/resources/files/flush.js
index f85673d21d..4a7d8ea459 100644
--- a/packages/ipfs-http-server/src/api/resources/files/flush.js
+++ b/packages/ipfs-http-server/src/api/resources/files/flush.js
@@ -1,4 +1,3 @@
-
 import Joi from '../../../utils/joi.js'
 
 export const flushResource = {
diff --git a/packages/ipfs-http-server/src/api/resources/files/ls.js b/packages/ipfs-http-server/src/api/resources/files/ls.js
index 22c409946a..9d1af684a9 100644
--- a/packages/ipfs-http-server/src/api/resources/files/ls.js
+++ b/packages/ipfs-http-server/src/api/resources/files/ls.js
@@ -1,4 +1,3 @@
-
 import Joi from '../../../utils/joi.js'
 import all from 'it-all'
 import map from 'it-map'
diff --git a/packages/ipfs-http-server/src/api/resources/files/mkdir.js b/packages/ipfs-http-server/src/api/resources/files/mkdir.js
index 807e3cc262..6b16e1bafe 100644
--- a/packages/ipfs-http-server/src/api/resources/files/mkdir.js
+++ b/packages/ipfs-http-server/src/api/resources/files/mkdir.js
@@ -1,4 +1,3 @@
-
 import Joi from '../../../utils/joi.js'
 import { parseMtime } from './utils/parse-mtime.js'
 
diff --git a/packages/ipfs-http-server/src/api/resources/files/mv.js b/packages/ipfs-http-server/src/api/resources/files/mv.js
index b50ed3c808..1d513062eb 100644
--- a/packages/ipfs-http-server/src/api/resources/files/mv.js
+++ b/packages/ipfs-http-server/src/api/resources/files/mv.js
@@ -1,4 +1,3 @@
-
 import Joi from '../../../utils/joi.js'
 
 export const mvResource = {
diff --git a/packages/ipfs-http-server/src/api/resources/files/read.js b/packages/ipfs-http-server/src/api/resources/files/read.js
index 8438a894b9..efb947b207 100644
--- a/packages/ipfs-http-server/src/api/resources/files/read.js
+++ b/packages/ipfs-http-server/src/api/resources/files/read.js
@@ -1,4 +1,3 @@
-
 import Joi from '../../../utils/joi.js'
 import { streamResponse } from '../../../utils/stream-response.js'
 
diff --git a/packages/ipfs-http-server/src/api/resources/files/rm.js b/packages/ipfs-http-server/src/api/resources/files/rm.js
index 4b3095af82..eb721af068 100644
--- a/packages/ipfs-http-server/src/api/resources/files/rm.js
+++ b/packages/ipfs-http-server/src/api/resources/files/rm.js
@@ -1,4 +1,3 @@
-
 import Joi from '../../../utils/joi.js'
 
 export const rmResource = {
diff --git a/packages/ipfs-http-server/src/api/resources/files/stat.js b/packages/ipfs-http-server/src/api/resources/files/stat.js
index c2d2e63c98..60f5fc6897 100644
--- a/packages/ipfs-http-server/src/api/resources/files/stat.js
+++ b/packages/ipfs-http-server/src/api/resources/files/stat.js
@@ -1,4 +1,3 @@
-
 import Joi from '../../../utils/joi.js'
 
 export const statResource = {
diff --git a/packages/ipfs-http-server/src/api/resources/files/touch.js b/packages/ipfs-http-server/src/api/resources/files/touch.js
index 388a6b2a0b..1e421ada75 100644
--- a/packages/ipfs-http-server/src/api/resources/files/touch.js
+++ b/packages/ipfs-http-server/src/api/resources/files/touch.js
@@ -1,4 +1,3 @@
-
 import Joi from '../../../utils/joi.js'
 import { parseMtime } from './utils/parse-mtime.js'
 
diff --git a/packages/ipfs-http-server/src/api/resources/files/write.js b/packages/ipfs-http-server/src/api/resources/files/write.js
index 15c5b4f585..012661320a 100644
--- a/packages/ipfs-http-server/src/api/resources/files/write.js
+++ b/packages/ipfs-http-server/src/api/resources/files/write.js
@@ -1,4 +1,3 @@
-
 import Joi from '../../../utils/joi.js'
 import { multipartRequestParser } from '../../../utils/multipart-request-parser.js'
 import Boom from '@hapi/boom'
diff --git a/packages/ipfs-http-server/src/api/resources/id.js b/packages/ipfs-http-server/src/api/resources/id.js
index 6482eaee25..f2642f6c4e 100644
--- a/packages/ipfs-http-server/src/api/resources/id.js
+++ b/packages/ipfs-http-server/src/api/resources/id.js
@@ -1,4 +1,3 @@
-
 import Joi from '../../utils/joi.js'
 
 export const idResource = {
diff --git a/packages/ipfs-http-server/src/api/resources/key.js b/packages/ipfs-http-server/src/api/resources/key.js
index e3ef5d1c32..7ce5b8af9d 100644
--- a/packages/ipfs-http-server/src/api/resources/key.js
+++ b/packages/ipfs-http-server/src/api/resources/key.js
@@ -1,4 +1,3 @@
-
 import Joi from '../../utils/joi.js'
 
 /**
diff --git a/packages/ipfs-http-server/src/api/resources/name.js b/packages/ipfs-http-server/src/api/resources/name.js
index f02bb7d5f7..fb1a50380f 100644
--- a/packages/ipfs-http-server/src/api/resources/name.js
+++ b/packages/ipfs-http-server/src/api/resources/name.js
@@ -1,4 +1,3 @@
-
 import Joi from '../../utils/joi.js'
 import { pipe } from 'it-pipe'
 import map from 'it-map'
diff --git a/packages/ipfs-http-server/src/api/resources/object.js b/packages/ipfs-http-server/src/api/resources/object.js
index 142e93c274..cd4f5291db 100644
--- a/packages/ipfs-http-server/src/api/resources/object.js
+++ b/packages/ipfs-http-server/src/api/resources/object.js
@@ -1,4 +1,3 @@
-
 import { multipartRequestParser } from '../../utils/multipart-request-parser.js'
 import all from 'it-all'
 import * as dagPB from '@ipld/dag-pb'
diff --git a/packages/ipfs-http-server/src/api/resources/pin.js b/packages/ipfs-http-server/src/api/resources/pin.js
index f871fe7a02..ac100b6c92 100644
--- a/packages/ipfs-http-server/src/api/resources/pin.js
+++ b/packages/ipfs-http-server/src/api/resources/pin.js
@@ -1,4 +1,3 @@
-
 import Joi from '../../utils/joi.js'
 import Boom from '@hapi/boom'
 import map from 'it-map'
diff --git a/packages/ipfs-http-server/src/api/resources/ping.js b/packages/ipfs-http-server/src/api/resources/ping.js
index 762179ebb9..6c2120aec7 100644
--- a/packages/ipfs-http-server/src/api/resources/ping.js
+++ b/packages/ipfs-http-server/src/api/resources/ping.js
@@ -1,4 +1,3 @@
-
 import Joi from '../../utils/joi.js'
 import { pipe } from 'it-pipe'
 import map from 'it-map'
diff --git a/packages/ipfs-http-server/src/api/resources/pubsub.js b/packages/ipfs-http-server/src/api/resources/pubsub.js
index c41ddd9c68..fa8caef8ed 100644
--- a/packages/ipfs-http-server/src/api/resources/pubsub.js
+++ b/packages/ipfs-http-server/src/api/resources/pubsub.js
@@ -1,4 +1,3 @@
-
 import Joi from '../../utils/joi.js'
 import all from 'it-all'
 import { multipartRequestParser } from '../../utils/multipart-request-parser.js'
diff --git a/packages/ipfs-http-server/src/api/resources/repo.js b/packages/ipfs-http-server/src/api/resources/repo.js
index c39dc979e1..44e56c7e52 100644
--- a/packages/ipfs-http-server/src/api/resources/repo.js
+++ b/packages/ipfs-http-server/src/api/resources/repo.js
@@ -1,4 +1,3 @@
-
 import Joi from '../../utils/joi.js'
 import map from 'it-map'
 import filter from 'it-filter'
diff --git a/packages/ipfs-http-server/src/api/resources/resolve.js b/packages/ipfs-http-server/src/api/resources/resolve.js
index b5a1a4e810..b23c5c2888 100644
--- a/packages/ipfs-http-server/src/api/resources/resolve.js
+++ b/packages/ipfs-http-server/src/api/resources/resolve.js
@@ -1,4 +1,3 @@
-
 import Joi from '../../utils/joi.js'
 
 export const resolveResource = {
diff --git a/packages/ipfs-http-server/src/api/resources/stats.js b/packages/ipfs-http-server/src/api/resources/stats.js
index 7a637510f3..195cfd17ba 100644
--- a/packages/ipfs-http-server/src/api/resources/stats.js
+++ b/packages/ipfs-http-server/src/api/resources/stats.js
@@ -1,4 +1,3 @@
-
 import map from 'it-map'
 import { pipe } from 'it-pipe'
 import { streamResponse } from '../../utils/stream-response.js'
diff --git a/packages/ipfs-http-server/src/api/resources/swarm.js b/packages/ipfs-http-server/src/api/resources/swarm.js
index 256f561eb8..4804a2f380 100644
--- a/packages/ipfs-http-server/src/api/resources/swarm.js
+++ b/packages/ipfs-http-server/src/api/resources/swarm.js
@@ -1,4 +1,3 @@
-
 import Joi from '../../utils/joi.js'
 
 export const peersResource = {
diff --git a/packages/ipfs-http-server/src/api/resources/version.js b/packages/ipfs-http-server/src/api/resources/version.js
index 8bd62d6523..31e3e77c4e 100644
--- a/packages/ipfs-http-server/src/api/resources/version.js
+++ b/packages/ipfs-http-server/src/api/resources/version.js
@@ -1,4 +1,3 @@
-
 import Joi from '../../utils/joi.js'
 import { ipfsHttpClient } from '../../version.js'
 
diff --git a/packages/ipfs-http-server/src/api/routes/bitswap.js b/packages/ipfs-http-server/src/api/routes/bitswap.js
index 843266367f..c1e8a98df0 100644
--- a/packages/ipfs-http-server/src/api/routes/bitswap.js
+++ b/packages/ipfs-http-server/src/api/routes/bitswap.js
@@ -1,4 +1,3 @@
-
 import {
   wantlistResource,
   statResource,
diff --git a/packages/ipfs-http-server/src/api/routes/block.js b/packages/ipfs-http-server/src/api/routes/block.js
index ea6a573667..718db16aa8 100644
--- a/packages/ipfs-http-server/src/api/routes/block.js
+++ b/packages/ipfs-http-server/src/api/routes/block.js
@@ -1,4 +1,3 @@
-
 import {
   getResource,
   putResource,
diff --git a/packages/ipfs-http-server/src/api/routes/debug.js b/packages/ipfs-http-server/src/api/routes/debug.js
index bde69fff8a..f73dd58035 100644
--- a/packages/ipfs-http-server/src/api/routes/debug.js
+++ b/packages/ipfs-http-server/src/api/routes/debug.js
@@ -1,4 +1,3 @@
-
 import client from 'prom-client'
 import Boom from '@hapi/boom'
 
diff --git a/packages/ipfs-http-server/src/api/routes/version.js b/packages/ipfs-http-server/src/api/routes/version.js
index 56ce216281..c7a490efca 100644
--- a/packages/ipfs-http-server/src/api/routes/version.js
+++ b/packages/ipfs-http-server/src/api/routes/version.js
@@ -1,4 +1,3 @@
-
 import { versionResource } from '../resources/version.js'
 
 export default [{
diff --git a/packages/ipfs-http-server/src/api/routes/webui.js b/packages/ipfs-http-server/src/api/routes/webui.js
index eb42f58300..bc6d945b5d 100644
--- a/packages/ipfs-http-server/src/api/routes/webui.js
+++ b/packages/ipfs-http-server/src/api/routes/webui.js
@@ -1,4 +1,3 @@
-
 import resources from 'ipfs-http-gateway/resources/index'
 
 const webuiCid = 'bafybeif4zkmu7qdhkpf3pnhwxipylqleof7rl6ojbe7mq3fzogz6m4xk3i' // v2.11.4
diff --git a/packages/ipfs-http-server/src/error-handler.js b/packages/ipfs-http-server/src/error-handler.js
index 886685e4a3..1c21274117 100644
--- a/packages/ipfs-http-server/src/error-handler.js
+++ b/packages/ipfs-http-server/src/error-handler.js
@@ -1,4 +1,3 @@
-
 import Boom from '@hapi/boom'
 
 /**
diff --git a/packages/ipfs-http-server/src/index.js b/packages/ipfs-http-server/src/index.js
index d159bc141c..3beccca8df 100644
--- a/packages/ipfs-http-server/src/index.js
+++ b/packages/ipfs-http-server/src/index.js
@@ -1,4 +1,3 @@
-
 import Hapi from '@hapi/hapi'
 import Pino from 'hapi-pino'
 import debug from 'debug'
diff --git a/packages/ipfs-http-server/src/utils/joi.js b/packages/ipfs-http-server/src/utils/joi.js
index 7eb6be4d58..3b62532ba9 100644
--- a/packages/ipfs-http-server/src/utils/joi.js
+++ b/packages/ipfs-http-server/src/utils/joi.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import parseDuration from 'parse-duration'
 import { Multiaddr } from 'multiaddr'
diff --git a/packages/ipfs-http-server/src/utils/multipart-request-parser.js b/packages/ipfs-http-server/src/utils/multipart-request-parser.js
index 4a9405857a..5c8b6ac9cf 100644
--- a/packages/ipfs-http-server/src/utils/multipart-request-parser.js
+++ b/packages/ipfs-http-server/src/utils/multipart-request-parser.js
@@ -1,4 +1,3 @@
-
 import { concat as uint8ArrayConcat } from 'uint8arrays/concat'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import drain from 'it-drain'
diff --git a/packages/ipfs-http-server/src/utils/stream-response.js b/packages/ipfs-http-server/src/utils/stream-response.js
index d91d2a7c87..7b0ac7c94e 100644
--- a/packages/ipfs-http-server/src/utils/stream-response.js
+++ b/packages/ipfs-http-server/src/utils/stream-response.js
@@ -1,4 +1,3 @@
-
 import { PassThrough } from 'stream'
 import { pipe } from 'it-pipe'
 import debug from 'debug'
diff --git a/packages/ipfs-message-port-client/src/dag.js b/packages/ipfs-message-port-client/src/dag.js
index 6401ded85a..6875f9e9ce 100644
--- a/packages/ipfs-message-port-client/src/dag.js
+++ b/packages/ipfs-message-port-client/src/dag.js
@@ -1,4 +1,3 @@
-
 import { Client } from './client.js'
 import { encodeCID, decodeCID } from 'ipfs-message-port-protocol/cid'
 import { encodeNode, decodeNode } from 'ipfs-message-port-protocol/dag'
diff --git a/packages/ipfs-message-port-protocol/src/dag.js b/packages/ipfs-message-port-protocol/src/dag.js
index 109d24511a..540a3f326d 100644
--- a/packages/ipfs-message-port-protocol/src/dag.js
+++ b/packages/ipfs-message-port-protocol/src/dag.js
@@ -1,4 +1,3 @@
-
 import { CID } from 'multiformats/cid'
 import { encodeCID, decodeCID } from './cid.js'
 
diff --git a/packages/ipfs-message-port-server/src/dag.js b/packages/ipfs-message-port-server/src/dag.js
index 2159f483c6..852f414f15 100644
--- a/packages/ipfs-message-port-server/src/dag.js
+++ b/packages/ipfs-message-port-server/src/dag.js
@@ -1,4 +1,3 @@
-
 import { encodeCID, decodeCID } from 'ipfs-message-port-protocol/cid'
 import { decodeNode, encodeNode } from 'ipfs-message-port-protocol/dag'
 
diff --git a/packages/ipfs/package.json b/packages/ipfs/package.json
index 69aab81ebb..140447f0cc 100644
--- a/packages/ipfs/package.json
+++ b/packages/ipfs/package.json
@@ -42,6 +42,7 @@
       "import": "./src/index.js"
     },
     "./path": {
+      "browser": "./src/path.browser.js",
       "import": "./src/path.js"
     }
   },
@@ -102,6 +103,7 @@
   },
   "browser": {
     "./src/cli.js": false,
+    "./src/path.js": "./src/path.browser.js",
     "go-ipfs": false
   },
   "engines": {
diff --git a/packages/ipfs/src/path.browser.js b/packages/ipfs/src/path.browser.js
new file mode 100644
index 0000000000..62a40effe6
--- /dev/null
+++ b/packages/ipfs/src/path.browser.js
@@ -0,0 +1,4 @@
+
+export function path () {
+  throw new Error('Not supported in browsers')
+}