From c47bf6e26a00d07a26196dab0268effe91d207c8 Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Fri, 13 Jan 2023 17:12:31 +0000
Subject: [PATCH 1/2] deps(dev): update interop, ipfsd-ctl and kubo-rpc-client

Update deps to use latest multiformats
---
 package.json                             | 1 -
 packages/ipfs-cli/package.json           | 2 --
 packages/ipfs-core/package.json          | 4 +---
 packages/ipfs-http-client/package.json   | 2 +-
 packages/ipfs-http-response/package.json | 2 +-
 packages/ipfs/package.json               | 6 +++---
 6 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 2975d4486f..e65d38e81a 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,6 @@
   },
   "devDependencies": {
     "aegir": "^37.11.0",
-    "node-fetch": "npm:@achingbrain/node-fetch@^2.6.4",
     "npm-run-all": "^4.1.5"
   },
   "eslintConfig": {
diff --git a/packages/ipfs-cli/package.json b/packages/ipfs-cli/package.json
index f710bc1011..a6ae7b5aa8 100644
--- a/packages/ipfs-cli/package.json
+++ b/packages/ipfs-cli/package.json
@@ -103,7 +103,6 @@
     "@types/get-folder-size": "^3.0.1",
     "@types/ncp": "^2.0.5",
     "@types/progress": "^2.0.3",
-    "@types/rimraf": "^3.0.1",
     "@types/yargs": "^17.0.10",
     "aegir": "^37.11.0",
     "ipfs-repo": "^17.0.0",
@@ -114,7 +113,6 @@
     "nanoid": "^4.0.0",
     "ncp": "^2.0.0",
     "pako": "^2.0.4",
-    "rimraf": "^3.0.2",
     "sinon": "^15.0.1",
     "string-argv": "^0.3.1",
     "temp-write": "^5.0.0"
diff --git a/packages/ipfs-core/package.json b/packages/ipfs-core/package.json
index 1b0ccc59ff..6d91648bbe 100644
--- a/packages/ipfs-core/package.json
+++ b/packages/ipfs-core/package.json
@@ -151,19 +151,17 @@
     "@chainsafe/libp2p-gossipsub": "^6.0.0",
     "@types/dlv": "^1.1.2",
     "@types/pako": "^2.0.0",
-    "@types/rimraf": "^3.0.1",
     "aegir": "^37.11.0",
     "blockstore-datastore-adapter": "^5.0.0",
     "delay": "^5.0.0",
     "go-ipfs": "^0.12.0",
     "interface-blockstore-tests": "^4.0.0",
     "interface-ipfs-core": "^0.158.0",
-    "ipfsd-ctl": "^12.0.3",
+    "ipfsd-ctl": "^13.0.0",
     "iso-url": "^1.0.0",
     "it-all": "^2.0.0",
     "nanoid": "^4.0.0",
     "p-defer": "^4.0.0",
-    "rimraf": "^3.0.2",
     "sinon": "^15.0.1"
   },
   "gitHead": ""
diff --git a/packages/ipfs-http-client/package.json b/packages/ipfs-http-client/package.json
index ce2219a4bf..9129c71528 100644
--- a/packages/ipfs-http-client/package.json
+++ b/packages/ipfs-http-client/package.json
@@ -91,7 +91,7 @@
     "aegir": "^37.11.0",
     "delay": "^5.0.0",
     "go-ipfs": "^0.12.0",
-    "ipfsd-ctl": "^12.0.3",
+    "ipfsd-ctl": "^13.0.0",
     "it-all": "^2.0.0",
     "it-first": "^2.0.0",
     "nock": "^13.0.2",
diff --git a/packages/ipfs-http-response/package.json b/packages/ipfs-http-response/package.json
index c02f3fa0f5..cc2c7cb3af 100644
--- a/packages/ipfs-http-response/package.json
+++ b/packages/ipfs-http-response/package.json
@@ -82,7 +82,7 @@
     "aegir": "^37.11.0",
     "get-stream": "^6.0.0",
     "ipfs-core": "^0.18.0",
-    "ipfsd-ctl": "^12.0.3",
+    "ipfsd-ctl": "^13.0.0",
     "it-all": "^2.0.0",
     "uint8arrays": "^4.0.2"
   },
diff --git a/packages/ipfs/package.json b/packages/ipfs/package.json
index 954d50d58d..5f7b6c4ea4 100644
--- a/packages/ipfs/package.json
+++ b/packages/ipfs/package.json
@@ -94,11 +94,11 @@
     "ipfs-client": "^0.10.0",
     "ipfs-core-types": "^0.14.0",
     "ipfs-http-client": "^60.0.0",
-    "ipfs-interop": "ipfs/interop#deps/update-multiformats",
+    "ipfs-interop": "^10.0.0",
     "ipfs-utils": "^9.0.13",
-    "ipfsd-ctl": "^12.0.3",
+    "ipfsd-ctl": "^13.0.0",
     "iso-url": "^1.0.0",
-    "kubo-rpc-client": "^2.0.2",
+    "kubo-rpc-client": "^3.0.0",
     "merge-options": "^3.0.4",
     "mock-ipfs-pinning-service": "^0.4.2",
     "url": "^0.11.0"

From 02946aaefd52f09714e58ec44d7319057ea5b4fa Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Fri, 13 Jan 2023 17:18:01 +0000
Subject: [PATCH 2/2] chore: add dep

---
 packages/ipfs-cli/package.json  | 2 ++
 packages/ipfs-core/package.json | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/packages/ipfs-cli/package.json b/packages/ipfs-cli/package.json
index a6ae7b5aa8..f710bc1011 100644
--- a/packages/ipfs-cli/package.json
+++ b/packages/ipfs-cli/package.json
@@ -103,6 +103,7 @@
     "@types/get-folder-size": "^3.0.1",
     "@types/ncp": "^2.0.5",
     "@types/progress": "^2.0.3",
+    "@types/rimraf": "^3.0.1",
     "@types/yargs": "^17.0.10",
     "aegir": "^37.11.0",
     "ipfs-repo": "^17.0.0",
@@ -113,6 +114,7 @@
     "nanoid": "^4.0.0",
     "ncp": "^2.0.0",
     "pako": "^2.0.4",
+    "rimraf": "^3.0.2",
     "sinon": "^15.0.1",
     "string-argv": "^0.3.1",
     "temp-write": "^5.0.0"
diff --git a/packages/ipfs-core/package.json b/packages/ipfs-core/package.json
index 6d91648bbe..3c5f53597e 100644
--- a/packages/ipfs-core/package.json
+++ b/packages/ipfs-core/package.json
@@ -151,6 +151,7 @@
     "@chainsafe/libp2p-gossipsub": "^6.0.0",
     "@types/dlv": "^1.1.2",
     "@types/pako": "^2.0.0",
+    "@types/rimraf": "^3.0.1",
     "aegir": "^37.11.0",
     "blockstore-datastore-adapter": "^5.0.0",
     "delay": "^5.0.0",
@@ -162,6 +163,7 @@
     "it-all": "^2.0.0",
     "nanoid": "^4.0.0",
     "p-defer": "^4.0.0",
+    "rimraf": "^3.0.2",
     "sinon": "^15.0.1"
   },
   "gitHead": ""