diff --git a/api/api_full.go b/api/api_full.go
index 9776a122c43..06a14b76e5a 100644
--- a/api/api_full.go
+++ b/api/api_full.go
@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/google/uuid"
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	"github.com/libp2p/go-libp2p/core/peer"
 
 	"github.com/filecoin-project/go-address"
diff --git a/api/api_gateway.go b/api/api_gateway.go
index c1e53ccf05f..f4d6c20a03b 100644
--- a/api/api_gateway.go
+++ b/api/api_gateway.go
@@ -3,8 +3,8 @@ package api
 import (
 	"context"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-jsonrpc"
diff --git a/api/docgen/docgen.go b/api/docgen/docgen.go
index 0a047044649..7a9993bb782 100644
--- a/api/docgen/docgen.go
+++ b/api/docgen/docgen.go
@@ -14,9 +14,9 @@ import (
 	"unicode"
 
 	"github.com/google/uuid"
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	"github.com/ipfs/go-graphsync"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	textselector "github.com/ipld/go-ipld-selector-text-lite"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	"github.com/libp2p/go-libp2p/core/metrics"
diff --git a/api/mocks/mock_full.go b/api/mocks/mock_full.go
index 83efbffdb27..33e22e9c1b1 100644
--- a/api/mocks/mock_full.go
+++ b/api/mocks/mock_full.go
@@ -13,7 +13,7 @@ import (
 	gomock "github.com/golang/mock/gomock"
 	uuid "github.com/google/uuid"
 	cid "github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	metrics "github.com/libp2p/go-libp2p/core/metrics"
 	network0 "github.com/libp2p/go-libp2p/core/network"
 	peer "github.com/libp2p/go-libp2p/core/peer"
diff --git a/api/proxy_gen.go b/api/proxy_gen.go
index 538e5815833..df36bdd88e9 100644
--- a/api/proxy_gen.go
+++ b/api/proxy_gen.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/libp2p/go-libp2p/core/metrics"
 	"github.com/libp2p/go-libp2p/core/network"
 	"github.com/libp2p/go-libp2p/core/peer"
diff --git a/api/v0api/full.go b/api/v0api/full.go
index 86a4ce47a28..322f7244954 100644
--- a/api/v0api/full.go
+++ b/api/v0api/full.go
@@ -3,8 +3,8 @@ package v0api
 import (
 	"context"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	textselector "github.com/ipld/go-ipld-selector-text-lite"
 	"github.com/libp2p/go-libp2p/core/peer"
 
diff --git a/api/v0api/gateway.go b/api/v0api/gateway.go
index 83c7bdfb3e5..30eb0d1c478 100644
--- a/api/v0api/gateway.go
+++ b/api/v0api/gateway.go
@@ -3,8 +3,8 @@ package v0api
 import (
 	"context"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
diff --git a/api/v0api/proxy_gen.go b/api/v0api/proxy_gen.go
index 91583522544..43b6013f1f5 100644
--- a/api/v0api/proxy_gen.go
+++ b/api/v0api/proxy_gen.go
@@ -6,7 +6,7 @@ import (
 	"context"
 
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"golang.org/x/xerrors"
 
diff --git a/api/v0api/v0mocks/mock_full.go b/api/v0api/v0mocks/mock_full.go
index a4adfc94402..44a1eb1685f 100644
--- a/api/v0api/v0mocks/mock_full.go
+++ b/api/v0api/v0mocks/mock_full.go
@@ -12,7 +12,7 @@ import (
 	gomock "github.com/golang/mock/gomock"
 	uuid "github.com/google/uuid"
 	cid "github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	metrics "github.com/libp2p/go-libp2p/core/metrics"
 	network0 "github.com/libp2p/go-libp2p/core/network"
 	peer "github.com/libp2p/go-libp2p/core/peer"
diff --git a/blockstore/api.go b/blockstore/api.go
index 251deb13a05..090f53e5a99 100644
--- a/blockstore/api.go
+++ b/blockstore/api.go
@@ -3,8 +3,8 @@ package blockstore
 import (
 	"context"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	"golang.org/x/xerrors"
 )
 
diff --git a/blockstore/autobatch.go b/blockstore/autobatch.go
index 3cb8eafa6a7..d41d521ef74 100644
--- a/blockstore/autobatch.go
+++ b/blockstore/autobatch.go
@@ -5,9 +5,9 @@ import (
 	"sync"
 	"time"
 
+	block "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	block "github.com/ipfs/go-libipfs/blocks"
 	"golang.org/x/xerrors"
 )
 
diff --git a/blockstore/badger/blockstore.go b/blockstore/badger/blockstore.go
index 5527bf89076..e4cd743d06b 100644
--- a/blockstore/badger/blockstore.go
+++ b/blockstore/badger/blockstore.go
@@ -13,9 +13,9 @@ import (
 	"github.com/dgraph-io/badger/v2"
 	"github.com/dgraph-io/badger/v2/options"
 	"github.com/dgraph-io/badger/v2/pb"
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	logger "github.com/ipfs/go-log/v2"
 	pool "github.com/libp2p/go-buffer-pool"
 	"github.com/multiformats/go-base32"
diff --git a/blockstore/badger/blockstore_test.go b/blockstore/badger/blockstore_test.go
index bf85104bb5b..d253f37d95d 100644
--- a/blockstore/badger/blockstore_test.go
+++ b/blockstore/badger/blockstore_test.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 	"testing"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/sync/errgroup"
 
diff --git a/blockstore/badger/blockstore_test_suite.go b/blockstore/badger/blockstore_test_suite.go
index 877eb6e6bdc..7db15590193 100644
--- a/blockstore/badger/blockstore_test_suite.go
+++ b/blockstore/badger/blockstore_test_suite.go
@@ -9,10 +9,10 @@ import (
 	"strings"
 	"testing"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	u "github.com/ipfs/go-ipfs-util"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	"github.com/stretchr/testify/require"
 
 	"github.com/filecoin-project/lotus/blockstore"
diff --git a/blockstore/buffered.go b/blockstore/buffered.go
index bc37b2f69ec..2a789b6371a 100644
--- a/blockstore/buffered.go
+++ b/blockstore/buffered.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"os"
 
+	block "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	block "github.com/ipfs/go-libipfs/blocks"
 )
 
 // buflog is a logger for the buffered blockstore. It is subscoped from the
diff --git a/blockstore/discard.go b/blockstore/discard.go
index 87879756186..158c7cfbbea 100644
--- a/blockstore/discard.go
+++ b/blockstore/discard.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"io"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 )
 
 var _ Blockstore = (*discardstore)(nil)
diff --git a/blockstore/fallback.go b/blockstore/fallback.go
index 9fab960f5d7..de948b34600 100644
--- a/blockstore/fallback.go
+++ b/blockstore/fallback.go
@@ -5,9 +5,9 @@ import (
 	"sync"
 	"time"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	"golang.org/x/xerrors"
 )
 
diff --git a/blockstore/idstore.go b/blockstore/idstore.go
index ae807076d32..fb575dca72f 100644
--- a/blockstore/idstore.go
+++ b/blockstore/idstore.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"io"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	mh "github.com/multiformats/go-multihash"
 	"golang.org/x/xerrors"
 )
diff --git a/blockstore/ipfs.go b/blockstore/ipfs.go
index c7dbb480a45..7b356cd0e97 100644
--- a/blockstore/ipfs.go
+++ b/blockstore/ipfs.go
@@ -5,9 +5,9 @@ import (
 	"context"
 	"io"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	httpapi "github.com/ipfs/go-ipfs-http-client"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	iface "github.com/ipfs/interface-go-ipfs-core"
 	"github.com/ipfs/interface-go-ipfs-core/options"
 	"github.com/ipfs/interface-go-ipfs-core/path"
diff --git a/blockstore/mem.go b/blockstore/mem.go
index 5b06634de11..8dbf4b719ad 100644
--- a/blockstore/mem.go
+++ b/blockstore/mem.go
@@ -3,9 +3,9 @@ package blockstore
 import (
 	"context"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 )
 
 // NewMemory returns a temporary memory-backed blockstore.
diff --git a/blockstore/mem_test.go b/blockstore/mem_test.go
index 6a5e0d2d11d..4d4a776245b 100644
--- a/blockstore/mem_test.go
+++ b/blockstore/mem_test.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"testing"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	mh "github.com/multiformats/go-multihash"
 	"github.com/stretchr/testify/require"
 )
diff --git a/blockstore/net.go b/blockstore/net.go
index 62aceed71f4..c4a88cfc970 100644
--- a/blockstore/net.go
+++ b/blockstore/net.go
@@ -8,9 +8,9 @@ import (
 	"sync"
 	"sync/atomic"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	"github.com/libp2p/go-msgio"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
diff --git a/blockstore/net_serve.go b/blockstore/net_serve.go
index b58d2a5fd19..2540c845e81 100644
--- a/blockstore/net_serve.go
+++ b/blockstore/net_serve.go
@@ -5,9 +5,9 @@ import (
 	"context"
 	"encoding/binary"
 
+	block "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	block "github.com/ipfs/go-libipfs/blocks"
 	"github.com/libp2p/go-msgio"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
diff --git a/blockstore/net_test.go b/blockstore/net_test.go
index 6c3060a98f5..d8c33818eb3 100644
--- a/blockstore/net_test.go
+++ b/blockstore/net_test.go
@@ -6,8 +6,8 @@ import (
 	"io"
 	"testing"
 
+	block "github.com/ipfs/go-block-format"
 	ipld "github.com/ipfs/go-ipld-format"
-	block "github.com/ipfs/go-libipfs/blocks"
 	"github.com/libp2p/go-msgio"
 	"github.com/stretchr/testify/require"
 )
diff --git a/blockstore/splitstore/debug.go b/blockstore/splitstore/debug.go
index c870a44e1b5..f059ae4ced9 100644
--- a/blockstore/splitstore/debug.go
+++ b/blockstore/splitstore/debug.go
@@ -12,8 +12,8 @@ import (
 	"sync"
 	"time"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	"go.uber.org/multierr"
 	"golang.org/x/xerrors"
 )
diff --git a/blockstore/splitstore/splitstore.go b/blockstore/splitstore/splitstore.go
index bd9efb630b2..1b10f09bd0c 100644
--- a/blockstore/splitstore/splitstore.go
+++ b/blockstore/splitstore/splitstore.go
@@ -8,10 +8,10 @@ import (
 	"sync/atomic"
 	"time"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	dstore "github.com/ipfs/go-datastore"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	logging "github.com/ipfs/go-log/v2"
 	"go.opencensus.io/stats"
 	"go.uber.org/multierr"
diff --git a/blockstore/splitstore/splitstore_compact.go b/blockstore/splitstore/splitstore_compact.go
index e5cfec0e47f..42645fa95b8 100644
--- a/blockstore/splitstore/splitstore_compact.go
+++ b/blockstore/splitstore/splitstore_compact.go
@@ -10,9 +10,9 @@ import (
 	"sync/atomic"
 	"time"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"go.opencensus.io/stats"
 	"golang.org/x/sync/errgroup"
diff --git a/blockstore/splitstore/splitstore_expose.go b/blockstore/splitstore/splitstore_expose.go
index 7461e338db8..93183612968 100644
--- a/blockstore/splitstore/splitstore_expose.go
+++ b/blockstore/splitstore/splitstore_expose.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"errors"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 
 	bstore "github.com/filecoin-project/lotus/blockstore"
 )
diff --git a/blockstore/splitstore/splitstore_reify.go b/blockstore/splitstore/splitstore_reify.go
index 07efedead38..7f54de55f43 100644
--- a/blockstore/splitstore/splitstore_reify.go
+++ b/blockstore/splitstore/splitstore_reify.go
@@ -5,8 +5,8 @@ import (
 	"runtime"
 	"sync/atomic"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	"golang.org/x/xerrors"
 )
 
diff --git a/blockstore/splitstore/splitstore_test.go b/blockstore/splitstore/splitstore_test.go
index 68e1bfb6586..4e168fc543c 100644
--- a/blockstore/splitstore/splitstore_test.go
+++ b/blockstore/splitstore/splitstore_test.go
@@ -11,11 +11,11 @@ import (
 	"testing"
 	"time"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	"github.com/ipfs/go-datastore"
 	dssync "github.com/ipfs/go-datastore/sync"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	logging "github.com/ipfs/go-log/v2"
 	mh "github.com/multiformats/go-multihash"
 
diff --git a/blockstore/splitstore/splitstore_warmup.go b/blockstore/splitstore/splitstore_warmup.go
index 23bbad7cada..e387263dae7 100644
--- a/blockstore/splitstore/splitstore_warmup.go
+++ b/blockstore/splitstore/splitstore_warmup.go
@@ -5,9 +5,9 @@ import (
 	"sync/atomic"
 	"time"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-state-types/abi"
diff --git a/blockstore/sync.go b/blockstore/sync.go
index 652943dca1e..4f0cf830ee6 100644
--- a/blockstore/sync.go
+++ b/blockstore/sync.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"sync"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 )
 
 // NewMemorySync returns a thread-safe in-memory blockstore.
diff --git a/blockstore/timed.go b/blockstore/timed.go
index 3deabb7b88b..01e089a9f85 100644
--- a/blockstore/timed.go
+++ b/blockstore/timed.go
@@ -6,9 +6,9 @@ import (
 	"sync"
 	"time"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	"github.com/raulk/clock"
 	"go.uber.org/multierr"
 )
diff --git a/blockstore/timed_test.go b/blockstore/timed_test.go
index fb3aa00c9b4..931f145075b 100644
--- a/blockstore/timed_test.go
+++ b/blockstore/timed_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 	"time"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	"github.com/raulk/clock"
 	"github.com/stretchr/testify/require"
 )
diff --git a/blockstore/union.go b/blockstore/union.go
index ae6f819558d..e7fafbbbd85 100644
--- a/blockstore/union.go
+++ b/blockstore/union.go
@@ -3,9 +3,9 @@ package blockstore
 import (
 	"context"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 )
 
 type unionBlockstore []Blockstore
diff --git a/blockstore/union_test.go b/blockstore/union_test.go
index 47aab852a86..57948994770 100644
--- a/blockstore/union_test.go
+++ b/blockstore/union_test.go
@@ -5,7 +5,7 @@ import (
 	"context"
 	"testing"
 
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/chain/events/state/mock/api.go b/chain/events/state/mock/api.go
index 680e304f56c..cdec4265922 100644
--- a/chain/events/state/mock/api.go
+++ b/chain/events/state/mock/api.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"sync"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
diff --git a/chain/gen/genesis/genblock.go b/chain/gen/genesis/genblock.go
index 930b3ccff4e..f26659cdfac 100644
--- a/chain/gen/genesis/genblock.go
+++ b/chain/gen/genesis/genblock.go
@@ -3,8 +3,8 @@ package genesis
 import (
 	"encoding/hex"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	"github.com/multiformats/go-multihash"
 )
 
diff --git a/chain/index/msgindex_test.go b/chain/index/msgindex_test.go
index 24f9b845f2b..4ebdcfd35ba 100644
--- a/chain/index/msgindex_test.go
+++ b/chain/index/msgindex_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	"github.com/ipfs/go-libipfs/blocks"
 	"github.com/stretchr/testify/require"
 
 	"github.com/filecoin-project/go-address"
diff --git a/chain/store/messages.go b/chain/store/messages.go
index ee37b4855ea..3686f74f462 100644
--- a/chain/store/messages.go
+++ b/chain/store/messages.go
@@ -3,10 +3,10 @@ package store
 import (
 	"context"
 
+	block "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	cbor "github.com/ipfs/go-ipld-cbor"
 	ipld "github.com/ipfs/go-ipld-format"
-	block "github.com/ipfs/go-libipfs/blocks"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
diff --git a/chain/store/snapshot.go b/chain/store/snapshot.go
index 0a878e1e09a..66d23675ef3 100644
--- a/chain/store/snapshot.go
+++ b/chain/store/snapshot.go
@@ -9,9 +9,9 @@ import (
 	"sync"
 	"time"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	format "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	"github.com/ipld/go-car"
 	carutil "github.com/ipld/go-car/util"
 	carv2 "github.com/ipld/go-car/v2"
diff --git a/chain/store/store.go b/chain/store/store.go
index d7188a7bfd1..b34ddb2665d 100644
--- a/chain/store/store.go
+++ b/chain/store/store.go
@@ -12,11 +12,11 @@ import (
 	"time"
 
 	lru "github.com/hashicorp/golang-lru/v2"
+	block "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	dstore "github.com/ipfs/go-datastore"
 	"github.com/ipfs/go-datastore/query"
 	cbor "github.com/ipfs/go-ipld-cbor"
-	block "github.com/ipfs/go-libipfs/blocks"
 	logging "github.com/ipfs/go-log/v2"
 	"go.opencensus.io/stats"
 	"go.opencensus.io/trace"
diff --git a/chain/sub/incoming.go b/chain/sub/incoming.go
index 87598bd2e03..f98724361bf 100644
--- a/chain/sub/incoming.go
+++ b/chain/sub/incoming.go
@@ -8,9 +8,9 @@ import (
 	"time"
 
 	lru "github.com/hashicorp/golang-lru/v2"
+	blocks "github.com/ipfs/go-block-format"
 	bserv "github.com/ipfs/go-blockservice"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	logging "github.com/ipfs/go-log/v2"
 	"github.com/ipni/storetheindex/announce/message"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
diff --git a/chain/sub/incoming_test.go b/chain/sub/incoming_test.go
index 03f880c581f..0a9504a884f 100644
--- a/chain/sub/incoming_test.go
+++ b/chain/sub/incoming_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	"github.com/ipni/storetheindex/announce/message"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	pb "github.com/libp2p/go-libp2p-pubsub/pb"
diff --git a/chain/sync.go b/chain/sync.go
index db7b7fc042d..b0c8b50ff96 100644
--- a/chain/sync.go
+++ b/chain/sync.go
@@ -11,10 +11,10 @@ import (
 
 	"github.com/Gurpartap/async"
 	"github.com/hashicorp/go-multierror"
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	cbor "github.com/ipfs/go-ipld-cbor"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	logging "github.com/ipfs/go-log/v2"
 	"github.com/libp2p/go-libp2p/core/connmgr"
 	"github.com/libp2p/go-libp2p/core/peer"
diff --git a/chain/types/blockheader.go b/chain/types/blockheader.go
index 559569ba01b..e0b9e6b30bb 100644
--- a/chain/types/blockheader.go
+++ b/chain/types/blockheader.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"math/big"
 
+	block "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	block "github.com/ipfs/go-libipfs/blocks"
 	"github.com/minio/blake2b-simd"
 	"golang.org/x/xerrors"
 
diff --git a/chain/types/message.go b/chain/types/message.go
index 4304ba659ff..84f7a19a062 100644
--- a/chain/types/message.go
+++ b/chain/types/message.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"fmt"
 
+	block "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	block "github.com/ipfs/go-libipfs/blocks"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
diff --git a/chain/types/signedmessage.go b/chain/types/signedmessage.go
index dc867c5e547..16853171464 100644
--- a/chain/types/signedmessage.go
+++ b/chain/types/signedmessage.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"encoding/json"
 
+	block "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	block "github.com/ipfs/go-libipfs/blocks"
 
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/crypto"
diff --git a/chain/types/tipset_key.go b/chain/types/tipset_key.go
index 50753ffd245..15e655da7d6 100644
--- a/chain/types/tipset_key.go
+++ b/chain/types/tipset_key.go
@@ -7,8 +7,8 @@ import (
 	"io"
 	"strings"
 
+	block "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	block "github.com/ipfs/go-libipfs/blocks"
 	typegen "github.com/whyrusleeping/cbor-gen"
 
 	"github.com/filecoin-project/go-state-types/abi"
diff --git a/chain/vm/vm.go b/chain/vm/vm.go
index 6fbe7933b68..58afc14bc18 100644
--- a/chain/vm/vm.go
+++ b/chain/vm/vm.go
@@ -7,9 +7,9 @@ import (
 	"sync/atomic"
 	"time"
 
+	block "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	cbor "github.com/ipfs/go-ipld-cbor"
-	block "github.com/ipfs/go-libipfs/blocks"
 	logging "github.com/ipfs/go-log/v2"
 	mh "github.com/multiformats/go-multihash"
 	cbg "github.com/whyrusleeping/cbor-gen"
diff --git a/cmd/lotus-shed/datastore-vlog.go b/cmd/lotus-shed/datastore-vlog.go
index af412df19da..936d33849f7 100644
--- a/cmd/lotus-shed/datastore-vlog.go
+++ b/cmd/lotus-shed/datastore-vlog.go
@@ -12,8 +12,8 @@ import (
 	"strings"
 
 	"github.com/dgraph-io/badger/v2/y"
+	block "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	block "github.com/ipfs/go-libipfs/blocks"
 	"github.com/mitchellh/go-homedir"
 	"github.com/multiformats/go-base32"
 	"github.com/urfave/cli/v2"
diff --git a/cmd/lotus-shed/export.go b/cmd/lotus-shed/export.go
index d67fa449352..459de3383d3 100644
--- a/cmd/lotus-shed/export.go
+++ b/cmd/lotus-shed/export.go
@@ -15,11 +15,11 @@ import (
 	"github.com/dgraph-io/badger/v2"
 	"github.com/dgraph-io/badger/v2/pb"
 	"github.com/dustin/go-humanize"
+	block "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-blockservice"
 	"github.com/ipfs/go-cid"
 	offline "github.com/ipfs/go-ipfs-exchange-offline"
 	ipld "github.com/ipfs/go-ipld-format"
-	block "github.com/ipfs/go-libipfs/blocks"
 	"github.com/ipfs/go-merkledag"
 	"github.com/ipld/go-car"
 	"github.com/multiformats/go-base32"
diff --git a/cmd/lotus-shed/import-car.go b/cmd/lotus-shed/import-car.go
index 4c636a3af40..973e7b31b84 100644
--- a/cmd/lotus-shed/import-car.go
+++ b/cmd/lotus-shed/import-car.go
@@ -7,8 +7,8 @@ import (
 	"io"
 	"os"
 
+	block "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	block "github.com/ipfs/go-libipfs/blocks"
 	"github.com/ipld/go-car"
 	"github.com/urfave/cli/v2"
 	"golang.org/x/xerrors"
diff --git a/cmd/tvx/stores.go b/cmd/tvx/stores.go
index b863ffa7442..9035c482a0b 100644
--- a/cmd/tvx/stores.go
+++ b/cmd/tvx/stores.go
@@ -6,6 +6,7 @@ import (
 	"sync"
 
 	"github.com/fatih/color"
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-blockservice"
 	"github.com/ipfs/go-cid"
 	ds "github.com/ipfs/go-datastore"
@@ -14,7 +15,6 @@ import (
 	offline "github.com/ipfs/go-ipfs-exchange-offline"
 	cbor "github.com/ipfs/go-ipld-cbor"
 	format "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	"github.com/ipfs/go-merkledag"
 	"golang.org/x/xerrors"
 
diff --git a/conformance/runner.go b/conformance/runner.go
index 827c10a5cb9..09d4c0621b6 100644
--- a/conformance/runner.go
+++ b/conformance/runner.go
@@ -13,12 +13,12 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/hashicorp/go-multierror"
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-blockservice"
 	"github.com/ipfs/go-cid"
 	ds "github.com/ipfs/go-datastore"
 	offline "github.com/ipfs/go-ipfs-exchange-offline"
 	format "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	"github.com/ipfs/go-merkledag"
 	"github.com/ipld/go-car"
 
diff --git a/gateway/node.go b/gateway/node.go
index 977c1e5a8ed..a88b2286066 100644
--- a/gateway/node.go
+++ b/gateway/node.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	"go.opencensus.io/stats"
 	"golang.org/x/time/rate"
 
diff --git a/gateway/proxy_fil.go b/gateway/proxy_fil.go
index e15d246f859..c15a78f5ff4 100644
--- a/gateway/proxy_fil.go
+++ b/gateway/proxy_fil.go
@@ -3,8 +3,8 @@ package gateway
 import (
 	"context"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
diff --git a/itests/deals_partial_retrieval_dm-level_test.go b/itests/deals_partial_retrieval_dm-level_test.go
index e3414c19171..4e59b163bc6 100644
--- a/itests/deals_partial_retrieval_dm-level_test.go
+++ b/itests/deals_partial_retrieval_dm-level_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 	"time"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	"github.com/ipld/go-car"
 	textselector "github.com/ipld/go-ipld-selector-text-lite"
 	"github.com/stretchr/testify/require"
diff --git a/itests/deals_partial_retrieval_test.go b/itests/deals_partial_retrieval_test.go
index e2dae9aff19..0bbf23da054 100644
--- a/itests/deals_partial_retrieval_test.go
+++ b/itests/deals_partial_retrieval_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 	"time"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	"github.com/ipld/go-car"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/xerrors"
diff --git a/markets/dagstore/blockstore.go b/markets/dagstore/blockstore.go
index 593204ec8e5..317cb08b9fc 100644
--- a/markets/dagstore/blockstore.go
+++ b/markets/dagstore/blockstore.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"io"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	bstore "github.com/ipfs/go-ipfs-blockstore"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/dagstore"
diff --git a/markets/storageadapter/api.go b/markets/storageadapter/api.go
index 3105f2261c0..b93ffdfbb16 100644
--- a/markets/storageadapter/api.go
+++ b/markets/storageadapter/api.go
@@ -3,9 +3,9 @@ package storageadapter
 import (
 	"context"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	cbor "github.com/ipfs/go-ipld-cbor"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
diff --git a/markets/storageadapter/ondealsectorcommitted_test.go b/markets/storageadapter/ondealsectorcommitted_test.go
index 592c22db7d5..1d7519ff9f9 100644
--- a/markets/storageadapter/ondealsectorcommitted_test.go
+++ b/markets/storageadapter/ondealsectorcommitted_test.go
@@ -10,8 +10,8 @@ import (
 	"testing"
 	"time"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/xerrors"
 
diff --git a/node/impl/full/chain.go b/node/impl/full/chain.go
index d0f36ce488c..addca2b9737 100644
--- a/node/impl/full/chain.go
+++ b/node/impl/full/chain.go
@@ -15,12 +15,12 @@ import (
 	"sync"
 	"time"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-blockservice"
 	"github.com/ipfs/go-cid"
 	offline "github.com/ipfs/go-ipfs-exchange-offline"
 	cbor "github.com/ipfs/go-ipld-cbor"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	logging "github.com/ipfs/go-log/v2"
 	"github.com/ipfs/go-merkledag"
 	mh "github.com/multiformats/go-multihash"