From 4ec1f74a6f2b76ab38dc61a61ed7c7c060ae9865 Mon Sep 17 00:00:00 2001
From: Volker Mische <volker.mische@gmail.com>
Date: Thu, 23 Apr 2020 15:43:02 +0200
Subject: [PATCH] Revert "Revert "fix: update deps and use ipld-block""

This in not only a revert, but also updates ipld-in-memory in order
to make sure that the whole dependency chain is using ipld-block
insteald of ipfs-block.

BREAKING CHANGE: Use ipld-block instead of ipfs-block

This reverts commit 6af9449eeaa215587a97c6b8963b93a1482341fe.
---
 package.json       | 6 +++---
 src/index.js       | 2 +-
 test/ipld-zcash.js | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 400b65c..2cf7dd9 100644
--- a/package.json
+++ b/package.json
@@ -41,11 +41,11 @@
     "ethereumjs-block": "^2.2.0",
     "fs-extra": "^9.0.0",
     "ipfs-block-service": "^0.17.0",
-    "ipfs-repo": "^1.0.0",
+    "ipfs-repo": "^2.0.0",
     "ipld-bitcoin": "~0.3.0",
     "ipld-ethereum": "^4.0.0",
     "ipld-git": "~0.5.0",
-    "ipld-in-memory": "^3.0.1",
+    "ipld-in-memory": "^4.0.0",
     "ipld-zcash": "~0.4.0",
     "merkle-patricia-tree": "^3.0.0",
     "multihashes": "~0.4.15",
@@ -53,7 +53,7 @@
   },
   "dependencies": {
     "cids": "~0.8.0",
-    "ipfs-block": "~0.8.1",
+    "ipld-block": "~0.9.1",
     "ipld-dag-cbor": "~0.15.0",
     "ipld-dag-pb": "~0.18.1",
     "ipld-raw": "^4.0.0",
diff --git a/src/index.js b/src/index.js
index 8e95a62..c5f0840 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const Block = require('ipfs-block')
+const Block = require('ipld-block')
 const CID = require('cids')
 const mergeOptions = require('merge-options')
 const ipldDagCbor = require('ipld-dag-cbor')
diff --git a/test/ipld-zcash.js b/test/ipld-zcash.js
index 1c6b33c..e5aee56 100644
--- a/test/ipld-zcash.js
+++ b/test/ipld-zcash.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const Block = require('ipfs-block')
+const Block = require('ipld-block')
 const chai = require('chai')
 const chaiAsProised = require('chai-as-promised')
 const dirtyChai = require('dirty-chai')