diff --git a/chain/actors/adt/adt.go b/chain/actors/adt/adt.go
index 52a211cf8..f9de39996 100644
--- a/chain/actors/adt/adt.go
+++ b/chain/actors/adt/adt.go
@@ -3,6 +3,8 @@ package adt
 import (
 	"bytes"
 	"crypto/sha256"
+	"fmt"
+
 	builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin"
 	builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
 	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
@@ -10,7 +12,6 @@ import (
 	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
 	"github.com/ipfs/go-cid"
 	sha256simd "github.com/minio/sha256-simd"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/cbor"
@@ -116,7 +117,7 @@ func MapOptsForActorCode(c cid.Cid) (*MapOpts, error) {
 		}, nil
 	}
 
-	return nil, xerrors.Errorf("actor code unknown or doesn't have Map: %s", c)
+	return nil, fmt.Errorf("actor code unknown or doesn't have Map: %s", c)
 }
 
 type MapHashFunc func([]byte) []byte
diff --git a/chain/actors/aerrors/error_test.go b/chain/actors/aerrors/error_test.go
index 319c33f24..f4e6d8bb8 100644
--- a/chain/actors/aerrors/error_test.go
+++ b/chain/actors/aerrors/error_test.go
@@ -1,19 +1,21 @@
 package aerrors_test
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/filecoin-project/go-state-types/exitcode"
+	"golang.org/x/xerrors"
+
 	. "github.com/filecoin-project/lily/chain/actors/aerrors"
 
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/xerrors"
 )
 
 func TestFatalError(t *testing.T) {
 	e1 := xerrors.New("out of disk space")
-	e2 := xerrors.Errorf("could not put node: %w", e1)
-	e3 := xerrors.Errorf("could not save head: %w", e2)
+	e2 := fmt.Errorf("could not put node: %w", e1)
+	e3 := fmt.Errorf("could not save head: %w", e2)
 	ae := Escalate(e3, "failed to save the head")
 	aw1 := Wrap(ae, "saving head of new miner actor")
 	aw2 := Absorb(aw1, 1, "try to absorb fatal error")
@@ -25,7 +27,7 @@ func TestFatalError(t *testing.T) {
 }
 func TestAbsorbeError(t *testing.T) {
 	e1 := xerrors.New("EOF")
-	e2 := xerrors.Errorf("could not decode: %w", e1)
+	e2 := fmt.Errorf("could not decode: %w", e1)
 	ae := Absorb(e2, 35, "failed to decode CBOR")
 	aw1 := Wrap(ae, "saving head of new miner actor")
 	aw2 := Wrap(aw1, "initializing actor")
diff --git a/chain/actors/aerrors/wrap.go b/chain/actors/aerrors/wrap.go
index 0552829f9..53bdfc505 100644
--- a/chain/actors/aerrors/wrap.go
+++ b/chain/actors/aerrors/wrap.go
@@ -182,7 +182,7 @@ func HandleExternalError(err error, msg string) ActorError {
 		}
 	}
 
-	if xerrors.Is(err, &cbor.SerializationError{}) {
+	if errors.Is(err, &cbor.SerializationError{}) {
 		return &actorError{
 			fatal:   false,
 			retCode: 253,
diff --git a/chain/actors/agen/generator/gen.go b/chain/actors/agen/generator/gen.go
index 5dbb6c0ee..ee0de1527 100644
--- a/chain/actors/agen/generator/gen.go
+++ b/chain/actors/agen/generator/gen.go
@@ -7,8 +7,6 @@ import (
 	"os"
 	"path/filepath"
 	"text/template"
-
-	"golang.org/x/xerrors"
 )
 
 var latestVersion = 7
@@ -69,7 +67,7 @@ func generateAdapters() error {
 		{
 			af, err := ioutil.ReadFile(filepath.Join(actDir, "actor.go.template"))
 			if err != nil {
-				return xerrors.Errorf("loading actor template: %w", err)
+				return fmt.Errorf("loading actor template: %w", err)
 			}
 
 			tpl := template.Must(template.New("").Funcs(template.FuncMap{
@@ -102,7 +100,7 @@ func generateState(actDir string) error {
 			return nil // skip
 		}
 
-		return xerrors.Errorf("loading state adapter template: %w", err)
+		return fmt.Errorf("loading state adapter template: %w", err)
 	}
 
 	for _, version := range versions {
@@ -134,7 +132,7 @@ func generateMessages(actDir string) error {
 			return nil // skip
 		}
 
-		return xerrors.Errorf("loading message adapter template: %w", err)
+		return fmt.Errorf("loading message adapter template: %w", err)
 	}
 
 	for _, version := range versions {
@@ -166,7 +164,7 @@ func generatePolicy() error {
 			return nil // skip
 		}
 
-		return xerrors.Errorf("loading policy template file: %w", err)
+		return fmt.Errorf("loading policy template file: %w", err)
 	}
 
 	tpl := template.Must(template.New("").Funcs(template.FuncMap{
@@ -197,7 +195,7 @@ func generateBuiltin() error {
 			return nil // skip
 		}
 
-		return xerrors.Errorf("loading builtin template file: %w", err)
+		return fmt.Errorf("loading builtin template file: %w", err)
 	}
 
 	tpl := template.Must(template.New("").Funcs(template.FuncMap{
diff --git a/chain/actors/builtin/account/account.go b/chain/actors/builtin/account/account.go
index 0cbfdbe4f..6e757122c 100644
--- a/chain/actors/builtin/account/account.go
+++ b/chain/actors/builtin/account/account.go
@@ -2,7 +2,7 @@
 package account
 
 import (
-	"golang.org/x/xerrors"
+	"fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/cbor"
@@ -92,7 +92,7 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		return load7(store, act.Head)
 
 	}
-	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+	return nil, fmt.Errorf("unknown actor code %s", act.Code)
 }
 
 type State interface {
diff --git a/chain/actors/builtin/account/actor.go.template b/chain/actors/builtin/account/actor.go.template
index e3be0e048..b422e5071 100644
--- a/chain/actors/builtin/account/actor.go.template
+++ b/chain/actors/builtin/account/actor.go.template
@@ -2,7 +2,7 @@
 package account
 
 import (
-	"golang.org/x/xerrors"
+    "fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/cbor"
@@ -40,7 +40,7 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		return load{{.}}(store, act.Head)
 {{end}}
 	}
-	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+	return nil, fmt.Errorf("unknown actor code %s", act.Code)
 }
 
 type State interface {
diff --git a/chain/actors/builtin/builtin.go b/chain/actors/builtin/builtin.go
index ab08c987b..0836160e4 100644
--- a/chain/actors/builtin/builtin.go
+++ b/chain/actors/builtin/builtin.go
@@ -2,11 +2,11 @@
 package builtin
 
 import (
+	"fmt"
 	"strings"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/ipfs/go-cid"
-	"golang.org/x/xerrors"
 
 	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
 	smoothing0 "github.com/filecoin-project/specs-actors/actors/util/smoothing"
@@ -126,7 +126,7 @@ func RegisterActorState(code cid.Cid, loader ActorStateLoader) {
 func Load(store adt.Store, act *types.Actor) (cbor.Marshaler, error) {
 	loader, found := ActorStateLoaders[act.Code]
 	if !found {
-		return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+		return nil, fmt.Errorf("unknown actor code %s", act.Code)
 	}
 	return loader(store, act.Head)
 }
diff --git a/chain/actors/builtin/builtin.go.template b/chain/actors/builtin/builtin.go.template
index cf02ac4c5..b8836e782 100644
--- a/chain/actors/builtin/builtin.go.template
+++ b/chain/actors/builtin/builtin.go.template
@@ -3,10 +3,10 @@ package builtin
 
 import (
 	"strings"
+	"fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/ipfs/go-cid"
-	"golang.org/x/xerrors"
 
 	{{range .versions}}
         builtin{{.}} "github.com/filecoin-project/specs-actors{{import .}}actors/builtin"
@@ -78,7 +78,7 @@ func RegisterActorState(code cid.Cid, loader ActorStateLoader) {
 func Load(store adt.Store, act *types.Actor) (cbor.Marshaler, error) {
 	loader, found := ActorStateLoaders[act.Code]
 	if !found {
-		return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+		return nil, fmt.Errorf("unknown actor code %s", act.Code)
 	}
 	return loader(store, act.Head)
 }
diff --git a/chain/actors/builtin/init/actor.go.template b/chain/actors/builtin/init/actor.go.template
index 821dd3b0c..6caaac48f 100644
--- a/chain/actors/builtin/init/actor.go.template
+++ b/chain/actors/builtin/init/actor.go.template
@@ -2,7 +2,7 @@
 package init
 
 import (
-	"golang.org/x/xerrors"
+    "fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -45,7 +45,7 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		return load{{.}}(store, act.Head)
 {{end}}
 	}
-	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+	return nil, fmt.Errorf("unknown actor code %s", act.Code)
 }
 
 type State interface {
diff --git a/chain/actors/builtin/init/init.go b/chain/actors/builtin/init/init.go
index b8931f8cb..34635369a 100644
--- a/chain/actors/builtin/init/init.go
+++ b/chain/actors/builtin/init/init.go
@@ -2,7 +2,7 @@
 package init
 
 import (
-	"golang.org/x/xerrors"
+	"fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -97,7 +97,7 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		return load7(store, act.Head)
 
 	}
-	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+	return nil, fmt.Errorf("unknown actor code %s", act.Code)
 }
 
 type State interface {
diff --git a/chain/actors/builtin/init/state.go.template b/chain/actors/builtin/init/state.go.template
index 29f3dfb13..fe773440d 100644
--- a/chain/actors/builtin/init/state.go.template
+++ b/chain/actors/builtin/init/state.go.template
@@ -2,11 +2,11 @@
 package init
 
 import (
+    "fmt"
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 
@@ -77,12 +77,12 @@ func (s *state{{.v}}) Remove(addrs ...address.Address) (err error) {
 	}
 	for _, addr := range addrs {
 		if err = m.Delete(abi.AddrKey(addr)); err != nil {
-			return xerrors.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
+			return fmt.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
 		}
 	}
 	amr, err := m.Root()
 	if err != nil {
-		return xerrors.Errorf("failed to get address map root: %w", err)
+		return fmt.Errorf("failed to get address map root: %w", err)
 	}
 	s.State.AddressMap = amr
 	return nil
diff --git a/chain/actors/builtin/init/v0.go b/chain/actors/builtin/init/v0.go
index 68f6b3b8f..46548fc26 100644
--- a/chain/actors/builtin/init/v0.go
+++ b/chain/actors/builtin/init/v0.go
@@ -2,11 +2,11 @@
 package init
 
 import (
+	"fmt"
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 
@@ -77,12 +77,12 @@ func (s *state0) Remove(addrs ...address.Address) (err error) {
 	}
 	for _, addr := range addrs {
 		if err = m.Delete(abi.AddrKey(addr)); err != nil {
-			return xerrors.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
+			return fmt.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
 		}
 	}
 	amr, err := m.Root()
 	if err != nil {
-		return xerrors.Errorf("failed to get address map root: %w", err)
+		return fmt.Errorf("failed to get address map root: %w", err)
 	}
 	s.State.AddressMap = amr
 	return nil
diff --git a/chain/actors/builtin/init/v2.go b/chain/actors/builtin/init/v2.go
index 8c27d6b11..9d5aef2c0 100644
--- a/chain/actors/builtin/init/v2.go
+++ b/chain/actors/builtin/init/v2.go
@@ -2,11 +2,11 @@
 package init
 
 import (
+	"fmt"
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 
@@ -77,12 +77,12 @@ func (s *state2) Remove(addrs ...address.Address) (err error) {
 	}
 	for _, addr := range addrs {
 		if err = m.Delete(abi.AddrKey(addr)); err != nil {
-			return xerrors.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
+			return fmt.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
 		}
 	}
 	amr, err := m.Root()
 	if err != nil {
-		return xerrors.Errorf("failed to get address map root: %w", err)
+		return fmt.Errorf("failed to get address map root: %w", err)
 	}
 	s.State.AddressMap = amr
 	return nil
diff --git a/chain/actors/builtin/init/v3.go b/chain/actors/builtin/init/v3.go
index dcf4270e3..fd813c62c 100644
--- a/chain/actors/builtin/init/v3.go
+++ b/chain/actors/builtin/init/v3.go
@@ -2,11 +2,11 @@
 package init
 
 import (
+	"fmt"
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 
@@ -77,12 +77,12 @@ func (s *state3) Remove(addrs ...address.Address) (err error) {
 	}
 	for _, addr := range addrs {
 		if err = m.Delete(abi.AddrKey(addr)); err != nil {
-			return xerrors.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
+			return fmt.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
 		}
 	}
 	amr, err := m.Root()
 	if err != nil {
-		return xerrors.Errorf("failed to get address map root: %w", err)
+		return fmt.Errorf("failed to get address map root: %w", err)
 	}
 	s.State.AddressMap = amr
 	return nil
diff --git a/chain/actors/builtin/init/v4.go b/chain/actors/builtin/init/v4.go
index 06b35809c..8c3ef09a0 100644
--- a/chain/actors/builtin/init/v4.go
+++ b/chain/actors/builtin/init/v4.go
@@ -2,11 +2,11 @@
 package init
 
 import (
+	"fmt"
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 
@@ -77,12 +77,12 @@ func (s *state4) Remove(addrs ...address.Address) (err error) {
 	}
 	for _, addr := range addrs {
 		if err = m.Delete(abi.AddrKey(addr)); err != nil {
-			return xerrors.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
+			return fmt.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
 		}
 	}
 	amr, err := m.Root()
 	if err != nil {
-		return xerrors.Errorf("failed to get address map root: %w", err)
+		return fmt.Errorf("failed to get address map root: %w", err)
 	}
 	s.State.AddressMap = amr
 	return nil
diff --git a/chain/actors/builtin/init/v5.go b/chain/actors/builtin/init/v5.go
index 49d265662..0d3c817c4 100644
--- a/chain/actors/builtin/init/v5.go
+++ b/chain/actors/builtin/init/v5.go
@@ -2,11 +2,11 @@
 package init
 
 import (
+	"fmt"
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 
@@ -77,12 +77,12 @@ func (s *state5) Remove(addrs ...address.Address) (err error) {
 	}
 	for _, addr := range addrs {
 		if err = m.Delete(abi.AddrKey(addr)); err != nil {
-			return xerrors.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
+			return fmt.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
 		}
 	}
 	amr, err := m.Root()
 	if err != nil {
-		return xerrors.Errorf("failed to get address map root: %w", err)
+		return fmt.Errorf("failed to get address map root: %w", err)
 	}
 	s.State.AddressMap = amr
 	return nil
diff --git a/chain/actors/builtin/init/v6.go b/chain/actors/builtin/init/v6.go
index bc8815fb4..6fb3ade00 100644
--- a/chain/actors/builtin/init/v6.go
+++ b/chain/actors/builtin/init/v6.go
@@ -2,11 +2,11 @@
 package init
 
 import (
+	"fmt"
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 
@@ -77,12 +77,12 @@ func (s *state6) Remove(addrs ...address.Address) (err error) {
 	}
 	for _, addr := range addrs {
 		if err = m.Delete(abi.AddrKey(addr)); err != nil {
-			return xerrors.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
+			return fmt.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
 		}
 	}
 	amr, err := m.Root()
 	if err != nil {
-		return xerrors.Errorf("failed to get address map root: %w", err)
+		return fmt.Errorf("failed to get address map root: %w", err)
 	}
 	s.State.AddressMap = amr
 	return nil
diff --git a/chain/actors/builtin/init/v7.go b/chain/actors/builtin/init/v7.go
index 123c57055..8cb02ce64 100644
--- a/chain/actors/builtin/init/v7.go
+++ b/chain/actors/builtin/init/v7.go
@@ -2,11 +2,11 @@
 package init
 
 import (
+	"fmt"
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 
@@ -77,12 +77,12 @@ func (s *state7) Remove(addrs ...address.Address) (err error) {
 	}
 	for _, addr := range addrs {
 		if err = m.Delete(abi.AddrKey(addr)); err != nil {
-			return xerrors.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
+			return fmt.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
 		}
 	}
 	amr, err := m.Root()
 	if err != nil {
-		return xerrors.Errorf("failed to get address map root: %w", err)
+		return fmt.Errorf("failed to get address map root: %w", err)
 	}
 	s.State.AddressMap = amr
 	return nil
diff --git a/chain/actors/builtin/market/actor.go.template b/chain/actors/builtin/market/actor.go.template
index 1743a2900..cc1d66ff9 100644
--- a/chain/actors/builtin/market/actor.go.template
+++ b/chain/actors/builtin/market/actor.go.template
@@ -2,7 +2,7 @@
 package market
 
 import (
-	"golang.org/x/xerrors"
+    "fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -48,7 +48,7 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		return load{{.}}(store, act.Head)
 {{end}}
 	}
-	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+	return nil, fmt.Errorf("unknown actor code %s", act.Code)
 }
 
 type State interface {
diff --git a/chain/actors/builtin/market/market.go b/chain/actors/builtin/market/market.go
index 7a93e44ab..23dd1905b 100644
--- a/chain/actors/builtin/market/market.go
+++ b/chain/actors/builtin/market/market.go
@@ -2,7 +2,7 @@
 package market
 
 import (
-	"golang.org/x/xerrors"
+	"fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -100,7 +100,7 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		return load7(store, act.Head)
 
 	}
-	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+	return nil, fmt.Errorf("unknown actor code %s", act.Code)
 }
 
 type State interface {
diff --git a/chain/actors/builtin/miner/actor.go.template b/chain/actors/builtin/miner/actor.go.template
index 6968ca6a0..42c751954 100644
--- a/chain/actors/builtin/miner/actor.go.template
+++ b/chain/actors/builtin/miner/actor.go.template
@@ -2,12 +2,12 @@
 package miner
 
 import (
+"fmt"
 	"github.com/filecoin-project/go-state-types/big"
 	"github.com/filecoin-project/go-state-types/network"
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p-core/peer"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-bitfield"
@@ -68,7 +68,7 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		return load{{.}}(store, act.Head)
 {{end}}
 }
-	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+	return nil, fmt.Errorf("unknown actor code %s", act.Code)
 }
 
 type State interface {
@@ -211,7 +211,7 @@ func PreferredSealProofTypeFromWindowPoStType(nver network.Version, proof abi.Re
 		case abi.RegisteredPoStProof_StackedDrgWindow64GiBV1:
 			return abi.RegisteredSealProof_StackedDrg64GiBV1, nil
 		default:
-			return -1, xerrors.Errorf("unrecognized window post type: %d", proof)
+			return -1, fmt.Errorf("unrecognized window post type: %d", proof)
 		}
 	}
 
@@ -227,7 +227,7 @@ func PreferredSealProofTypeFromWindowPoStType(nver network.Version, proof abi.Re
 	case abi.RegisteredPoStProof_StackedDrgWindow64GiBV1:
 		return abi.RegisteredSealProof_StackedDrg64GiBV1_1, nil
 	default:
-		return -1, xerrors.Errorf("unrecognized window post type: %d", proof)
+		return -1, fmt.Errorf("unrecognized window post type: %d", proof)
 	}
 }
 
@@ -244,7 +244,7 @@ func WinningPoStProofTypeFromWindowPoStProofType(nver network.Version, proof abi
 	case abi.RegisteredPoStProof_StackedDrgWindow64GiBV1:
 		return abi.RegisteredPoStProof_StackedDrgWinning64GiBV1, nil
 	default:
-		return -1, xerrors.Errorf("unknown proof type %d", proof)
+		return -1, fmt.Errorf("unknown proof type %d", proof)
 	}
 }
 
diff --git a/chain/actors/builtin/miner/diff.go b/chain/actors/builtin/miner/diff.go
index 91e73e77e..a0b159111 100644
--- a/chain/actors/builtin/miner/diff.go
+++ b/chain/actors/builtin/miner/diff.go
@@ -2,15 +2,14 @@ package miner
 
 import (
 	"context"
-
-	cbg "github.com/whyrusleeping/cbor-gen"
-	"go.opentelemetry.io/otel"
-	"go.opentelemetry.io/otel/attribute"
-	"golang.org/x/xerrors"
+	"fmt"
 
 	"github.com/filecoin-project/go-amt-ipld/v4"
 	"github.com/filecoin-project/go-hamt-ipld/v3"
 	"github.com/filecoin-project/go-state-types/abi"
+	cbg "github.com/whyrusleeping/cbor-gen"
+	"go.opentelemetry.io/otel"
+	"go.opentelemetry.io/otel/attribute"
 
 	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
@@ -48,7 +47,7 @@ func DiffPreCommits(ctx context.Context, store adt.Store, pre, cur State) (*PreC
 		}
 		err = diff.CompareMap(prep, curp, diffContainer)
 		if err != nil {
-			return nil, xerrors.Errorf("diff miner precommit: %w", err)
+			return nil, fmt.Errorf("diff miner precommit: %w", err)
 		}
 		return diffContainer.Results, nil
 	}
@@ -112,7 +111,7 @@ type preCommitDiffContainer struct {
 func (m *preCommitDiffContainer) AsKey(key string) (abi.Keyer, error) {
 	sector, err := abi.ParseUIntKey(key)
 	if err != nil {
-		return nil, xerrors.Errorf("pre commit diff container as key: %w", err)
+		return nil, fmt.Errorf("pre commit diff container as key: %w", err)
 	}
 	return abi.UIntKey(sector), nil
 }
@@ -120,7 +119,7 @@ func (m *preCommitDiffContainer) AsKey(key string) (abi.Keyer, error) {
 func (m *preCommitDiffContainer) Add(key string, val *cbg.Deferred) error {
 	sp, err := m.after.DecodeSectorPreCommitOnChainInfo(val)
 	if err != nil {
-		return xerrors.Errorf("pre commit diff container add: %w", err)
+		return fmt.Errorf("pre commit diff container add: %w", err)
 	}
 	m.Results.Added = append(m.Results.Added, sp)
 	return nil
@@ -133,7 +132,7 @@ func (m *preCommitDiffContainer) Modify(key string, from, to *cbg.Deferred) erro
 func (m *preCommitDiffContainer) Remove(key string, val *cbg.Deferred) error {
 	sp, err := m.pre.DecodeSectorPreCommitOnChainInfo(val)
 	if err != nil {
-		return xerrors.Errorf("pre commit diff container remove: %w", err)
+		return fmt.Errorf("pre commit diff container remove: %w", err)
 	}
 	m.Results.Removed = append(m.Results.Removed, sp)
 	return nil
@@ -161,7 +160,7 @@ func DiffSectors(ctx context.Context, store adt.Store, pre, cur State) (*SectorC
 		}
 		err = diff.CompareArray(pres, curs, diffContainer)
 		if err != nil {
-			return nil, xerrors.Errorf("diff miner sectors: %w", err)
+			return nil, fmt.Errorf("diff miner sectors: %w", err)
 		}
 		return diffContainer.Results, nil
 	}
@@ -209,7 +208,7 @@ type sectorDiffContainer struct {
 func (m *sectorDiffContainer) Add(key uint64, val *cbg.Deferred) error {
 	si, err := m.after.DecodeSectorOnChainInfo(val)
 	if err != nil {
-		return xerrors.Errorf("sector diff container add: %w", err)
+		return fmt.Errorf("sector diff container add: %w", err)
 	}
 	m.Results.Added = append(m.Results.Added, si)
 	return nil
@@ -218,12 +217,12 @@ func (m *sectorDiffContainer) Add(key uint64, val *cbg.Deferred) error {
 func (m *sectorDiffContainer) Modify(key uint64, from, to *cbg.Deferred) error {
 	siFrom, err := m.pre.DecodeSectorOnChainInfo(from)
 	if err != nil {
-		return xerrors.Errorf("sector diff container modify from: %w", err)
+		return fmt.Errorf("sector diff container modify from: %w", err)
 	}
 
 	siTo, err := m.after.DecodeSectorOnChainInfo(to)
 	if err != nil {
-		return xerrors.Errorf("sector diff container modify to: %w", err)
+		return fmt.Errorf("sector diff container modify to: %w", err)
 	}
 
 	if siFrom.Expiration != siTo.Expiration {
@@ -247,7 +246,7 @@ func (m *sectorDiffContainer) Modify(key uint64, from, to *cbg.Deferred) error {
 func (m *sectorDiffContainer) Remove(key uint64, val *cbg.Deferred) error {
 	si, err := m.pre.DecodeSectorOnChainInfo(val)
 	if err != nil {
-		return xerrors.Errorf("sector diff container remove: %w", err)
+		return fmt.Errorf("sector diff container remove: %w", err)
 	}
 	m.Results.Removed = append(m.Results.Removed, si)
 	return nil
diff --git a/chain/actors/builtin/miner/miner.go b/chain/actors/builtin/miner/miner.go
index 4c372f652..8d53e56f8 100644
--- a/chain/actors/builtin/miner/miner.go
+++ b/chain/actors/builtin/miner/miner.go
@@ -2,12 +2,12 @@
 package miner
 
 import (
+	"fmt"
 	"github.com/filecoin-project/go-state-types/big"
 	"github.com/filecoin-project/go-state-types/network"
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p-core/peer"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-bitfield"
@@ -120,7 +120,7 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		return load7(store, act.Head)
 
 	}
-	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+	return nil, fmt.Errorf("unknown actor code %s", act.Code)
 }
 
 type State interface {
@@ -262,7 +262,7 @@ func PreferredSealProofTypeFromWindowPoStType(nver network.Version, proof abi.Re
 		case abi.RegisteredPoStProof_StackedDrgWindow64GiBV1:
 			return abi.RegisteredSealProof_StackedDrg64GiBV1, nil
 		default:
-			return -1, xerrors.Errorf("unrecognized window post type: %d", proof)
+			return -1, fmt.Errorf("unrecognized window post type: %d", proof)
 		}
 	}
 
@@ -278,7 +278,7 @@ func PreferredSealProofTypeFromWindowPoStType(nver network.Version, proof abi.Re
 	case abi.RegisteredPoStProof_StackedDrgWindow64GiBV1:
 		return abi.RegisteredSealProof_StackedDrg64GiBV1_1, nil
 	default:
-		return -1, xerrors.Errorf("unrecognized window post type: %d", proof)
+		return -1, fmt.Errorf("unrecognized window post type: %d", proof)
 	}
 }
 
@@ -295,7 +295,7 @@ func WinningPoStProofTypeFromWindowPoStProofType(nver network.Version, proof abi
 	case abi.RegisteredPoStProof_StackedDrgWindow64GiBV1:
 		return abi.RegisteredPoStProof_StackedDrgWinning64GiBV1, nil
 	default:
-		return -1, xerrors.Errorf("unknown proof type %d", proof)
+		return -1, fmt.Errorf("unknown proof type %d", proof)
 	}
 }
 
diff --git a/chain/actors/builtin/miner/state.go.template b/chain/actors/builtin/miner/state.go.template
index 2f345c041..e70dc601c 100644
--- a/chain/actors/builtin/miner/state.go.template
+++ b/chain/actors/builtin/miner/state.go.template
@@ -3,6 +3,7 @@ package miner
 
 import (
 	"bytes"
+	"fmt"
 	"errors"
 {{if (le .v 1)}}
 	"github.com/filecoin-project/go-state-types/big"
@@ -15,7 +16,6 @@ import (
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p-core/peer"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/adt"
 
@@ -61,7 +61,7 @@ func (s *state{{.v}}) SectorsAmtBitwidth() int {
 func (s *state{{.v}}) AvailableBalance(bal abi.TokenAmount) (available abi.TokenAmount, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			err = xerrors.Errorf("failed to get available balance: %w", r)
+			err = fmt.Errorf("failed to get available balance: %w", r)
 			available = abi.NewTokenAmount(0)
 		}
 	}()
@@ -206,7 +206,7 @@ func (s *state{{.v}}) GetSectorExpiration(num abi.SectorNumber) (*SectorExpirati
 		return nil, err
 	}
 	if out.Early == 0 && out.OnTime == 0 {
-		return nil, xerrors.Errorf("failed to find sector %d", num)
+		return nil, fmt.Errorf("failed to find sector %d", num)
 	}
 	return &out, nil
 }
diff --git a/chain/actors/builtin/miner/utils.go b/chain/actors/builtin/miner/utils.go
index 2f24e8454..53e6f8d5c 100644
--- a/chain/actors/builtin/miner/utils.go
+++ b/chain/actors/builtin/miner/utils.go
@@ -1,7 +1,7 @@
 package miner
 
 import (
-	"golang.org/x/xerrors"
+	"fmt"
 
 	"github.com/filecoin-project/go-bitfield"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -15,7 +15,7 @@ func AllPartSectors(mas State, sget func(Partition) (bitfield.BitField, error))
 		return dl.ForEachPartition(func(partidx uint64, part Partition) error {
 			s, err := sget(part)
 			if err != nil {
-				return xerrors.Errorf("getting sector list (dl: %d, part %d): %w", dlidx, partidx, err)
+				return fmt.Errorf("getting sector list (dl: %d, part %d): %w", dlidx, partidx, err)
 			}
 
 			parts = append(parts, s)
@@ -46,7 +46,7 @@ func SealProofTypeFromSectorSize(ssize abi.SectorSize, nv network.Version) (abi.
 		case 64 << 30:
 			return abi.RegisteredSealProof_StackedDrg64GiBV1, nil
 		default:
-			return 0, xerrors.Errorf("unsupported sector size for miner: %v", ssize)
+			return 0, fmt.Errorf("unsupported sector size for miner: %v", ssize)
 		}
 	case nv >= network.Version7:
 		switch ssize {
@@ -61,9 +61,9 @@ func SealProofTypeFromSectorSize(ssize abi.SectorSize, nv network.Version) (abi.
 		case 64 << 30:
 			return abi.RegisteredSealProof_StackedDrg64GiBV1_1, nil
 		default:
-			return 0, xerrors.Errorf("unsupported sector size for miner: %v", ssize)
+			return 0, fmt.Errorf("unsupported sector size for miner: %v", ssize)
 		}
 	}
 
-	return 0, xerrors.Errorf("unsupported network version")
+	return 0, fmt.Errorf("unsupported network version")
 }
diff --git a/chain/actors/builtin/miner/v0.go b/chain/actors/builtin/miner/v0.go
index bc2477bf6..9a29034c1 100644
--- a/chain/actors/builtin/miner/v0.go
+++ b/chain/actors/builtin/miner/v0.go
@@ -4,6 +4,7 @@ package miner
 import (
 	"bytes"
 	"errors"
+	"fmt"
 
 	"github.com/filecoin-project/go-state-types/big"
 
@@ -15,7 +16,6 @@ import (
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p-core/peer"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/adt"
 
@@ -61,7 +61,7 @@ func (s *state0) SectorsAmtBitwidth() int {
 func (s *state0) AvailableBalance(bal abi.TokenAmount) (available abi.TokenAmount, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			err = xerrors.Errorf("failed to get available balance: %w", r)
+			err = fmt.Errorf("failed to get available balance: %w", r)
 			available = abi.NewTokenAmount(0)
 		}
 	}()
@@ -196,7 +196,7 @@ func (s *state0) GetSectorExpiration(num abi.SectorNumber) (*SectorExpiration, e
 		return nil, err
 	}
 	if out.Early == 0 && out.OnTime == 0 {
-		return nil, xerrors.Errorf("failed to find sector %d", num)
+		return nil, fmt.Errorf("failed to find sector %d", num)
 	}
 	return &out, nil
 }
diff --git a/chain/actors/builtin/miner/v2.go b/chain/actors/builtin/miner/v2.go
index 815351de6..dc4617b89 100644
--- a/chain/actors/builtin/miner/v2.go
+++ b/chain/actors/builtin/miner/v2.go
@@ -4,6 +4,7 @@ package miner
 import (
 	"bytes"
 	"errors"
+	"fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-bitfield"
@@ -13,7 +14,6 @@ import (
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p-core/peer"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/adt"
 
@@ -59,7 +59,7 @@ func (s *state2) SectorsAmtBitwidth() int {
 func (s *state2) AvailableBalance(bal abi.TokenAmount) (available abi.TokenAmount, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			err = xerrors.Errorf("failed to get available balance: %w", r)
+			err = fmt.Errorf("failed to get available balance: %w", r)
 			available = abi.NewTokenAmount(0)
 		}
 	}()
@@ -194,7 +194,7 @@ func (s *state2) GetSectorExpiration(num abi.SectorNumber) (*SectorExpiration, e
 		return nil, err
 	}
 	if out.Early == 0 && out.OnTime == 0 {
-		return nil, xerrors.Errorf("failed to find sector %d", num)
+		return nil, fmt.Errorf("failed to find sector %d", num)
 	}
 	return &out, nil
 }
diff --git a/chain/actors/builtin/miner/v3.go b/chain/actors/builtin/miner/v3.go
index eb1233730..5cc82196b 100644
--- a/chain/actors/builtin/miner/v3.go
+++ b/chain/actors/builtin/miner/v3.go
@@ -4,6 +4,7 @@ package miner
 import (
 	"bytes"
 	"errors"
+	"fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-bitfield"
@@ -13,7 +14,6 @@ import (
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p-core/peer"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/adt"
 
@@ -59,7 +59,7 @@ func (s *state3) SectorsAmtBitwidth() int {
 func (s *state3) AvailableBalance(bal abi.TokenAmount) (available abi.TokenAmount, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			err = xerrors.Errorf("failed to get available balance: %w", r)
+			err = fmt.Errorf("failed to get available balance: %w", r)
 			available = abi.NewTokenAmount(0)
 		}
 	}()
@@ -194,7 +194,7 @@ func (s *state3) GetSectorExpiration(num abi.SectorNumber) (*SectorExpiration, e
 		return nil, err
 	}
 	if out.Early == 0 && out.OnTime == 0 {
-		return nil, xerrors.Errorf("failed to find sector %d", num)
+		return nil, fmt.Errorf("failed to find sector %d", num)
 	}
 	return &out, nil
 }
diff --git a/chain/actors/builtin/miner/v4.go b/chain/actors/builtin/miner/v4.go
index cecd055bd..f6622d5ae 100644
--- a/chain/actors/builtin/miner/v4.go
+++ b/chain/actors/builtin/miner/v4.go
@@ -4,6 +4,7 @@ package miner
 import (
 	"bytes"
 	"errors"
+	"fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-bitfield"
@@ -13,7 +14,6 @@ import (
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p-core/peer"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/adt"
 
@@ -59,7 +59,7 @@ func (s *state4) SectorsAmtBitwidth() int {
 func (s *state4) AvailableBalance(bal abi.TokenAmount) (available abi.TokenAmount, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			err = xerrors.Errorf("failed to get available balance: %w", r)
+			err = fmt.Errorf("failed to get available balance: %w", r)
 			available = abi.NewTokenAmount(0)
 		}
 	}()
@@ -194,7 +194,7 @@ func (s *state4) GetSectorExpiration(num abi.SectorNumber) (*SectorExpiration, e
 		return nil, err
 	}
 	if out.Early == 0 && out.OnTime == 0 {
-		return nil, xerrors.Errorf("failed to find sector %d", num)
+		return nil, fmt.Errorf("failed to find sector %d", num)
 	}
 	return &out, nil
 }
diff --git a/chain/actors/builtin/miner/v5.go b/chain/actors/builtin/miner/v5.go
index 925b453a9..397c81202 100644
--- a/chain/actors/builtin/miner/v5.go
+++ b/chain/actors/builtin/miner/v5.go
@@ -4,6 +4,7 @@ package miner
 import (
 	"bytes"
 	"errors"
+	"fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-bitfield"
@@ -13,7 +14,6 @@ import (
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p-core/peer"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/adt"
 
@@ -59,7 +59,7 @@ func (s *state5) SectorsAmtBitwidth() int {
 func (s *state5) AvailableBalance(bal abi.TokenAmount) (available abi.TokenAmount, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			err = xerrors.Errorf("failed to get available balance: %w", r)
+			err = fmt.Errorf("failed to get available balance: %w", r)
 			available = abi.NewTokenAmount(0)
 		}
 	}()
@@ -194,7 +194,7 @@ func (s *state5) GetSectorExpiration(num abi.SectorNumber) (*SectorExpiration, e
 		return nil, err
 	}
 	if out.Early == 0 && out.OnTime == 0 {
-		return nil, xerrors.Errorf("failed to find sector %d", num)
+		return nil, fmt.Errorf("failed to find sector %d", num)
 	}
 	return &out, nil
 }
diff --git a/chain/actors/builtin/miner/v6.go b/chain/actors/builtin/miner/v6.go
index 782a0483d..0e06518e2 100644
--- a/chain/actors/builtin/miner/v6.go
+++ b/chain/actors/builtin/miner/v6.go
@@ -4,6 +4,7 @@ package miner
 import (
 	"bytes"
 	"errors"
+	"fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-bitfield"
@@ -13,7 +14,6 @@ import (
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p-core/peer"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/adt"
 
@@ -59,7 +59,7 @@ func (s *state6) SectorsAmtBitwidth() int {
 func (s *state6) AvailableBalance(bal abi.TokenAmount) (available abi.TokenAmount, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			err = xerrors.Errorf("failed to get available balance: %w", r)
+			err = fmt.Errorf("failed to get available balance: %w", r)
 			available = abi.NewTokenAmount(0)
 		}
 	}()
@@ -194,7 +194,7 @@ func (s *state6) GetSectorExpiration(num abi.SectorNumber) (*SectorExpiration, e
 		return nil, err
 	}
 	if out.Early == 0 && out.OnTime == 0 {
-		return nil, xerrors.Errorf("failed to find sector %d", num)
+		return nil, fmt.Errorf("failed to find sector %d", num)
 	}
 	return &out, nil
 }
diff --git a/chain/actors/builtin/miner/v7.go b/chain/actors/builtin/miner/v7.go
index d17abbb9c..b56b53959 100644
--- a/chain/actors/builtin/miner/v7.go
+++ b/chain/actors/builtin/miner/v7.go
@@ -4,6 +4,7 @@ package miner
 import (
 	"bytes"
 	"errors"
+	"fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-bitfield"
@@ -13,7 +14,6 @@ import (
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p-core/peer"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/adt"
 
@@ -59,7 +59,7 @@ func (s *state7) SectorsAmtBitwidth() int {
 func (s *state7) AvailableBalance(bal abi.TokenAmount) (available abi.TokenAmount, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			err = xerrors.Errorf("failed to get available balance: %w", r)
+			err = fmt.Errorf("failed to get available balance: %w", r)
 			available = abi.NewTokenAmount(0)
 		}
 	}()
@@ -193,7 +193,7 @@ func (s *state7) GetSectorExpiration(num abi.SectorNumber) (*SectorExpiration, e
 		return nil, err
 	}
 	if out.Early == 0 && out.OnTime == 0 {
-		return nil, xerrors.Errorf("failed to find sector %d", num)
+		return nil, fmt.Errorf("failed to find sector %d", num)
 	}
 	return &out, nil
 }
diff --git a/chain/actors/builtin/multisig/actor.go.template b/chain/actors/builtin/multisig/actor.go.template
index 07e4171bf..e6b3540ab 100644
--- a/chain/actors/builtin/multisig/actor.go.template
+++ b/chain/actors/builtin/multisig/actor.go.template
@@ -6,7 +6,6 @@ import (
 
 	"github.com/minio/blake2b-simd"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -39,7 +38,7 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		return load{{.}}(store, act.Head)
 {{end}}
 	}
-	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+	return nil, fmt.Errorf("unknown actor code %s", act.Code)
 }
 
 type State interface {
@@ -111,13 +110,13 @@ func txnParams(id uint64, data *ProposalHashData) ([]byte, error) {
 	params := msig{{.latestVersion}}.TxnIDParams{ID: msig{{.latestVersion}}.TxnID(id)}
 	if data != nil {
 		if data.Requester.Protocol() != address.ID {
-			return nil, xerrors.Errorf("proposer address must be an ID address, was %s", data.Requester)
+			return nil, fmt.Errorf("proposer address must be an ID address, was %s", data.Requester)
 		}
 		if data.Value.Sign() == -1 {
-			return nil, xerrors.Errorf("proposal value must be non-negative, was %s", data.Value)
+			return nil, fmt.Errorf("proposal value must be non-negative, was %s", data.Value)
 		}
 		if data.To == address.Undef {
-			return nil, xerrors.Errorf("proposed destination address must be set")
+			return nil, fmt.Errorf("proposed destination address must be set")
 		}
 		pser, err := data.Serialize()
 		if err != nil {
diff --git a/chain/actors/builtin/multisig/message.go.template b/chain/actors/builtin/multisig/message.go.template
index a7274af1f..ddefa157c 100644
--- a/chain/actors/builtin/multisig/message.go.template
+++ b/chain/actors/builtin/multisig/message.go.template
@@ -2,7 +2,7 @@
 package multisig
 
 import (
-	"golang.org/x/xerrors"
+    "fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -28,7 +28,7 @@ func (m message{{.v}}) Create(
 	lenAddrs := uint64(len(signers))
 
 	if lenAddrs < threshold {
-		return nil, xerrors.Errorf("cannot require signing of more addresses than provided for multisig")
+		return nil, fmt.Errorf("cannot require signing of more addresses than provided for multisig")
 	}
 
 	if threshold == 0 {
@@ -36,11 +36,11 @@ func (m message{{.v}}) Create(
 	}
 
 	if m.from == address.Undef {
-		return nil, xerrors.Errorf("must provide source address")
+		return nil, fmt.Errorf("must provide source address")
 	}
 {{if (le .v 1)}}
 	if unlockStart != 0 {
-		return nil, xerrors.Errorf("actors v0 does not support a non-zero vesting start time")
+		return nil, fmt.Errorf("actors v0 does not support a non-zero vesting start time")
 	}
 {{end}}
 	// Set up constructor parameters for multisig
@@ -82,19 +82,19 @@ func (m message0) Propose(msig, to address.Address, amt abi.TokenAmount,
 	method abi.MethodNum, params []byte) (*types.Message, error) {
 
 	if msig == address.Undef {
-		return nil, xerrors.Errorf("must provide a multisig address for proposal")
+		return nil, fmt.Errorf("must provide a multisig address for proposal")
 	}
 
 	if to == address.Undef {
-		return nil, xerrors.Errorf("must provide a target address for proposal")
+		return nil, fmt.Errorf("must provide a target address for proposal")
 	}
 
 	if amt.Sign() == -1 {
-		return nil, xerrors.Errorf("must provide a non-negative amount for proposed send")
+		return nil, fmt.Errorf("must provide a non-negative amount for proposed send")
 	}
 
 	if m.from == address.Undef {
-		return nil, xerrors.Errorf("must provide source address")
+		return nil, fmt.Errorf("must provide source address")
 	}
 
 	enc, actErr := actors.SerializeParams(&multisig0.ProposeParams{
@@ -104,7 +104,7 @@ func (m message0) Propose(msig, to address.Address, amt abi.TokenAmount,
 		Params: params,
 	})
 	if actErr != nil {
-		return nil, xerrors.Errorf("failed to serialize parameters: %w", actErr)
+		return nil, fmt.Errorf("failed to serialize parameters: %w", actErr)
 	}
 
 	return &types.Message{
diff --git a/chain/actors/builtin/multisig/message0.go b/chain/actors/builtin/multisig/message0.go
index 56e85cbba..f1fc97b93 100644
--- a/chain/actors/builtin/multisig/message0.go
+++ b/chain/actors/builtin/multisig/message0.go
@@ -2,7 +2,7 @@
 package multisig
 
 import (
-	"golang.org/x/xerrors"
+	"fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -28,7 +28,7 @@ func (m message0) Create(
 	lenAddrs := uint64(len(signers))
 
 	if lenAddrs < threshold {
-		return nil, xerrors.Errorf("cannot require signing of more addresses than provided for multisig")
+		return nil, fmt.Errorf("cannot require signing of more addresses than provided for multisig")
 	}
 
 	if threshold == 0 {
@@ -36,11 +36,11 @@ func (m message0) Create(
 	}
 
 	if m.from == address.Undef {
-		return nil, xerrors.Errorf("must provide source address")
+		return nil, fmt.Errorf("must provide source address")
 	}
 
 	if unlockStart != 0 {
-		return nil, xerrors.Errorf("actors v0 does not support a non-zero vesting start time")
+		return nil, fmt.Errorf("actors v0 does not support a non-zero vesting start time")
 	}
 
 	// Set up constructor parameters for multisig
@@ -79,19 +79,19 @@ func (m message0) Propose(msig, to address.Address, amt abi.TokenAmount,
 	method abi.MethodNum, params []byte) (*types.Message, error) {
 
 	if msig == address.Undef {
-		return nil, xerrors.Errorf("must provide a multisig address for proposal")
+		return nil, fmt.Errorf("must provide a multisig address for proposal")
 	}
 
 	if to == address.Undef {
-		return nil, xerrors.Errorf("must provide a target address for proposal")
+		return nil, fmt.Errorf("must provide a target address for proposal")
 	}
 
 	if amt.Sign() == -1 {
-		return nil, xerrors.Errorf("must provide a non-negative amount for proposed send")
+		return nil, fmt.Errorf("must provide a non-negative amount for proposed send")
 	}
 
 	if m.from == address.Undef {
-		return nil, xerrors.Errorf("must provide source address")
+		return nil, fmt.Errorf("must provide source address")
 	}
 
 	enc, actErr := actors.SerializeParams(&multisig0.ProposeParams{
@@ -101,7 +101,7 @@ func (m message0) Propose(msig, to address.Address, amt abi.TokenAmount,
 		Params: params,
 	})
 	if actErr != nil {
-		return nil, xerrors.Errorf("failed to serialize parameters: %w", actErr)
+		return nil, fmt.Errorf("failed to serialize parameters: %w", actErr)
 	}
 
 	return &types.Message{
diff --git a/chain/actors/builtin/multisig/message2.go b/chain/actors/builtin/multisig/message2.go
index edf6d858c..2be30dab4 100644
--- a/chain/actors/builtin/multisig/message2.go
+++ b/chain/actors/builtin/multisig/message2.go
@@ -2,7 +2,7 @@
 package multisig
 
 import (
-	"golang.org/x/xerrors"
+	"fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -28,7 +28,7 @@ func (m message2) Create(
 	lenAddrs := uint64(len(signers))
 
 	if lenAddrs < threshold {
-		return nil, xerrors.Errorf("cannot require signing of more addresses than provided for multisig")
+		return nil, fmt.Errorf("cannot require signing of more addresses than provided for multisig")
 	}
 
 	if threshold == 0 {
@@ -36,7 +36,7 @@ func (m message2) Create(
 	}
 
 	if m.from == address.Undef {
-		return nil, xerrors.Errorf("must provide source address")
+		return nil, fmt.Errorf("must provide source address")
 	}
 
 	// Set up constructor parameters for multisig
diff --git a/chain/actors/builtin/multisig/message3.go b/chain/actors/builtin/multisig/message3.go
index f6fefc13c..061243d63 100644
--- a/chain/actors/builtin/multisig/message3.go
+++ b/chain/actors/builtin/multisig/message3.go
@@ -2,7 +2,7 @@
 package multisig
 
 import (
-	"golang.org/x/xerrors"
+	"fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -28,7 +28,7 @@ func (m message3) Create(
 	lenAddrs := uint64(len(signers))
 
 	if lenAddrs < threshold {
-		return nil, xerrors.Errorf("cannot require signing of more addresses than provided for multisig")
+		return nil, fmt.Errorf("cannot require signing of more addresses than provided for multisig")
 	}
 
 	if threshold == 0 {
@@ -36,7 +36,7 @@ func (m message3) Create(
 	}
 
 	if m.from == address.Undef {
-		return nil, xerrors.Errorf("must provide source address")
+		return nil, fmt.Errorf("must provide source address")
 	}
 
 	// Set up constructor parameters for multisig
diff --git a/chain/actors/builtin/multisig/message4.go b/chain/actors/builtin/multisig/message4.go
index 147994e4d..4fdccc9ab 100644
--- a/chain/actors/builtin/multisig/message4.go
+++ b/chain/actors/builtin/multisig/message4.go
@@ -2,7 +2,7 @@
 package multisig
 
 import (
-	"golang.org/x/xerrors"
+	"fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -28,7 +28,7 @@ func (m message4) Create(
 	lenAddrs := uint64(len(signers))
 
 	if lenAddrs < threshold {
-		return nil, xerrors.Errorf("cannot require signing of more addresses than provided for multisig")
+		return nil, fmt.Errorf("cannot require signing of more addresses than provided for multisig")
 	}
 
 	if threshold == 0 {
@@ -36,7 +36,7 @@ func (m message4) Create(
 	}
 
 	if m.from == address.Undef {
-		return nil, xerrors.Errorf("must provide source address")
+		return nil, fmt.Errorf("must provide source address")
 	}
 
 	// Set up constructor parameters for multisig
diff --git a/chain/actors/builtin/multisig/message5.go b/chain/actors/builtin/multisig/message5.go
index 8f7887bc9..cfe16919d 100644
--- a/chain/actors/builtin/multisig/message5.go
+++ b/chain/actors/builtin/multisig/message5.go
@@ -2,7 +2,7 @@
 package multisig
 
 import (
-	"golang.org/x/xerrors"
+	"fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -28,7 +28,7 @@ func (m message5) Create(
 	lenAddrs := uint64(len(signers))
 
 	if lenAddrs < threshold {
-		return nil, xerrors.Errorf("cannot require signing of more addresses than provided for multisig")
+		return nil, fmt.Errorf("cannot require signing of more addresses than provided for multisig")
 	}
 
 	if threshold == 0 {
@@ -36,7 +36,7 @@ func (m message5) Create(
 	}
 
 	if m.from == address.Undef {
-		return nil, xerrors.Errorf("must provide source address")
+		return nil, fmt.Errorf("must provide source address")
 	}
 
 	// Set up constructor parameters for multisig
diff --git a/chain/actors/builtin/multisig/message6.go b/chain/actors/builtin/multisig/message6.go
index 1ef7aed00..837803e01 100644
--- a/chain/actors/builtin/multisig/message6.go
+++ b/chain/actors/builtin/multisig/message6.go
@@ -2,7 +2,7 @@
 package multisig
 
 import (
-	"golang.org/x/xerrors"
+	"fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -28,7 +28,7 @@ func (m message6) Create(
 	lenAddrs := uint64(len(signers))
 
 	if lenAddrs < threshold {
-		return nil, xerrors.Errorf("cannot require signing of more addresses than provided for multisig")
+		return nil, fmt.Errorf("cannot require signing of more addresses than provided for multisig")
 	}
 
 	if threshold == 0 {
@@ -36,7 +36,7 @@ func (m message6) Create(
 	}
 
 	if m.from == address.Undef {
-		return nil, xerrors.Errorf("must provide source address")
+		return nil, fmt.Errorf("must provide source address")
 	}
 
 	// Set up constructor parameters for multisig
diff --git a/chain/actors/builtin/multisig/message7.go b/chain/actors/builtin/multisig/message7.go
index 2f133f751..3a3e08999 100644
--- a/chain/actors/builtin/multisig/message7.go
+++ b/chain/actors/builtin/multisig/message7.go
@@ -2,7 +2,7 @@
 package multisig
 
 import (
-	"golang.org/x/xerrors"
+	"fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -28,7 +28,7 @@ func (m message7) Create(
 	lenAddrs := uint64(len(signers))
 
 	if lenAddrs < threshold {
-		return nil, xerrors.Errorf("cannot require signing of more addresses than provided for multisig")
+		return nil, fmt.Errorf("cannot require signing of more addresses than provided for multisig")
 	}
 
 	if threshold == 0 {
@@ -36,7 +36,7 @@ func (m message7) Create(
 	}
 
 	if m.from == address.Undef {
-		return nil, xerrors.Errorf("must provide source address")
+		return nil, fmt.Errorf("must provide source address")
 	}
 
 	// Set up constructor parameters for multisig
diff --git a/chain/actors/builtin/multisig/multisig.go b/chain/actors/builtin/multisig/multisig.go
index c6680009b..283a1be39 100644
--- a/chain/actors/builtin/multisig/multisig.go
+++ b/chain/actors/builtin/multisig/multisig.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/minio/blake2b-simd"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -86,7 +85,7 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		return load7(store, act.Head)
 
 	}
-	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+	return nil, fmt.Errorf("unknown actor code %s", act.Code)
 }
 
 type State interface {
@@ -180,13 +179,13 @@ func txnParams(id uint64, data *ProposalHashData) ([]byte, error) {
 	params := msig7.TxnIDParams{ID: msig7.TxnID(id)}
 	if data != nil {
 		if data.Requester.Protocol() != address.ID {
-			return nil, xerrors.Errorf("proposer address must be an ID address, was %s", data.Requester)
+			return nil, fmt.Errorf("proposer address must be an ID address, was %s", data.Requester)
 		}
 		if data.Value.Sign() == -1 {
-			return nil, xerrors.Errorf("proposal value must be non-negative, was %s", data.Value)
+			return nil, fmt.Errorf("proposal value must be non-negative, was %s", data.Value)
 		}
 		if data.To == address.Undef {
-			return nil, xerrors.Errorf("proposed destination address must be set")
+			return nil, fmt.Errorf("proposed destination address must be set")
 		}
 		pser, err := data.Serialize()
 		if err != nil {
diff --git a/chain/actors/builtin/multisig/state.go.template b/chain/actors/builtin/multisig/state.go.template
index 055717ab2..c7e013b85 100644
--- a/chain/actors/builtin/multisig/state.go.template
+++ b/chain/actors/builtin/multisig/state.go.template
@@ -3,6 +3,7 @@ package multisig
 
 import (
 	"bytes"
+	"fmt"
 	"encoding/binary"
 
 	adt{{.v}} "github.com/filecoin-project/specs-actors{{.import}}actors/util/adt"
@@ -11,7 +12,6 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/adt"
 
@@ -72,7 +72,7 @@ func (s *state{{.v}}) ForEachPendingTxn(cb func(id int64, txn Transaction) error
 	return arr.ForEach(&out, func(key string) error {
 		txid, n := binary.Varint([]byte(key))
 		if n <= 0 {
-			return xerrors.Errorf("invalid pending transaction key: %v", key)
+			return fmt.Errorf("invalid pending transaction key: %v", key)
 		}
 		return cb(txid, (Transaction)(out)) //nolint:unconvert
 	})
diff --git a/chain/actors/builtin/multisig/v0.go b/chain/actors/builtin/multisig/v0.go
index 573e340c7..3d42def2d 100644
--- a/chain/actors/builtin/multisig/v0.go
+++ b/chain/actors/builtin/multisig/v0.go
@@ -4,6 +4,7 @@ package multisig
 import (
 	"bytes"
 	"encoding/binary"
+	"fmt"
 
 	adt0 "github.com/filecoin-project/specs-actors/actors/util/adt"
 
@@ -11,7 +12,6 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/adt"
 
@@ -72,7 +72,7 @@ func (s *state0) ForEachPendingTxn(cb func(id int64, txn Transaction) error) err
 	return arr.ForEach(&out, func(key string) error {
 		txid, n := binary.Varint([]byte(key))
 		if n <= 0 {
-			return xerrors.Errorf("invalid pending transaction key: %v", key)
+			return fmt.Errorf("invalid pending transaction key: %v", key)
 		}
 		return cb(txid, (Transaction)(out)) //nolint:unconvert
 	})
diff --git a/chain/actors/builtin/multisig/v2.go b/chain/actors/builtin/multisig/v2.go
index 5c6756c58..60e6c2765 100644
--- a/chain/actors/builtin/multisig/v2.go
+++ b/chain/actors/builtin/multisig/v2.go
@@ -4,6 +4,7 @@ package multisig
 import (
 	"bytes"
 	"encoding/binary"
+	"fmt"
 
 	adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt"
 
@@ -11,7 +12,6 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/adt"
 
@@ -72,7 +72,7 @@ func (s *state2) ForEachPendingTxn(cb func(id int64, txn Transaction) error) err
 	return arr.ForEach(&out, func(key string) error {
 		txid, n := binary.Varint([]byte(key))
 		if n <= 0 {
-			return xerrors.Errorf("invalid pending transaction key: %v", key)
+			return fmt.Errorf("invalid pending transaction key: %v", key)
 		}
 		return cb(txid, (Transaction)(out)) //nolint:unconvert
 	})
diff --git a/chain/actors/builtin/multisig/v3.go b/chain/actors/builtin/multisig/v3.go
index 4c82058a0..24a692bf4 100644
--- a/chain/actors/builtin/multisig/v3.go
+++ b/chain/actors/builtin/multisig/v3.go
@@ -4,6 +4,7 @@ package multisig
 import (
 	"bytes"
 	"encoding/binary"
+	"fmt"
 
 	adt3 "github.com/filecoin-project/specs-actors/v3/actors/util/adt"
 
@@ -11,7 +12,6 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/adt"
 
@@ -72,7 +72,7 @@ func (s *state3) ForEachPendingTxn(cb func(id int64, txn Transaction) error) err
 	return arr.ForEach(&out, func(key string) error {
 		txid, n := binary.Varint([]byte(key))
 		if n <= 0 {
-			return xerrors.Errorf("invalid pending transaction key: %v", key)
+			return fmt.Errorf("invalid pending transaction key: %v", key)
 		}
 		return cb(txid, (Transaction)(out)) //nolint:unconvert
 	})
diff --git a/chain/actors/builtin/multisig/v4.go b/chain/actors/builtin/multisig/v4.go
index b7fc16fc5..5efd1d1da 100644
--- a/chain/actors/builtin/multisig/v4.go
+++ b/chain/actors/builtin/multisig/v4.go
@@ -4,6 +4,7 @@ package multisig
 import (
 	"bytes"
 	"encoding/binary"
+	"fmt"
 
 	adt4 "github.com/filecoin-project/specs-actors/v4/actors/util/adt"
 
@@ -11,7 +12,6 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/adt"
 
@@ -72,7 +72,7 @@ func (s *state4) ForEachPendingTxn(cb func(id int64, txn Transaction) error) err
 	return arr.ForEach(&out, func(key string) error {
 		txid, n := binary.Varint([]byte(key))
 		if n <= 0 {
-			return xerrors.Errorf("invalid pending transaction key: %v", key)
+			return fmt.Errorf("invalid pending transaction key: %v", key)
 		}
 		return cb(txid, (Transaction)(out)) //nolint:unconvert
 	})
diff --git a/chain/actors/builtin/multisig/v5.go b/chain/actors/builtin/multisig/v5.go
index acbaff19c..f6d09d820 100644
--- a/chain/actors/builtin/multisig/v5.go
+++ b/chain/actors/builtin/multisig/v5.go
@@ -4,6 +4,7 @@ package multisig
 import (
 	"bytes"
 	"encoding/binary"
+	"fmt"
 
 	adt5 "github.com/filecoin-project/specs-actors/v5/actors/util/adt"
 
@@ -11,7 +12,6 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/adt"
 
@@ -72,7 +72,7 @@ func (s *state5) ForEachPendingTxn(cb func(id int64, txn Transaction) error) err
 	return arr.ForEach(&out, func(key string) error {
 		txid, n := binary.Varint([]byte(key))
 		if n <= 0 {
-			return xerrors.Errorf("invalid pending transaction key: %v", key)
+			return fmt.Errorf("invalid pending transaction key: %v", key)
 		}
 		return cb(txid, (Transaction)(out)) //nolint:unconvert
 	})
diff --git a/chain/actors/builtin/multisig/v6.go b/chain/actors/builtin/multisig/v6.go
index dc3b73576..81eb98fdf 100644
--- a/chain/actors/builtin/multisig/v6.go
+++ b/chain/actors/builtin/multisig/v6.go
@@ -4,6 +4,7 @@ package multisig
 import (
 	"bytes"
 	"encoding/binary"
+	"fmt"
 
 	adt6 "github.com/filecoin-project/specs-actors/v6/actors/util/adt"
 
@@ -11,7 +12,6 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/adt"
 
@@ -72,7 +72,7 @@ func (s *state6) ForEachPendingTxn(cb func(id int64, txn Transaction) error) err
 	return arr.ForEach(&out, func(key string) error {
 		txid, n := binary.Varint([]byte(key))
 		if n <= 0 {
-			return xerrors.Errorf("invalid pending transaction key: %v", key)
+			return fmt.Errorf("invalid pending transaction key: %v", key)
 		}
 		return cb(txid, (Transaction)(out)) //nolint:unconvert
 	})
diff --git a/chain/actors/builtin/multisig/v7.go b/chain/actors/builtin/multisig/v7.go
index b05a68d2c..2d5ac80c7 100644
--- a/chain/actors/builtin/multisig/v7.go
+++ b/chain/actors/builtin/multisig/v7.go
@@ -4,6 +4,7 @@ package multisig
 import (
 	"bytes"
 	"encoding/binary"
+	"fmt"
 
 	adt7 "github.com/filecoin-project/specs-actors/v7/actors/util/adt"
 
@@ -11,7 +12,6 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/adt"
 
@@ -72,7 +72,7 @@ func (s *state7) ForEachPendingTxn(cb func(id int64, txn Transaction) error) err
 	return arr.ForEach(&out, func(key string) error {
 		txid, n := binary.Varint([]byte(key))
 		if n <= 0 {
-			return xerrors.Errorf("invalid pending transaction key: %v", key)
+			return fmt.Errorf("invalid pending transaction key: %v", key)
 		}
 		return cb(txid, (Transaction)(out)) //nolint:unconvert
 	})
diff --git a/chain/actors/builtin/paych/actor.go.template b/chain/actors/builtin/paych/actor.go.template
index 595bdf0b0..e150a569a 100644
--- a/chain/actors/builtin/paych/actor.go.template
+++ b/chain/actors/builtin/paych/actor.go.template
@@ -5,7 +5,6 @@ import (
 	"encoding/base64"
 	"fmt"
 
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -48,7 +47,7 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		return load{{.}}(store, act.Head)
 {{end}}
 	}
-	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+	return nil, fmt.Errorf("unknown actor code %s", act.Code)
 }
 
 func MakeState(store adt.Store, av actors.Version) (State, error) {
@@ -58,7 +57,7 @@ func MakeState(store adt.Store, av actors.Version) (State, error) {
 		return make{{.}}(store)
 {{end}}
 }
-	return nil, xerrors.Errorf("unknown actor version %d", av)
+	return nil, fmt.Errorf("unknown actor version %d", av)
 }
 
 func GetActorCodeID(av actors.Version) (cid.Cid, error) {
@@ -69,7 +68,7 @@ func GetActorCodeID(av actors.Version) (cid.Cid, error) {
 {{end}}
 	}
 
-	return cid.Undef, xerrors.Errorf("unknown actor version %d", av)
+	return cid.Undef, fmt.Errorf("unknown actor version %d", av)
 }
 
 // State is an abstract version of payment channel state that works across
diff --git a/chain/actors/builtin/paych/paych.go b/chain/actors/builtin/paych/paych.go
index 814925bcf..03a6769ad 100644
--- a/chain/actors/builtin/paych/paych.go
+++ b/chain/actors/builtin/paych/paych.go
@@ -5,8 +5,6 @@ import (
 	"encoding/base64"
 	"fmt"
 
-	"golang.org/x/xerrors"
-
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	big "github.com/filecoin-project/go-state-types/big"
@@ -100,7 +98,7 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		return load7(store, act.Head)
 
 	}
-	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+	return nil, fmt.Errorf("unknown actor code %s", act.Code)
 }
 
 func MakeState(store adt.Store, av actors.Version) (State, error) {
@@ -128,7 +126,7 @@ func MakeState(store adt.Store, av actors.Version) (State, error) {
 		return make7(store)
 
 	}
-	return nil, xerrors.Errorf("unknown actor version %d", av)
+	return nil, fmt.Errorf("unknown actor version %d", av)
 }
 
 func GetActorCodeID(av actors.Version) (cid.Cid, error) {
@@ -157,7 +155,7 @@ func GetActorCodeID(av actors.Version) (cid.Cid, error) {
 
 	}
 
-	return cid.Undef, xerrors.Errorf("unknown actor version %d", av)
+	return cid.Undef, fmt.Errorf("unknown actor version %d", av)
 }
 
 // State is an abstract version of payment channel state that works across
diff --git a/chain/actors/builtin/power/actor.go.template b/chain/actors/builtin/power/actor.go.template
index 6440a1b05..8e4ac4f0a 100644
--- a/chain/actors/builtin/power/actor.go.template
+++ b/chain/actors/builtin/power/actor.go.template
@@ -2,11 +2,12 @@
 package power
 
 import (
+    "fmt"
+
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/big"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/cbor"
@@ -46,7 +47,7 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		return load{{.}}(store, act.Head)
 {{end}}
 	}
-	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+	return nil, fmt.Errorf("unknown actor code %s", act.Code)
 }
 
 type State interface {
diff --git a/chain/actors/builtin/power/power.go b/chain/actors/builtin/power/power.go
index c4b8075f4..2354121ce 100644
--- a/chain/actors/builtin/power/power.go
+++ b/chain/actors/builtin/power/power.go
@@ -2,11 +2,12 @@
 package power
 
 import (
+	"fmt"
+
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/big"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/cbor"
@@ -98,7 +99,7 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		return load7(store, act.Head)
 
 	}
-	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+	return nil, fmt.Errorf("unknown actor code %s", act.Code)
 }
 
 type State interface {
diff --git a/chain/actors/builtin/reward/actor.go.template b/chain/actors/builtin/reward/actor.go.template
index 942cd6040..7a1dde25f 100644
--- a/chain/actors/builtin/reward/actor.go.template
+++ b/chain/actors/builtin/reward/actor.go.template
@@ -2,10 +2,10 @@
 package reward
 
 import (
+    "fmt"
 	"github.com/filecoin-project/go-state-types/abi"
 	reward0 "github.com/filecoin-project/specs-actors/actors/builtin/reward"
 	"github.com/ipfs/go-cid"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-state-types/cbor"
 {{range .versions}}
@@ -44,7 +44,7 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		return load{{.}}(store, act.Head)
 {{end}}
 	}
-	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+	return nil, fmt.Errorf("unknown actor code %s", act.Code)
 }
 
 type State interface {
diff --git a/chain/actors/builtin/reward/reward.go b/chain/actors/builtin/reward/reward.go
index f599c3a32..0b3f7afe8 100644
--- a/chain/actors/builtin/reward/reward.go
+++ b/chain/actors/builtin/reward/reward.go
@@ -2,10 +2,10 @@
 package reward
 
 import (
+	"fmt"
 	"github.com/filecoin-project/go-state-types/abi"
 	reward0 "github.com/filecoin-project/specs-actors/actors/builtin/reward"
 	"github.com/ipfs/go-cid"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-state-types/cbor"
 
@@ -96,7 +96,7 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		return load7(store, act.Head)
 
 	}
-	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+	return nil, fmt.Errorf("unknown actor code %s", act.Code)
 }
 
 type State interface {
diff --git a/chain/actors/builtin/verifreg/actor.go.template b/chain/actors/builtin/verifreg/actor.go.template
index bff0fde35..78614be75 100644
--- a/chain/actors/builtin/verifreg/actor.go.template
+++ b/chain/actors/builtin/verifreg/actor.go.template
@@ -2,8 +2,8 @@
 package verifreg
 
 import (
+    "fmt"
 	"github.com/ipfs/go-cid"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -46,7 +46,7 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		return load{{.}}(store, act.Head)
 {{end}}
 	}
-	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+	return nil, fmt.Errorf("unknown actor code %s", act.Code)
 }
 
 type State interface {
diff --git a/chain/actors/builtin/verifreg/util.go b/chain/actors/builtin/verifreg/util.go
index f032cd331..af692593b 100644
--- a/chain/actors/builtin/verifreg/util.go
+++ b/chain/actors/builtin/verifreg/util.go
@@ -1,12 +1,14 @@
 package verifreg
 
 import (
+	"fmt"
+
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/big"
+
 	"github.com/filecoin-project/lily/chain/actors"
 	"github.com/filecoin-project/lily/chain/actors/adt"
-	"golang.org/x/xerrors"
 )
 
 // taking this as a function instead of asking the caller to call it helps reduce some of the error
@@ -18,16 +20,16 @@ type rootFunc func() (adt.Map, error)
 // Assumes that the bitwidth for v3 HAMTs is the DefaultHamtBitwidth
 func getDataCap(store adt.Store, ver actors.Version, root rootFunc, addr address.Address) (bool, abi.StoragePower, error) {
 	if addr.Protocol() != address.ID {
-		return false, big.Zero(), xerrors.Errorf("can only look up ID addresses")
+		return false, big.Zero(), fmt.Errorf("can only look up ID addresses")
 	}
 	vh, err := root()
 	if err != nil {
-		return false, big.Zero(), xerrors.Errorf("loading verifreg: %w", err)
+		return false, big.Zero(), fmt.Errorf("loading verifreg: %w", err)
 	}
 
 	var dcap abi.StoragePower
 	if found, err := vh.Get(abi.AddrKey(addr), &dcap); err != nil {
-		return false, big.Zero(), xerrors.Errorf("looking up addr: %w", err)
+		return false, big.Zero(), fmt.Errorf("looking up addr: %w", err)
 	} else if !found {
 		return false, big.Zero(), nil
 	}
@@ -39,7 +41,7 @@ func getDataCap(store adt.Store, ver actors.Version, root rootFunc, addr address
 func forEachCap(store adt.Store, ver actors.Version, root rootFunc, cb func(addr address.Address, dcap abi.StoragePower) error) error {
 	vh, err := root()
 	if err != nil {
-		return xerrors.Errorf("loading verified clients: %w", err)
+		return fmt.Errorf("loading verified clients: %w", err)
 	}
 	var dcap abi.StoragePower
 	return vh.ForEach(&dcap, func(key string) error {
diff --git a/chain/actors/builtin/verifreg/verifreg.go b/chain/actors/builtin/verifreg/verifreg.go
index 830127c19..585e36be9 100644
--- a/chain/actors/builtin/verifreg/verifreg.go
+++ b/chain/actors/builtin/verifreg/verifreg.go
@@ -2,8 +2,8 @@
 package verifreg
 
 import (
+	"fmt"
 	"github.com/ipfs/go-cid"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -98,7 +98,7 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 		return load7(store, act.Head)
 
 	}
-	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
+	return nil, fmt.Errorf("unknown actor code %s", act.Code)
 }
 
 type State interface {
diff --git a/chain/cache/tipset.go b/chain/cache/tipset.go
index 41ca373f9..90e7d07eb 100644
--- a/chain/cache/tipset.go
+++ b/chain/cache/tipset.go
@@ -3,10 +3,10 @@ package cache
 import (
 	"context"
 	"errors"
+	"fmt"
 
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/lotus/chain/types"
-	"golang.org/x/xerrors"
 )
 
 var (
@@ -177,7 +177,7 @@ func (c *TipSetCache) Warm(ctx context.Context, head *types.TipSet, getTipSetFn
 			return err
 		}
 		if expectNil != nil {
-			return xerrors.Errorf("unexpected tipset returned while warming tipset cache: %s", expectNil)
+			return fmt.Errorf("unexpected tipset returned while warming tipset cache: %s", expectNil)
 		}
 	}
 	return nil
diff --git a/chain/datasource/datasource.go b/chain/datasource/datasource.go
index b13e51498..993bddcfc 100644
--- a/chain/datasource/datasource.go
+++ b/chain/datasource/datasource.go
@@ -21,7 +21,6 @@ import (
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"golang.org/x/sync/singleflight"
-	"golang.org/x/xerrors"
 
 	states0 "github.com/filecoin-project/specs-actors/actors/states"
 	states2 "github.com/filecoin-project/specs-actors/v2/actors/states"
@@ -372,7 +371,7 @@ func fastDiff(ctx context.Context, store adt.Store, oldR, newR adt.Map) (tasks.A
 	for _, change := range changes {
 		addr, err := address.NewFromBytes([]byte(change.Key))
 		if err != nil {
-			return nil, xerrors.Errorf("address in state tree was not valid: %w", err)
+			return nil, fmt.Errorf("address in state tree was not valid: %w", err)
 		}
 		var ch tasks.ActorStateChange
 		switch change.Type {
@@ -452,7 +451,7 @@ func getStateTreeHamtRootCIDAndVersion(ctx context.Context, store adt.Store, c c
 		}
 		return tree.Map, root.Version, nil
 	default:
-		return nil, 0, xerrors.Errorf("unsupported state tree version: %d", root.Version)
+		return nil, 0, fmt.Errorf("unsupported state tree version: %d", root.Version)
 	}
 }
 
@@ -460,7 +459,7 @@ func asKey(strs ...fmt.Stringer) (string, error) {
 	var sb strings.Builder
 	for _, s := range strs {
 		if _, err := sb.WriteString(s.String()); err != nil {
-			return "", xerrors.Errorf("failed to make key for %s: %w", s, err)
+			return "", fmt.Errorf("failed to make key for %s: %w", s, err)
 		}
 	}
 	return sb.String(), nil
diff --git a/chain/export/export.go b/chain/export/export.go
index 8967ed85a..bf8dc0c52 100644
--- a/chain/export/export.go
+++ b/chain/export/export.go
@@ -3,6 +3,7 @@ package export
 import (
 	"bytes"
 	"context"
+	"fmt"
 	"io"
 
 	"github.com/filecoin-project/go-state-types/abi"
@@ -13,7 +14,6 @@ import (
 	"github.com/ipld/go-car"
 	"github.com/ipld/go-car/util"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 	"gopkg.in/cheggaaa/pb.v1"
 )
 
@@ -102,7 +102,7 @@ func (ce *ChainExporter) Export(ctx context.Context) error {
 
 			var b types.BlockHeader
 			if err := b.UnmarshalCBOR(bytes.NewBuffer(blk.RawData())); err != nil {
-				return xerrors.Errorf("unmarshaling block header (cid=%s): %w", blk, err)
+				return fmt.Errorf("unmarshaling block header (cid=%s): %w", blk, err)
 			}
 
 			if ce.Config.ShowProcess {
diff --git a/chain/gap/find.go b/chain/gap/find.go
index 3f58a27fd..cf56980e8 100644
--- a/chain/gap/find.go
+++ b/chain/gap/find.go
@@ -2,10 +2,10 @@ package gap
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/go-pg/pg/v10"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/lens"
 	"github.com/filecoin-project/lily/model/visor"
@@ -90,7 +90,7 @@ func (g *Finder) Run(ctx context.Context) error {
 		return err
 	}
 	if int64(head.Height()) < g.maxHeight {
-		return xerrors.Errorf("cannot look for gaps beyond chain head height %d", head.Height())
+		return fmt.Errorf("cannot look for gaps beyond chain head height %d", head.Height())
 	}
 
 	gaps, err := g.Find(ctx)
diff --git a/chain/indexer/distributed/catalog.go b/chain/indexer/distributed/catalog.go
index bd234d63a..2df964d3f 100644
--- a/chain/indexer/distributed/catalog.go
+++ b/chain/indexer/distributed/catalog.go
@@ -1,8 +1,9 @@
 package distributed
 
 import (
+	"fmt"
+
 	logging "github.com/ipfs/go-log/v2"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/config"
 )
@@ -18,7 +19,7 @@ func NewCatalog(cfg config.QueueConfig) (*Catalog, error) {
 
 	for name, nc := range cfg.Asynq {
 		if _, exists := c.queues[name]; exists {
-			return nil, xerrors.Errorf("duplicate queue name: %q", name)
+			return nil, fmt.Errorf("duplicate queue name: %q", name)
 		}
 		log.Debugw("registering queue", "name", name, "type", "redis")
 
@@ -43,12 +44,12 @@ type Catalog struct {
 // config.AsynqRedisConfig doesn't exist for `name`.
 func (c *Catalog) AsynqConfig(name string) (config.AsynqRedisConfig, error) {
 	if name == "" {
-		return config.AsynqRedisConfig{}, xerrors.Errorf("queue config name required")
+		return config.AsynqRedisConfig{}, fmt.Errorf("queue config name required")
 	}
 
 	n, exists := c.queues[name]
 	if !exists {
-		return config.AsynqRedisConfig{}, xerrors.Errorf("unknown queue: %q", name)
+		return config.AsynqRedisConfig{}, fmt.Errorf("unknown queue: %q", name)
 	}
 	return n, nil
 }
diff --git a/chain/indexer/distributed/queue/tasks/gapfill.go b/chain/indexer/distributed/queue/tasks/gapfill.go
index d8e9ee7ba..f488c459c 100644
--- a/chain/indexer/distributed/queue/tasks/gapfill.go
+++ b/chain/indexer/distributed/queue/tasks/gapfill.go
@@ -3,13 +3,13 @@ package tasks
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"strings"
 
 	"github.com/filecoin-project/lotus/blockstore"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/hibiken/asynq"
 	"go.opentelemetry.io/otel/trace"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/indexer"
 	"github.com/filecoin-project/lily/chain/indexer/distributed/queue/tracing"
@@ -66,14 +66,14 @@ func (gh *AsynqGapFillTipSetTaskHandler) HandleGapFillTipSetTask(ctx context.Con
 		if strings.Contains(err.Error(), blockstore.ErrNotFound.Error()) {
 			// return SkipRetry to prevent the task from being retried since nodes do not contain the block
 			// TODO: later, reschedule task in "backfill" queue with lily nodes capable of syncing the required data.
-			return xerrors.Errorf("indexing tipset for gap fill tipset.(height) %s.(%d): Error %s : %w", p.TipSet.Key().String(), p.TipSet.Height(), err, asynq.SkipRetry)
+			return fmt.Errorf("indexing tipset for gap fill tipset.(height) %s.(%d): Error %s : %w", p.TipSet.Key().String(), p.TipSet.Height(), err, asynq.SkipRetry)
 		} else {
 			return err
 		}
 	}
 	if !success {
 		log.Errorw("failed to gap fill task successfully", "height", p.TipSet.Height(), "tipset", p.TipSet.Key().String())
-		return xerrors.Errorf("gap filling tipset.(height) %s.(%d)", p.TipSet.Key(), p.TipSet.Height())
+		return fmt.Errorf("gap filling tipset.(height) %s.(%d)", p.TipSet.Key(), p.TipSet.Height())
 	} else {
 		if err := gh.db.SetGapsFilled(ctx, int64(p.TipSet.Height()), p.Tasks...); err != nil {
 			log.Errorw("failed to mark gap as filled", "error", err)
diff --git a/chain/indexer/distributed/queue/tasks/index.go b/chain/indexer/distributed/queue/tasks/index.go
index 52671ff19..e0186f389 100644
--- a/chain/indexer/distributed/queue/tasks/index.go
+++ b/chain/indexer/distributed/queue/tasks/index.go
@@ -3,6 +3,7 @@ package tasks
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"strings"
 
 	"github.com/filecoin-project/lotus/blockstore"
@@ -10,7 +11,6 @@ import (
 	"github.com/hibiken/asynq"
 	logging "github.com/ipfs/go-log/v2"
 	"go.opentelemetry.io/otel/trace"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/indexer"
 	"github.com/filecoin-project/lily/chain/indexer/distributed/queue/tracing"
@@ -68,13 +68,13 @@ func (ih *AsynqTipSetTaskHandler) HandleIndexTipSetTask(ctx context.Context, t *
 			log.Errorw("failed to index tipset", "height", p.TipSet.Height(), "tipset", p.TipSet.Key().String(), "error", err)
 			// return SkipRetry to prevent the task from being retried since nodes do not contain the block
 			// TODO: later, reschedule task in "backfill" queue with lily nodes capable of syncing the required data.
-			return xerrors.Errorf("indexing tipset.(height) %s.(%d): Error %s : %w", p.TipSet.Key().String(), p.TipSet.Height(), err, asynq.SkipRetry)
+			return fmt.Errorf("indexing tipset.(height) %s.(%d): Error %s : %w", p.TipSet.Key().String(), p.TipSet.Height(), err, asynq.SkipRetry)
 		}
 		return err
 	}
 	if !success {
 		log.Errorw("failed to index tipset successfully", "height", p.TipSet.Height(), "tipset", p.TipSet.Key().String())
-		return xerrors.Errorf("indexing tipset.(height) %s.(%d)", p.TipSet.Key().String(), p.TipSet.Height())
+		return fmt.Errorf("indexing tipset.(height) %s.(%d)", p.TipSet.Key().String(), p.TipSet.Height())
 	}
 	return nil
 }
diff --git a/chain/indexer/distributed/tipset.go b/chain/indexer/distributed/tipset.go
index 9e7b4d20e..93c3e8801 100644
--- a/chain/indexer/distributed/tipset.go
+++ b/chain/indexer/distributed/tipset.go
@@ -2,9 +2,9 @@ package distributed
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/lotus/chain/types"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/indexer"
 )
@@ -29,7 +29,7 @@ func (t *TipSetIndexer) TipSet(ctx context.Context, ts *types.TipSet, opts ...in
 		return false, err
 	}
 	if o.IndexType == indexer.Undefined {
-		return false, xerrors.Errorf("indexer type required")
+		return false, fmt.Errorf("indexer type required")
 	}
 	log.Infow("index tipset", "height", ts.Height(), "type", o.IndexType.String(), "tasks", o.Tasks)
 	if err := t.q.EnqueueTipSet(ctx, ts, o.IndexType, o.Tasks...); err != nil {
diff --git a/chain/indexer/exporter.go b/chain/indexer/exporter.go
index 5e7f2ee6e..a9931a746 100644
--- a/chain/indexer/exporter.go
+++ b/chain/indexer/exporter.go
@@ -11,7 +11,6 @@ import (
 	"go.opencensus.io/tag"
 	"go.opentelemetry.io/otel"
 	"golang.org/x/sync/errgroup"
-	"golang.org/x/xerrors"
 	"k8s.io/utils/keymutex"
 
 	"github.com/filecoin-project/lily/metrics"
@@ -64,7 +63,7 @@ func (me *ModelExporter) ExportResult(ctx context.Context, strg model.Storage, h
 
 			if err := strg.PersistBatch(ctx, res.Model); err != nil {
 				stats.Record(ctx, metrics.PersistFailure.M(1))
-				return xerrors.Errorf("persist result (%s.%T): %w", res.Name, res.Model, err)
+				return fmt.Errorf("persist result (%s.%T): %w", res.Name, res.Model, err)
 			}
 			log.Infow("model data persisted", "height", height, "task", res.Name, "duration", time.Since(start), "reporter", me.name)
 			return nil
diff --git a/chain/indexer/integrated/tipset.go b/chain/indexer/integrated/tipset.go
index 1a3ce9773..aae3ec22d 100644
--- a/chain/indexer/integrated/tipset.go
+++ b/chain/indexer/integrated/tipset.go
@@ -2,6 +2,7 @@ package integrated
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/ipfs/go-cid"
@@ -9,7 +10,6 @@ import (
 	"go.opencensus.io/tag"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lotus/chain/types"
 
@@ -82,7 +82,7 @@ func (ti *TipSetIndexer) init() error {
 			// it's not a task, maybe it's a table, if it is added to task list, else this is an unknown task
 			indexerTasks = append(indexerTasks, taskName)
 		} else {
-			return xerrors.Errorf("unknown task: %s", taskName)
+			return fmt.Errorf("unknown task: %s", taskName)
 		}
 	}
 
@@ -265,7 +265,7 @@ func (ti *TipSetIndexer) init() error {
 			tipsetProcessors[t] = consensus.NewTask(ti.node)
 
 		default:
-			return xerrors.Errorf("unknown task: %s", t)
+			return fmt.Errorf("unknown task: %s", t)
 		}
 	}
 
diff --git a/chain/indexer/interface.go b/chain/indexer/interface.go
index ae152acdd..6dab98c57 100644
--- a/chain/indexer/interface.go
+++ b/chain/indexer/interface.go
@@ -6,7 +6,6 @@ import (
 	"strings"
 
 	"github.com/filecoin-project/lotus/chain/types"
-	"golang.org/x/xerrors"
 )
 
 // Option specifies the index processing behavior. The interface allows implementations of the Indexer interface
@@ -100,7 +99,7 @@ func ConstructOptions(opts ...Option) (IndexerOptions, error) {
 		case tasksTypeOption:
 			res.Tasks = []string(o)
 			if len(res.Tasks) == 0 {
-				return IndexerOptions{}, xerrors.Errorf("tasks options cannot be empty")
+				return IndexerOptions{}, fmt.Errorf("tasks options cannot be empty")
 			}
 		default:
 		}
diff --git a/chain/indexer/tasktype/tablegen/generator/gen.go b/chain/indexer/tasktype/tablegen/generator/gen.go
index a136756ef..07c662891 100644
--- a/chain/indexer/tasktype/tablegen/generator/gen.go
+++ b/chain/indexer/tasktype/tablegen/generator/gen.go
@@ -2,6 +2,7 @@ package generator
 
 import (
 	"bytes"
+	"fmt"
 	"go/ast"
 	"go/doc"
 	"go/parser"
@@ -12,8 +13,6 @@ import (
 	"strings"
 	"text/template"
 
-	"golang.org/x/xerrors"
-
 	"github.com/filecoin-project/lily/storage"
 )
 
@@ -21,7 +20,7 @@ func Gen() error {
 	taskDir := "./chain/indexer/tasktype"
 	rf, err := ioutil.ReadFile(filepath.Join(taskDir, "table_tasks.go.template"))
 	if err != nil {
-		return xerrors.Errorf("loading registry template: %w", err)
+		return fmt.Errorf("loading registry template: %w", err)
 	}
 
 	mtn := modelTableNames()
diff --git a/chain/walk/walker.go b/chain/walk/walker.go
index 66fe92962..1ba7cda03 100644
--- a/chain/walk/walker.go
+++ b/chain/walk/walker.go
@@ -2,13 +2,13 @@ package walk
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/lotus/chain/types"
 	logging "github.com/ipfs/go-log/v2"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/indexer"
 	"github.com/filecoin-project/lily/lens"
@@ -48,11 +48,11 @@ func (c *Walker) Run(ctx context.Context) error {
 
 	head, err := c.node.ChainHead(ctx)
 	if err != nil {
-		return xerrors.Errorf("get chain head: %w", err)
+		return fmt.Errorf("get chain head: %w", err)
 	}
 
 	if int64(head.Height()) < c.minHeight {
-		return xerrors.Errorf("cannot walk history, chain head (%d) is earlier than minimum height (%d)", int64(head.Height()), c.minHeight)
+		return fmt.Errorf("cannot walk history, chain head (%d) is earlier than minimum height (%d)", int64(head.Height()), c.minHeight)
 	}
 
 	start := head
@@ -61,12 +61,12 @@ func (c *Walker) Run(ctx context.Context) error {
 	if int64(head.Height()) > c.maxHeight+1 {
 		start, err = c.node.ChainGetTipSetByHeight(ctx, abi.ChainEpoch(c.maxHeight), head.Key())
 		if err != nil {
-			return xerrors.Errorf("get tipset by height: %w", err)
+			return fmt.Errorf("get tipset by height: %w", err)
 		}
 	}
 
 	if err := c.WalkChain(ctx, c.node, start); err != nil {
-		return xerrors.Errorf("walk chain: %w", err)
+		return fmt.Errorf("walk chain: %w", err)
 	}
 
 	return nil
@@ -98,7 +98,7 @@ func (c *Walker) WalkChain(ctx context.Context, node lens.API, ts *types.TipSet)
 		log.Infow("walk tipset", "height", ts.Height(), "reporter", c.name)
 		if success, err := c.obs.TipSet(ctx, ts, indexer.WithIndexerType(indexer.Walk), indexer.WithTasks(c.tasks)); err != nil {
 			span.RecordError(err)
-			return xerrors.Errorf("notify tipset: %w", err)
+			return fmt.Errorf("notify tipset: %w", err)
 		} else if !success {
 			log.Errorw("walk incomplete", "height", ts.Height(), "tipset", ts.Key().String(), "reporter", c.name)
 		}
@@ -107,7 +107,7 @@ func (c *Walker) WalkChain(ctx context.Context, node lens.API, ts *types.TipSet)
 		ts, err = node.ChainGetTipSet(ctx, ts.Parents())
 		if err != nil {
 			span.RecordError(err)
-			return xerrors.Errorf("get tipset: %w", err)
+			return fmt.Errorf("get tipset: %w", err)
 		}
 	}
 
diff --git a/chain/watch/watcher.go b/chain/watch/watcher.go
index 1484874e7..c76ea484f 100644
--- a/chain/watch/watcher.go
+++ b/chain/watch/watcher.go
@@ -3,6 +3,7 @@ package watch
 import (
 	"context"
 	"errors"
+	"fmt"
 	"sync"
 	"sync/atomic"
 
@@ -12,7 +13,6 @@ import (
 	logging "github.com/ipfs/go-log/v2"
 	"go.opencensus.io/stats"
 	"go.opentelemetry.io/otel"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/cache"
 	"github.com/filecoin-project/lily/chain/indexer"
@@ -24,7 +24,7 @@ var log = logging.Logger("lily/chain/watch")
 
 type WatcherAPI interface {
 	Observe(obs events.TipSetObserver) *types.TipSet
-	//Unregister(obs events.TipSetObserver) bool
+	Unregister(obs events.TipSetObserver) bool
 	ChainGetTipSet(ctx context.Context, tsk types.TipSetKey) (*types.TipSet, error)
 }
 
@@ -135,8 +135,11 @@ func (c *Watcher) close() {
 	// ensure we reset the tipset cache to avoid process stale state if watcher is restarted.
 	c.cache.Reset()
 	// unregister the observer
-	// TODO https://github.com/filecoin-project/lotus/pull/8441
-	//c.api.Unregister(notifier)
+	if !c.api.Unregister(c.tsObserver) {
+		log.Errorf("watcher failed to unregister observer %T", c.tsObserver)
+	} else {
+		log.Infof("watcher successfully unregistered observer %T", c.tsObserver)
+	}
 	// close channel to signal completion
 	close(c.done)
 }
@@ -162,7 +165,7 @@ func (c *Watcher) Run(ctx context.Context) error {
 			}
 
 			if err := c.index(ctx, he); err != nil {
-				return xerrors.Errorf("index: %w", err)
+				return fmt.Errorf("index: %w", err)
 			}
 		}
 	}
@@ -184,7 +187,7 @@ func (c *Watcher) index(ctx context.Context, he *HeadEvent) error {
 		// If we have a zero confidence window then we need to notify every tipset we see
 		if c.confidence == 0 {
 			if err := c.indexTipSetAsync(ctx, he.TipSet); err != nil {
-				return xerrors.Errorf("notify tipset: %w", err)
+				return fmt.Errorf("notify tipset: %w", err)
 			}
 		}
 	case HeadEventApply:
@@ -196,7 +199,7 @@ func (c *Watcher) index(ctx context.Context, he *HeadEvent) error {
 		// Send the tipset that fell out of the confidence window to the observer
 		if tail != nil {
 			if err := c.indexTipSetAsync(ctx, tail); err != nil {
-				return xerrors.Errorf("notify tipset: %w", err)
+				return fmt.Errorf("notify tipset: %w", err)
 			}
 		}
 
diff --git a/commands/chain.go b/commands/chain.go
index 984685dae..e0bf15954 100644
--- a/commands/chain.go
+++ b/commands/chain.go
@@ -15,7 +15,6 @@ import (
 	lotuscli "github.com/filecoin-project/lotus/cli"
 	"github.com/ipfs/go-cid"
 	"github.com/urfave/cli/v2"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/lens/lily"
 )
@@ -86,7 +85,7 @@ var ChainGetBlock = &cli.Command{
 
 		blk, err := lapi.ChainGetBlock(ctx, bcid)
 		if err != nil {
-			return xerrors.Errorf("get block failed: %w", err)
+			return fmt.Errorf("get block failed: %w", err)
 		}
 
 		if cctx.Bool("raw") {
@@ -101,18 +100,18 @@ var ChainGetBlock = &cli.Command{
 
 		msgs, err := lapi.ChainGetBlockMessages(ctx, bcid)
 		if err != nil {
-			return xerrors.Errorf("failed to get messages: %w", err)
+			return fmt.Errorf("failed to get messages: %w", err)
 		}
 
 		pmsgs, err := lapi.ChainGetParentMessages(ctx, bcid)
 		if err != nil {
-			return xerrors.Errorf("failed to get parent messages: %w", err)
+			return fmt.Errorf("failed to get parent messages: %w", err)
 		}
 
 		recpts, err := lapi.ChainGetParentReceipts(ctx, bcid)
 		if err != nil {
 			log.Warn(err)
-			// return xerrors.Errorf("failed to get receipts: %w", err)
+			// return fmt.Errorf("failed to get receipts: %w", err)
 		}
 
 		cblock := struct {
@@ -239,12 +238,12 @@ var ChainGetMsgCmd = &cli.Command{
 
 		c, err := cid.Decode(cctx.Args().First())
 		if err != nil {
-			return xerrors.Errorf("failed to parse cid input: %w", err)
+			return fmt.Errorf("failed to parse cid input: %w", err)
 		}
 
 		mb, err := lapi.ChainReadObj(ctx, c)
 		if err != nil {
-			return xerrors.Errorf("failed to read object: %w", err)
+			return fmt.Errorf("failed to read object: %w", err)
 		}
 
 		var i interface{}
@@ -252,7 +251,7 @@ var ChainGetMsgCmd = &cli.Command{
 		if err != nil {
 			sm, err := types.DecodeSignedMessage(mb)
 			if err != nil {
-				return xerrors.Errorf("failed to decode object as a message: %w", err)
+				return fmt.Errorf("failed to decode object as a message: %w", err)
 			}
 			i = sm
 		} else {
diff --git a/commands/daemon.go b/commands/daemon.go
index 7fd73607f..2d20de348 100644
--- a/commands/daemon.go
+++ b/commands/daemon.go
@@ -2,6 +2,7 @@ package commands
 
 import (
 	"context"
+	"fmt"
 	"io/ioutil"
 	"path/filepath"
 
@@ -19,7 +20,6 @@ import (
 	"github.com/mitchellh/go-homedir"
 	"github.com/multiformats/go-multiaddr"
 	"github.com/urfave/cli/v2"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/indexer/distributed"
 	"github.com/filecoin-project/lily/commands/util"
@@ -169,15 +169,15 @@ Note that jobs are not persisted between restarts of the daemon. See
 		lotuslog.SetupLogLevels()
 
 		if err := setupLogging(LilyLogFlags); err != nil {
-			return xerrors.Errorf("setup logging: %w", err)
+			return fmt.Errorf("setup logging: %w", err)
 		}
 
 		if err := setupMetrics(LilyMetricFlags); err != nil {
-			return xerrors.Errorf("setup metrics: %w", err)
+			return fmt.Errorf("setup metrics: %w", err)
 		}
 
 		if err := setupTracing(LilyTracingFlags); err != nil {
-			return xerrors.Errorf("setup tracing: %w", err)
+			return fmt.Errorf("setup tracing: %w", err)
 		}
 
 		ctx := context.Background()
@@ -191,7 +191,7 @@ Note that jobs are not persisted between restarts of the daemon. See
 
 		r, err := repo.NewFS(daemonFlags.repo)
 		if err != nil {
-			return xerrors.Errorf("opening fs repo: %w", err)
+			return fmt.Errorf("opening fs repo: %w", err)
 		}
 
 		if daemonFlags.config == "" {
@@ -206,24 +206,24 @@ Note that jobs are not persisted between restarts of the daemon. See
 		}
 
 		if err := config.EnsureExists(daemonFlags.config); err != nil {
-			return xerrors.Errorf("ensuring config is present at %q: %w", daemonFlags.config, err)
+			return fmt.Errorf("ensuring config is present at %q: %w", daemonFlags.config, err)
 		}
 		r.SetConfigPath(daemonFlags.config)
 
 		err = r.Init(repo.FullNode)
 		if err != nil && err != repo.ErrRepoExists {
-			return xerrors.Errorf("repo init error: %w", err)
+			return fmt.Errorf("repo init error: %w", err)
 		}
 
 		if err := paramfetch.GetParams(lcli.ReqContext(c), lotusbuild.ParametersJSON(), lotusbuild.SrsJSON(), 0); err != nil {
-			return xerrors.Errorf("fetching proof parameters: %w", err)
+			return fmt.Errorf("fetching proof parameters: %w", err)
 		}
 
 		var genBytes []byte
 		if c.String("genesis") != "" {
 			genBytes, err = ioutil.ReadFile(daemonFlags.genesis)
 			if err != nil {
-				return xerrors.Errorf("reading genesis: %w", err)
+				return fmt.Errorf("reading genesis: %w", err)
 			}
 		} else {
 			genBytes = lotusbuild.MaybeGenesis()
@@ -278,12 +278,12 @@ Note that jobs are not persisted between restarts of the daemon. See
 			),
 		)
 		if err != nil {
-			return xerrors.Errorf("initializing node: %w", err)
+			return fmt.Errorf("initializing node: %w", err)
 		}
 
 		endpoint, err := r.APIEndpoint()
 		if err != nil {
-			return xerrors.Errorf("getting api endpoint: %w", err)
+			return fmt.Errorf("getting api endpoint: %w", err)
 		}
 
 		// TODO: properly parse api endpoint (or make it a URL)
diff --git a/commands/export.go b/commands/export.go
index c9dd690ac..8f2f6c1c0 100644
--- a/commands/export.go
+++ b/commands/export.go
@@ -2,6 +2,7 @@ package commands
 
 import (
 	"context"
+	"fmt"
 	"io"
 	"os"
 
@@ -11,7 +12,6 @@ import (
 	"github.com/filecoin-project/lotus/node/repo"
 	"github.com/mitchellh/go-homedir"
 	"github.com/urfave/cli/v2"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/export"
 )
@@ -110,7 +110,7 @@ Some examples:
 	Before: func(cctx *cli.Context) error {
 		from, to := chainExportFlags.from, chainExportFlags.to
 		if to < from {
-			return xerrors.Errorf("value of --to (%d) should be >= --from (%d)", to, from)
+			return fmt.Errorf("value of --to (%d) should be >= --from (%d)", to, from)
 		}
 
 		return nil
@@ -161,40 +161,40 @@ Some examples:
 func openChainAndBlockStores(ctx context.Context, path string) (*store.ChainStore, blockstore.Blockstore, func(), error) {
 	repoDir, err := homedir.Expand(path)
 	if err != nil {
-		return nil, nil, nil, xerrors.Errorf("expand repo path (%s): %w", path, err)
+		return nil, nil, nil, fmt.Errorf("expand repo path (%s): %w", path, err)
 	}
 
 	r, err := repo.NewFS(repoDir)
 	if err != nil {
-		return nil, nil, nil, xerrors.Errorf("open repo (%s): %w", repoDir, err)
+		return nil, nil, nil, fmt.Errorf("open repo (%s): %w", repoDir, err)
 	}
 
 	exists, err := r.Exists()
 	if err != nil {
-		return nil, nil, nil, xerrors.Errorf("check repo (%s) exists: %w", repoDir, err)
+		return nil, nil, nil, fmt.Errorf("check repo (%s) exists: %w", repoDir, err)
 	}
 	if !exists {
-		return nil, nil, nil, xerrors.Errorf("lily repo (%s) doesn't exists", repoDir)
+		return nil, nil, nil, fmt.Errorf("lily repo (%s) doesn't exists", repoDir)
 	}
 
 	lr, err := r.Lock(repo.FullNode)
 	if err != nil {
-		return nil, nil, nil, xerrors.Errorf("lock repo (%s): %w", repoDir, err)
+		return nil, nil, nil, fmt.Errorf("lock repo (%s): %w", repoDir, err)
 	}
 
 	chainAndStateBs, err := lr.Blockstore(ctx, repo.UniversalBlockstore)
 	if err != nil {
-		return nil, nil, nil, xerrors.Errorf("accessing repo (%s) blockstore: %w", repoDir, err)
+		return nil, nil, nil, fmt.Errorf("accessing repo (%s) blockstore: %w", repoDir, err)
 	}
 
 	mds, err := lr.Datastore(ctx, "/metadata")
 	if err != nil {
-		return nil, nil, nil, xerrors.Errorf("accessing repo (%s) datastore: %w", repoDir, err)
+		return nil, nil, nil, fmt.Errorf("accessing repo (%s) datastore: %w", repoDir, err)
 	}
 
 	cs := store.NewChainStore(chainAndStateBs, chainAndStateBs, mds, nil, nil)
 	if err := cs.Load(ctx); err != nil {
-		return nil, nil, nil, xerrors.Errorf("loading repo (%s) chain store: %w", repoDir, err)
+		return nil, nil, nil, fmt.Errorf("loading repo (%s) chain store: %w", repoDir, err)
 	}
 
 	return cs, chainAndStateBs,
diff --git a/commands/help.go b/commands/help.go
index aa8a9ce6a..b018f268f 100644
--- a/commands/help.go
+++ b/commands/help.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/urfave/cli/v2"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/indexer/tasktype"
 )
@@ -29,11 +28,11 @@ var HelpModelsDescribeCmd = &cli.Command{
 	Name: "models-describe",
 	Action: func(cctx *cli.Context) error {
 		if cctx.Args().First() == "" {
-			return xerrors.Errorf("model name required, run `lily help models-list`, to see all available models")
+			return fmt.Errorf("model name required, run `lily help models-list`, to see all available models")
 		}
 		mname := cctx.Args().First()
 		if _, found := tasktype.TableLookup[mname]; !found {
-			return xerrors.Errorf("model %s doesn't exist", mname)
+			return fmt.Errorf("model %s doesn't exist", mname)
 		}
 
 		modelFields := tasktype.TableFieldComments[mname]
diff --git a/commands/init.go b/commands/init.go
index 745c15d8f..34c8b6c17 100644
--- a/commands/init.go
+++ b/commands/init.go
@@ -2,6 +2,7 @@ package commands
 
 import (
 	"context"
+	"fmt"
 
 	paramfetch "github.com/filecoin-project/go-paramfetch"
 	lotusbuild "github.com/filecoin-project/lotus/build"
@@ -10,7 +11,6 @@ import (
 	"github.com/filecoin-project/lotus/node/repo"
 	"github.com/mitchellh/go-homedir"
 	"github.com/urfave/cli/v2"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/commands/util"
 	"github.com/filecoin-project/lily/config"
@@ -60,23 +60,23 @@ var InitCmd = &cli.Command{
 
 		r, err := repo.NewFS(initFlags.repo)
 		if err != nil {
-			return xerrors.Errorf("opening fs repo: %w", err)
+			return fmt.Errorf("opening fs repo: %w", err)
 		}
 
 		if initFlags.config != "" {
 			if err := config.EnsureExists(initFlags.config); err != nil {
-				return xerrors.Errorf("ensuring config is present at %q: %w", initFlags.config, err)
+				return fmt.Errorf("ensuring config is present at %q: %w", initFlags.config, err)
 			}
 			r.SetConfigPath(initFlags.config)
 		}
 
 		err = r.Init(repo.FullNode)
 		if err != nil && err != repo.ErrRepoExists {
-			return xerrors.Errorf("repo init error: %w", err)
+			return fmt.Errorf("repo init error: %w", err)
 		}
 
 		if err := paramfetch.GetParams(lcli.ReqContext(c), lotusbuild.ParametersJSON(), lotusbuild.SrsJSON(), 0); err != nil {
-			return xerrors.Errorf("fetching proof parameters: %w", err)
+			return fmt.Errorf("fetching proof parameters: %w", err)
 		}
 
 		if initFlags.importSnapshot != "" {
diff --git a/commands/job/index.go b/commands/job/index.go
index 2ff7f1db6..82167c00c 100644
--- a/commands/job/index.go
+++ b/commands/job/index.go
@@ -1,6 +1,7 @@
 package job
 
 import (
+	"fmt"
 	"strings"
 
 	"github.com/filecoin-project/go-state-types/abi"
@@ -8,7 +9,6 @@ import (
 	lotuscli "github.com/filecoin-project/lotus/cli"
 	"github.com/ipfs/go-cid"
 	"github.com/urfave/cli/v2"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/commands"
 	"github.com/filecoin-project/lily/lens/lily"
@@ -52,7 +52,7 @@ var IndexTipSetCmd = &cli.Command{
 	Before: func(cctx *cli.Context) error {
 		tsk, err := parseTipSetKey(indexFlags.tsKey)
 		if err != nil {
-			return xerrors.Errorf("failed to parse tipset key: %w", err)
+			return fmt.Errorf("failed to parse tipset key: %w", err)
 		}
 		indexFlags.tipsetKey = tsk
 
@@ -111,7 +111,7 @@ var IndexHeightCmd = &cli.Command{
 		}
 
 		if indexFlags.height != int64(ts.Height()) {
-			return xerrors.Errorf("height (%d) is null round, next non-null round height: %d", indexFlags.height, ts.Height())
+			return fmt.Errorf("height (%d) is null round, next non-null round height: %d", indexFlags.height, ts.Height())
 		}
 		indexFlags.tipsetKey = ts.Key()
 
diff --git a/commands/job/options.go b/commands/job/options.go
index b5ab08a88..2388f882c 100644
--- a/commands/job/options.go
+++ b/commands/job/options.go
@@ -5,7 +5,6 @@ import (
 	"time"
 
 	"github.com/urfave/cli/v2"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/indexer/tasktype"
 	"github.com/filecoin-project/lily/lens/lily"
@@ -121,7 +120,7 @@ var rangeFlags rangeOps
 func (r rangeOps) validate() error {
 	from, to := rangeFlags.from, rangeFlags.to
 	if to < from {
-		return xerrors.Errorf("value of --to (%d) should be >= --from (%d)", to, from)
+		return fmt.Errorf("value of --to (%d) should be >= --from (%d)", to, from)
 	}
 
 	return nil
diff --git a/commands/lily.go b/commands/lily.go
index dc39a9270..2e853c6a8 100644
--- a/commands/lily.go
+++ b/commands/lily.go
@@ -2,6 +2,7 @@ package commands
 
 import (
 	"context"
+	"fmt"
 	"net/http"
 	"strings"
 
@@ -9,7 +10,6 @@ import (
 	cliutil "github.com/filecoin-project/lotus/cli/util"
 	"github.com/filecoin-project/lotus/node"
 	"github.com/filecoin-project/lotus/node/repo"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/lens/lily"
 )
@@ -21,7 +21,7 @@ func GetAPI(ctx context.Context) (lily.LilyAPI, jsonrpc.ClientCloser, error) {
 
 	addr, err := ainfo.DialArgs("v0")
 	if err != nil {
-		return nil, nil, xerrors.Errorf("could not get DialArgs: %w", err)
+		return nil, nil, fmt.Errorf("could not get DialArgs: %w", err)
 	}
 
 	return NewSentinelNodeRPC(ctx, addr, ainfo.AuthHeader())
diff --git a/commands/log.go b/commands/log.go
index e3c2e50bb..05a65eacd 100644
--- a/commands/log.go
+++ b/commands/log.go
@@ -7,7 +7,6 @@ import (
 
 	lotuscli "github.com/filecoin-project/lotus/cli"
 	"github.com/urfave/cli/v2"
-	"golang.org/x/xerrors"
 )
 
 var LogCmd = &cli.Command{
@@ -103,7 +102,7 @@ var LogSetLevel = &cli.Command{
 
 		for _, system := range systems {
 			if err := api.LogSetLevel(ctx, system, cctx.Args().First()); err != nil {
-				return xerrors.Errorf("setting log level on %s: %v", system, err)
+				return fmt.Errorf("setting log level on %s: %v", system, err)
 			}
 		}
 
@@ -156,7 +155,7 @@ var LogSetLevelRegex = &cli.Command{
 		}
 
 		if err := api.LogSetLevelRegex(ctx, cctx.Args().Get(1), cctx.Args().First()); err != nil {
-			return xerrors.Errorf("setting log level via regex: %w", err)
+			return fmt.Errorf("setting log level via regex: %w", err)
 		}
 
 		return nil
diff --git a/commands/migrate.go b/commands/migrate.go
index 91288d470..9c5ccc107 100644
--- a/commands/migrate.go
+++ b/commands/migrate.go
@@ -5,7 +5,6 @@ import (
 	"os"
 
 	"github.com/urfave/cli/v2"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/version"
 
@@ -84,20 +83,20 @@ var MigrateCmd = &cli.Command{
 	),
 	Action: func(cctx *cli.Context) error {
 		if err := setupLogging(LilyLogFlags); err != nil {
-			return xerrors.Errorf("setup logging: %w", err)
+			return fmt.Errorf("setup logging: %w", err)
 		}
 
 		ctx := cctx.Context
 
 		db, err := storage.NewDatabase(ctx, LilyDBFlags.DB, LilyDBFlags.DBPoolSize, LilyDBFlags.Name, LilyDBFlags.DBSchema, false)
 		if err != nil {
-			return xerrors.Errorf("connect database: %w", err)
+			return fmt.Errorf("connect database: %w", err)
 		}
 
 		if cctx.IsSet("to") {
 			targetVersion, err := model.ParseVersion(cctx.String("to"))
 			if err != nil {
-				return xerrors.Errorf("invalid schema version: %w", err)
+				return fmt.Errorf("invalid schema version: %w", err)
 			}
 
 			return db.MigrateSchemaTo(ctx, targetVersion)
@@ -109,13 +108,13 @@ var MigrateCmd = &cli.Command{
 
 		dbVersion, latestVersion, err := db.GetSchemaVersions(ctx)
 		if err != nil {
-			return xerrors.Errorf("get schema versions: %w", err)
+			return fmt.Errorf("get schema versions: %w", err)
 		}
 
 		log.Infof("current database schema is version %s, latest is %s", dbVersion, latestVersion)
 
 		if err := db.VerifyCurrentSchema(ctx); err != nil {
-			return xerrors.Errorf("verify schema: %w", err)
+			return fmt.Errorf("verify schema: %w", err)
 		}
 
 		log.Infof("database schema is supported by this version of visor")
diff --git a/commands/net.go b/commands/net.go
index 14f2cf3e3..b0fa00e86 100644
--- a/commands/net.go
+++ b/commands/net.go
@@ -11,7 +11,6 @@ import (
 	lotuscli "github.com/filecoin-project/lotus/cli"
 	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/urfave/cli/v2"
-	"golang.org/x/xerrors"
 )
 
 var NetCmd = &cli.Command{
@@ -33,13 +32,13 @@ var NetID = &cli.Command{
 		ctx := lotuscli.ReqContext(cctx)
 		lapi, closer, err := GetAPI(ctx)
 		if err != nil {
-			return xerrors.Errorf("get api: %w", err)
+			return fmt.Errorf("get api: %w", err)
 		}
 		defer closer()
 
 		pid, err := lapi.ID(ctx)
 		if err != nil {
-			return xerrors.Errorf("get id: %w", err)
+			return fmt.Errorf("get id: %w", err)
 		}
 
 		fmt.Println(pid)
@@ -54,7 +53,7 @@ var NetListen = &cli.Command{
 		ctx := lotuscli.ReqContext(cctx)
 		lapi, closer, err := GetAPI(ctx)
 		if err != nil {
-			return xerrors.Errorf("get api: %w", err)
+			return fmt.Errorf("get api: %w", err)
 		}
 		defer closer()
 
@@ -89,7 +88,7 @@ var NetPeers = &cli.Command{
 		ctx := lotuscli.ReqContext(cctx)
 		lapi, closer, err := GetAPI(ctx)
 		if err != nil {
-			return xerrors.Errorf("get api: %w", err)
+			return fmt.Errorf("get api: %w", err)
 		}
 		defer closer()
 
@@ -152,7 +151,7 @@ var NetReachability = &cli.Command{
 		ctx := lotuscli.ReqContext(cctx)
 		lapi, closer, err := GetAPI(ctx)
 		if err != nil {
-			return xerrors.Errorf("get api: %w", err)
+			return fmt.Errorf("get api: %w", err)
 		}
 		defer closer()
 
@@ -183,7 +182,7 @@ var NetScores = &cli.Command{
 		ctx := lotuscli.ReqContext(cctx)
 		lapi, closer, err := GetAPI(ctx)
 		if err != nil {
-			return xerrors.Errorf("get api: %w", err)
+			return fmt.Errorf("get api: %w", err)
 		}
 		defer closer()
 
diff --git a/commands/setup.go b/commands/setup.go
index d62e5ac1f..47df3ffb0 100644
--- a/commands/setup.go
+++ b/commands/setup.go
@@ -1,6 +1,7 @@
 package commands
 
 import (
+	"fmt"
 	"net/http"
 	"net/http/pprof"
 	"strings"
@@ -21,7 +22,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus/collectors"
 	"go.opencensus.io/stats/view"
 	"go.opencensus.io/zpages"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/metrics"
 	"github.com/filecoin-project/lily/version"
@@ -59,7 +59,7 @@ var LilyMetricFlags LilyMetricOpts
 func setupLogging(flags LilyLogOpts) error {
 	ll := flags.LogLevel
 	if err := logging.SetLogLevel("*", ll); err != nil {
-		return xerrors.Errorf("set log level: %w", err)
+		return fmt.Errorf("set log level: %w", err)
 	}
 
 	llnamed := flags.LogLevelNamed
@@ -67,10 +67,10 @@ func setupLogging(flags LilyLogOpts) error {
 		for _, llname := range strings.Split(llnamed, ",") {
 			parts := strings.Split(llname, ":")
 			if len(parts) != 2 {
-				return xerrors.Errorf("invalid named log level format: %q", llname)
+				return fmt.Errorf("invalid named log level format: %q", llname)
 			}
 			if err := logging.SetLogLevel(parts[0], parts[1]); err != nil {
-				return xerrors.Errorf("set named log level %q to %q: %w", parts[0], parts[1], err)
+				return fmt.Errorf("set named log level %q to %q: %w", parts[0], parts[1], err)
 			}
 
 		}
@@ -153,7 +153,7 @@ func setupTracing(flags LilyTracingOpts) error {
 
 	tp, err := metrics.NewJaegerTraceProvider(LilyTracingFlags.ServiceName, LilyTracingFlags.ProviderURL, LilyTracingFlags.JaegerSamplerParam)
 	if err != nil {
-		return xerrors.Errorf("setup tracing: %w", err)
+		return fmt.Errorf("setup tracing: %w", err)
 	}
 	otel.SetTracerProvider(tp)
 	// upgrades libraries (lotus) that use OpenCensus to OpenTelemetry to facilitate a migration.
diff --git a/commands/util/import.go b/commands/util/import.go
index c85a0d6af..86cbe2fdc 100644
--- a/commands/util/import.go
+++ b/commands/util/import.go
@@ -3,6 +3,7 @@ package util
 import (
 	"bufio"
 	"context"
+	"fmt"
 	"io"
 	"io/fs"
 	"net/http"
@@ -18,7 +19,7 @@ import (
 	"github.com/filecoin-project/lotus/journal/fsjournal"
 	"github.com/filecoin-project/lotus/node/repo"
 	"github.com/mitchellh/go-homedir"
-	"golang.org/x/xerrors"
+
 	"gopkg.in/cheggaaa/pb.v1"
 )
 
@@ -32,7 +33,7 @@ func ImportFromFsFile(ctx context.Context, r repo.Repo, fs fs.File, snapshot boo
 
 	bs, err := lr.Blockstore(ctx, repo.UniversalBlockstore)
 	if err != nil {
-		return xerrors.Errorf("failed to open blockstore: %w", err)
+		return fmt.Errorf("failed to open blockstore: %w", err)
 	}
 
 	mds, err := lr.Datastore(context.TODO(), "/metadata")
@@ -42,7 +43,7 @@ func ImportFromFsFile(ctx context.Context, r repo.Repo, fs fs.File, snapshot boo
 
 	j, err := fsjournal.OpenFSJournal(lr, journal.EnvDisabledEvents())
 	if err != nil {
-		return xerrors.Errorf("failed to open journal: %w", err)
+		return fmt.Errorf("failed to open journal: %w", err)
 	}
 
 	cst := store.NewChainStore(bs, bs, mds, filcns.Weight, j)
@@ -51,11 +52,11 @@ func ImportFromFsFile(ctx context.Context, r repo.Repo, fs fs.File, snapshot boo
 	ts, err := cst.Import(ctx, fs)
 
 	if err != nil {
-		return xerrors.Errorf("importing chain failed: %w", err)
+		return fmt.Errorf("importing chain failed: %w", err)
 	}
 
 	if err := cst.FlushValidationCache(ctx); err != nil {
-		return xerrors.Errorf("flushing validation cache failed: %w", err)
+		return fmt.Errorf("flushing validation cache failed: %w", err)
 	}
 
 	gb, err := cst.GetTipsetByHeight(ctx, 0, ts, true)
@@ -76,7 +77,7 @@ func ImportFromFsFile(ctx context.Context, r repo.Repo, fs fs.File, snapshot boo
 	if !snapshot {
 		log.Infof("validating imported chain...")
 		if err := stm.ValidateChain(ctx, ts); err != nil {
-			return xerrors.Errorf("chain validation failed: %w", err)
+			return fmt.Errorf("chain validation failed: %w", err)
 		}
 	}
 
@@ -99,7 +100,7 @@ func ImportChain(ctx context.Context, r repo.Repo, fname string, snapshot bool)
 		defer resp.Body.Close() //nolint:errcheck
 
 		if resp.StatusCode != http.StatusOK {
-			return xerrors.Errorf("non-200 response: %d", resp.StatusCode)
+			return fmt.Errorf("non-200 response: %d", resp.StatusCode)
 		}
 
 		rd = resp.Body
@@ -133,7 +134,7 @@ func ImportChain(ctx context.Context, r repo.Repo, fname string, snapshot bool)
 
 	bs, err := lr.Blockstore(ctx, repo.UniversalBlockstore)
 	if err != nil {
-		return xerrors.Errorf("failed to open blockstore: %w", err)
+		return fmt.Errorf("failed to open blockstore: %w", err)
 	}
 
 	mds, err := lr.Datastore(context.TODO(), "/metadata")
@@ -143,7 +144,7 @@ func ImportChain(ctx context.Context, r repo.Repo, fname string, snapshot bool)
 
 	j, err := fsjournal.OpenFSJournal(lr, journal.EnvDisabledEvents())
 	if err != nil {
-		return xerrors.Errorf("failed to open journal: %w", err)
+		return fmt.Errorf("failed to open journal: %w", err)
 	}
 
 	cst := store.NewChainStore(bs, bs, mds, filcns.Weight, j)
@@ -165,11 +166,11 @@ func ImportChain(ctx context.Context, r repo.Repo, fname string, snapshot bool)
 	bar.Finish()
 
 	if err != nil {
-		return xerrors.Errorf("importing chain failed: %w", err)
+		return fmt.Errorf("importing chain failed: %w", err)
 	}
 
 	if err := cst.FlushValidationCache(ctx); err != nil {
-		return xerrors.Errorf("flushing validation cache failed: %w", err)
+		return fmt.Errorf("flushing validation cache failed: %w", err)
 	}
 
 	gb, err := cst.GetTipsetByHeight(ctx, 0, ts, true)
@@ -190,7 +191,7 @@ func ImportChain(ctx context.Context, r repo.Repo, fname string, snapshot bool)
 	if !snapshot {
 		log.Infof("validating imported chain...")
 		if err := stm.ValidateChain(ctx, ts); err != nil {
-			return xerrors.Errorf("chain validation failed: %w", err)
+			return fmt.Errorf("chain validation failed: %w", err)
 		}
 	}
 
diff --git a/commands/util/rpc.go b/commands/util/rpc.go
index 40f1e16c4..d8e5a5cd2 100644
--- a/commands/util/rpc.go
+++ b/commands/util/rpc.go
@@ -2,6 +2,7 @@ package util
 
 import (
 	"context"
+	"fmt"
 	"net"
 	"net/http"
 	"os"
@@ -17,7 +18,6 @@ import (
 	manet "github.com/multiformats/go-multiaddr/net"
 	"go.opencensus.io/stats"
 	"go.opencensus.io/tag"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lotus/metrics"
 	"github.com/filecoin-project/lotus/node"
@@ -98,7 +98,7 @@ func ServeRPC(a lily.LilyAPI, stop node.StopFunc, addr multiaddr.Multiaddr, shut
 	http.Handle("/rpc/v0", ah)
 	lst, err := manet.Listen(addr)
 	if err != nil {
-		return xerrors.Errorf("could not listen: %w", err)
+		return fmt.Errorf("could not listen: %w", err)
 	}
 
 	srv := &http.Server{
diff --git a/config/config.go b/config/config.go
index cab00333c..8a74e12c3 100644
--- a/config/config.go
+++ b/config/config.go
@@ -1,6 +1,7 @@
 package config
 
 import (
+	"fmt"
 	"io"
 	"os"
 	"time"
@@ -8,7 +9,6 @@ import (
 	"github.com/BurntSushi/toml"
 	"github.com/filecoin-project/lotus/node/config"
 	logging "github.com/ipfs/go-log/v2"
-	"golang.org/x/xerrors"
 )
 
 var log = logging.Logger("lily/config")
@@ -163,16 +163,16 @@ func EnsureExists(path string) error {
 
 	comm, err := config.ConfigComment(SampleConf())
 	if err != nil {
-		return xerrors.Errorf("comment: %w", err)
+		return fmt.Errorf("comment: %w", err)
 	}
 	_, err = c.Write(comm)
 	if err != nil {
 		_ = c.Close() // ignore error since we are recovering from a write error anyway
-		return xerrors.Errorf("write config: %w", err)
+		return fmt.Errorf("write config: %w", err)
 	}
 
 	if err := c.Close(); err != nil {
-		return xerrors.Errorf("close config: %w", err)
+		return fmt.Errorf("close config: %w", err)
 	}
 	return nil
 }
diff --git a/go.mod b/go.mod
index 8acee9cc2..ea915b165 100644
--- a/go.mod
+++ b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/filecoin-project/go-jsonrpc v0.1.5
 	github.com/filecoin-project/go-paramfetch v0.0.4
 	github.com/filecoin-project/go-state-types v0.1.3
-	github.com/filecoin-project/lotus v1.15.1
+	github.com/filecoin-project/lotus v1.15.2
 	github.com/filecoin-project/specs-actors v0.9.14
 	github.com/filecoin-project/specs-actors/v2 v2.3.6
 	github.com/filecoin-project/specs-actors/v3 v3.1.1
@@ -31,17 +31,17 @@ require (
 	github.com/ipfs/go-fs-lock v0.0.7
 	github.com/ipfs/go-ipfs-blockstore v1.1.2
 	github.com/ipfs/go-ipld-cbor v0.0.6
-	github.com/ipfs/go-log/v2 v2.5.0
+	github.com/ipfs/go-log/v2 v2.5.1
 	github.com/ipfs/go-metrics-prometheus v0.0.2
 	github.com/ipld/go-car v0.3.3
 	github.com/lib/pq v1.9.0
-	github.com/libp2p/go-libp2p-core v0.14.0
+	github.com/libp2p/go-libp2p-core v0.15.1
 	github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1
 	github.com/minio/sha256-simd v1.0.0
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/multiformats/go-multiaddr v0.5.0
 	github.com/multiformats/go-multihash v0.1.0
-	github.com/prometheus/client_golang v1.11.0
+	github.com/prometheus/client_golang v1.12.1
 	github.com/raulk/clock v1.1.0
 	github.com/stretchr/testify v1.7.0
 	github.com/urfave/cli/v2 v2.3.0
@@ -52,11 +52,11 @@ require (
 	go.opentelemetry.io/otel/exporters/jaeger v1.2.0
 	go.opentelemetry.io/otel/sdk v1.2.0
 	go.uber.org/fx v1.15.0
-	go.uber.org/multierr v1.7.0
-	go.uber.org/zap v1.19.1
+	go.uber.org/multierr v1.8.0
+	go.uber.org/zap v1.21.0
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	golang.org/x/text v0.3.7
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
+	golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f
 	gopkg.in/cheggaaa/pb.v1 v1.0.28
 )
 
@@ -81,7 +81,7 @@ require (
 	github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
 	github.com/akavel/rsrc v0.8.0 // indirect
 	github.com/alecthomas/units v0.0.0-20210927113745-59d0afb8317a // indirect
-	github.com/benbjohnson/clock v1.2.0 // indirect
+	github.com/benbjohnson/clock v1.3.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bep/debounce v1.2.0 // indirect
 	github.com/btcsuite/btcd v0.22.0-beta // indirect
@@ -90,8 +90,8 @@ require (
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/cheekybits/genny v1.0.0 // indirect
 	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
-	github.com/cilium/ebpf v0.2.0 // indirect
-	github.com/containerd/cgroups v0.0.0-20201119153540-4cbc285b3327 // indirect
+	github.com/cilium/ebpf v0.4.0 // indirect
+	github.com/containerd/cgroups v1.0.3 // indirect
 	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
 	github.com/crackcomm/go-gitignore v0.0.0-20170627025303-887ab5e44cc3 // indirect
@@ -111,7 +111,7 @@ require (
 	github.com/dustin/go-humanize v1.0.0 // indirect
 	github.com/elastic/go-sysinfo v1.7.0 // indirect
 	github.com/elastic/go-windows v1.0.0 // indirect
-	github.com/elastic/gosigar v0.14.1 // indirect
+	github.com/elastic/gosigar v0.14.2 // indirect
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/filecoin-project/dagstore v0.5.2 // indirect
 	github.com/filecoin-project/filecoin-ffi v0.30.4-0.20200910194244-f640612a1a1f // indirect
@@ -131,7 +131,7 @@ require (
 	github.com/filecoin-project/go-statestore v0.2.0 // indirect
 	github.com/filecoin-project/go-storedcounter v0.1.0 // indirect
 	github.com/filecoin-project/index-provider v0.5.0 // indirect
-	github.com/filecoin-project/specs-storage v0.2.0 // indirect
+	github.com/filecoin-project/specs-storage v0.2.2 // indirect
 	github.com/filecoin-project/storetheindex v0.3.5 // indirect
 	github.com/flynn/noise v1.0.0 // indirect
 	github.com/francoispqt/gojay v1.2.13 // indirect
@@ -149,7 +149,7 @@ require (
 	github.com/go-pg/zerochecker v0.2.0 // indirect
 	github.com/go-redis/redis/v8 v8.11.4 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
-	github.com/godbus/dbus/v5 v5.0.4 // indirect
+	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/glog v1.0.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -159,13 +159,13 @@ require (
 	github.com/google/gopacket v1.1.19 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/gorilla/mux v1.7.4 // indirect
-	github.com/gorilla/websocket v1.4.2 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/hako/durafmt v0.0.0-20200710122514-c0fb7b4da026 // indirect
 	github.com/hannahhoward/cbor-gen-for v0.0.0-20200817222906-ea96cece81f1 // indirect
 	github.com/hannahhoward/go-pubsub v0.0.0-20200423002714-8d62886cc36e // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/huin/goupnp v1.0.2 // indirect
+	github.com/huin/goupnp v1.0.3 // indirect
 	github.com/icza/backscanner v0.0.0-20210726202459-ac2ffc679f94 // indirect
 	github.com/ipfs/bbloom v0.0.4 // indirect
 	github.com/ipfs/go-bitfield v1.0.0 // indirect
@@ -218,15 +218,15 @@ require (
 	github.com/jpillora/backoff v1.0.0 // indirect
 	github.com/kelseyhightower/envconfig v1.4.0 // indirect
 	github.com/kilic/bls12-381 v0.0.0-20200820230200-6b2c19996391 // indirect
-	github.com/klauspost/compress v1.13.6 // indirect
-	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
+	github.com/klauspost/compress v1.15.1 // indirect
+	github.com/klauspost/cpuid/v2 v2.0.12 // indirect
 	github.com/koron/go-ssdp v0.0.2 // indirect
 	github.com/libp2p/go-buffer-pool v0.0.2 // indirect
 	github.com/libp2p/go-cidranger v1.1.0 // indirect
 	github.com/libp2p/go-conn-security-multistream v0.3.0 // indirect
 	github.com/libp2p/go-eventbus v0.2.1 // indirect
 	github.com/libp2p/go-flow-metrics v0.0.3 // indirect
-	github.com/libp2p/go-libp2p v0.18.0 // indirect
+	github.com/libp2p/go-libp2p v0.19.0 // indirect
 	github.com/libp2p/go-libp2p-asn-util v0.1.0 // indirect
 	github.com/libp2p/go-libp2p-blankhost v0.3.0 // indirect
 	github.com/libp2p/go-libp2p-connmgr v0.3.1 // indirect
@@ -235,24 +235,23 @@ require (
 	github.com/libp2p/go-libp2p-kad-dht v0.15.0 // indirect
 	github.com/libp2p/go-libp2p-kbucket v0.4.7 // indirect
 	github.com/libp2p/go-libp2p-loggables v0.1.0 // indirect
-	github.com/libp2p/go-libp2p-mplex v0.6.0 // indirect
 	github.com/libp2p/go-libp2p-nat v0.1.0 // indirect
-	github.com/libp2p/go-libp2p-noise v0.3.0 // indirect
+	github.com/libp2p/go-libp2p-noise v0.4.0 // indirect
 	github.com/libp2p/go-libp2p-peerstore v0.6.0 // indirect
 	github.com/libp2p/go-libp2p-pnet v0.2.0 // indirect
 	github.com/libp2p/go-libp2p-pubsub v0.6.1 // indirect
-	github.com/libp2p/go-libp2p-quic-transport v0.16.1 // indirect
+	github.com/libp2p/go-libp2p-quic-transport v0.17.0 // indirect
 	github.com/libp2p/go-libp2p-record v0.1.3 // indirect
-	github.com/libp2p/go-libp2p-resource-manager v0.1.5 // indirect
+	github.com/libp2p/go-libp2p-resource-manager v0.2.1 // indirect
 	github.com/libp2p/go-libp2p-routing-helpers v0.2.3 // indirect
 	github.com/libp2p/go-libp2p-swarm v0.10.2 // indirect
-	github.com/libp2p/go-libp2p-testing v0.8.0 // indirect
-	github.com/libp2p/go-libp2p-tls v0.3.1 // indirect
+	github.com/libp2p/go-libp2p-testing v0.9.2 // indirect
+	github.com/libp2p/go-libp2p-tls v0.4.1 // indirect
 	github.com/libp2p/go-libp2p-transport-upgrader v0.7.1 // indirect
-	github.com/libp2p/go-libp2p-yamux v0.8.2 // indirect
+	github.com/libp2p/go-libp2p-yamux v0.9.1 // indirect
 	github.com/libp2p/go-maddr-filter v0.1.0 // indirect
 	github.com/libp2p/go-mplex v0.6.0 // indirect
-	github.com/libp2p/go-msgio v0.1.0 // indirect
+	github.com/libp2p/go-msgio v0.2.0 // indirect
 	github.com/libp2p/go-nat v0.1.0 // indirect
 	github.com/libp2p/go-netroute v0.2.0 // indirect
 	github.com/libp2p/go-openssl v0.0.7 // indirect
@@ -261,19 +260,19 @@ require (
 	github.com/libp2p/go-stream-muxer-multistream v0.4.0 // indirect
 	github.com/libp2p/go-tcp-transport v0.5.1 // indirect
 	github.com/libp2p/go-ws-transport v0.6.0 // indirect
-	github.com/libp2p/go-yamux/v3 v3.0.2 // indirect
-	github.com/lucas-clemente/quic-go v0.25.0 // indirect
+	github.com/libp2p/go-yamux/v3 v3.1.1 // indirect
+	github.com/lucas-clemente/quic-go v0.27.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.0.3 // indirect
 	github.com/magefile/mage v1.9.0 // indirect
-	github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect
-	github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect
-	github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1 // indirect
+	github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect
+	github.com/marten-seemann/qtls-go1-17 v0.1.1 // indirect
+	github.com/marten-seemann/qtls-go1-18 v0.1.1 // indirect
 	github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
 	github.com/mattn/go-colorable v0.1.9 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
-	github.com/miekg/dns v1.1.43 // indirect
+	github.com/miekg/dns v1.1.48 // indirect
 	github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
 	github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
 	github.com/mr-tron/base58 v1.2.0 // indirect
@@ -283,12 +282,12 @@ require (
 	github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
 	github.com/multiformats/go-multibase v0.0.3 // indirect
 	github.com/multiformats/go-multicodec v0.4.1 // indirect
-	github.com/multiformats/go-multistream v0.2.2 // indirect
+	github.com/multiformats/go-multistream v0.3.0 // indirect
 	github.com/multiformats/go-varint v0.0.6 // indirect
 	github.com/nikkolasg/hexjson v0.0.0-20181101101858-78e39397e00c // indirect
 	github.com/nkovacs/streamquote v1.0.0 // indirect
 	github.com/nxadm/tail v1.4.8 // indirect
-	github.com/onsi/ginkgo v1.16.4 // indirect
+	github.com/onsi/ginkgo v1.16.5 // indirect
 	github.com/opencontainers/runtime-spec v1.0.2 // indirect
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
@@ -297,7 +296,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/polydawn/refmt v0.0.0-20201211092308-30ac6d18308e // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.30.0 // indirect
+	github.com/prometheus/common v0.33.0 // indirect
 	github.com/prometheus/procfs v0.7.3 // indirect
 	github.com/prometheus/statsd_exporter v0.21.0 // indirect
 	github.com/raulk/go-watchdog v1.2.0 // indirect
@@ -338,17 +337,17 @@ require (
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/dig v1.12.0 // indirect
 	go4.org v0.0.0-20200411211856-f5505b9728dd // indirect
-	golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b // indirect
+	golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
 	golang.org/x/exp v0.0.0-20210715201039-d37aa40e8013 // indirect
-	golang.org/x/mod v0.4.2 // indirect
-	golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
-	golang.org/x/sys v0.0.0-20211209171907-798191bca915 // indirect
-	golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect
+	golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
+	golang.org/x/net v0.0.0-20220418201149-a630d4f3e7a2 // indirect
+	golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
+	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
-	golang.org/x/tools v0.1.7 // indirect
+	golang.org/x/tools v0.1.10 // indirect
 	google.golang.org/genproto v0.0.0-20210917145530-b395a37504d4 // indirect
-	google.golang.org/grpc v1.40.0 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
+	google.golang.org/grpc v1.45.0 // indirect
+	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
diff --git a/go.sum b/go.sum
index 86b902ec2..7b221e1c2 100644
--- a/go.sum
+++ b/go.sum
@@ -121,8 +121,9 @@ github.com/beevik/ntp v0.2.0/go.mod h1:hIHWr+l3+/clUnF44zdK+CWW7fO8dR5cIylAQ76NR
 github.com/benbjohnson/clock v1.0.2/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
 github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
-github.com/benbjohnson/clock v1.2.0 h1:9Re3G2TWxkE06LdMWMpcY6KV81GLXMGiYpPYUPkFAws=
 github.com/benbjohnson/clock v1.2.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
+github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
+github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
@@ -176,8 +177,9 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5O
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/cilium/ebpf v0.2.0 h1:Fv93L3KKckEcEHR3oApXVzyBTDA8WAm6VXhPE00N3f8=
 github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs=
+github.com/cilium/ebpf v0.4.0 h1:QlHdikaxALkqWasW8hAC1mfR0jdmvbfaBdBPFmRSglA=
+github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs=
 github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
 github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
 github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng=
@@ -185,12 +187,17 @@ github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
 github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
 github.com/codegangsta/cli v1.20.0/go.mod h1:/qJNoX69yVSKu5o4jLyXAENLRyk1uhi7zkbQ3slBdOA=
-github.com/containerd/cgroups v0.0.0-20201119153540-4cbc285b3327 h1:7grrpcfCtbZLsjtB0DgMuzs1umsJmpzaHMZ6cO6iAWw=
 github.com/containerd/cgroups v0.0.0-20201119153540-4cbc285b3327/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE=
+github.com/containerd/cgroups v1.0.3 h1:ADZftAkglvCiD44c77s5YmMqaP2pzVCFZvBmAlBdAP4=
+github.com/containerd/cgroups v1.0.3/go.mod h1:/ofk34relqNjSGyqPrmEULrO4Sc8LJhvJmWbUCUKqj8=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
@@ -274,8 +281,8 @@ github.com/elastic/go-sysinfo v1.7.0/go.mod h1:i1ZYdU10oLNfRzq4vq62BEwD2fH8KaWh6
 github.com/elastic/go-windows v1.0.0 h1:qLURgZFkkrYyTTkvYpsZIgf83AUsdIHfvlJaqaZ7aSY=
 github.com/elastic/go-windows v1.0.0/go.mod h1:TsU0Nrp7/y3+VwE82FoZF8gC/XFg/Elz6CcloAxnPgU=
 github.com/elastic/gosigar v0.12.0/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs=
-github.com/elastic/gosigar v0.14.1 h1:T0aQ7n/n2ZA9W7DmAnj60v+qzqKERdBgJBO1CG2W6rc=
-github.com/elastic/gosigar v0.14.1/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs=
+github.com/elastic/gosigar v0.14.2 h1:Dg80n8cr90OZ7x+bAax/QjoW/XqTI11RmA79ZwIm9/4=
+github.com/elastic/gosigar v0.14.2/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs=
 github.com/elgris/jsondiff v0.0.0-20160530203242-765b5c24c302/go.mod h1:qBlWZqWeVx9BjvqBsnC/8RUlAYpIFmPvgROcw0n1scE=
 github.com/ema/qdisc v0.0.0-20190904071900-b82c76788043/go.mod h1:ix4kG2zvdUd8kEKSW0ZTr1XLks0epFpI4j745DXxlNE=
 github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
@@ -285,6 +292,7 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
+github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/etclabscore/go-jsonschema-walk v0.0.6/go.mod h1:VdfDY72AFAiUhy0ZXEaWSpveGjMT5JcDIm903NGqFwQ=
 github.com/etclabscore/go-openrpc-reflect v0.0.36/go.mod h1:0404Ky3igAasAOpyj1eESjstTyneBAIk5PgJFbK4s5E=
@@ -376,8 +384,8 @@ github.com/filecoin-project/go-storedcounter v0.1.0 h1:Mui6wSUBC+cQGHbDUBcO7rfh5
 github.com/filecoin-project/go-storedcounter v0.1.0/go.mod h1:4ceukaXi4vFURIoxYMfKzaRF5Xv/Pinh2oTnoxpv+z8=
 github.com/filecoin-project/index-provider v0.5.0 h1:k2C1RFvOvxmA2i8bhmkb3b4qun7RDRDzzs/y25/TwQg=
 github.com/filecoin-project/index-provider v0.5.0/go.mod h1:KHVrP2vU3YuScb+fawObwTFoR882up9U07kk0ZrfP0c=
-github.com/filecoin-project/lotus v1.15.1 h1:/IRmRlmc2zs+tXMbz0XyAYAPpeLQSIxnyFltuYSErYY=
-github.com/filecoin-project/lotus v1.15.1/go.mod h1:S/8iC5pQwAM9PEG92anrRSPxKNFJvHtvXUVCZPxJEMY=
+github.com/filecoin-project/lotus v1.15.2 h1:M5/MIvmodUpZTkBjSb/C2GR0SaKDS4q1s8uXsDtqzdg=
+github.com/filecoin-project/lotus v1.15.2/go.mod h1:ofqUV+bsesKyD7cK7ue6ngxutkDCOqkpOl2GkU84cco=
 github.com/filecoin-project/specs-actors v0.9.13/go.mod h1:TS1AW/7LbG+615j4NsjMK1qlpAwaFsG9w0V2tg2gSao=
 github.com/filecoin-project/specs-actors v0.9.14 h1:68PVstg2UB3ZsMLF+DKFTAs/YKsqhKWynkr0IqmVRQY=
 github.com/filecoin-project/specs-actors v0.9.14/go.mod h1:TS1AW/7LbG+615j4NsjMK1qlpAwaFsG9w0V2tg2gSao=
@@ -395,12 +403,11 @@ github.com/filecoin-project/specs-actors/v5 v5.0.4/go.mod h1:5BAKRAMsOOlD8+qCw4U
 github.com/filecoin-project/specs-actors/v6 v6.0.0/go.mod h1:V1AYfi5GkHXipx1mnVivoICZh3wtwPxDVuds+fbfQtk=
 github.com/filecoin-project/specs-actors/v6 v6.0.1 h1:laxvHNsvrq83Y9n+W7znVCePi3oLyRf0Rkl4jFO8Wew=
 github.com/filecoin-project/specs-actors/v6 v6.0.1/go.mod h1:V1AYfi5GkHXipx1mnVivoICZh3wtwPxDVuds+fbfQtk=
-github.com/filecoin-project/specs-actors/v7 v7.0.0-20211222192039-c83bea50c402/go.mod h1:p6LIOFezA1rgRLMewbvdi3Pp6SAu+q9FtJ9CAleSjrE=
 github.com/filecoin-project/specs-actors/v7 v7.0.0-rc1.0.20220118005651-2470cb39827e/go.mod h1:TA5FwCna+Yi36POaT7SLKXsgEDvJwc0V/L6ZsO19B9M=
 github.com/filecoin-project/specs-actors/v7 v7.0.0 h1:FQN7tjt3o68hfb3qLFSJBoLMuOFY0REkFVLO/zXj8RU=
 github.com/filecoin-project/specs-actors/v7 v7.0.0/go.mod h1:TA5FwCna+Yi36POaT7SLKXsgEDvJwc0V/L6ZsO19B9M=
-github.com/filecoin-project/specs-storage v0.2.0 h1:Y4UDv0apRQ3zI2GiPPubi8JblpUZZphEdaJUxCutfyg=
-github.com/filecoin-project/specs-storage v0.2.0/go.mod h1:Tb88Zq+IBJbvAn3mS89GYj3jdRThBTE/771HCVZdRJU=
+github.com/filecoin-project/specs-storage v0.2.2 h1:6ugbtKQ6LTcTEnEIX9HkeCtTp1PCYO497P/bokF5tF4=
+github.com/filecoin-project/specs-storage v0.2.2/go.mod h1:6cc/lncmAxMUocPi0z1EPCX63beIX7F7UnlmUZ3hLQo=
 github.com/filecoin-project/storetheindex v0.3.5 h1:KoS9TvjPm6zIZfUH8atAHJbVHOO7GTP1MdTG+v0eE+Q=
 github.com/filecoin-project/storetheindex v0.3.5/go.mod h1:0r3d0kSpK63O6AvLr1CjAINLi+nWD49clzcnKV+GLpI=
 github.com/filecoin-project/test-vectors/schema v0.0.5/go.mod h1:iQ9QXLpYWL3m7warwvK1JC/pTri8mnfEmKygNDqqY6E=
@@ -495,8 +502,9 @@ github.com/go-zookeeper/zk v1.0.2/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL
 github.com/godbus/dbus v0.0.0-20190402143921-271e53dc4968 h1:s+PDl6lozQ+dEUtUtQnO7+A2iPG3sK1pI4liU+jxn90=
 github.com/godbus/dbus v0.0.0-20190402143921-271e53dc4968/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
 github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
+github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
 github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
 github.com/gogo/googleapis v1.4.0 h1:zgVt4UpGxcqVOw97aRGxT4svlcmdK35fynLNctY32zI=
@@ -610,8 +618,9 @@ github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB7
 github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-middleware v1.1.0/go.mod h1:f5nM7jw/oeRSadq3xCzHAvxcr8HZnzsqU6ILg/0NiiE=
@@ -683,8 +692,9 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
 github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
 github.com/hudl/fargo v1.4.0/go.mod h1:9Ai6uvFy5fQNq6VPKtg+Ceq1+eTY4nKUlR2JElEOcDo=
 github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc=
-github.com/huin/goupnp v1.0.2 h1:RfGLP+h3mvisuWEyybxNq5Eft3NWhHLPeUN72kpKZoI=
 github.com/huin/goupnp v1.0.2/go.mod h1:0dxJBVBHqTMjIUMkESDTNgOOx/Mw5wYIfyFmdzSamkM=
+github.com/huin/goupnp v1.0.3 h1:N8No57ls+MnjlB+JPiCVSOyy/ot7MJTqlo7rn+NYSqQ=
+github.com/huin/goupnp v1.0.3/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y=
 github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
 github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0/go.mod h1:N0Wam8K1arqPXNWjMo21EXnBPOPp36vB07FNRdD2geA=
 github.com/iancoleman/orderedmap v0.1.0/go.mod h1:N0Wam8K1arqPXNWjMo21EXnBPOPp36vB07FNRdD2geA=
@@ -872,8 +882,9 @@ github.com/ipfs/go-log/v2 v2.1.2/go.mod h1:2v2nsGfZsvvAJz13SyFzf9ObaqwHiHxsPLEHn
 github.com/ipfs/go-log/v2 v2.1.3/go.mod h1:/8d0SH3Su5Ooc31QlL1WysJhvyOTDCjcCZ9Axpmri6g=
 github.com/ipfs/go-log/v2 v2.3.0/go.mod h1:QqGoj30OTpnKaG/LKTGTxoP2mmQtjVMEnK72gynbe/g=
 github.com/ipfs/go-log/v2 v2.4.0/go.mod h1:nPZnh7Cj7lwS3LpRU5Mwr2ol1c2gXIEXuF6aywqrtmo=
-github.com/ipfs/go-log/v2 v2.5.0 h1:+MhAooFd9XZNvR0i9FriKW6HB0ql7HNXUuflWtc0dd4=
 github.com/ipfs/go-log/v2 v2.5.0/go.mod h1:prSpmC1Gpllc9UYWxDiZDreBYw7zp4Iqp1kOLU9U5UI=
+github.com/ipfs/go-log/v2 v2.5.1 h1:1XdUzF7048prq4aBjDQQ4SL5RxftpRGdXhNRwKSAlcY=
+github.com/ipfs/go-log/v2 v2.5.1/go.mod h1:prSpmC1Gpllc9UYWxDiZDreBYw7zp4Iqp1kOLU9U5UI=
 github.com/ipfs/go-merkledag v0.0.6/go.mod h1:QYPdnlvkOg7GnQRofu9XZimC5ZW5Wi3bKys/4GQQfto=
 github.com/ipfs/go-merkledag v0.2.3/go.mod h1:SQiXrtSts3KGNmgOzMICy5c0POOpUNQLvB3ClKnBAlk=
 github.com/ipfs/go-merkledag v0.2.4/go.mod h1:SQiXrtSts3KGNmgOzMICy5c0POOpUNQLvB3ClKnBAlk=
@@ -1024,12 +1035,14 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
 github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
 github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
-github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
+github.com/klauspost/compress v1.15.1 h1:y9FcTHGyrebwfP0ZZqFiaxTaiDnUrGkJkI+f583BL1A=
+github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.0.6/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
+github.com/klauspost/cpuid/v2 v2.0.12 h1:p9dKCg8i4gmOxtv35DvrYoWqYzQrvEVdjQ762Y0OqZE=
+github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c=
 github.com/koalacxr/quantile v0.0.1/go.mod h1:bGN/mCZLZ4lrSDHRQ6Lglj9chowGux8sGUIND+DQeD0=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -1092,8 +1105,8 @@ github.com/libp2p/go-libp2p v0.16.0/go.mod h1:ump42BsirwAWxKzsCiFnTtN1Yc+DuPu76f
 github.com/libp2p/go-libp2p v0.17.0/go.mod h1:Fkin50rsGdv5mm5BshBUtPRZknt9esfmYXBOYcwOTgw=
 github.com/libp2p/go-libp2p v0.18.0-rc1/go.mod h1:RgYlH7IIWHXREimC92bw5Lg1V2R5XmSzuLHb5fTnr+8=
 github.com/libp2p/go-libp2p v0.18.0-rc3/go.mod h1:WYL+Xw1iuwi6rdfzw5VIEpD+HqzYucHZ6fcUuumbI3M=
-github.com/libp2p/go-libp2p v0.18.0 h1:moKKKG875KNGsCjZxTIFB75ihHiVjFeWg5I4aR1pDLk=
-github.com/libp2p/go-libp2p v0.18.0/go.mod h1:+veaZ9z1SZQhmc5PW78jvnnxZ89Mgvmh4cggO11ETmw=
+github.com/libp2p/go-libp2p v0.19.0 h1:zosskMbaobL7UDCVLEe1m5CGs1TaFNFoN/M5XLiKg0U=
+github.com/libp2p/go-libp2p v0.19.0/go.mod h1:Ki9jJXLO2YqrTIFxofV7Twyd3INWPT97+r8hGt7XPjI=
 github.com/libp2p/go-libp2p-asn-util v0.0.0-20200825225859-85005c6cf052/go.mod h1:nRMRTab+kZuk0LnKZpxhOVH/ndsdr2Nr//Zltc/vwgo=
 github.com/libp2p/go-libp2p-asn-util v0.1.0 h1:rABPCO77SjdbJ/eJ/ynIo8vWICy1VEnL5JAxJbQLo1E=
 github.com/libp2p/go-libp2p-asn-util v0.1.0/go.mod h1:wu+AnM9Ii2KgO5jMmS1rz9dvzTdj8BXqsPR9HR0XB7I=
@@ -1163,8 +1176,9 @@ github.com/libp2p/go-libp2p-core v0.10.0/go.mod h1:ECdxehoYosLYHgDDFa2N4yE8Y7aQR
 github.com/libp2p/go-libp2p-core v0.11.0/go.mod h1:ECdxehoYosLYHgDDFa2N4yE8Y7aQRAMf0sX9mf2sbGg=
 github.com/libp2p/go-libp2p-core v0.12.0/go.mod h1:ECdxehoYosLYHgDDFa2N4yE8Y7aQRAMf0sX9mf2sbGg=
 github.com/libp2p/go-libp2p-core v0.13.0/go.mod h1:ECdxehoYosLYHgDDFa2N4yE8Y7aQRAMf0sX9mf2sbGg=
-github.com/libp2p/go-libp2p-core v0.14.0 h1:0kYSgiK/D7Eo28GTuRXo5YHsWwAisVpFCqCVPUd/vJs=
 github.com/libp2p/go-libp2p-core v0.14.0/go.mod h1:tLasfcVdTXnixsLB0QYaT1syJOhsbrhG7q6pGrHtBg8=
+github.com/libp2p/go-libp2p-core v0.15.1 h1:0RY+Mi/ARK9DgG1g9xVQLb8dDaaU8tCePMtGALEfBnM=
+github.com/libp2p/go-libp2p-core v0.15.1/go.mod h1:agSaboYM4hzB1cWekgVReqV5M4g5M+2eNNejV+1EEhs=
 github.com/libp2p/go-libp2p-crypto v0.0.1/go.mod h1:yJkNyDmO341d5wwXxDUGO0LykUVT72ImHNUqh5D/dBE=
 github.com/libp2p/go-libp2p-crypto v0.0.2/go.mod h1:eETI5OUfBnvARGOHrJz2eWNyTUxEGZnBxMcbUjfIj4I=
 github.com/libp2p/go-libp2p-crypto v0.1.0/go.mod h1:sPUokVISZiy+nNuTTH/TY+leRSxnFj/2GLjtOTW90hI=
@@ -1220,8 +1234,9 @@ github.com/libp2p/go-libp2p-netutil v0.1.0 h1:zscYDNVEcGxyUpMd0JReUZTrpMfia8PmLK
 github.com/libp2p/go-libp2p-netutil v0.1.0/go.mod h1:3Qv/aDqtMLTUyQeundkKsA+YCThNdbQD54k3TqjpbFU=
 github.com/libp2p/go-libp2p-noise v0.1.1/go.mod h1:QDFLdKX7nluB7DEnlVPbz7xlLHdwHFA9HiohJRr3vwM=
 github.com/libp2p/go-libp2p-noise v0.2.0/go.mod h1:IEbYhBBzGyvdLBoxxULL/SGbJARhUeqlO8lVSREYu2Q=
-github.com/libp2p/go-libp2p-noise v0.3.0 h1:NCVH7evhVt9njbTQshzT7N1S3Q6fjj9M11FCgfH5+cA=
 github.com/libp2p/go-libp2p-noise v0.3.0/go.mod h1:JNjHbociDJKHD64KTkzGnzqJ0FEV5gHJa6AB00kbCNQ=
+github.com/libp2p/go-libp2p-noise v0.4.0 h1:khcMsGhHNdGqKE5LDLrnHwZvdGVMsrnD4GTkTWkwmLU=
+github.com/libp2p/go-libp2p-noise v0.4.0/go.mod h1:BzzY5pyzCYSyJbQy9oD8z5oP2idsafjt4/X42h9DjZU=
 github.com/libp2p/go-libp2p-peer v0.0.1/go.mod h1:nXQvOBbwVqoP+T5Y5nCjeH4sP9IX/J0AMzcDUVruVoo=
 github.com/libp2p/go-libp2p-peer v0.1.1/go.mod h1:jkF12jGB4Gk/IOo+yomm+7oLWxF278F7UnrYUQ1Q8es=
 github.com/libp2p/go-libp2p-peer v0.2.0/go.mod h1:RCffaCvUyW2CJmG2gAWVqwePwW7JMgxjsHm7+J5kjWY=
@@ -1255,8 +1270,8 @@ github.com/libp2p/go-libp2p-quic-transport v0.13.0/go.mod h1:39/ZWJ1TW/jx1iFkKzz
 github.com/libp2p/go-libp2p-quic-transport v0.15.0/go.mod h1:wv4uGwjcqe8Mhjj7N/Ic0aKjA+/10UnMlSzLO0yRpYQ=
 github.com/libp2p/go-libp2p-quic-transport v0.15.2/go.mod h1:wv4uGwjcqe8Mhjj7N/Ic0aKjA+/10UnMlSzLO0yRpYQ=
 github.com/libp2p/go-libp2p-quic-transport v0.16.0/go.mod h1:1BXjVMzr+w7EkPfiHkKnwsWjPjtfaNT0q8RS3tGDvEQ=
-github.com/libp2p/go-libp2p-quic-transport v0.16.1 h1:N/XqYXHurphPLDfXYhll8NyqzdZYQqAF4GIr7+SmLV8=
-github.com/libp2p/go-libp2p-quic-transport v0.16.1/go.mod h1:1BXjVMzr+w7EkPfiHkKnwsWjPjtfaNT0q8RS3tGDvEQ=
+github.com/libp2p/go-libp2p-quic-transport v0.17.0 h1:yFh4Gf5MlToAYLuw/dRvuzYd1EnE2pX3Lq1N6KDiWRQ=
+github.com/libp2p/go-libp2p-quic-transport v0.17.0/go.mod h1:x4pw61P3/GRCcSLypcQJE/Q2+E9f4X+5aRcZLXf20LM=
 github.com/libp2p/go-libp2p-record v0.0.1/go.mod h1:grzqg263Rug/sRex85QrDOLntdFAymLDLm7lxMgU79Q=
 github.com/libp2p/go-libp2p-record v0.1.0/go.mod h1:ujNc8iuE5dlKWVy6wuL6dd58t0n7xI4hAIl8pE6wu5Q=
 github.com/libp2p/go-libp2p-record v0.1.1/go.mod h1:VRgKajOyMVgP/F0L5g3kH7SVskp17vFi2xheb5uMJtg=
@@ -1265,8 +1280,8 @@ github.com/libp2p/go-libp2p-record v0.1.3 h1:R27hoScIhQf/A8XJZ8lYpnqh9LatJ5YbHs2
 github.com/libp2p/go-libp2p-record v0.1.3/go.mod h1:yNUff/adKIfPnYQXgp6FQmNu3gLJ6EMg7+/vv2+9pY4=
 github.com/libp2p/go-libp2p-resource-manager v0.1.0/go.mod h1:wJPNjeE4XQlxeidwqVY5G6DLOKqFK33u2n8blpl0I6Y=
 github.com/libp2p/go-libp2p-resource-manager v0.1.3/go.mod h1:wJPNjeE4XQlxeidwqVY5G6DLOKqFK33u2n8blpl0I6Y=
-github.com/libp2p/go-libp2p-resource-manager v0.1.5 h1:7J6t9KLFS0MxXDTfqA6rwfVCZl/yLQnXW5LpZjHAANI=
-github.com/libp2p/go-libp2p-resource-manager v0.1.5/go.mod h1:wJPNjeE4XQlxeidwqVY5G6DLOKqFK33u2n8blpl0I6Y=
+github.com/libp2p/go-libp2p-resource-manager v0.2.1 h1:/0yqQQ4oT+3fEhUGGP2PhuIhdv10+pu5jLhvFNfUx/w=
+github.com/libp2p/go-libp2p-resource-manager v0.2.1/go.mod h1:K+eCkiapf+ey/LADO4TaMpMTP9/Qde/uLlrnRqV4PLQ=
 github.com/libp2p/go-libp2p-routing v0.0.1/go.mod h1:N51q3yTr4Zdr7V8Jt2JIktVU+3xBBylx1MZeVA6t1Ys=
 github.com/libp2p/go-libp2p-routing v0.1.0/go.mod h1:zfLhI1RI8RLEzmEaaPwzonRvXeeSHddONWkcTcB54nE=
 github.com/libp2p/go-libp2p-routing-helpers v0.2.3 h1:xY61alxJ6PurSi+MXbywZpelvuU4U4p/gPTxjqCqTzY=
@@ -1306,12 +1321,15 @@ github.com/libp2p/go-libp2p-testing v0.4.2/go.mod h1:Q+PFXYoiYFN5CAEG2w3gLPEzotl
 github.com/libp2p/go-libp2p-testing v0.5.0/go.mod h1:QBk8fqIL1XNcno/l3/hhaIEn4aLRijpYOR+zVjjlh+A=
 github.com/libp2p/go-libp2p-testing v0.6.0/go.mod h1:QBk8fqIL1XNcno/l3/hhaIEn4aLRijpYOR+zVjjlh+A=
 github.com/libp2p/go-libp2p-testing v0.7.0/go.mod h1:OLbdn9DbgdMwv00v+tlp1l3oe2Cl+FAjoWIA2pa0X6E=
-github.com/libp2p/go-libp2p-testing v0.8.0 h1:/te8SOIyj5sGH5Jr1Uoo+qYB00aK8O4+yHGzLgfE3kc=
 github.com/libp2p/go-libp2p-testing v0.8.0/go.mod h1:gRdsNxQSxAZowTgcLY7CC33xPmleZzoBpqSYbWenqPc=
+github.com/libp2p/go-libp2p-testing v0.9.0/go.mod h1:Td7kbdkWqYTJYQGTwzlgXwaqldraIanyjuRiAbK/XQU=
+github.com/libp2p/go-libp2p-testing v0.9.2 h1:dCpODRtRaDZKF8HXT9qqqgON+OMEB423Knrgeod8j84=
+github.com/libp2p/go-libp2p-testing v0.9.2/go.mod h1:Td7kbdkWqYTJYQGTwzlgXwaqldraIanyjuRiAbK/XQU=
 github.com/libp2p/go-libp2p-tls v0.1.3/go.mod h1:wZfuewxOndz5RTnCAxFliGjvYSDA40sKitV4c50uI1M=
 github.com/libp2p/go-libp2p-tls v0.3.0/go.mod h1:fwF5X6PWGxm6IDRwF3V8AVCCj/hOd5oFlg+wo2FxJDY=
-github.com/libp2p/go-libp2p-tls v0.3.1 h1:lsE2zYte+rZCEOHF72J1Fg3XK3dGQyKvI6i5ehJfEp0=
 github.com/libp2p/go-libp2p-tls v0.3.1/go.mod h1:fwF5X6PWGxm6IDRwF3V8AVCCj/hOd5oFlg+wo2FxJDY=
+github.com/libp2p/go-libp2p-tls v0.4.1 h1:1ByJUbyoMXvYXDoW6lLsMxqMViQNXmt+CfQqlnCpY+M=
+github.com/libp2p/go-libp2p-tls v0.4.1/go.mod h1:EKCixHEysLNDlLUoKxv+3f/Lp90O2EXNjTr0UQDnrIw=
 github.com/libp2p/go-libp2p-transport v0.0.1/go.mod h1:UzbUs9X+PHOSw7S3ZmeOxfnwaQY5vGDzZmKPod3N3tk=
 github.com/libp2p/go-libp2p-transport v0.0.5/go.mod h1:StoY3sx6IqsP6XKoabsPnHCwqKXWUMWU7Rfcsubee/A=
 github.com/libp2p/go-libp2p-transport-upgrader v0.0.4/go.mod h1:RGq+tupk+oj7PzL2kn/m1w6YXxcIAYJYeI90h6BGgUc=
@@ -1345,8 +1363,8 @@ github.com/libp2p/go-libp2p-yamux v0.6.0/go.mod h1:MRhd6mAYnFRnSISp4M8i0ClV/j+mW
 github.com/libp2p/go-libp2p-yamux v0.7.0/go.mod h1:fMyA0CsPfHkIuBU0wjRGrCjTBFiXTXxG0k5M4ETv+08=
 github.com/libp2p/go-libp2p-yamux v0.8.0/go.mod h1:yTkPgN2ib8FHyU1ZcVD7aelzyAqXXwEPbyx+aSKm9h8=
 github.com/libp2p/go-libp2p-yamux v0.8.1/go.mod h1:rUozF8Jah2dL9LLGyBaBeTQeARdwhefMCTQVQt6QobE=
-github.com/libp2p/go-libp2p-yamux v0.8.2 h1:6GKWntresp0TFxMP/oSoH96nV8XKJRdynXsdp43dn0Y=
-github.com/libp2p/go-libp2p-yamux v0.8.2/go.mod h1:rUozF8Jah2dL9LLGyBaBeTQeARdwhefMCTQVQt6QobE=
+github.com/libp2p/go-libp2p-yamux v0.9.1 h1:oplewiRix8s45SOrI30rCPZG5mM087YZp+VYhXAh4+c=
+github.com/libp2p/go-libp2p-yamux v0.9.1/go.mod h1:wRc6wvyxQINFcKe7daL4BeQ02Iyp+wxyC8WCNfngBrA=
 github.com/libp2p/go-maddr-filter v0.0.1/go.mod h1:6eT12kSQMA9x2pvFQa+xesMKUBlj9VImZbj3B9FBH/Q=
 github.com/libp2p/go-maddr-filter v0.0.4/go.mod h1:6eT12kSQMA9x2pvFQa+xesMKUBlj9VImZbj3B9FBH/Q=
 github.com/libp2p/go-maddr-filter v0.0.5/go.mod h1:Jk+36PMfIqCJhAnaASRH83bdAvfDRp/w6ENFaC9bG+M=
@@ -1366,8 +1384,9 @@ github.com/libp2p/go-msgio v0.0.2/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+
 github.com/libp2p/go-msgio v0.0.3/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
 github.com/libp2p/go-msgio v0.0.4/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
 github.com/libp2p/go-msgio v0.0.6/go.mod h1:4ecVB6d9f4BDSL5fqvPiC4A3KivjWn+Venn/1ALLMWA=
-github.com/libp2p/go-msgio v0.1.0 h1:8Q7g/528ivAlfXTFWvWhVjTE8XG8sDTkRUKPYh9+5Q8=
 github.com/libp2p/go-msgio v0.1.0/go.mod h1:eNlv2vy9V2X/kNldcZ+SShFE++o2Yjxwx6RAYsmgJnE=
+github.com/libp2p/go-msgio v0.2.0 h1:W6shmB+FeynDrUVl2dgFQvzfBZcXiyqY4VmpQLu9FqU=
+github.com/libp2p/go-msgio v0.2.0/go.mod h1:dBVM1gW3Jk9XqHkU4eKdGvVHdLa51hoGfll6jMJMSlY=
 github.com/libp2p/go-nat v0.0.3/go.mod h1:88nUEt0k0JD45Bk93NIwDqjlhiOwOoV36GchpcVc1yI=
 github.com/libp2p/go-nat v0.0.4/go.mod h1:Nmw50VAvKuk38jUBcmNh6p9lUJLoODbJRvYAa/+KSDo=
 github.com/libp2p/go-nat v0.0.5/go.mod h1:B7NxsVNPZmRLvMOwiEO1scOSyjA56zxYAGv1yQgRkEU=
@@ -1445,8 +1464,9 @@ github.com/libp2p/go-yamux/v2 v2.1.1/go.mod h1:3So6P6TV6r75R9jiBpiIKgU/66lOarCZj
 github.com/libp2p/go-yamux/v2 v2.2.0/go.mod h1:3So6P6TV6r75R9jiBpiIKgU/66lOarCZjqROGxzPpPQ=
 github.com/libp2p/go-yamux/v2 v2.3.0/go.mod h1:iTU+lOIn/2h0AgKcL49clNTwfEw+WSfDYrXe05EyKIs=
 github.com/libp2p/go-yamux/v3 v3.0.1/go.mod h1:s2LsDhHbh+RfCsQoICSYt58U2f8ijtPANFD8BmE74Bo=
-github.com/libp2p/go-yamux/v3 v3.0.2 h1:LW0q5+A1Wy0npEsPJP9wmare2NH4ohNluN5EWVwv2mE=
 github.com/libp2p/go-yamux/v3 v3.0.2/go.mod h1:s2LsDhHbh+RfCsQoICSYt58U2f8ijtPANFD8BmE74Bo=
+github.com/libp2p/go-yamux/v3 v3.1.1 h1:X0qSVodCZciOu/f4KTp9V+O0LAqcqP2tdaUGB0+0lng=
+github.com/libp2p/go-yamux/v3 v3.1.1/go.mod h1:jeLEQgLXqE2YqX1ilAClIfCMDY+0uXQUKmmb/qp0gT4=
 github.com/libp2p/zeroconf/v2 v2.1.1/go.mod h1:fuJqLnUwZTshS3U/bMRJ3+ow/v9oid1n0DmyYyNO1Xs=
 github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
 github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
@@ -1455,8 +1475,9 @@ github.com/lucas-clemente/quic-go v0.19.3/go.mod h1:ADXpNbTQjq1hIzCpB+y/k5iz4n4z
 github.com/lucas-clemente/quic-go v0.21.2/go.mod h1:vF5M1XqhBAHgbjKcJOXY3JZz3GP0T3FQhz/uyOUS38Q=
 github.com/lucas-clemente/quic-go v0.23.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0=
 github.com/lucas-clemente/quic-go v0.24.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0=
-github.com/lucas-clemente/quic-go v0.25.0 h1:K+X9Gvd7JXsOHtU0N2icZ2Nw3rx82uBej3mP4CLgibc=
 github.com/lucas-clemente/quic-go v0.25.0/go.mod h1:YtzP8bxRVCBlO77yRanE264+fY/T2U9ZlW1AaHOsMOg=
+github.com/lucas-clemente/quic-go v0.27.0 h1:v6WY87q9zD4dKASbG8hy/LpzAVNzEQzw8sEIeloJsc4=
+github.com/lucas-clemente/quic-go v0.27.0/go.mod h1:AzgQoPda7N+3IqMMMkywBKggIFo2KT6pfnlrQ2QieeI=
 github.com/lucasb-eyer/go-colorful v1.0.3 h1:QIbQXiugsb+q10B+MI+7DI1oQLdmnep86tWFlaaUAac=
 github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/lufia/iostat v1.1.0/go.mod h1:rEPNA0xXgjHQjuI5Cy05sLlS2oRcSlWHRLrvh/AQ+Pg=
@@ -1477,13 +1498,16 @@ github.com/marten-seemann/qtls v0.10.0/go.mod h1:UvMd1oaYDACI99/oZUYLzMCkBXQVT0a
 github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
 github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
 github.com/marten-seemann/qtls-go1-15 v0.1.5/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
-github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2iHl5yhJRpnco=
 github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
+github.com/marten-seemann/qtls-go1-16 v0.1.5 h1:o9JrYPPco/Nukd/HpOHMHZoBDXQqoNtUCmny98/1uqQ=
+github.com/marten-seemann/qtls-go1-16 v0.1.5/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
 github.com/marten-seemann/qtls-go1-17 v0.1.0-rc.1/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
-github.com/marten-seemann/qtls-go1-17 v0.1.0 h1:P9ggrs5xtwiqXv/FHNwntmuLMNq3KaSIG93AtAZ48xk=
 github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
-github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1 h1:EnzzN9fPUkUck/1CuY1FlzBaIYMoiBsdwTNmNGkwUUM=
+github.com/marten-seemann/qtls-go1-17 v0.1.1 h1:DQjHPq+aOzUeh9/lixAGunn6rIOQyWChPSI4+hgW7jc=
+github.com/marten-seemann/qtls-go1-17 v0.1.1/go.mod h1:C2ekUKcDdz9SDWxec1N/MvcXBpaX9l3Nx67XaR84L5s=
 github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI=
+github.com/marten-seemann/qtls-go1-18 v0.1.1 h1:qp7p7XXUFL7fpBvSS1sWD+uSqPvzNQK43DH+/qEkj0Y=
+github.com/marten-seemann/qtls-go1-18 v0.1.1/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
 github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd h1:br0buuQ854V8u83wA0rVZ8ttrq5CpaPZdvrK0LP2lOk=
 github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd/go.mod h1:QuCEs1Nt24+FYQEqAAncTDPJIuGs+LxK1MCiFL25pMU=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
@@ -1527,8 +1551,9 @@ github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKju
 github.com/miekg/dns v1.1.28/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
 github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
 github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
-github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg=
 github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
+github.com/miekg/dns v1.1.48 h1:Ucfr7IIVyMBz4lRE8qmGUuZ4Wt3/ZGu9hmcMT3Uu4tQ=
+github.com/miekg/dns v1.1.48/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
 github.com/mikioh/tcp v0.0.0-20190314235350-803a9b46060c h1:bzE/A84HN25pxAuk9Eej1Kz9OUelF97nAc82bDquQI8=
 github.com/mikioh/tcp v0.0.0-20190314235350-803a9b46060c/go.mod h1:0SQS9kMwD2VsyFEB++InYyBJroV/FRmBgcydeSUcJms=
 github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b h1:z78hV3sbSMAUoyUMM0I83AUIT6Hu17AWfgjzIbtrYFc=
@@ -1634,8 +1659,9 @@ github.com/multiformats/go-multistream v0.1.0/go.mod h1:fJTiDfXJVmItycydCnNx4+wS
 github.com/multiformats/go-multistream v0.1.1/go.mod h1:KmHZ40hzVxiaiwlj3MEbYgK9JFk2/9UktWZAF54Du38=
 github.com/multiformats/go-multistream v0.2.0/go.mod h1:5GZPQZbkWOLOn3J2y4Y99vVW7vOfsAflxARk3x14o6k=
 github.com/multiformats/go-multistream v0.2.1/go.mod h1:5GZPQZbkWOLOn3J2y4Y99vVW7vOfsAflxARk3x14o6k=
-github.com/multiformats/go-multistream v0.2.2 h1:TCYu1BHTDr1F/Qm75qwYISQdzGcRdC21nFgQW7l7GBo=
 github.com/multiformats/go-multistream v0.2.2/go.mod h1:UIcnm7Zuo8HKG+HkWgfQsGL+/MIEhyTqbODbIUwSXKs=
+github.com/multiformats/go-multistream v0.3.0 h1:yX1v4IWseLPmr0rmnDo148wWJbNx40JxBZGmQb5fUP4=
+github.com/multiformats/go-multistream v0.3.0/go.mod h1:ODRoqamLUsETKS9BNcII4gcRsJBU5VAwRIv7O39cEXg=
 github.com/multiformats/go-varint v0.0.1/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
 github.com/multiformats/go-varint v0.0.2/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
 github.com/multiformats/go-varint v0.0.5/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
@@ -1679,8 +1705,9 @@ github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9k
 github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
 github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg=
 github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E=
-github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
+github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
@@ -1755,8 +1782,9 @@ github.com/prometheus/client_golang v1.4.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3O
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
 github.com/prometheus/client_golang v1.9.0/go.mod h1:FqZLKOZnGdFAhOK4nqGHa7D66IdsO+O441Eve7ptJDU=
 github.com/prometheus/client_golang v1.10.0/go.mod h1:WJM3cc3yu7XKBKa/I8WeZm+V3eltZnBwfENSU7mdogU=
-github.com/prometheus/client_golang v1.11.0 h1:HNkLOAEQMIDv/K+04rukrLx6ch7msSRwf3/SASFAGtQ=
 github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
+github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk=
+github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@@ -1776,8 +1804,10 @@ github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16
 github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
 github.com/prometheus/common v0.28.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
-github.com/prometheus/common v0.30.0 h1:JEkYlQnpzrzQFxi6gnukFPdQ+ac82oRhzMcIduJu/Ug=
 github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
+github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
+github.com/prometheus/common v0.33.0 h1:rHgav/0a6+uYgGdNt3jwz8FNSesO/Hsang3O0T9A5SE=
+github.com/prometheus/common v0.33.0/go.mod h1:gB3sOl7P0TvJabZpLY5uQMpUqRCPPCyRLCZYc7JZTNE=
 github.com/prometheus/node_exporter v1.0.0-rc.0.0.20200428091818-01054558c289/go.mod h1:FGbBv5OPKjch+jNUJmEQpMZytIdyW0NdBtWFcfSKusc=
 github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
@@ -2030,7 +2060,7 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/zondax/hid v0.9.0 h1:eiT3P6vNxAEVxXMw66eZUAAnU2zD33JBkfG/EnfAKl8=
 github.com/zondax/hid v0.9.0/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM=
 github.com/zondax/ledger-go v0.12.1 h1:hYRcyznPRJp+5mzF2sazTLP2nGvGjYDD2VzhHhFomLU=
@@ -2114,8 +2144,9 @@ go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+
 go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
 go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
-go.uber.org/multierr v1.7.0 h1:zaiO/rmgFjbmCXdSYJWQcdvOCsthmdaHfr3Gm2Kx4Ec=
 go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
+go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8=
+go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
 go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
@@ -2125,8 +2156,9 @@ go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ=
 go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
 go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
 go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
-go.uber.org/zap v1.19.1 h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI=
 go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI=
+go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8=
+go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
 go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
 go4.org v0.0.0-20200411211856-f5505b9728dd h1:BNJlw5kRTzdmyfh5U8F93HA2OwkP7ZGwA51eJ/0wKOU=
 go4.org v0.0.0-20200411211856-f5505b9728dd/go.mod h1:CIiUVy99QCPfoE13bO4EZaz5GZMZXMSBGhxRdsvzbkg=
@@ -2177,8 +2209,9 @@ golang.org/x/crypto v0.0.0-20210813211128-0a44fdfbc16e/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20210915214749-c084706c2272/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b h1:QAqMVf3pSa6eeTsuklijukjXBlj7Es2QQplab+/RbQ4=
 golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA=
+golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20181106170214-d68db9428509/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -2226,8 +2259,9 @@ golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o=
+golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
 golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -2290,11 +2324,15 @@ golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT
 golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE=
+golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220418201149-a630d4f3e7a2 h1:6mzvA99KwZxbOrxww4EvWVQUnN1+xEu9tafK5ZxkYeA=
+golang.org/x/net v0.0.0-20220418201149-a630d4f3e7a2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -2303,6 +2341,7 @@ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4Iltr
 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
 golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -2418,18 +2457,22 @@ golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210903071746-97244b99971b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210923061019-b8560ed6a9b7/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211025112917-711f33c9992c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211209171907-798191bca915 h1:P+8mCzuEpyszAT6T42q0sxU+eveBAF/cJ2Kp0x6/8+0=
 golang.org/x/sys v0.0.0-20211209171907-798191bca915/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
+golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf h1:MZ2shdL+ZM/XzY3ZGOnh4Nlpnxz5GSOhOmtHo3iPU6M=
 golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -2512,13 +2555,15 @@ golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.7 h1:6j8CgantCy3yc8JGBqkDLMKWqZ0RDU2g1HVgacojGWQ=
-golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
+golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20=
+golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f h1:GGU+dLjvlC3qDwqYgL6UgRmHXhOOgns0bZu2Ty5mm6U=
+golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
 gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0=
 gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
@@ -2616,8 +2661,9 @@ google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTp
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.40.0 h1:AGJ0Ih4mHjSeibYkFGh1dD9KJ/eOtZ93I6hoHhukQ5Q=
 google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
+google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M=
+google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -2630,8 +2676,9 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
+google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff --git a/itests/builder.go b/itests/builder.go
index 9ec987db7..c5538c0f6 100644
--- a/itests/builder.go
+++ b/itests/builder.go
@@ -14,7 +14,6 @@ import (
 	"github.com/go-pg/pg/v10"
 	"github.com/ipfs/go-cid"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/config"
 	"github.com/filecoin-project/lily/lens"
@@ -365,7 +364,7 @@ func collectEpochsWithNullRoundsRange(ctx context.Context, api lens.API, from, t
 	}
 	if int64(head.Height()) != to {
 		// TODO
-		return nil, xerrors.Errorf("TODO to (%d) was a null round, not handled yet", to)
+		return nil, fmt.Errorf("TODO to (%d) was a null round, not handled yet", to)
 	}
 
 	tail, err := api.ChainGetTipSetByHeight(ctx, abi.ChainEpoch(from), types.EmptyTSK)
@@ -374,7 +373,7 @@ func collectEpochsWithNullRoundsRange(ctx context.Context, api lens.API, from, t
 	}
 	if int64(tail.Height()) != from {
 		// TODO
-		return nil, xerrors.Errorf("TODO from (%d) was a null round, not handled yet", from)
+		return nil, fmt.Errorf("TODO from (%d) was a null round, not handled yet", from)
 	}
 
 	out := make(map[int64]*types.TipSet)
@@ -403,7 +402,7 @@ func collectTipSetRange(ctx context.Context, api lens.API, from, to int64) ([]*t
 	}
 	if int64(head.Height()) != to {
 		// TODO
-		return nil, xerrors.Errorf("TODO to (%d) was a null round, not handled yet", to)
+		return nil, fmt.Errorf("TODO to (%d) was a null round, not handled yet", to)
 	}
 
 	tail, err := api.ChainGetTipSetByHeight(ctx, abi.ChainEpoch(from), types.EmptyTSK)
@@ -412,7 +411,7 @@ func collectTipSetRange(ctx context.Context, api lens.API, from, to int64) ([]*t
 	}
 	if int64(tail.Height()) != from {
 		// TODO
-		return nil, xerrors.Errorf("TODO from (%d) was a null round, not handled yet", from)
+		return nil, fmt.Errorf("TODO from (%d) was a null round, not handled yet", from)
 	}
 
 	out := make([]*types.TipSet, 0, head.Height()-tail.Height())
diff --git a/itests/fetch/fetch.go b/itests/fetch/fetch.go
index 7ce77d003..4a9ecdfd3 100644
--- a/itests/fetch/fetch.go
+++ b/itests/fetch/fetch.go
@@ -5,6 +5,8 @@ import (
 	"crypto/sha256"
 	"encoding/hex"
 	"encoding/json"
+	"errors"
+	"fmt"
 	"io"
 	"net/http"
 	"net/url"
@@ -15,7 +17,6 @@ import (
 	"time"
 
 	"go.uber.org/multierr"
-	"golang.org/x/xerrors"
 	"gopkg.in/cheggaaa/pb.v1"
 
 	fslock "github.com/ipfs/go-fs-lock"
@@ -114,12 +115,12 @@ func (ft *fetch) fetchAsync(ctx context.Context, vectorTar, vectorDir string, in
 			lockfail = true
 
 			le := fslock.LockedError("")
-			if xerrors.As(err, &le) {
+			if errors.As(err, &le) {
 				log.Warnf("acquiring filesystem fetch lock: %s; will retry in %s", err, lockRetry)
 				time.Sleep(lockRetry)
 				continue
 			}
-			ft.errs = append(ft.errs, xerrors.Errorf("acquiring filesystem fetch lock: %w", err))
+			ft.errs = append(ft.errs, fmt.Errorf("acquiring filesystem fetch lock: %w", err))
 			return
 		}
 		defer func() {
@@ -135,15 +136,14 @@ func (ft *fetch) fetchAsync(ctx context.Context, vectorTar, vectorDir string, in
 		}
 
 		if err := doFetch(ctx, path, info); err != nil {
-			ft.errs = append(ft.errs, xerrors.Errorf("fetching file %s failed: %w", path, err))
+			ft.errs = append(ft.errs, fmt.Errorf("fetching file %s failed: %w", path, err))
 			return
 		}
-		ft.checkFile(path, info)
-		if err != nil {
-			ft.errs = append(ft.errs, xerrors.Errorf("checking file %s failed: %w", path, err))
+		if err := ft.checkFile(path, info); err != nil {
+			ft.errs = append(ft.errs, fmt.Errorf("checking file %s failed: %w", path, err))
 			err := os.Remove(path)
 			if err != nil {
-				ft.errs = append(ft.errs, xerrors.Errorf("remove file %s failed: %w", path, err))
+				ft.errs = append(ft.errs, fmt.Errorf("remove file %s failed: %w", path, err))
 			}
 		}
 	}()
@@ -198,7 +198,7 @@ func (ft *fetch) checkFile(path string, info VectorFile) error {
 		return nil
 	}
 
-	return xerrors.Errorf("checksum mismatch in test vector file %s, %s != %s", path, strSum, info.Digest)
+	return fmt.Errorf("checksum mismatch in test vector file %s, %s != %s", path, strSum, info.Digest)
 }
 
 func doFetch(ctx context.Context, out string, info VectorFile) error {
diff --git a/itests/init.go b/itests/init.go
index b0f5f8f6b..6beed82df 100644
--- a/itests/init.go
+++ b/itests/init.go
@@ -4,15 +4,17 @@ import (
 	"archive/tar"
 	"context"
 	"encoding/json"
-	"github.com/filecoin-project/lily/build"
-	"github.com/filecoin-project/lily/itests/fetch"
-	logging "github.com/ipfs/go-log/v2"
-	"go.uber.org/multierr"
-	"golang.org/x/xerrors"
+	"fmt"
 	"io"
 	"os"
 	"path/filepath"
 	"time"
+
+	logging "github.com/ipfs/go-log/v2"
+	"go.uber.org/multierr"
+
+	"github.com/filecoin-project/lily/build"
+	"github.com/filecoin-project/lily/itests/fetch"
 )
 
 var log = logging.Logger("lily/itests")
@@ -129,7 +131,7 @@ func vectorsForNetwork(fileName string, meta fetch.VectorFile) (*TestVector, err
 				return nil, err
 			}
 		default:
-			return nil, xerrors.Errorf("unexpected file: %v", t.Name)
+			return nil, fmt.Errorf("unexpected file: %v", t.Name)
 		}
 	}
 
diff --git a/lens/lily/impl.go b/lens/lily/impl.go
index 13236e584..e49ffbd73 100644
--- a/lens/lily/impl.go
+++ b/lens/lily/impl.go
@@ -19,7 +19,6 @@ import (
 	"github.com/ipfs/go-cid"
 	logging "github.com/ipfs/go-log/v2"
 	"go.uber.org/fx"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/datasource"
 	"github.com/filecoin-project/lily/chain/gap"
@@ -68,7 +67,7 @@ func (m *LilyNodeAPI) ChainGetTipSetAfterHeight(ctx context.Context, epoch abi.C
 	// TODO (Frrist): I copied this from lotus, I need it now to handle gap filling edge cases.
 	ts, err := m.ChainAPI.Chain.GetTipSetFromKey(ctx, key)
 	if err != nil {
-		return nil, xerrors.Errorf("loading tipset %s: %w", key, err)
+		return nil, fmt.Errorf("loading tipset %s: %w", key, err)
 	}
 	return m.ChainAPI.Chain.GetTipsetByHeight(ctx, epoch, ts, false)
 }
@@ -485,26 +484,26 @@ func (m *LilyNodeAPI) GetMessageExecutionsForTipSet(ctx context.Context, next *t
 	// contain executions for this tipset.
 	executions, err := msgMonitor.ExecutionFor(current)
 	if err != nil {
-		if err == modules.ExecutionTraceNotFound {
+		if err == modules.ErrExecutionTraceNotFound {
 			// if lily hasn't watched this tipset be applied then we need to compute its execution trace.
 			// this will likely be the case for most walk tasks.
 			_, err := m.StateManager.ExecutionTraceWithMonitor(ctx, current, msgMonitor)
 			if err != nil {
-				return nil, xerrors.Errorf("failed to compute execution trace for tipset %s: %w", current.Key().String(), err)
+				return nil, fmt.Errorf("failed to compute execution trace for tipset %s: %w", current.Key().String(), err)
 			}
 			// the above call will populate the msgMonitor with an execution trace for this tipset, get it.
 			executions, err = msgMonitor.ExecutionFor(current)
 			if err != nil {
-				return nil, xerrors.Errorf("failed to find execution trace for tipset %s: %w", current.Key().String(), err)
+				return nil, fmt.Errorf("failed to find execution trace for tipset %s: %w", current.Key().String(), err)
 			}
 		} else {
-			return nil, xerrors.Errorf("failed to extract message execution for tipset %s: %w", next, err)
+			return nil, fmt.Errorf("failed to extract message execution for tipset %s: %w", next, err)
 		}
 	}
 
 	getActorCode, err := util.MakeGetActorCodeFunc(ctx, m.ChainAPI.Chain.ActorStore(ctx), next, current)
 	if err != nil {
-		return nil, xerrors.Errorf("failed to make actor code query function: %w", err)
+		return nil, fmt.Errorf("failed to make actor code query function: %w", err)
 	}
 
 	out := make([]*lens.MessageExecution, len(executions))
@@ -517,7 +516,7 @@ func (m *LilyNodeAPI) GetMessageExecutionsForTipSet(ctx context.Context, next *t
 		// if the message sender cannot be found this is an unexpected error
 		fromCode, found := getActorCode(execution.Msg.From)
 		if !found {
-			return nil, xerrors.Errorf("failed to find from actor %s height %d message %s", execution.Msg.From, execution.TipSet.Height(), execution.Msg.Cid())
+			return nil, fmt.Errorf("failed to find from actor %s height %d message %s", execution.Msg.From, execution.TipSet.Height(), execution.Msg.Cid())
 		}
 		out[idx] = &lens.MessageExecution{
 			Cid:           execution.Mcid,
diff --git a/lens/lily/modules/statemanager.go b/lens/lily/modules/statemanager.go
index ea1d47d6b..75743a6f6 100644
--- a/lens/lily/modules/statemanager.go
+++ b/lens/lily/modules/statemanager.go
@@ -2,6 +2,7 @@ package modules
 
 import (
 	"context"
+	"fmt"
 	"sync"
 
 	"github.com/filecoin-project/lotus/chain/beacon"
@@ -14,12 +15,11 @@ import (
 	"github.com/ipfs/go-cid"
 	logging "github.com/ipfs/go-log/v2"
 	"go.uber.org/fx"
-	"golang.org/x/xerrors"
 )
 
 var log = logging.Logger("lily/lens")
 
-var ExecutionTraceNotFound = xerrors.Errorf("failed to find execution trace")
+var ErrExecutionTraceNotFound = fmt.Errorf("failed to find execution trace")
 
 func StateManager(lmctx helpers.MetricsCtx, lc fx.Lifecycle, cs *store.ChainStore, exec stmgr.Executor, sys vm.SyscallBuilder, us stmgr.UpgradeSchedule, bs beacon.Schedule, em stmgr.ExecMonitor) (*stmgr.StateManager, error) {
 	sm, err := stmgr.NewStateManagerWithUpgradeScheduleAndMonitor(cs, exec, sys, us, bs, em)
@@ -98,7 +98,7 @@ func (b *BufferedExecMonitor) ExecutionFor(ts *types.TipSet) ([]*BufferedExecuti
 
 	exe, found := b.cache.Get(ts.Key())
 	if !found {
-		return nil, ExecutionTraceNotFound
+		return nil, ErrExecutionTraceNotFound
 	}
 	return exe.([]*BufferedExecution), nil
 }
diff --git a/lens/lily/modules/store.go b/lens/lily/modules/store.go
index 63c03eb95..33e2cbac5 100644
--- a/lens/lily/modules/store.go
+++ b/lens/lily/modules/store.go
@@ -2,13 +2,13 @@ package modules
 
 import (
 	"context"
+	"fmt"
 	"io"
 
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 	"github.com/filecoin-project/lotus/node/modules/helpers"
 	"github.com/filecoin-project/lotus/node/repo"
 	"go.uber.org/fx"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/lens/util"
 )
@@ -42,7 +42,7 @@ func NewCachingUniversalBlockstore(lc fx.Lifecycle, mctx helpers.MetricsCtx, cc
 	log.Infof("creating caching blockstore with size=%d", cc.BlockstoreCacheSize)
 	cbs, err := util.NewCachingBlockstore(bs, int(cc.BlockstoreCacheSize))
 	if err != nil {
-		return nil, xerrors.Errorf("failed to create caching blockstore: %v", err)
+		return nil, fmt.Errorf("failed to create caching blockstore: %v", err)
 	}
 
 	return cbs, err
diff --git a/lens/util/repo.go b/lens/util/repo.go
index 8246e364d..e9ca53fbf 100644
--- a/lens/util/repo.go
+++ b/lens/util/repo.go
@@ -14,7 +14,6 @@ import (
 	logging "github.com/ipfs/go-log/v2"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"go.opentelemetry.io/otel"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -46,7 +45,7 @@ func GetExecutedAndBlockMessagesForTipset(ctx context.Context, cs *store.ChainSt
 	ctx, span := otel.Tracer("").Start(ctx, "GetExecutedAndBlockMessagesForTipSet")
 	defer span.End()
 	if !types.CidArrsEqual(current.Parents().Cids(), executed.Cids()) {
-		return nil, xerrors.Errorf("current tipset (%s) is not on the same chain as executed (%s)", current.Key(), executed.Key())
+		return nil, fmt.Errorf("current tipset (%s) is not on the same chain as executed (%s)", current.Key(), executed.Key())
 	}
 
 	getActorCode, err := MakeGetActorCodeFunc(ctx, cs.ActorStore(ctx), current, executed)
@@ -59,7 +58,7 @@ func GetExecutedAndBlockMessagesForTipset(ctx context.Context, cs *store.ChainSt
 	for blockIdx, bh := range executed.Blocks() {
 		blscids, secpkcids, err := cs.ReadMsgMetaCids(ctx, bh.Messages)
 		if err != nil {
-			return nil, xerrors.Errorf("read messages for block: %w", err)
+			return nil, fmt.Errorf("read messages for block: %w", err)
 		}
 
 		for _, c := range blscids {
@@ -74,7 +73,7 @@ func GetExecutedAndBlockMessagesForTipset(ctx context.Context, cs *store.ChainSt
 
 	bmsgs, err := cs.BlockMsgsForTipset(ctx, executed)
 	if err != nil {
-		return nil, xerrors.Errorf("block messages for tipset: %w", err)
+		return nil, fmt.Errorf("block messages for tipset: %w", err)
 	}
 
 	span.AddEvent("read block messages for tipset")
@@ -82,7 +81,7 @@ func GetExecutedAndBlockMessagesForTipset(ctx context.Context, cs *store.ChainSt
 	pblocks := executed.Blocks()
 	if len(bmsgs) != len(pblocks) {
 		// logic error somewhere
-		return nil, xerrors.Errorf("mismatching number of blocks returned from block messages, got %d wanted %d", len(bmsgs), len(pblocks))
+		return nil, fmt.Errorf("mismatching number of blocks returned from block messages, got %d wanted %d", len(bmsgs), len(pblocks))
 	}
 
 	count := 0
@@ -106,7 +105,7 @@ func GetExecutedAndBlockMessagesForTipset(ctx context.Context, cs *store.ChainSt
 			// we must always be able to find the sender, else there is a logic error somewhere.
 			fromCode, found := getActorCode(msg.From)
 			if !found {
-				return nil, xerrors.Errorf("failed to find from actor %s height %d message %s", msg.From, current.Height(), msg.Cid())
+				return nil, fmt.Errorf("failed to find from actor %s height %d message %s", msg.From, current.Height(), msg.Cid())
 			}
 			emsgs = append(emsgs, &lens.ExecutedMessage{
 				Cid:           blsm.Cid(),
@@ -131,7 +130,7 @@ func GetExecutedAndBlockMessagesForTipset(ctx context.Context, cs *store.ChainSt
 			// we must always be able to find the sender, else there is a logic error somewhere.
 			fromCode, found := getActorCode(msg.From)
 			if !found {
-				return nil, xerrors.Errorf("failed to find from actor %s height %d message %s", msg.From, current.Height(), msg.Cid())
+				return nil, fmt.Errorf("failed to find from actor %s height %d message %s", msg.From, current.Height(), msg.Cid())
 			}
 			emsgs = append(emsgs, &lens.ExecutedMessage{
 				Cid:           secm.Cid(),
@@ -152,12 +151,12 @@ func GetExecutedAndBlockMessagesForTipset(ctx context.Context, cs *store.ChainSt
 	// Retrieve receipts using a block from the child tipset
 	rs, err := adt.AsArray(cs.ActorStore(ctx), current.Blocks()[0].ParentMessageReceipts)
 	if err != nil {
-		return nil, xerrors.Errorf("amt load: %w", err)
+		return nil, fmt.Errorf("amt load: %w", err)
 	}
 
 	if rs.Length() != uint64(len(emsgs)) {
 		// logic error somewhere
-		return nil, xerrors.Errorf("mismatching number of receipts: got %d wanted %d", rs.Length(), len(emsgs))
+		return nil, fmt.Errorf("mismatching number of receipts: got %d wanted %d", rs.Length(), len(emsgs))
 	}
 
 	filVested, err := sm.GetFilVested(ctx, current.Height())
@@ -178,12 +177,12 @@ func GetExecutedAndBlockMessagesForTipset(ctx context.Context, cs *store.ChainSt
 		FilVested:      filVested,
 	})
 	if err != nil {
-		return nil, xerrors.Errorf("creating temporary vm: %w", err)
+		return nil, fmt.Errorf("creating temporary vm: %w", err)
 	}
 
 	parentStateTree, err := state.LoadStateTree(cs.ActorStore(ctx), executed.ParentState())
 	if err != nil {
-		return nil, xerrors.Errorf("load state tree: %w", err)
+		return nil, fmt.Errorf("load state tree: %w", err)
 	}
 	span.AddEvent("loaded parent state tree")
 
@@ -195,13 +194,13 @@ func GetExecutedAndBlockMessagesForTipset(ctx context.Context, cs *store.ChainSt
 		if found, err := rs.Get(em.Index, &r); err != nil {
 			return nil, err
 		} else if !found {
-			return nil, xerrors.Errorf("failed to find receipt %d", em.Index)
+			return nil, fmt.Errorf("failed to find receipt %d", em.Index)
 		}
 		em.Receipt = &r
 
 		burn, err := vmw.ShouldBurn(ctx, parentStateTree, em.Message, em.Receipt.ExitCode)
 		if err != nil {
-			return nil, xerrors.Errorf("deciding whether should burn failed: %w", err)
+			return nil, fmt.Errorf("deciding whether should burn failed: %w", err)
 		}
 
 		em.GasOutputs = vm.ComputeGasOutputs(em.Receipt.GasUsed, em.Message.GasLimit, em.BlockHeader.ParentBaseFee, em.Message.GasFeeCap, em.Message.GasPremium, burn)
@@ -266,7 +265,7 @@ func ParseParams(params []byte, method abi.MethodNum, actCode cid.Cid) (string,
 		reflect.TypeOf(bitfield.BitField{}): bitfieldCountMarshaller,
 	})
 	if err != nil {
-		return "", "", xerrors.Errorf("failed to parse message params method: %d, actor code: %s, params: %s: %w", method, actCode, string(params), err)
+		return "", "", fmt.Errorf("failed to parse message params method: %d, actor code: %s, params: %s: %w", method, actCode, string(params), err)
 	}
 
 	return string(b), m.Name, err
@@ -279,12 +278,12 @@ func MethodAndParamsForMessage(m *types.Message, destCode cid.Cid) (string, stri
 	}
 
 	if !destCode.Defined() {
-		return "Unknown", "", xerrors.Errorf("missing actor code")
+		return "Unknown", "", fmt.Errorf("missing actor code")
 	}
 
 	params, method, err := ParseParams(m.Params, m.Method, destCode)
 	if method == "Unknown" {
-		return "", "", xerrors.Errorf("unknown method for actor type %s: %d", destCode.String(), int64(m.Method))
+		return "", "", fmt.Errorf("unknown method for actor type %s: %d", destCode.String(), int64(m.Method))
 	}
 	if err != nil {
 		log.Warnf("failed to parse parameters of message %s: %v", m.Cid, err)
@@ -300,15 +299,15 @@ func MethodAndParamsForMessage(m *types.Message, destCode cid.Cid) (string, stri
 
 func ActorNameAndFamilyFromCode(c cid.Cid) (name string, family string, err error) {
 	if !c.Defined() {
-		return "", "", xerrors.Errorf("cannot derive actor name from undefined CID")
+		return "", "", fmt.Errorf("cannot derive actor name from undefined CID")
 	}
 	name = builtin.ActorNameByCode(c)
 	if name == "<unknown>" {
-		return "", "", xerrors.Errorf("cannot derive actor name from unknown CID: %s (maybe we need up update deps?)", c.String())
+		return "", "", fmt.Errorf("cannot derive actor name from unknown CID: %s (maybe we need up update deps?)", c.String())
 	}
 	tokens := strings.Split(name, "/")
 	if len(tokens) != 3 {
-		return "", "", xerrors.Errorf("cannot parse actor name: %s from tokens: %s", name, tokens)
+		return "", "", fmt.Errorf("cannot parse actor name: %s from tokens: %s", name, tokens)
 	}
 	// network = tokens[0]
 	// version = tokens[1]
@@ -321,7 +320,7 @@ func MakeGetActorCodeFunc(ctx context.Context, store adt.Store, next, current *t
 	defer span.End()
 	nextStateTree, err := state.LoadStateTree(store, next.ParentState())
 	if err != nil {
-		return nil, xerrors.Errorf("load state tree: %w", err)
+		return nil, fmt.Errorf("load state tree: %w", err)
 	}
 
 	// Build a lookup of actor codes that exist after all messages in the current epoch have been executed
@@ -330,17 +329,17 @@ func MakeGetActorCodeFunc(ctx context.Context, store adt.Store, next, current *t
 		actorCodes[a] = act.Code
 		return nil
 	}); err != nil {
-		return nil, xerrors.Errorf("iterate actors: %w", err)
+		return nil, fmt.Errorf("iterate actors: %w", err)
 	}
 
 	nextInitActor, err := nextStateTree.GetActor(builtininit.Address)
 	if err != nil {
-		return nil, xerrors.Errorf("getting init actor: %w", err)
+		return nil, fmt.Errorf("getting init actor: %w", err)
 	}
 
 	nextInitActorState, err := builtininit.Load(store, nextInitActor)
 	if err != nil {
-		return nil, xerrors.Errorf("loading init actor state: %w", err)
+		return nil, fmt.Errorf("loading init actor state: %w", err)
 	}
 
 	return func(a address.Address) (cid.Cid, bool) {
@@ -386,7 +385,7 @@ func MarshalWithOverrides(v interface{}, overrides map[reflect.Type]marshaller)
 	defer func() {
 		if r := recover(); r != nil {
 			out = nil
-			err = xerrors.Errorf("failed to override message param json marshaller: %v", r)
+			err = fmt.Errorf("failed to override message param json marshaller: %v", r)
 		}
 	}()
 	pwt := paramWrapperType{
diff --git a/lens/util/store.go b/lens/util/store.go
index a7619402e..ec1ea18c5 100644
--- a/lens/util/store.go
+++ b/lens/util/store.go
@@ -3,6 +3,7 @@ package util
 import (
 	"bytes"
 	"context"
+	"fmt"
 	"reflect"
 	"sync/atomic"
 
@@ -13,7 +14,6 @@ import (
 	"github.com/ipfs/go-cid"
 	cbor "github.com/ipfs/go-ipld-cbor"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 )
 
 type CacheConfig struct {
@@ -141,7 +141,7 @@ type CachingBlockstore struct {
 func NewCachingBlockstore(blocks blockstore.Blockstore, cacheSize int) (*CachingBlockstore, error) {
 	cache, err := lru.NewARC(cacheSize)
 	if err != nil {
-		return nil, xerrors.Errorf("new arc: %w", err)
+		return nil, fmt.Errorf("new arc: %w", err)
 	}
 
 	return &CachingBlockstore{
@@ -248,7 +248,7 @@ type CachingStateStore struct {
 func NewCachingStateStore(blocks blockstore.Blockstore, cacheSize int) (*CachingStateStore, error) {
 	cache, err := lru.NewARC(cacheSize)
 	if err != nil {
-		return nil, xerrors.Errorf("new arc: %w", err)
+		return nil, fmt.Errorf("new arc: %w", err)
 	}
 
 	store := adt.WrapStore(context.Background(), cbor.NewCborStore(blocks))
@@ -273,7 +273,7 @@ func (cas *CachingStateStore) Get(ctx context.Context, c cid.Cid, out interface{
 
 	cu, ok := out.(cbg.CBORUnmarshaler)
 	if !ok {
-		return xerrors.Errorf("out parameter does not implement CBORUnmarshaler")
+		return fmt.Errorf("out parameter does not implement CBORUnmarshaler")
 	}
 
 	v, hit := cas.cache.Get(c)
@@ -305,11 +305,11 @@ func (cas *CachingStateStore) Get(ctx context.Context, c cid.Cid, out interface{
 func (cas *CachingStateStore) tryAssign(value interface{}, out interface{}) error {
 	o := reflect.ValueOf(out).Elem()
 	if !o.CanSet() {
-		return xerrors.Errorf("out parameter (type %s) cannot be set", o.Type().Name())
+		return fmt.Errorf("out parameter (type %s) cannot be set", o.Type().Name())
 	}
 
 	if !value.(reflect.Value).Type().AssignableTo(o.Type()) {
-		return xerrors.Errorf("out parameter (type %s) cannot be assigned cached value (type %s)", o.Type().Name(), value.(reflect.Value).Type().Name())
+		return fmt.Errorf("out parameter (type %s) cannot be assigned cached value (type %s)", o.Type().Name(), value.(reflect.Value).Type().Name())
 	}
 
 	o.Set(value.(reflect.Value))
diff --git a/model/actors/init/idaddress.go b/model/actors/init/idaddress.go
index 54b6e511c..a686a347c 100644
--- a/model/actors/init/idaddress.go
+++ b/model/actors/init/idaddress.go
@@ -2,11 +2,11 @@ package init
 
 import (
 	"context"
+	"fmt"
 
 	"go.opencensus.io/tag"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/metrics"
 	"github.com/filecoin-project/lily/model"
@@ -58,7 +58,7 @@ func (ia *IdAddress) Persist(ctx context.Context, s model.StorageBatch, version
 
 	m, ok := ia.AsVersion(version)
 	if !ok {
-		return xerrors.Errorf("IdAddress not supported for schema version %s", version)
+		return fmt.Errorf("IdAddress not supported for schema version %s", version)
 	}
 
 	metrics.RecordCount(ctx, metrics.PersistModel, 1)
diff --git a/model/actors/miner/feedebt.go b/model/actors/miner/feedebt.go
index 90c883991..36aee5c6f 100644
--- a/model/actors/miner/feedebt.go
+++ b/model/actors/miner/feedebt.go
@@ -2,10 +2,10 @@ package miner
 
 import (
 	"context"
+	"fmt"
 
 	"go.opencensus.io/tag"
 	"go.opentelemetry.io/otel"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/metrics"
 	"github.com/filecoin-project/lily/model"
@@ -59,7 +59,7 @@ func (m *MinerFeeDebt) Persist(ctx context.Context, s model.StorageBatch, versio
 
 	vm, ok := m.AsVersion(version)
 	if !ok {
-		return xerrors.Errorf("MinerFeeDebt not supported for schema version %s", version)
+		return fmt.Errorf("MinerFeeDebt not supported for schema version %s", version)
 	}
 
 	metrics.RecordCount(ctx, metrics.PersistModel, 1)
diff --git a/model/actors/miner/lockedfunds.go b/model/actors/miner/lockedfunds.go
index 75db96c16..3992bdd17 100644
--- a/model/actors/miner/lockedfunds.go
+++ b/model/actors/miner/lockedfunds.go
@@ -2,10 +2,10 @@ package miner
 
 import (
 	"context"
+	"fmt"
 
 	"go.opencensus.io/tag"
 	"go.opentelemetry.io/otel"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/metrics"
 	"github.com/filecoin-project/lily/model"
@@ -65,7 +65,7 @@ func (m *MinerLockedFund) Persist(ctx context.Context, s model.StorageBatch, ver
 
 	vm, ok := m.AsVersion(version)
 	if !ok {
-		return xerrors.Errorf("MinerLockedFund not supported for schema version %s", version)
+		return fmt.Errorf("MinerLockedFund not supported for schema version %s", version)
 	}
 
 	metrics.RecordCount(ctx, metrics.PersistModel, 1)
diff --git a/model/actors/miner/precommit.go b/model/actors/miner/precommit.go
index 4cf7a46fc..7bee01389 100644
--- a/model/actors/miner/precommit.go
+++ b/model/actors/miner/precommit.go
@@ -2,11 +2,12 @@ package miner
 
 import (
 	"context"
+	"fmt"
+
 	"go.opentelemetry.io/otel/attribute"
 
 	"go.opencensus.io/tag"
 	"go.opentelemetry.io/otel"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/metrics"
 	"github.com/filecoin-project/lily/model"
@@ -94,7 +95,7 @@ func (mpi *MinerPreCommitInfo) Persist(ctx context.Context, s model.StorageBatch
 
 	m, ok := mpi.AsVersion(version)
 	if !ok {
-		return xerrors.Errorf("MinerPreCommitInfo not supported for schema version %s", version)
+		return fmt.Errorf("MinerPreCommitInfo not supported for schema version %s", version)
 	}
 
 	metrics.RecordCount(ctx, metrics.PersistModel, 1)
diff --git a/model/actors/miner/sector.go b/model/actors/miner/sector.go
index 9225d1ba9..68925fedb 100644
--- a/model/actors/miner/sector.go
+++ b/model/actors/miner/sector.go
@@ -2,11 +2,11 @@ package miner
 
 import (
 	"context"
+	"fmt"
 
 	"go.opencensus.io/tag"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/metrics"
 	"github.com/filecoin-project/lily/model"
@@ -118,7 +118,7 @@ func (msi *MinerSectorInfoV7) Persist(ctx context.Context, s model.StorageBatch,
 
 	m, ok := msi.AsVersion(version)
 	if !ok {
-		return xerrors.Errorf("MinerSectorInfoV7 not supported for schema version %s", version)
+		return fmt.Errorf("MinerSectorInfoV7 not supported for schema version %s", version)
 	}
 
 	metrics.RecordCount(ctx, metrics.PersistModel, 1)
@@ -193,7 +193,7 @@ func (msi *MinerSectorInfoV1_6) Persist(ctx context.Context, s model.StorageBatc
 
 	m, ok := msi.AsVersion(version)
 	if !ok {
-		return xerrors.Errorf("MinerSectorInfoV7 not supported for schema version %s", version)
+		return fmt.Errorf("MinerSectorInfoV7 not supported for schema version %s", version)
 	}
 
 	metrics.RecordCount(ctx, metrics.PersistModel, 1)
diff --git a/model/actors/power/chainpower.go b/model/actors/power/chainpower.go
index d929669c6..a36075d67 100644
--- a/model/actors/power/chainpower.go
+++ b/model/actors/power/chainpower.go
@@ -2,11 +2,11 @@ package power
 
 import (
 	"context"
+	"fmt"
 
 	"go.opencensus.io/tag"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/metrics"
 	"github.com/filecoin-project/lily/model"
@@ -89,7 +89,7 @@ func (cp *ChainPower) Persist(ctx context.Context, s model.StorageBatch, version
 
 	vcp, ok := cp.AsVersion(version)
 	if !ok {
-		return xerrors.Errorf("ChainPower not supported for schema version %s", version)
+		return fmt.Errorf("ChainPower not supported for schema version %s", version)
 	}
 
 	metrics.RecordCount(ctx, metrics.PersistModel, 1)
diff --git a/model/actors/power/claimedpower.go b/model/actors/power/claimedpower.go
index ece70fe46..cdfcca537 100644
--- a/model/actors/power/claimedpower.go
+++ b/model/actors/power/claimedpower.go
@@ -2,10 +2,10 @@ package power
 
 import (
 	"context"
+	"fmt"
 
 	"go.opencensus.io/tag"
 	"go.opentelemetry.io/otel"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/metrics"
 	"github.com/filecoin-project/lily/model"
@@ -60,7 +60,7 @@ func (p *PowerActorClaim) Persist(ctx context.Context, s model.StorageBatch, ver
 
 	vp, ok := p.AsVersion(version)
 	if !ok {
-		return xerrors.Errorf("PowerActorClaim not supported for schema version %s", version)
+		return fmt.Errorf("PowerActorClaim not supported for schema version %s", version)
 	}
 
 	metrics.RecordCount(ctx, metrics.PersistModel, 1)
diff --git a/model/actors/reward/chainreward.go b/model/actors/reward/chainreward.go
index 211e5407f..c8ca24e1e 100644
--- a/model/actors/reward/chainreward.go
+++ b/model/actors/reward/chainreward.go
@@ -2,10 +2,10 @@ package reward
 
 import (
 	"context"
+	"fmt"
 
 	"go.opencensus.io/tag"
 	"go.opentelemetry.io/otel"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/metrics"
 	"github.com/filecoin-project/lily/model"
@@ -79,7 +79,7 @@ func (r *ChainReward) Persist(ctx context.Context, s model.StorageBatch, version
 
 	vr, ok := r.AsVersion(version)
 	if !ok {
-		return xerrors.Errorf("ChainReward not supported for schema version %s", version)
+		return fmt.Errorf("ChainReward not supported for schema version %s", version)
 	}
 
 	metrics.RecordCount(ctx, metrics.PersistModel, 1)
diff --git a/model/chain/economics.go b/model/chain/economics.go
index a3f5744e6..e5aec7817 100644
--- a/model/chain/economics.go
+++ b/model/chain/economics.go
@@ -2,11 +2,11 @@ package chain
 
 import (
 	"context"
+	"fmt"
 
 	"go.opencensus.io/tag"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/metrics"
 	"github.com/filecoin-project/lily/model"
@@ -65,7 +65,7 @@ func (c *ChainEconomics) Persist(ctx context.Context, s model.StorageBatch, vers
 
 	m, ok := c.AsVersion(version)
 	if !ok {
-		return xerrors.Errorf("ChainEconomics not supported for schema version %s", version)
+		return fmt.Errorf("ChainEconomics not supported for schema version %s", version)
 	}
 
 	metrics.RecordCount(ctx, metrics.PersistModel, 1)
diff --git a/model/derived/gasoutputs.go b/model/derived/gasoutputs.go
index a743ed2f7..af9eb3aa7 100644
--- a/model/derived/gasoutputs.go
+++ b/model/derived/gasoutputs.go
@@ -2,11 +2,11 @@ package derived
 
 import (
 	"context"
+	"fmt"
 
 	"go.opencensus.io/tag"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/metrics"
 	"github.com/filecoin-project/lily/model"
@@ -115,7 +115,7 @@ func (g *GasOutputs) Persist(ctx context.Context, s model.StorageBatch, version
 
 	vg, ok := g.AsVersion(version)
 	if !ok {
-		return xerrors.Errorf("GasOutputs not supported for schema version %s", version)
+		return fmt.Errorf("GasOutputs not supported for schema version %s", version)
 	}
 
 	metrics.RecordCount(ctx, metrics.PersistModel, 1)
@@ -143,7 +143,7 @@ func (l GasOutputsList) Persist(ctx context.Context, s model.StorageBatch, versi
 		for _, g := range l {
 			vg, ok := g.AsVersion(version)
 			if !ok {
-				return xerrors.Errorf("GasOutputs not supported for schema version %s", version)
+				return fmt.Errorf("GasOutputs not supported for schema version %s", version)
 			}
 			vgl = append(vgl, vg)
 		}
diff --git a/model/messages/gaseconomy.go b/model/messages/gaseconomy.go
index fc81551bb..52af5e5c1 100644
--- a/model/messages/gaseconomy.go
+++ b/model/messages/gaseconomy.go
@@ -2,9 +2,9 @@ package messages
 
 import (
 	"context"
+	"fmt"
 
 	"go.opencensus.io/tag"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/metrics"
 	"github.com/filecoin-project/lily/model"
@@ -76,7 +76,7 @@ func (g *MessageGasEconomy) Persist(ctx context.Context, s model.StorageBatch, v
 
 	vm, ok := g.AsVersion(version)
 	if !ok {
-		return xerrors.Errorf("MessageGasEconomy not supported for schema version %s", version)
+		return fmt.Errorf("MessageGasEconomy not supported for schema version %s", version)
 	}
 
 	metrics.RecordCount(ctx, metrics.PersistModel, 1)
diff --git a/model/messages/message.go b/model/messages/message.go
index 6abee671d..9dfefaa41 100644
--- a/model/messages/message.go
+++ b/model/messages/message.go
@@ -2,10 +2,11 @@ package messages
 
 import (
 	"context"
+	"fmt"
+
 	"go.opencensus.io/tag"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/metrics"
 	"github.com/filecoin-project/lily/model"
@@ -79,7 +80,7 @@ func (m *Message) Persist(ctx context.Context, s model.StorageBatch, version mod
 
 	vm, ok := m.AsVersion(version)
 	if !ok {
-		return xerrors.Errorf("Message not supported for schema version %s", version)
+		return fmt.Errorf("Message not supported for schema version %s", version)
 	}
 
 	metrics.RecordCount(ctx, metrics.PersistModel, 1)
@@ -107,7 +108,7 @@ func (ms Messages) Persist(ctx context.Context, s model.StorageBatch, version mo
 		for _, m := range ms {
 			vm, ok := m.AsVersion(version)
 			if !ok {
-				return xerrors.Errorf("Message not supported for schema version %s", version)
+				return fmt.Errorf("Message not supported for schema version %s", version)
 			}
 			vms = append(vms, vm)
 		}
diff --git a/model/messages/parsedmessage.go b/model/messages/parsedmessage.go
index 6554219d0..b2ddd5ae8 100644
--- a/model/messages/parsedmessage.go
+++ b/model/messages/parsedmessage.go
@@ -2,11 +2,11 @@ package messages
 
 import (
 	"context"
+	"fmt"
 
 	"go.opencensus.io/tag"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/metrics"
 	"github.com/filecoin-project/lily/model"
@@ -64,7 +64,7 @@ func (pm *ParsedMessage) Persist(ctx context.Context, s model.StorageBatch, vers
 
 	vpm, ok := pm.AsVersion(version)
 	if !ok {
-		return xerrors.Errorf("ParsedMessage not supported for schema version %s", version)
+		return fmt.Errorf("ParsedMessage not supported for schema version %s", version)
 	}
 
 	metrics.RecordCount(ctx, metrics.PersistModel, 1)
@@ -92,7 +92,7 @@ func (pms ParsedMessages) Persist(ctx context.Context, s model.StorageBatch, ver
 		for _, m := range pms {
 			vpm, ok := m.AsVersion(version)
 			if !ok {
-				return xerrors.Errorf("ParsedMessage not supported for schema version %s", version)
+				return fmt.Errorf("ParsedMessage not supported for schema version %s", version)
 			}
 			vpms = append(vpms, vpm)
 		}
diff --git a/network/surveyer.go b/network/surveyer.go
index 4af0623d8..10e00411c 100644
--- a/network/surveyer.go
+++ b/network/surveyer.go
@@ -2,17 +2,18 @@ package network
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"go.opencensus.io/stats"
 	"go.opencensus.io/tag"
 	"go.opentelemetry.io/otel"
-	"golang.org/x/xerrors"
+
+	logging "github.com/ipfs/go-log/v2"
 
 	"github.com/filecoin-project/lily/metrics"
 	"github.com/filecoin-project/lily/model"
 	"github.com/filecoin-project/lily/tasks/survey/peeragents"
-	logging "github.com/ipfs/go-log/v2"
 )
 
 const (
@@ -27,7 +28,7 @@ type API interface {
 
 func NewSurveyer(api API, storage model.Storage, interval time.Duration, name string, tasks []string) (*Surveyer, error) {
 	if interval <= 0 {
-		return nil, xerrors.Errorf("surveyer interval must be greater than zero: %d", interval)
+		return nil, fmt.Errorf("surveyer interval must be greater than zero: %d", interval)
 	}
 
 	obs := &Surveyer{
@@ -42,7 +43,7 @@ func NewSurveyer(api API, storage model.Storage, interval time.Duration, name st
 		case PeerAgentsTask:
 			obs.tasks[PeerAgentsTask] = peeragents.NewTask(api)
 		default:
-			return nil, xerrors.Errorf("unknown task: %s", task)
+			return nil, fmt.Errorf("unknown task: %s", task)
 		}
 	}
 
diff --git a/schedule/scheduler.go b/schedule/scheduler.go
index cf9b0372c..9a9b098d8 100644
--- a/schedule/scheduler.go
+++ b/schedule/scheduler.go
@@ -3,6 +3,7 @@ package schedule
 import (
 	"context"
 	"errors"
+	"fmt"
 	"sort"
 	"sync"
 	"time"
@@ -11,7 +12,6 @@ import (
 	logging "github.com/ipfs/go-log/v2"
 	"go.uber.org/fx"
 	"go.uber.org/zap"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/metrics"
 	"github.com/filecoin-project/lily/storage"
@@ -250,7 +250,7 @@ func (s *Scheduler) Run(ctx context.Context) error {
 func (s *Scheduler) StartJob(id JobID) error {
 	job, err := s.getJob(id)
 	if err != nil {
-		return xerrors.Errorf("start job: %w", err)
+		return fmt.Errorf("start job: %w", err)
 	}
 
 	job.lk.Lock()
@@ -258,7 +258,7 @@ func (s *Scheduler) StartJob(id JobID) error {
 	job.errorMsg = ""
 	if job.running {
 		job.lk.Unlock()
-		return xerrors.Errorf("starting worker ID: %d already running", id)
+		return fmt.Errorf("starting worker ID: %d already running", id)
 	}
 	job.lk.Unlock()
 
@@ -270,14 +270,14 @@ func (s *Scheduler) StartJob(id JobID) error {
 func (s *Scheduler) StopJob(id JobID) error {
 	job, err := s.getJob(id)
 	if err != nil {
-		return xerrors.Errorf("stop job: %w", err)
+		return fmt.Errorf("stop job: %w", err)
 	}
 
 	job.lk.Lock()
 	defer job.lk.Unlock()
 
 	if !job.running {
-		return xerrors.Errorf("stopping job ID: %d already stopped", id)
+		return fmt.Errorf("stopping job ID: %d already stopped", id)
 	}
 
 	job.log.Infow("stopping job", "id", job)
@@ -288,7 +288,7 @@ func (s *Scheduler) StopJob(id JobID) error {
 func (s *Scheduler) WaitJob(id JobID) (*JobListResult, error) {
 	job, err := s.getJob(id)
 	if err != nil {
-		return nil, xerrors.Errorf("wait job: %w", err)
+		return nil, fmt.Errorf("wait job: %w", err)
 	}
 
 	// wait on the job to complete
@@ -297,7 +297,7 @@ func (s *Scheduler) WaitJob(id JobID) (*JobListResult, error) {
 	// fetch the job to get the latest results (EndedAt and Running will have changed)
 	job, err = s.getJob(id)
 	if err != nil {
-		return nil, xerrors.Errorf("wait job: %w", err)
+		return nil, fmt.Errorf("wait job: %w", err)
 	}
 	return &JobListResult{
 		ID:                  job.id,
@@ -320,7 +320,7 @@ func (s *Scheduler) getJob(id JobID) (*JobConfig, error) {
 	job, ok := s.jobs[id]
 	s.jobsMu.Unlock()
 	if !ok {
-		return nil, xerrors.Errorf("job id: %d not found", id)
+		return nil, fmt.Errorf("job id: %d not found", id)
 	}
 	return job, nil
 }
diff --git a/schemas/v1/schema.go b/schemas/v1/schema.go
index 3281a4a09..ddce5a990 100644
--- a/schemas/v1/schema.go
+++ b/schemas/v1/schema.go
@@ -7,7 +7,6 @@ import (
 	"text/template"
 
 	"github.com/go-pg/migrations/v8"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/model"
 	"github.com/filecoin-project/lily/schemas"
@@ -22,11 +21,11 @@ func init() {
 func GetBase(cfg schemas.Config) (string, error) {
 	tmpl, err := template.New("base").Funcs(schemaTemplateFuncMap).Parse(BaseTemplate)
 	if err != nil {
-		return "", xerrors.Errorf("parse base template: %w", err)
+		return "", fmt.Errorf("parse base template: %w", err)
 	}
 	var buf strings.Builder
 	if err := tmpl.Execute(&buf, cfg); err != nil {
-		return "", xerrors.Errorf("execute base template: %w", err)
+		return "", fmt.Errorf("execute base template: %w", err)
 	}
 	return buf.String(), nil
 }
@@ -84,13 +83,13 @@ func (pl *patchList) Collection(cfg schemas.Config) (*migrations.Collection, err
 
 	// patch 0 must not exist - it's the base schema by definition
 	if _, exists := pl.pm[0]; exists {
-		return nil, xerrors.Errorf("found patch 0, which should not exist")
+		return nil, fmt.Errorf("found patch 0, which should not exist")
 	}
 
 	// index from 1 since schema seq 0 is the base and not in `pm`
 	for i := 1; i <= count; i++ {
 		if _, exists := pl.pm[i]; !exists {
-			return nil, xerrors.Errorf("missing patch %d", i)
+			return nil, fmt.Errorf("missing patch %d", i)
 		}
 	}
 
@@ -100,7 +99,7 @@ func (pl *patchList) Collection(cfg schemas.Config) (*migrations.Collection, err
 
 		var buf strings.Builder
 		if err := p.tmpl.Execute(&buf, cfg); err != nil {
-			return nil, xerrors.Errorf("execute patch template: %w", err)
+			return nil, fmt.Errorf("execute patch template: %w", err)
 		}
 		sql := buf.String()
 
diff --git a/storage/catalog.go b/storage/catalog.go
index b8d2fe346..0b911f60f 100644
--- a/storage/catalog.go
+++ b/storage/catalog.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/filecoin-project/lily/config"
 	"github.com/filecoin-project/lily/model"
-	"golang.org/x/xerrors"
 )
 
 type Connector interface {
@@ -127,7 +126,7 @@ func (c *Catalog) ConnectAsDatabase(ctx context.Context, name string, md Metadat
 
 	db, ok := strg.(*Database)
 	if !ok {
-		return nil, xerrors.Errorf("storage type (%T) is unsupported", strg)
+		return nil, fmt.Errorf("storage type (%T) is unsupported", strg)
 	}
 	return db, nil
 }
diff --git a/storage/locks.go b/storage/locks.go
index df583d4a6..efd2acb11 100644
--- a/storage/locks.go
+++ b/storage/locks.go
@@ -3,9 +3,9 @@ package storage
 import (
 	"context"
 	"errors"
+	"fmt"
 
 	"github.com/go-pg/pg/v10"
-	"golang.org/x/xerrors"
 )
 
 var ErrLockNotAcquired = errors.New("lock not acquired")
@@ -21,7 +21,7 @@ func (l AdvisoryLock) LockExclusive(ctx context.Context, db *pg.DB) error {
 	var acquired bool
 	_, err := db.QueryOneContext(ctx, pg.Scan(&acquired), `SELECT pg_try_advisory_lock(?);`, int64(l))
 	if err != nil {
-		return xerrors.Errorf("acquiring exclusive lock: %w", err)
+		return fmt.Errorf("acquiring exclusive lock: %w", err)
 	}
 	if !acquired {
 		return ErrLockNotAcquired
@@ -34,7 +34,7 @@ func (l AdvisoryLock) UnlockExclusive(ctx context.Context, db *pg.DB) error {
 	var released bool
 	_, err := db.QueryOneContext(ctx, pg.Scan(&released), `SELECT pg_advisory_unlock(?);`, int64(l))
 	if err != nil {
-		return xerrors.Errorf("unlocking exclusive lock: %w", err)
+		return fmt.Errorf("unlocking exclusive lock: %w", err)
 	}
 	if !released {
 		return ErrLockNotReleased
@@ -47,7 +47,7 @@ func (l AdvisoryLock) LockShared(ctx context.Context, db *pg.DB) error {
 	var acquired bool
 	_, err := db.QueryOneContext(ctx, pg.Scan(&acquired), `SELECT pg_try_advisory_lock_shared(?);`, int64(l))
 	if err != nil {
-		return xerrors.Errorf("acquiring exclusive lock: %w", err)
+		return fmt.Errorf("acquiring exclusive lock: %w", err)
 	}
 	if !acquired {
 		return ErrLockNotAcquired
@@ -60,7 +60,7 @@ func (l AdvisoryLock) UnlockShared(ctx context.Context, db *pg.DB) error {
 	var released bool
 	_, err := db.QueryOneContext(ctx, pg.Scan(&released), `SELECT pg_advisory_unlock_shared(?);`, int64(l))
 	if err != nil {
-		return xerrors.Errorf("unlocking shared lock: %w", err)
+		return fmt.Errorf("unlocking shared lock: %w", err)
 	}
 	if !released {
 		return ErrLockNotReleased
diff --git a/storage/migrate.go b/storage/migrate.go
index abbdb782f..37ea43253 100644
--- a/storage/migrate.go
+++ b/storage/migrate.go
@@ -2,11 +2,11 @@ package storage
 
 import (
 	"context"
+	"fmt"
 	"strconv"
 
 	"github.com/go-pg/migrations/v8"
 	"github.com/go-pg/pg/v10"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/model"
 	"github.com/filecoin-project/lily/schemas"
@@ -27,7 +27,7 @@ func (d *Database) GetSchemaVersions(ctx context.Context) (model.Version, model.
 	// Temporarily connect
 	db, err := connect(ctx, d.opt)
 	if err != nil {
-		return model.Version{}, model.Version{}, xerrors.Errorf("connect: %w", err)
+		return model.Version{}, model.Version{}, fmt.Errorf("connect: %w", err)
 	}
 	defer db.Close() // nolint: errcheck
 	dbVersion, _, err := getDatabaseSchemaVersion(ctx, db, d.SchemaConfig())
@@ -41,12 +41,12 @@ func (d *Database) GetSchemaVersions(ctx context.Context) (model.Version, model.
 func getDatabaseSchemaVersion(ctx context.Context, db *pg.DB, cfg schemas.Config) (model.Version, bool, error) {
 	vvExists, err := tableExists(ctx, db, cfg.SchemaName, "visor_version")
 	if err != nil {
-		return model.Version{}, false, xerrors.Errorf("checking if visor_version exists:%w", err)
+		return model.Version{}, false, fmt.Errorf("checking if visor_version exists:%w", err)
 	}
 
 	migExists, err := tableExists(ctx, db, cfg.SchemaName, "gopg_migrations")
 	if err != nil {
-		return model.Version{}, false, xerrors.Errorf("checking if gopg_migrations exists:%w", err)
+		return model.Version{}, false, fmt.Errorf("checking if gopg_migrations exists:%w", err)
 	}
 
 	if !migExists && !vvExists {
@@ -71,7 +71,7 @@ func getDatabaseSchemaVersion(ctx context.Context, db *pg.DB, cfg schemas.Config
 
 	migration, err := coll.Version(db)
 	if err != nil {
-		return model.Version{}, false, xerrors.Errorf("unable to determine schema version: %w", err)
+		return model.Version{}, false, fmt.Errorf("unable to determine schema version: %w", err)
 	}
 
 	if major == 0 && migration == 0 {
@@ -92,7 +92,7 @@ func initDatabaseSchema(ctx context.Context, db *pg.DB, cfg schemas.Config) erro
 	if cfg.SchemaName != "public" {
 		_, err := db.Exec(`CREATE SCHEMA IF NOT EXISTS ?`, pg.SafeQuery(cfg.SchemaName))
 		if err != nil {
-			return xerrors.Errorf("ensure schema exists :%w", err)
+			return fmt.Errorf("ensure schema exists :%w", err)
 		}
 	}
 
@@ -105,7 +105,7 @@ func initDatabaseSchema(ctx context.Context, db *pg.DB, cfg schemas.Config) erro
 		)
 	`, pg.SafeQuery(vvTableName))
 	if err != nil {
-		return xerrors.Errorf("ensure visor_version exists :%w", err)
+		return fmt.Errorf("ensure visor_version exists :%w", err)
 	}
 
 	// Ensure the gopg migrations table exists
@@ -118,7 +118,7 @@ func initDatabaseSchema(ctx context.Context, db *pg.DB, cfg schemas.Config) erro
 		)
 	`, pg.SafeQuery(migTableName))
 	if err != nil {
-		return xerrors.Errorf("ensure visor_version exists :%w", err)
+		return fmt.Errorf("ensure visor_version exists :%w", err)
 	}
 
 	return nil
@@ -128,22 +128,22 @@ func validateDatabaseSchemaVersion(ctx context.Context, db *pg.DB, cfg schemas.C
 	// Check if the version of the schema is compatible
 	dbVersion, initialized, err := getDatabaseSchemaVersion(ctx, db, cfg)
 	if err != nil {
-		return model.Version{}, xerrors.Errorf("get schema version: %w", err)
+		return model.Version{}, fmt.Errorf("get schema version: %w", err)
 	}
 
 	if !initialized {
-		return model.Version{}, xerrors.Errorf("schema not installed in database")
+		return model.Version{}, fmt.Errorf("schema not installed in database")
 	}
 
 	if dbVersion.Before(LatestSchemaVersion()) {
 		// the latest schema version supported by lily (LatestSchemaVersion()) is newer than the schema version in use by the database (`dbVersion`)
 		// running lily this way will cause models data persistence failures.
-		return model.Version{}, xerrors.Errorf("the latest schema version supported by lily (%s) is newer than the schema version in use by the database (%s) running lily this way will cause models data persistence failures: %w", LatestSchemaVersion(), dbVersion, ErrSchemaTooOld)
+		return model.Version{}, fmt.Errorf("the latest schema version supported by lily (%s) is newer than the schema version in use by the database (%s) running lily this way will cause models data persistence failures: %w", LatestSchemaVersion(), dbVersion, ErrSchemaTooOld)
 	}
 	if LatestSchemaVersion().Before(dbVersion) {
 		// the latest schema version supported by lily (LatestSchemaVersion()) is older than the schema version in use by the database (`dbVersion`)
 		// running lily this way will cause undefined behaviour.
-		return model.Version{}, xerrors.Errorf("the latest schema version supported by lily (%s) is older than the schema version in use by the database (%s) running lily this way will cause undefined behaviour: %w", LatestSchemaVersion(), dbVersion, ErrSchemaTooNew)
+		return model.Version{}, fmt.Errorf("the latest schema version supported by lily (%s) is older than the schema version in use by the database (%s) running lily this way will cause undefined behaviour: %w", LatestSchemaVersion(), dbVersion, ErrSchemaTooNew)
 	}
 	return dbVersion, nil
 }
@@ -161,7 +161,7 @@ func latestSchemaVersionForMajor(major int) model.Version {
 	case 1:
 		return v1.Version()
 	default:
-		return model.Version{} //, xerrors.Errorf("unsupported major version: %d", version.Major)
+		return model.Version{} //, fmt.Errorf("unsupported major version: %d", version.Major)
 	}
 }
 
@@ -175,46 +175,46 @@ func (d *Database) MigrateSchema(ctx context.Context) error {
 func (d *Database) MigrateSchemaTo(ctx context.Context, target model.Version) error {
 	db, err := connect(ctx, d.opt)
 	if err != nil {
-		return xerrors.Errorf("connect: %w", err)
+		return fmt.Errorf("connect: %w", err)
 	}
 	defer db.Close() // nolint: errcheck
 
 	dbVersion, initialized, err := getDatabaseSchemaVersion(ctx, db, d.SchemaConfig())
 	if err != nil {
-		return xerrors.Errorf("get schema versions: %w", err)
+		return fmt.Errorf("get schema versions: %w", err)
 	}
 	log.Infof("current database schema is version %s", dbVersion)
 
 	// Check that we are not trying to migrate to a different major version of an already installed schema
 	if initialized && target.Major != dbVersion.Major {
-		return xerrors.Errorf("cannot migrate to a different major schema version. database version=%s, target version=%s", dbVersion, target)
+		return fmt.Errorf("cannot migrate to a different major schema version. database version=%s, target version=%s", dbVersion, target)
 	}
 
 	latestVersion := latestSchemaVersionForMajor(target.Major)
 	if latestVersion.Patch < target.Patch {
-		return xerrors.Errorf("no migrations found for version %s", target)
+		return fmt.Errorf("no migrations found for version %s", target)
 	}
 
 	if dbVersion == target {
-		return xerrors.Errorf("database schema is already at version %d", dbVersion)
+		return fmt.Errorf("database schema is already at version %d", dbVersion)
 	}
 
 	coll, err := collectionForVersion(target, d.SchemaConfig())
 	if err != nil {
-		return xerrors.Errorf("no schema definition corresponds to version %s: %w", target, err)
+		return fmt.Errorf("no schema definition corresponds to version %s: %w", target, err)
 	}
 
 	if err := checkMigrationSequence(ctx, coll, dbVersion.Patch, target.Patch); err != nil {
-		return xerrors.Errorf("check migration sequence: %w", err)
+		return fmt.Errorf("check migration sequence: %w", err)
 	}
 
 	// Acquire an exclusive lock on the schema so we know no other instances are running
 	if err := SchemaLock.LockExclusive(ctx, db); err != nil {
-		return xerrors.Errorf("acquiring schema lock: %w", err)
+		return fmt.Errorf("acquiring schema lock: %w", err)
 	}
 
 	if err := initDatabaseSchema(ctx, db, d.SchemaConfig()); err != nil {
-		return xerrors.Errorf("initializing schema version tables: %w", err)
+		return fmt.Errorf("initializing schema version tables: %w", err)
 	}
 
 	// Check if we need to create the base schema
@@ -223,11 +223,11 @@ func (d *Database) MigrateSchemaTo(ctx context.Context, target model.Version) er
 
 		base, err := baseForVersion(target, d.SchemaConfig())
 		if err != nil {
-			return xerrors.Errorf("no base schema defined for version %s: %w", target, err)
+			return fmt.Errorf("no base schema defined for version %s: %w", target, err)
 		}
 
 		if _, err := db.Exec(base); err != nil {
-			return xerrors.Errorf("creating base schema: %w", err)
+			return fmt.Errorf("creating base schema: %w", err)
 		}
 
 		dbVersion.Major = target.Major
@@ -247,7 +247,7 @@ func (d *Database) MigrateSchemaTo(ctx context.Context, target model.Version) er
 			log.Warnf("running destructive schema migration from patch %d to patch %d", dbVersion.Patch, dbVersion.Patch-1)
 			_, newDBPatch, err := coll.Run(db, "down")
 			if err != nil {
-				return xerrors.Errorf("run migration: %w", err)
+				return fmt.Errorf("run migration: %w", err)
 			}
 			dbVersion.Patch = int(newDBPatch)
 			log.Infof("current database schema is now version %s", dbVersion)
@@ -259,7 +259,7 @@ func (d *Database) MigrateSchemaTo(ctx context.Context, target model.Version) er
 	log.Infof("running schema migration from version %s to version %s", dbVersion, target)
 	_, newDBPatch, err := coll.Run(db, "up", strconv.Itoa(target.Patch))
 	if err != nil {
-		return xerrors.Errorf("run migration: %w", err)
+		return fmt.Errorf("run migration: %w", err)
 	}
 
 	dbVersion.Patch = int(newDBPatch)
@@ -274,7 +274,7 @@ func checkMigrationSequence(ctx context.Context, coll *migrations.Collection, fr
 	ms := coll.Migrations()
 	for _, m := range ms {
 		if versions[m.Version] {
-			return xerrors.Errorf("duplication migration for schema version %d", m.Version)
+			return fmt.Errorf("duplication migration for schema version %d", m.Version)
 		}
 		versions[m.Version] = true
 	}
@@ -294,7 +294,7 @@ func checkMigrationSequence(ctx context.Context, coll *migrations.Collection, fr
 		}
 
 		if !versions[int64(i)] {
-			return xerrors.Errorf("missing migration for schema version %d", i)
+			return fmt.Errorf("missing migration for schema version %d", i)
 		}
 	}
 
@@ -306,7 +306,7 @@ func collectionForVersion(version model.Version, cfg schemas.Config) (*migration
 	case 1:
 		return v1.GetPatches(cfg)
 	default:
-		return nil, xerrors.Errorf("unsupported major version: %d", version.Major)
+		return nil, fmt.Errorf("unsupported major version: %d", version.Major)
 	}
 }
 
@@ -315,6 +315,6 @@ func baseForVersion(version model.Version, cfg schemas.Config) (string, error) {
 	case 1:
 		return v1.GetBase(cfg)
 	default:
-		return "", xerrors.Errorf("unsupported major version: %d", version.Major)
+		return "", fmt.Errorf("unsupported major version: %d", version.Major)
 	}
 }
diff --git a/storage/sql.go b/storage/sql.go
index 24f05b60c..fdc177c9b 100644
--- a/storage/sql.go
+++ b/storage/sql.go
@@ -3,6 +3,7 @@ package storage
 import (
 	"context"
 	"errors"
+	"fmt"
 	"reflect"
 	"sort"
 	"strings"
@@ -12,7 +13,6 @@ import (
 	"github.com/go-pg/pg/v10/types"
 	logging "github.com/ipfs/go-log/v2"
 	"github.com/raulk/clock"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/model"
 	"github.com/filecoin-project/lily/model/actors/common"
@@ -106,7 +106,7 @@ func NewDatabase(ctx context.Context, url string, poolSize int, name string, sch
 
 	opt, err := pg.ParseURL(url)
 	if err != nil {
-		return nil, xerrors.Errorf("parse database URL: %w", err)
+		return nil, fmt.Errorf("parse database URL: %w", err)
 	}
 	opt.PoolSize = poolSize
 	if opt.ApplicationName == "" {
@@ -179,7 +179,7 @@ type Database struct {
 func (d *Database) Connect(ctx context.Context) error {
 	db, err := connect(ctx, d.opt)
 	if err != nil {
-		return xerrors.Errorf("connect: %w", err)
+		return fmt.Errorf("connect: %w", err)
 	}
 
 	dbVersion, err := validateDatabaseSchemaVersion(ctx, db, d.SchemaConfig())
@@ -208,13 +208,13 @@ func connect(ctx context.Context, opt *pg.Options) (*pg.DB, error) {
 
 	// Check if connection credentials are valid and PostgreSQL is up and running.
 	if err := db.Ping(ctx); err != nil {
-		return nil, xerrors.Errorf("ping database: %w", err)
+		return nil, fmt.Errorf("ping database: %w", err)
 	}
 
 	// Acquire a shared lock on the schema to notify other instances that we are running
 	if err := SchemaLock.LockShared(ctx, db); err != nil {
 		_ = db.Close() // nolint: errcheck
-		return nil, xerrors.Errorf("failed to acquire schema lock, possible migration in progress: %w", err)
+		return nil, fmt.Errorf("failed to acquire schema lock, possible migration in progress: %w", err)
 	}
 
 	return db, nil
@@ -258,7 +258,7 @@ func (d *Database) VerifyCurrentSchema(ctx context.Context) error {
 	// Temporarily connect
 	db, err := connect(ctx, d.opt)
 	if err != nil {
-		return xerrors.Errorf("connect: %w", err)
+		return fmt.Errorf("connect: %w", err)
 	}
 	defer db.Close() // nolint: errcheck
 	return verifyCurrentSchema(ctx, db, d.SchemaConfig())
@@ -271,11 +271,11 @@ func verifyCurrentSchema(ctx context.Context, db *pg.DB, cfg schemas.Config) err
 
 	version, initialized, err := getDatabaseSchemaVersion(ctx, db, cfg)
 	if err != nil {
-		return xerrors.Errorf("get schema version: %w", err)
+		return fmt.Errorf("get schema version: %w", err)
 	}
 
 	if !initialized {
-		return xerrors.Errorf("schema not installed in database")
+		return fmt.Errorf("schema not installed in database")
 	}
 
 	valid := true
@@ -283,7 +283,7 @@ func verifyCurrentSchema(ctx context.Context, db *pg.DB, cfg schemas.Config) err
 		if vm, ok := model.(versionable); ok {
 			m, ok := vm.AsVersion(version)
 			if !ok {
-				return xerrors.Errorf("model %T does not support version %s", model, version)
+				return fmt.Errorf("model %T does not support version %s", model, version)
 			}
 			model = m
 		}
@@ -299,7 +299,7 @@ func verifyCurrentSchema(ctx context.Context, db *pg.DB, cfg schemas.Config) err
 
 	}
 	if !valid {
-		return xerrors.Errorf("database schema was not compatible with current models")
+		return fmt.Errorf("database schema was not compatible with current models")
 	}
 	return nil
 }
@@ -309,10 +309,10 @@ func verifyModel(ctx context.Context, db *pg.DB, schemaName string, m *orm.Table
 
 	exists, err := tableExists(ctx, db, schemaName, tableName)
 	if err != nil {
-		return xerrors.Errorf("querying table: %v", err)
+		return fmt.Errorf("querying table: %v", err)
 	}
 	if !exists {
-		return xerrors.Errorf("required table %s not found", m.SQLName)
+		return fmt.Errorf("required table %s not found", m.SQLName)
 	}
 
 	for _, fld := range m.Fields {
@@ -320,17 +320,17 @@ func verifyModel(ctx context.Context, db *pg.DB, schemaName string, m *orm.Table
 		_, err := db.QueryOne(pg.Scan(&datatype), `SELECT data_type FROM information_schema.columns WHERE table_schema=? AND table_name=? AND column_name=?`, schemaName, tableName, fld.SQLName)
 		if err != nil {
 			if errors.Is(err, pg.ErrNoRows) {
-				return xerrors.Errorf("required column %s.%s not found", tableName, fld.SQLName)
+				return fmt.Errorf("required column %s.%s not found", tableName, fld.SQLName)
 			}
-			return xerrors.Errorf("querying field: %v %T", err, err)
+			return fmt.Errorf("querying field: %v %T", err, err)
 		}
 		if datatype == "USER-DEFINED" {
 			_, err := db.QueryOne(pg.Scan(&datatype), `SELECT udt_name FROM information_schema.columns WHERE table_schema=? AND table_name=? AND column_name=?`, schemaName, tableName, fld.SQLName)
 			if err != nil {
 				if errors.Is(err, pg.ErrNoRows) {
-					return xerrors.Errorf("required column %s.%s not found", tableName, fld.SQLName)
+					return fmt.Errorf("required column %s.%s not found", tableName, fld.SQLName)
 				}
-				return xerrors.Errorf("querying field: %v %T", err, err)
+				return fmt.Errorf("querying field: %v %T", err, err)
 			}
 		}
 
@@ -342,7 +342,7 @@ func verifyModel(ctx context.Context, db *pg.DB, schemaName string, m *orm.Table
 		}
 
 		if datatype != fld.SQLType {
-			return xerrors.Errorf("column %s.%s had datatype %s, expected %s", tableName, fld.SQLName, datatype, fld.SQLType)
+			return fmt.Errorf("column %s.%s had datatype %s, expected %s", tableName, fld.SQLName, datatype, fld.SQLType)
 		}
 
 	}
@@ -354,7 +354,7 @@ func tableExists(ctx context.Context, db *pg.DB, schemaName string, tableName st
 	var exists bool
 	_, err := db.QueryOneContext(ctx, pg.Scan(&exists), `SELECT EXISTS (SELECT FROM information_schema.tables WHERE table_schema=? AND table_name=?)`, schemaName, tableName)
 	if err != nil {
-		return false, xerrors.Errorf("querying table: %v", err)
+		return false, fmt.Errorf("querying table: %v", err)
 	}
 
 	return exists, nil
@@ -374,7 +374,7 @@ func (d *Database) PersistBatch(ctx context.Context, ps ...model.Persistable) er
 
 		for _, p := range ps {
 			if err := p.Persist(ctx, txs, d.version); err != nil {
-				return xerrors.Errorf("persisting %T: %w", p, err)
+				return fmt.Errorf("persisting %T: %w", p, err)
 			}
 		}
 
@@ -420,13 +420,13 @@ func (s *TxStorage) PersistModel(ctx context.Context, m interface{}) error {
 			OnConflict(conflict).
 			Set(upsert).
 			Insert(); err != nil {
-			return xerrors.Errorf("upserting model: %w", err)
+			return fmt.Errorf("upserting model: %w", err)
 		}
 	} else {
 		if _, err := s.tx.ModelContext(ctx, m).
 			OnConflict("do nothing").
 			Insert(); err != nil {
-			return xerrors.Errorf("persisting model: %w", err)
+			return fmt.Errorf("persisting model: %w", err)
 		}
 	}
 	return nil
@@ -522,7 +522,7 @@ func (d *Database) QueryGaps(ctx context.Context, minHeight, maxHeight int64, ta
 			Where("height >= ?", minHeight).
 			Where("height <= ?", maxHeight).
 			Select(); err != nil {
-			return nil, xerrors.Errorf("querying gap reports: %w", err)
+			return nil, fmt.Errorf("querying gap reports: %w", err)
 		}
 	} else {
 		if err := d.AsORM().ModelContext(ctx, &out).
@@ -531,7 +531,7 @@ func (d *Database) QueryGaps(ctx context.Context, minHeight, maxHeight int64, ta
 			Where("height >= ?", minHeight).
 			Where("height <= ?", maxHeight).
 			Select(); err != nil {
-			return nil, xerrors.Errorf("querying gap reports: %w", err)
+			return nil, fmt.Errorf("querying gap reports: %w", err)
 		}
 	}
 	return out, nil
diff --git a/tasks/actorstate/init_/init.go b/tasks/actorstate/init_/init.go
index 610c94ba3..7ae7cdd8b 100644
--- a/tasks/actorstate/init_/init.go
+++ b/tasks/actorstate/init_/init.go
@@ -2,6 +2,7 @@ package init_
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -9,7 +10,6 @@ import (
 	logging "github.com/ipfs/go-log/v2"
 	"go.opentelemetry.io/otel"
 	"go.uber.org/zap"
-	"golang.org/x/xerrors"
 
 	init_ "github.com/filecoin-project/lily/chain/actors/builtin/init"
 	"github.com/filecoin-project/lily/model"
@@ -69,22 +69,22 @@ func (InitExtractor) Extract(ctx context.Context, a actorstate.ActorInfo, node a
 	}
 	prevActor, err := node.Actor(ctx, a.Address, a.Executed.Key())
 	if err != nil {
-		return nil, xerrors.Errorf("loading previous init actor: %w", err)
+		return nil, fmt.Errorf("loading previous init actor: %w", err)
 	}
 
 	prevState, err := init_.Load(node.Store(), prevActor)
 	if err != nil {
-		return nil, xerrors.Errorf("loading previous init actor state: %w", err)
+		return nil, fmt.Errorf("loading previous init actor state: %w", err)
 	}
 
 	curState, err := init_.Load(node.Store(), &a.Actor)
 	if err != nil {
-		return nil, xerrors.Errorf("loading current init actor state: %w", err)
+		return nil, fmt.Errorf("loading current init actor state: %w", err)
 	}
 
 	addressChanges, err := init_.DiffAddressMap(ctx, node.Store(), prevState, curState)
 	if err != nil {
-		return nil, xerrors.Errorf("diffing init actor state: %w", err)
+		return nil, fmt.Errorf("diffing init actor state: %w", err)
 	}
 
 	out := make(initmodel.IdAddressList, 0, len(addressChanges.Added)+len(addressChanges.Modified))
diff --git a/tasks/actorstate/market/context.go b/tasks/actorstate/market/context.go
index 0cd353b91..6ae67e8a3 100644
--- a/tasks/actorstate/market/context.go
+++ b/tasks/actorstate/market/context.go
@@ -2,11 +2,11 @@ package market
 
 import (
 	"context"
+	"fmt"
 	"unicode/utf8"
 
 	"github.com/filecoin-project/lotus/chain/types"
 	"golang.org/x/text/runes"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/adt"
 	"github.com/filecoin-project/lily/tasks/actorstate"
@@ -28,7 +28,7 @@ type MarketStateExtractionContext struct {
 func NewMarketStateExtractionContext(ctx context.Context, a actorstate.ActorInfo, node actorstate.ActorStateAPI) (*MarketStateExtractionContext, error) {
 	curState, err := market.Load(node.Store(), &a.Actor)
 	if err != nil {
-		return nil, xerrors.Errorf("loading current market state: %w", err)
+		return nil, fmt.Errorf("loading current market state: %w", err)
 	}
 
 	prevTipset := a.Current
@@ -38,12 +38,12 @@ func NewMarketStateExtractionContext(ctx context.Context, a actorstate.ActorInfo
 
 		prevActor, err := node.Actor(ctx, a.Address, a.Executed.Key())
 		if err != nil {
-			return nil, xerrors.Errorf("loading previous market actor state at tipset %s epoch %d: %w", a.Executed.Key(), a.Current.Height(), err)
+			return nil, fmt.Errorf("loading previous market actor state at tipset %s epoch %d: %w", a.Executed.Key(), a.Current.Height(), err)
 		}
 
 		prevState, err = market.Load(node.Store(), prevActor)
 		if err != nil {
-			return nil, xerrors.Errorf("loading previous market actor state: %w", err)
+			return nil, fmt.Errorf("loading previous market actor state: %w", err)
 		}
 
 	}
diff --git a/tasks/actorstate/market/deal_proposal.go b/tasks/actorstate/market/deal_proposal.go
index 9ab6de911..1711786b5 100644
--- a/tasks/actorstate/market/deal_proposal.go
+++ b/tasks/actorstate/market/deal_proposal.go
@@ -2,12 +2,12 @@ package market
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/go-state-types/abi"
 	logging "github.com/ipfs/go-log/v2"
 	"go.opentelemetry.io/otel"
 	"go.uber.org/zap"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/builtin/market"
 	"github.com/filecoin-project/lily/model"
@@ -36,7 +36,7 @@ func (DealProposalExtractor) Extract(ctx context.Context, a actorstate.ActorInfo
 
 	currDealProposals, err := ec.CurrState.Proposals()
 	if err != nil {
-		return nil, xerrors.Errorf("loading current market deal proposals: %w:", err)
+		return nil, fmt.Errorf("loading current market deal proposals: %w", err)
 	}
 
 	if ec.IsGenesis() {
@@ -61,7 +61,7 @@ func (DealProposalExtractor) Extract(ctx context.Context, a actorstate.ActorInfo
 			})
 			return nil
 		}); err != nil {
-			return nil, xerrors.Errorf("walking current deal states: %w", err)
+			return nil, fmt.Errorf("walking current deal states: %w", err)
 		}
 		return out, nil
 
@@ -69,7 +69,7 @@ func (DealProposalExtractor) Extract(ctx context.Context, a actorstate.ActorInfo
 
 	changed, err := ec.CurrState.ProposalsChanged(ec.PrevState)
 	if err != nil {
-		return nil, xerrors.Errorf("checking for deal proposal changes: %w", err)
+		return nil, fmt.Errorf("checking for deal proposal changes: %w", err)
 	}
 
 	if !changed {
@@ -78,7 +78,7 @@ func (DealProposalExtractor) Extract(ctx context.Context, a actorstate.ActorInfo
 
 	changes, err := market.DiffDealProposals(ctx, ec.Store, ec.PrevState, ec.CurrState)
 	if err != nil {
-		return nil, xerrors.Errorf("diffing deal states: %w", err)
+		return nil, fmt.Errorf("diffing deal states: %w", err)
 	}
 
 	out := make(marketmodel.MarketDealProposals, len(changes.Added))
diff --git a/tasks/actorstate/market/deal_state.go b/tasks/actorstate/market/deal_state.go
index f00814019..225c4769a 100644
--- a/tasks/actorstate/market/deal_state.go
+++ b/tasks/actorstate/market/deal_state.go
@@ -2,11 +2,11 @@ package market
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/go-state-types/abi"
 	"go.opentelemetry.io/otel"
 	"go.uber.org/zap"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/builtin/market"
 	"github.com/filecoin-project/lily/model"
@@ -33,7 +33,7 @@ func (DealStateExtractor) Extract(ctx context.Context, a actorstate.ActorInfo, n
 
 	currDealStates, err := ec.CurrState.States()
 	if err != nil {
-		return nil, xerrors.Errorf("loading current market deal states: %w", err)
+		return nil, fmt.Errorf("loading current market deal states: %w", err)
 	}
 
 	if ec.IsGenesis() {
@@ -49,14 +49,14 @@ func (DealStateExtractor) Extract(ctx context.Context, a actorstate.ActorInfo, n
 			})
 			return nil
 		}); err != nil {
-			return nil, xerrors.Errorf("walking current deal states: %w", err)
+			return nil, fmt.Errorf("walking current deal states: %w", err)
 		}
 		return out, nil
 	}
 
 	changed, err := ec.CurrState.StatesChanged(ec.PrevState)
 	if err != nil {
-		return nil, xerrors.Errorf("checking for deal state changes: %w", err)
+		return nil, fmt.Errorf("checking for deal state changes: %w", err)
 	}
 
 	if !changed {
@@ -65,7 +65,7 @@ func (DealStateExtractor) Extract(ctx context.Context, a actorstate.ActorInfo, n
 
 	changes, err := market.DiffDealStates(ctx, ec.Store, ec.PrevState, ec.CurrState)
 	if err != nil {
-		return nil, xerrors.Errorf("diffing deal states: %w", err)
+		return nil, fmt.Errorf("diffing deal states: %w", err)
 	}
 
 	out := make(marketmodel.MarketDealStates, len(changes.Added)+len(changes.Modified))
diff --git a/tasks/actorstate/miner/context.go b/tasks/actorstate/miner/context.go
index 06da6716e..8ff7b24f9 100644
--- a/tasks/actorstate/miner/context.go
+++ b/tasks/actorstate/miner/context.go
@@ -2,9 +2,9 @@ package miner
 
 import (
 	"context"
+	"fmt"
 
 	"go.opentelemetry.io/otel"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lotus/chain/types"
 
@@ -18,7 +18,7 @@ func NewMinerStateExtractionContext(ctx context.Context, a actorstate.ActorInfo,
 
 	curState, err := miner.Load(node.Store(), &a.Actor)
 	if err != nil {
-		return nil, xerrors.Errorf("loading current miner state: %w", err)
+		return nil, fmt.Errorf("loading current miner state: %w", err)
 	}
 
 	prevTipset := a.Current
@@ -39,12 +39,12 @@ func NewMinerStateExtractionContext(ctx context.Context, a actorstate.ActorInfo,
 					CurrTs:    a.Current,
 				}, nil
 			}
-			return nil, xerrors.Errorf("loading previous miner %s at tipset %s epoch %d: %w", a.Address, a.Executed.Key(), a.Current.Height(), err)
+			return nil, fmt.Errorf("loading previous miner %s at tipset %s epoch %d: %w", a.Address, a.Executed.Key(), a.Current.Height(), err)
 		}
 
 		prevState, err = miner.Load(node.Store(), prevActor)
 		if err != nil {
-			return nil, xerrors.Errorf("loading previous miner actor state: %w", err)
+			return nil, fmt.Errorf("loading previous miner actor state: %w", err)
 		}
 	}
 
diff --git a/tasks/actorstate/miner/deadline_info.go b/tasks/actorstate/miner/deadline_info.go
index 4a855ff59..e3b13cee7 100644
--- a/tasks/actorstate/miner/deadline_info.go
+++ b/tasks/actorstate/miner/deadline_info.go
@@ -2,10 +2,10 @@ package miner
 
 import (
 	"context"
+	"fmt"
 
 	"go.opentelemetry.io/otel"
 	"go.uber.org/zap"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/model"
 	minermodel "github.com/filecoin-project/lily/model/actors/miner"
@@ -24,7 +24,7 @@ func (DeadlineInfoExtractor) Extract(ctx context.Context, a actorstate.ActorInfo
 
 	ec, err := NewMinerStateExtractionContext(ctx, a, node)
 	if err != nil {
-		return nil, xerrors.Errorf("creating miner state extraction context: %w", err)
+		return nil, fmt.Errorf("creating miner state extraction context: %w", err)
 	}
 	currDeadlineInfo, err := ec.CurrState.DeadlineInfo(ec.CurrTs.Height())
 	if err != nil {
diff --git a/tasks/actorstate/miner/fee_debt.go b/tasks/actorstate/miner/fee_debt.go
index 5aaea7363..a6c0bcdd4 100644
--- a/tasks/actorstate/miner/fee_debt.go
+++ b/tasks/actorstate/miner/fee_debt.go
@@ -2,10 +2,10 @@ package miner
 
 import (
 	"context"
+	"fmt"
 
 	"go.opentelemetry.io/otel"
 	"go.uber.org/zap"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/model"
 	minermodel "github.com/filecoin-project/lily/model/actors/miner"
@@ -23,18 +23,18 @@ func (FeeDebtExtractor) Extract(ctx context.Context, a actorstate.ActorInfo, nod
 	}
 	ec, err := NewMinerStateExtractionContext(ctx, a, node)
 	if err != nil {
-		return nil, xerrors.Errorf("creating miner state extraction context: %w", err)
+		return nil, fmt.Errorf("creating miner state extraction context: %w", err)
 	}
 
 	currDebt, err := ec.CurrState.FeeDebt()
 	if err != nil {
-		return nil, xerrors.Errorf("loading current miner fee debt: %w", err)
+		return nil, fmt.Errorf("loading current miner fee debt: %w", err)
 	}
 
 	if ec.HasPreviousState() {
 		prevDebt, err := ec.PrevState.FeeDebt()
 		if err != nil {
-			return nil, xerrors.Errorf("loading previous miner fee debt: %w", err)
+			return nil, fmt.Errorf("loading previous miner fee debt: %w", err)
 		}
 		if prevDebt == currDebt {
 			return nil, nil
diff --git a/tasks/actorstate/miner/info.go b/tasks/actorstate/miner/info.go
index a7854f6bb..eb07fe834 100644
--- a/tasks/actorstate/miner/info.go
+++ b/tasks/actorstate/miner/info.go
@@ -2,13 +2,13 @@ package miner
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/go-address"
 	logging "github.com/ipfs/go-log/v2"
 	maddr "github.com/multiformats/go-multiaddr"
 	"go.opentelemetry.io/otel"
 	"go.uber.org/zap"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/model"
 	minermodel "github.com/filecoin-project/lily/model/actors/miner"
@@ -28,7 +28,7 @@ func (InfoExtractor) Extract(ctx context.Context, a actorstate.ActorInfo, node a
 	}
 	ec, err := NewMinerStateExtractionContext(ctx, a, node)
 	if err != nil {
-		return nil, xerrors.Errorf("creating miner state extraction context: %w", err)
+		return nil, fmt.Errorf("creating miner state extraction context: %w", err)
 	}
 
 	if !ec.HasPreviousState() {
diff --git a/tasks/actorstate/miner/locked_funds.go b/tasks/actorstate/miner/locked_funds.go
index 5a55d0a69..750a01bc9 100644
--- a/tasks/actorstate/miner/locked_funds.go
+++ b/tasks/actorstate/miner/locked_funds.go
@@ -2,10 +2,10 @@ package miner
 
 import (
 	"context"
+	"fmt"
 
 	"go.opentelemetry.io/otel"
 	"go.uber.org/zap"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/model"
 	minermodel "github.com/filecoin-project/lily/model/actors/miner"
@@ -24,17 +24,17 @@ func (LockedFundsExtractor) Extract(ctx context.Context, a actorstate.ActorInfo,
 
 	ec, err := NewMinerStateExtractionContext(ctx, a, node)
 	if err != nil {
-		return nil, xerrors.Errorf("creating miner state extraction context: %w", err)
+		return nil, fmt.Errorf("creating miner state extraction context: %w", err)
 	}
 
 	currLocked, err := ec.CurrState.LockedFunds()
 	if err != nil {
-		return nil, xerrors.Errorf("loading current miner locked funds: %w", err)
+		return nil, fmt.Errorf("loading current miner locked funds: %w", err)
 	}
 	if ec.HasPreviousState() {
 		prevLocked, err := ec.PrevState.LockedFunds()
 		if err != nil {
-			return nil, xerrors.Errorf("loading previous miner locked funds: %w", err)
+			return nil, fmt.Errorf("loading previous miner locked funds: %w", err)
 		}
 		if prevLocked == currLocked {
 			return nil, nil
diff --git a/tasks/actorstate/miner/post.go b/tasks/actorstate/miner/post.go
index f7f590f8f..8b650fa85 100644
--- a/tasks/actorstate/miner/post.go
+++ b/tasks/actorstate/miner/post.go
@@ -3,12 +3,12 @@ package miner
 import (
 	"bytes"
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/go-bitfield"
 	"github.com/filecoin-project/go-state-types/abi"
 	"go.opentelemetry.io/otel"
 	"go.uber.org/zap"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/builtin/miner"
 	"github.com/filecoin-project/lily/lens"
@@ -29,7 +29,7 @@ func (PoStExtractor) Extract(ctx context.Context, a actorstate.ActorInfo, node a
 
 	ec, err := NewMinerStateExtractionContext(ctx, a, node)
 	if err != nil {
-		return nil, xerrors.Errorf("creating miner state extraction context: %w", err)
+		return nil, fmt.Errorf("creating miner state extraction context: %w", err)
 	}
 
 	// short circuit genesis state, no PoSt messages in genesis blocks.
@@ -43,18 +43,18 @@ func (PoStExtractor) Extract(ctx context.Context, a actorstate.ActorInfo, node a
 	loadPartitions := func(state miner.State, epoch abi.ChainEpoch) (map[uint64]miner.Partition, error) {
 		info, err := state.DeadlineInfo(epoch)
 		if err != nil {
-			return nil, xerrors.Errorf("deadline info: %w", err)
+			return nil, fmt.Errorf("deadline info: %w", err)
 		}
 		dline, err := state.LoadDeadline(info.Index)
 		if err != nil {
-			return nil, xerrors.Errorf("load deadline: %w", err)
+			return nil, fmt.Errorf("load deadline: %w", err)
 		}
 		pmap := make(map[uint64]miner.Partition)
 		if err := dline.ForEachPartition(func(idx uint64, p miner.Partition) error {
 			pmap[idx] = p
 			return nil
 		}); err != nil {
-			return nil, xerrors.Errorf("foreach partition: %w", err)
+			return nil, fmt.Errorf("foreach partition: %w", err)
 		}
 		return pmap, nil
 	}
@@ -66,7 +66,7 @@ func (PoStExtractor) Extract(ctx context.Context, a actorstate.ActorInfo, node a
 		}
 		params := miner.SubmitWindowedPoStParams{}
 		if err := params.UnmarshalCBOR(bytes.NewBuffer(msg.Message.Params)); err != nil {
-			return xerrors.Errorf("unmarshal post params: %w", err)
+			return fmt.Errorf("unmarshal post params: %w", err)
 		}
 
 		var err error
@@ -74,25 +74,25 @@ func (PoStExtractor) Extract(ctx context.Context, a actorstate.ActorInfo, node a
 		if partitions == nil {
 			partitions, err = loadPartitions(ec.PrevState, ec.PrevTs.Height())
 			if err != nil {
-				return xerrors.Errorf("load partitions: %w", err)
+				return fmt.Errorf("load partitions: %w", err)
 			}
 		}
 
 		for _, p := range params.Partitions {
 			all, err := partitions[p.Index].AllSectors()
 			if err != nil {
-				return xerrors.Errorf("all sectors: %w", err)
+				return fmt.Errorf("all sectors: %w", err)
 			}
 			proven, err := bitfield.SubtractBitField(all, p.Skipped)
 			if err != nil {
-				return xerrors.Errorf("subtract skipped bitfield: %w", err)
+				return fmt.Errorf("subtract skipped bitfield: %w", err)
 			}
 
 			if err := proven.ForEach(func(sector uint64) error {
 				sectors = append(sectors, sector)
 				return nil
 			}); err != nil {
-				return xerrors.Errorf("foreach proven: %w", err)
+				return fmt.Errorf("foreach proven: %w", err)
 			}
 		}
 
@@ -109,13 +109,13 @@ func (PoStExtractor) Extract(ctx context.Context, a actorstate.ActorInfo, node a
 
 	tsMsgs, err := node.ExecutedAndBlockMessages(ctx, a.Current, a.Executed)
 	if err != nil {
-		return nil, xerrors.Errorf("getting executed and block messages: %w", err)
+		return nil, fmt.Errorf("getting executed and block messages: %w", err)
 	}
 
 	for _, msg := range tsMsgs.Executed {
 		if msg.Message.To == a.Address && msg.Message.Method == 5 /* miner.SubmitWindowedPoSt */ {
 			if err := processPostMsg(msg); err != nil {
-				return nil, xerrors.Errorf("process post msg: %w", err)
+				return nil, fmt.Errorf("process post msg: %w", err)
 			}
 		}
 	}
diff --git a/tasks/actorstate/miner/precommit.go b/tasks/actorstate/miner/precommit.go
index 389b3cd4f..65c26a143 100644
--- a/tasks/actorstate/miner/precommit.go
+++ b/tasks/actorstate/miner/precommit.go
@@ -2,10 +2,10 @@ package miner
 
 import (
 	"context"
+	"fmt"
 
 	"go.opentelemetry.io/otel"
 	"go.uber.org/zap"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/builtin/miner"
 	"github.com/filecoin-project/lily/model"
@@ -25,7 +25,7 @@ func (PreCommitInfoExtractor) Extract(ctx context.Context, a actorstate.ActorInf
 
 	ec, err := NewMinerStateExtractionContext(ctx, a, node)
 	if err != nil {
-		return nil, xerrors.Errorf("creating miner state extraction context: %w", err)
+		return nil, fmt.Errorf("creating miner state extraction context: %w", err)
 	}
 
 	var preCommits []miner.SectorPreCommitOnChainInfo
diff --git a/tasks/actorstate/miner/sector.go b/tasks/actorstate/miner/sector.go
index 8f9eb1740..d7ca47f29 100644
--- a/tasks/actorstate/miner/sector.go
+++ b/tasks/actorstate/miner/sector.go
@@ -2,10 +2,10 @@ package miner
 
 import (
 	"context"
+	"fmt"
 
 	"go.opentelemetry.io/otel"
 	"go.uber.org/zap"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/builtin/miner"
 	"github.com/filecoin-project/lily/model"
@@ -25,7 +25,7 @@ func (SectorInfoExtractor) Extract(ctx context.Context, a actorstate.ActorInfo,
 
 	ec, err := NewMinerStateExtractionContext(ctx, a, node)
 	if err != nil {
-		return nil, xerrors.Errorf("creating miner state extraction context: %w", err)
+		return nil, fmt.Errorf("creating miner state extraction context: %w", err)
 	}
 
 	var sectors []*miner.SectorOnChainInfo
@@ -33,7 +33,7 @@ func (SectorInfoExtractor) Extract(ctx context.Context, a actorstate.ActorInfo,
 		// If the miner doesn't have previous state list all of its current sectors.
 		sectors, err = ec.CurrState.LoadSectors(nil)
 		if err != nil {
-			return nil, xerrors.Errorf("loading miner sectors: %w", err)
+			return nil, fmt.Errorf("loading miner sectors: %w", err)
 		}
 	} else {
 		// If the miner has previous state compute the list of sectors added in its new state.
diff --git a/tasks/actorstate/miner/sector_deals.go b/tasks/actorstate/miner/sector_deals.go
index 5963c9ed2..ae244da2c 100644
--- a/tasks/actorstate/miner/sector_deals.go
+++ b/tasks/actorstate/miner/sector_deals.go
@@ -2,10 +2,10 @@ package miner
 
 import (
 	"context"
+	"fmt"
 
 	"go.opentelemetry.io/otel"
 	"go.uber.org/zap"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/builtin/miner"
 	"github.com/filecoin-project/lily/model"
@@ -25,7 +25,7 @@ func (SectorDealsExtractor) Extract(ctx context.Context, a actorstate.ActorInfo,
 
 	ec, err := NewMinerStateExtractionContext(ctx, a, node)
 	if err != nil {
-		return nil, xerrors.Errorf("creating miner state extraction context: %w", err)
+		return nil, fmt.Errorf("creating miner state extraction context: %w", err)
 	}
 
 	var sectors []*miner.SectorOnChainInfo
@@ -33,7 +33,7 @@ func (SectorDealsExtractor) Extract(ctx context.Context, a actorstate.ActorInfo,
 		// If the miner doesn't have previous state list all of its current sectors.
 		sectors, err = ec.CurrState.LoadSectors(nil)
 		if err != nil {
-			return nil, xerrors.Errorf("loading miner sectors: %w", err)
+			return nil, fmt.Errorf("loading miner sectors: %w", err)
 		}
 	} else {
 		// If the miner has previous state compute the list of new sectors in its current state.
diff --git a/tasks/actorstate/miner/sector_events.go b/tasks/actorstate/miner/sector_events.go
index 1e1ded23f..46ce08a1d 100644
--- a/tasks/actorstate/miner/sector_events.go
+++ b/tasks/actorstate/miner/sector_events.go
@@ -2,12 +2,12 @@ package miner
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/go-bitfield"
 	"github.com/filecoin-project/go-state-types/abi"
 	"go.opentelemetry.io/otel"
 	"go.uber.org/zap"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/builtin/miner"
 	"github.com/filecoin-project/lily/model"
@@ -27,7 +27,7 @@ func (SectorEventsExtractor) Extract(ctx context.Context, a actorstate.ActorInfo
 
 	ec, err := NewMinerStateExtractionContext(ctx, a, node)
 	if err != nil {
-		return nil, xerrors.Errorf("creating miner state extraction context: %w", err)
+		return nil, fmt.Errorf("creating miner state extraction context: %w", err)
 	}
 
 	var sectorChanges *miner.SectorChanges
@@ -36,7 +36,7 @@ func (SectorEventsExtractor) Extract(ctx context.Context, a actorstate.ActorInfo
 		// If the miner doesn't have previous state list all of its current sectors and precommits
 		sectors, err := ec.CurrState.LoadSectors(nil)
 		if err != nil {
-			return nil, xerrors.Errorf("loading miner sectors: %w", err)
+			return nil, fmt.Errorf("loading miner sectors: %w", err)
 		}
 
 		sectorChanges = miner.MakeSectorChanges()
@@ -79,7 +79,7 @@ func extractSectorEvents(ctx context.Context, a actorstate.ActorInfo, ec *MinerS
 
 	partitionEvents, err := extractMinerPartitionsDiff(ctx, a, ec)
 	if err != nil {
-		return nil, xerrors.Errorf("extracting miner partition diff: %w", err)
+		return nil, fmt.Errorf("extracting miner partition diff: %w", err)
 	}
 
 	sectorEvents := extractMinerSectorEvents(a, sc)
@@ -200,7 +200,7 @@ func extractMinerPartitionsDiff(ctx context.Context, a actorstate.ActorInfo, ec
 
 	removedSectors, err := ec.CurrState.LoadSectors(&removed)
 	if err != nil {
-		return nil, xerrors.Errorf("fetching miners removed sectors: %w", err)
+		return nil, fmt.Errorf("fetching miners removed sectors: %w", err)
 	}
 	rmExpireIndex := make(map[uint64]abi.ChainEpoch)
 	for _, rm := range removedSectors {
@@ -225,7 +225,7 @@ func extractMinerPartitionsDiff(ctx context.Context, a actorstate.ActorInfo, ec
 		})
 		return nil
 	}); err != nil {
-		return nil, xerrors.Errorf("walking miners removed sectors: %w", err)
+		return nil, fmt.Errorf("walking miners removed sectors: %w", err)
 	}
 
 	// track recovering sectors
@@ -239,7 +239,7 @@ func extractMinerPartitionsDiff(ctx context.Context, a actorstate.ActorInfo, ec
 		})
 		return nil
 	}); err != nil {
-		return nil, xerrors.Errorf("walking miners recovering sectors: %w", err)
+		return nil, fmt.Errorf("walking miners recovering sectors: %w", err)
 	}
 
 	// track faulted sectors
@@ -253,7 +253,7 @@ func extractMinerPartitionsDiff(ctx context.Context, a actorstate.ActorInfo, ec
 		})
 		return nil
 	}); err != nil {
-		return nil, xerrors.Errorf("walking miners faulted sectors: %w", err)
+		return nil, fmt.Errorf("walking miners faulted sectors: %w", err)
 	}
 
 	// track recovered sectors
@@ -267,7 +267,7 @@ func extractMinerPartitionsDiff(ctx context.Context, a actorstate.ActorInfo, ec
 		})
 		return nil
 	}); err != nil {
-		return nil, xerrors.Errorf("walking miners recovered sectors: %w", err)
+		return nil, fmt.Errorf("walking miners recovered sectors: %w", err)
 	}
 	return out, nil
 }
diff --git a/tasks/actorstate/miner/sectorv7.go b/tasks/actorstate/miner/sectorv7.go
index e0b894740..826cbc912 100644
--- a/tasks/actorstate/miner/sectorv7.go
+++ b/tasks/actorstate/miner/sectorv7.go
@@ -2,10 +2,10 @@ package miner
 
 import (
 	"context"
+	"fmt"
 
 	"go.opentelemetry.io/otel"
 	"go.uber.org/zap"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/builtin/miner"
 	"github.com/filecoin-project/lily/model"
@@ -25,7 +25,7 @@ func (V7SectorInfoExtractor) Extract(ctx context.Context, a actorstate.ActorInfo
 
 	ec, err := NewMinerStateExtractionContext(ctx, a, node)
 	if err != nil {
-		return nil, xerrors.Errorf("creating miner state extraction context: %w", err)
+		return nil, fmt.Errorf("creating miner state extraction context: %w", err)
 	}
 
 	var sectors []*miner.SectorOnChainInfo
@@ -33,7 +33,7 @@ func (V7SectorInfoExtractor) Extract(ctx context.Context, a actorstate.ActorInfo
 		// If the miner doesn't have previous state list all of its current sectors.
 		sectors, err = ec.CurrState.LoadSectors(nil)
 		if err != nil {
-			return nil, xerrors.Errorf("loading miner sectors: %w", err)
+			return nil, fmt.Errorf("loading miner sectors: %w", err)
 		}
 	} else {
 		// If the miner has previous state compute the list of new sectors in its current state.
diff --git a/tasks/actorstate/multisig/multisig.go b/tasks/actorstate/multisig/multisig.go
index 8de17483f..54e5ff365 100644
--- a/tasks/actorstate/multisig/multisig.go
+++ b/tasks/actorstate/multisig/multisig.go
@@ -2,12 +2,12 @@ package multisig
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/lotus/chain/types"
 	logging "github.com/ipfs/go-log/v2"
 	"go.opentelemetry.io/otel"
 	"go.uber.org/zap"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/adt"
 	"github.com/filecoin-project/lily/chain/actors/builtin/multisig"
@@ -36,7 +36,7 @@ func (MultiSigActorExtractor) Extract(ctx context.Context, a actorstate.ActorInf
 
 	transactionModels, err := ExtractMultisigTransactions(ctx, a, ec)
 	if err != nil {
-		return nil, xerrors.Errorf("extracting multisig actor %s with head %s transactions: %w", a.Address, a.Actor.Head, err)
+		return nil, fmt.Errorf("extracting multisig actor %s with head %s transactions: %w", a.Address, a.Actor.Head, err)
 	}
 	return &multisigmodel.MultisigTaskResult{TransactionModel: transactionModels}, nil
 }
@@ -70,7 +70,7 @@ func ExtractMultisigTransactions(ctx context.Context, a actorstate.ActorInfo, ec
 
 	changes, err := multisig.DiffPendingTransactions(ctx, ec.Store, ec.PrevState, ec.CurrState)
 	if err != nil {
-		return nil, xerrors.Errorf("diffing pending transactions: %w", err)
+		return nil, fmt.Errorf("diffing pending transactions: %w", err)
 	}
 
 	for _, added := range changes.Added {
@@ -129,7 +129,7 @@ func (m *MsigExtractionContext) HasPreviousState() bool {
 func NewMultiSigExtractionContext(ctx context.Context, a actorstate.ActorInfo, node actorstate.ActorStateAPI) (*MsigExtractionContext, error) {
 	curState, err := multisig.Load(node.Store(), &a.Actor)
 	if err != nil {
-		return nil, xerrors.Errorf("loading current multisig state at head %s: %w", a.Actor.Head, err)
+		return nil, fmt.Errorf("loading current multisig state at head %s: %w", a.Actor.Head, err)
 	}
 
 	prevState := curState
@@ -147,12 +147,12 @@ func NewMultiSigExtractionContext(ctx context.Context, a actorstate.ActorInfo, n
 					Store:     node.Store(),
 				}, nil
 			}
-			return nil, xerrors.Errorf("loading previous multisig %s at tipset %s epoch %d: %w", a.Address, a.Executed.Key(), a.Current.Height(), err)
+			return nil, fmt.Errorf("loading previous multisig %s at tipset %s epoch %d: %w", a.Address, a.Executed.Key(), a.Current.Height(), err)
 		}
 
 		prevState, err = multisig.Load(node.Store(), prevActor)
 		if err != nil {
-			return nil, xerrors.Errorf("loading previous multisig actor state: %w", err)
+			return nil, fmt.Errorf("loading previous multisig actor state: %w", err)
 		}
 	}
 
diff --git a/tasks/actorstate/power/power.go b/tasks/actorstate/power/power.go
index d73d10743..899948cb4 100644
--- a/tasks/actorstate/power/power.go
+++ b/tasks/actorstate/power/power.go
@@ -2,11 +2,11 @@ package power
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/specs-actors/v3/actors/util/adt"
 	"go.opentelemetry.io/otel"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/builtin/power"
 	"github.com/filecoin-project/lily/tasks/actorstate"
@@ -22,7 +22,7 @@ type StoragePowerExtractor struct{}
 func NewPowerStateExtractionContext(ctx context.Context, a actorstate.ActorInfo, node actorstate.ActorStateAPI) (*PowerStateExtractionContext, error) {
 	curState, err := power.Load(node.Store(), &a.Actor)
 	if err != nil {
-		return nil, xerrors.Errorf("loading current power state: %w", err)
+		return nil, fmt.Errorf("loading current power state: %w", err)
 	}
 
 	prevState := curState
@@ -39,12 +39,12 @@ func NewPowerStateExtractionContext(ctx context.Context, a actorstate.ActorInfo,
 					Store:     node.Store(),
 				}, nil
 			}
-			return nil, xerrors.Errorf("loading previous power actor at tipset %s epoch %d: %w", a.Executed.Key(), a.Current.Height(), err)
+			return nil, fmt.Errorf("loading previous power actor at tipset %s epoch %d: %w", a.Executed.Key(), a.Current.Height(), err)
 		}
 
 		prevState, err = power.Load(node.Store(), prevActor)
 		if err != nil {
-			return nil, xerrors.Errorf("loading previous power actor state: %w", err)
+			return nil, fmt.Errorf("loading previous power actor state: %w", err)
 		}
 	}
 	return &PowerStateExtractionContext{
diff --git a/tasks/actorstate/task.go b/tasks/actorstate/task.go
index 38e37dbb7..6169839c7 100644
--- a/tasks/actorstate/task.go
+++ b/tasks/actorstate/task.go
@@ -11,7 +11,6 @@ import (
 	"github.com/ipfs/go-cid"
 	"go.opencensus.io/tag"
 	"go.opentelemetry.io/otel"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/builtin"
 	"github.com/filecoin-project/lily/metrics"
@@ -156,7 +155,7 @@ func (t *Task) startActorStateExtraction(ctx context.Context, current, executed
 						defer stop()
 						data, err := e.Extract(ctx, info, t.node)
 						if err != nil {
-							res.Error = xerrors.Errorf("failed to extract parsed actor state: %w", err)
+							res.Error = fmt.Errorf("failed to extract parsed actor state: %w", err)
 						}
 						res.Data = data
 						results <- res
diff --git a/tasks/actorstate/verifreg/client.go b/tasks/actorstate/verifreg/client.go
index f90d0abb2..c958f7fbd 100644
--- a/tasks/actorstate/verifreg/client.go
+++ b/tasks/actorstate/verifreg/client.go
@@ -2,12 +2,12 @@ package verifreg
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"go.opentelemetry.io/otel"
 	"go.uber.org/zap"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/builtin/verifreg"
 	"github.com/filecoin-project/lily/model"
@@ -50,7 +50,7 @@ func (ClientExtractor) Extract(ctx context.Context, a actorstate.ActorInfo, node
 
 	changes, err := verifreg.DiffVerifiedClients(ctx, ec.Store, ec.PrevState, ec.CurrState)
 	if err != nil {
-		return nil, xerrors.Errorf("diffing verified registry clients: %w", err)
+		return nil, fmt.Errorf("diffing verified registry clients: %w", err)
 	}
 
 	for _, change := range changes.Added {
diff --git a/tasks/actorstate/verifreg/verifier.go b/tasks/actorstate/verifreg/verifier.go
index 72ca1de57..a7ef3b477 100644
--- a/tasks/actorstate/verifreg/verifier.go
+++ b/tasks/actorstate/verifreg/verifier.go
@@ -2,13 +2,13 @@ package verifreg
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	logging "github.com/ipfs/go-log/v2"
 	"go.opentelemetry.io/otel"
 	"go.uber.org/zap"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/builtin/verifreg"
 	"github.com/filecoin-project/lily/model"
@@ -53,7 +53,7 @@ func (VerifierExtractor) Extract(ctx context.Context, a actorstate.ActorInfo, no
 
 	changes, err := verifreg.DiffVerifiers(ctx, ec.Store, ec.PrevState, ec.CurrState)
 	if err != nil {
-		return nil, xerrors.Errorf("diffing verified registry verifiers: %w", err)
+		return nil, fmt.Errorf("diffing verified registry verifiers: %w", err)
 	}
 
 	// a new verifier was added
diff --git a/tasks/actorstate/verifreg/verifreg.go b/tasks/actorstate/verifreg/verifreg.go
index f887a2fcc..d381841cd 100644
--- a/tasks/actorstate/verifreg/verifreg.go
+++ b/tasks/actorstate/verifreg/verifreg.go
@@ -2,10 +2,10 @@ package verifreg
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/lotus/chain/types"
 	"go.opentelemetry.io/otel"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/tasks/actorstate"
 
@@ -30,7 +30,7 @@ func (v *VerifiedRegistryExtractionContext) HasPreviousState() bool {
 func NewVerifiedRegistryExtractorContext(ctx context.Context, a actorstate.ActorInfo, node actorstate.ActorStateAPI) (*VerifiedRegistryExtractionContext, error) {
 	curState, err := verifreg.Load(node.Store(), &a.Actor)
 	if err != nil {
-		return nil, xerrors.Errorf("loading current verified registry state: %w", err)
+		return nil, fmt.Errorf("loading current verified registry state: %w", err)
 	}
 
 	prevState := curState
@@ -48,12 +48,12 @@ func NewVerifiedRegistryExtractorContext(ctx context.Context, a actorstate.Actor
 					Store:     node.Store(),
 				}, nil
 			}
-			return nil, xerrors.Errorf("loading previous verified registry actor at tipset %s epoch %d: %w", a.Executed.Key(), a.Current.Height(), err)
+			return nil, fmt.Errorf("loading previous verified registry actor at tipset %s epoch %d: %w", a.Executed.Key(), a.Current.Height(), err)
 		}
 
 		prevState, err = verifreg.Load(node.Store(), prevActor)
 		if err != nil {
-			return nil, xerrors.Errorf("loading previous verified registry state: %w", err)
+			return nil, fmt.Errorf("loading previous verified registry state: %w", err)
 		}
 	}
 	return &VerifiedRegistryExtractionContext{
diff --git a/tasks/chaineconomics/economics.go b/tasks/chaineconomics/economics.go
index 6d2205e9f..f85dc2390 100644
--- a/tasks/chaineconomics/economics.go
+++ b/tasks/chaineconomics/economics.go
@@ -2,13 +2,13 @@ package chaineconomics
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/chain/types"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/model"
 	chainmodel "github.com/filecoin-project/lily/model/chain"
@@ -32,7 +32,7 @@ func ExtractChainEconomicsModel(ctx context.Context, node ChainEconomicsLens, ts
 
 	supply, err := node.CirculatingSupply(ctx, ts)
 	if err != nil {
-		return nil, xerrors.Errorf("get circulating supply: %w", err)
+		return nil, fmt.Errorf("get circulating supply: %w", err)
 	}
 
 	return &chainmodel.ChainEconomics{
diff --git a/tasks/messageexecutions/internal_message/task.go b/tasks/messageexecutions/internal_message/task.go
index 8fe0a205d..2c4c998f1 100644
--- a/tasks/messageexecutions/internal_message/task.go
+++ b/tasks/messageexecutions/internal_message/task.go
@@ -2,11 +2,11 @@ package internal_message
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/lotus/chain/types"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/lens/util"
 	"github.com/filecoin-project/lily/model"
@@ -46,7 +46,7 @@ func (p *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 
 	mex, err := p.node.MessageExecutions(ctx, current, executed)
 	if err != nil {
-		report.ErrorsDetected = xerrors.Errorf("getting messages executions for tipset: %w", err)
+		report.ErrorsDetected = fmt.Errorf("getting messages executions for tipset: %w", err)
 		return nil, report, nil
 	}
 
@@ -58,7 +58,7 @@ func (p *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 	for _, m := range mex {
 		select {
 		case <-ctx.Done():
-			return nil, nil, xerrors.Errorf("context done: %w", ctx.Err())
+			return nil, nil, fmt.Errorf("context done: %w", ctx.Err())
 		default:
 		}
 
@@ -68,7 +68,7 @@ func (p *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 			if err != nil {
 				errorsDetected = append(errorsDetected, &messages.MessageError{
 					Cid:   m.Cid,
-					Error: xerrors.Errorf("failed get message to actor name and family: %w", err).Error(),
+					Error: fmt.Errorf("failed get message to actor name and family: %w", err).Error(),
 				})
 			}
 			internalResult = append(internalResult, &messagemodel.InternalMessage{
diff --git a/tasks/messageexecutions/internal_parsed_message/task.go b/tasks/messageexecutions/internal_parsed_message/task.go
index 8f9d150ce..4ca9d5d33 100644
--- a/tasks/messageexecutions/internal_parsed_message/task.go
+++ b/tasks/messageexecutions/internal_parsed_message/task.go
@@ -2,11 +2,11 @@ package internal_parsed_message
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/lotus/chain/types"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/lens/util"
 	"github.com/filecoin-project/lily/model"
@@ -46,7 +46,7 @@ func (p *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 
 	mex, err := p.node.MessageExecutions(ctx, current, executed)
 	if err != nil {
-		report.ErrorsDetected = xerrors.Errorf("getting messages executions for tipset: %w", err)
+		report.ErrorsDetected = fmt.Errorf("getting messages executions for tipset: %w", err)
 		return nil, report, nil
 	}
 
@@ -58,7 +58,7 @@ func (p *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 	for _, m := range mex {
 		select {
 		case <-ctx.Done():
-			return nil, nil, xerrors.Errorf("context done: %w", ctx.Err())
+			return nil, nil, fmt.Errorf("context done: %w", ctx.Err())
 		default:
 		}
 
@@ -68,7 +68,7 @@ func (p *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 			if err != nil {
 				errorsDetected = append(errorsDetected, &messages.MessageError{
 					Cid:   m.Cid,
-					Error: xerrors.Errorf("failed parse method and params for message: %w", err).Error(),
+					Error: fmt.Errorf("failed parse method and params for message: %w", err).Error(),
 				})
 			}
 			internalParsedResult = append(internalParsedResult, &messagemodel.InternalParsedMessage{
diff --git a/tasks/messages/block_message/task.go b/tasks/messages/block_message/task.go
index 7e8812b37..907c26234 100644
--- a/tasks/messages/block_message/task.go
+++ b/tasks/messages/block_message/task.go
@@ -2,11 +2,11 @@ package block_message
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/lotus/chain/types"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/model"
 	messagemodel "github.com/filecoin-project/lily/model/messages"
@@ -44,7 +44,7 @@ func (t *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 
 	tsMsgs, err := t.node.ExecutedAndBlockMessages(ctx, current, executed)
 	if err != nil {
-		report.ErrorsDetected = xerrors.Errorf("getting executed and block messages: %w", err)
+		report.ErrorsDetected = fmt.Errorf("getting executed and block messages: %w", err)
 		return nil, report, nil
 	}
 	blkMsgs := tsMsgs.Block
@@ -59,7 +59,7 @@ func (t *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 		// Stop processing if we have been told to cancel
 		select {
 		case <-ctx.Done():
-			return nil, nil, xerrors.Errorf("context done: %w", ctx.Err())
+			return nil, nil, fmt.Errorf("context done: %w", ctx.Err())
 		default:
 		}
 
diff --git a/tasks/messages/gas_economy/task.go b/tasks/messages/gas_economy/task.go
index 1ef254876..c13f40024 100644
--- a/tasks/messages/gas_economy/task.go
+++ b/tasks/messages/gas_economy/task.go
@@ -2,6 +2,7 @@ package gas_economy
 
 import (
 	"context"
+	"fmt"
 	"math"
 	"math/big"
 
@@ -11,7 +12,6 @@ import (
 	"github.com/ipfs/go-cid"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/model"
 	messagemodel "github.com/filecoin-project/lily/model/messages"
@@ -50,7 +50,7 @@ func (t *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 
 	tsMsgs, err := t.node.ExecutedAndBlockMessages(ctx, current, executed)
 	if err != nil {
-		report.ErrorsDetected = xerrors.Errorf("getting executed and block messages: %w", err)
+		report.ErrorsDetected = fmt.Errorf("getting executed and block messages: %w", err)
 		return nil, report, nil
 	}
 	emsgs := tsMsgs.Executed
@@ -66,7 +66,7 @@ func (t *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 		// Stop processing if we have been told to cancel
 		select {
 		case <-ctx.Done():
-			return nil, nil, xerrors.Errorf("context done: %w", ctx.Err())
+			return nil, nil, fmt.Errorf("context done: %w", ctx.Err())
 		default:
 		}
 
diff --git a/tasks/messages/gas_output/task.go b/tasks/messages/gas_output/task.go
index a356f4951..c7c58516a 100644
--- a/tasks/messages/gas_output/task.go
+++ b/tasks/messages/gas_output/task.go
@@ -2,12 +2,12 @@ package gas_output
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/ipfs/go-cid"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/builtin"
 	"github.com/filecoin-project/lily/model"
@@ -47,7 +47,7 @@ func (t *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 
 	tsMsgs, err := t.node.ExecutedAndBlockMessages(ctx, current, executed)
 	if err != nil {
-		report.ErrorsDetected = xerrors.Errorf("getting executed and block messages: %w", err)
+		report.ErrorsDetected = fmt.Errorf("getting executed and block messages: %w", err)
 		return nil, report, nil
 	}
 	emsgs := tsMsgs.Executed
@@ -62,7 +62,7 @@ func (t *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 		// Stop processing if we have been told to cancel
 		select {
 		case <-ctx.Done():
-			return nil, nil, xerrors.Errorf("context done: %w", ctx.Err())
+			return nil, nil, fmt.Errorf("context done: %w", ctx.Err())
 		default:
 		}
 
@@ -77,7 +77,7 @@ func (t *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 		} else {
 			errorsDetected = append(errorsDetected, &messages.MessageError{
 				Cid:   m.Cid,
-				Error: xerrors.Errorf("failed to serialize message: %w", err).Error(),
+				Error: fmt.Errorf("failed to serialize message: %w", err).Error(),
 			})
 		}
 
diff --git a/tasks/messages/message/task.go b/tasks/messages/message/task.go
index 1cbb48168..862d74820 100644
--- a/tasks/messages/message/task.go
+++ b/tasks/messages/message/task.go
@@ -2,12 +2,12 @@ package message
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/ipfs/go-cid"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/model"
 	messagemodel "github.com/filecoin-project/lily/model/messages"
@@ -46,7 +46,7 @@ func (t *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 
 	tsMsgs, err := t.node.ExecutedAndBlockMessages(ctx, current, executed)
 	if err != nil {
-		report.ErrorsDetected = xerrors.Errorf("getting executed and block messages: %w", err)
+		report.ErrorsDetected = fmt.Errorf("getting executed and block messages: %w", err)
 		return nil, report, nil
 	}
 	blkMsgs := tsMsgs.Block
@@ -62,7 +62,7 @@ func (t *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 		// Stop processing if we have been told to cancel
 		select {
 		case <-ctx.Done():
-			return nil, nil, xerrors.Errorf("context done: %w", ctx.Err())
+			return nil, nil, fmt.Errorf("context done: %w", ctx.Err())
 		default:
 		}
 
@@ -78,7 +78,7 @@ func (t *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 			} else {
 				errorsDetected = append(errorsDetected, &messages.MessageError{
 					Cid:   msg.Cid(),
-					Error: xerrors.Errorf("failed to serialize message: %w", err).Error(),
+					Error: fmt.Errorf("failed to serialize message: %w", err).Error(),
 				})
 			}
 
@@ -111,7 +111,7 @@ func (t *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 			} else {
 				errorsDetected = append(errorsDetected, &messages.MessageError{
 					Cid:   msg.Cid(),
-					Error: xerrors.Errorf("failed to serialize message: %w", err).Error(),
+					Error: fmt.Errorf("failed to serialize message: %w", err).Error(),
 				})
 			}
 
diff --git a/tasks/messages/parsed_message/task.go b/tasks/messages/parsed_message/task.go
index 73ae03e92..6bfad7256 100644
--- a/tasks/messages/parsed_message/task.go
+++ b/tasks/messages/parsed_message/task.go
@@ -2,13 +2,13 @@ package parsed_message
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/go-state-types/exitcode"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/ipfs/go-cid"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/lens/util"
 	"github.com/filecoin-project/lily/model"
@@ -48,7 +48,7 @@ func (t *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 
 	tsMsgs, err := t.node.ExecutedAndBlockMessages(ctx, current, executed)
 	if err != nil {
-		report.ErrorsDetected = xerrors.Errorf("getting executed and block messages: %w", err)
+		report.ErrorsDetected = fmt.Errorf("getting executed and block messages: %w", err)
 		return nil, report, nil
 	}
 	emsgs := tsMsgs.Executed
@@ -65,7 +65,7 @@ func (t *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 		// Stop processing if we have been told to cancel
 		select {
 		case <-ctx.Done():
-			return nil, nil, xerrors.Errorf("context done: %w", ctx.Err())
+			return nil, nil, fmt.Errorf("context done: %w", ctx.Err())
 		default:
 		}
 
@@ -99,7 +99,7 @@ func (t *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 				} else {
 					errorsDetected = append(errorsDetected, &messages.MessageError{
 						Cid:   m.Cid,
-						Error: xerrors.Errorf("failed to parse message params: %w", err).Error(),
+						Error: fmt.Errorf("failed to parse message params: %w", err).Error(),
 					})
 				}
 			}
@@ -112,7 +112,7 @@ func (t *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 			if m.Receipt.ExitCode == 0 {
 				errorsDetected = append(errorsDetected, &messages.MessageError{
 					Cid:   m.Cid,
-					Error: xerrors.Errorf("failed to parse message params: missing to actor code").Error(),
+					Error: fmt.Errorf("failed to parse message params: missing to actor code").Error(),
 				})
 			}
 		}
diff --git a/tasks/messages/receipt/task.go b/tasks/messages/receipt/task.go
index 00184d3cb..3990f9ab0 100644
--- a/tasks/messages/receipt/task.go
+++ b/tasks/messages/receipt/task.go
@@ -2,12 +2,12 @@ package receipt
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/ipfs/go-cid"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/model"
 	messagemodel "github.com/filecoin-project/lily/model/messages"
@@ -46,7 +46,7 @@ func (t *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 
 	tsMsgs, err := t.node.ExecutedAndBlockMessages(ctx, current, executed)
 	if err != nil {
-		report.ErrorsDetected = xerrors.Errorf("getting executed and block messages: %w", err)
+		report.ErrorsDetected = fmt.Errorf("getting executed and block messages: %w", err)
 		return nil, report, nil
 	}
 	emsgs := tsMsgs.Executed
@@ -61,7 +61,7 @@ func (t *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 		// Stop processing if we have been told to cancel
 		select {
 		case <-ctx.Done():
-			return nil, nil, xerrors.Errorf("context done: %w", ctx.Err())
+			return nil, nil, fmt.Errorf("context done: %w", ctx.Err())
 		default:
 		}
 
diff --git a/tasks/msapprovals/msapprovals.go b/tasks/msapprovals/msapprovals.go
index 5a1ab3288..c44487a4c 100644
--- a/tasks/msapprovals/msapprovals.go
+++ b/tasks/msapprovals/msapprovals.go
@@ -4,12 +4,12 @@ package msapprovals
 import (
 	"bytes"
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/lotus/chain/actors/builtin"
 	"github.com/filecoin-project/lotus/chain/types"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/builtin/multisig"
 	"github.com/filecoin-project/lily/tasks"
@@ -54,7 +54,7 @@ func (p *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 
 	tsMsgs, err := p.node.ExecutedAndBlockMessages(ctx, current, executed)
 	if err != nil {
-		report.ErrorsDetected = xerrors.Errorf("getting executed and block messages: %w", err)
+		report.ErrorsDetected = fmt.Errorf("getting executed and block messages: %w", err)
 		return nil, report, nil
 	}
 	emsgs := tsMsgs.Executed
@@ -66,7 +66,7 @@ func (p *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 		// Stop processing if we have been told to cancel
 		select {
 		case <-ctx.Done():
-			return nil, nil, xerrors.Errorf("context done: %w", ctx.Err())
+			return nil, nil, fmt.Errorf("context done: %w", ctx.Err())
 		default:
 		}
 
@@ -89,7 +89,7 @@ func (p *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 		if err != nil {
 			errorsDetected = append(errorsDetected, &MultisigError{
 				Addr:  m.Message.To.String(),
-				Error: xerrors.Errorf("failed to find transaction: %w", err).Error(),
+				Error: fmt.Errorf("failed to find transaction: %w", err).Error(),
 			})
 			continue
 		}
@@ -117,7 +117,7 @@ func (p *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 		if err != nil {
 			errorsDetected = append(errorsDetected, &MultisigError{
 				Addr:  m.Message.To.String(),
-				Error: xerrors.Errorf("failed to load actor: %w", err).Error(),
+				Error: fmt.Errorf("failed to load actor: %w", err).Error(),
 			})
 			continue
 		}
@@ -126,7 +126,7 @@ func (p *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 		if err != nil {
 			errorsDetected = append(errorsDetected, &MultisigError{
 				Addr:  m.Message.To.String(),
-				Error: xerrors.Errorf("failed to load actor state: %w", err).Error(),
+				Error: fmt.Errorf("failed to load actor state: %w", err).Error(),
 			})
 			continue
 		}
@@ -135,7 +135,7 @@ func (p *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 		if err != nil {
 			errorsDetected = append(errorsDetected, &MultisigError{
 				Addr:  m.Message.To.String(),
-				Error: xerrors.Errorf("failed to read initial balance: %w", err).Error(),
+				Error: fmt.Errorf("failed to read initial balance: %w", err).Error(),
 			})
 			continue
 		}
@@ -145,7 +145,7 @@ func (p *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 		if err != nil {
 			errorsDetected = append(errorsDetected, &MultisigError{
 				Addr:  m.Message.To.String(),
-				Error: xerrors.Errorf("failed to read initial balance: %w", err).Error(),
+				Error: fmt.Errorf("failed to read initial balance: %w", err).Error(),
 			})
 			continue
 		}
@@ -155,7 +155,7 @@ func (p *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 		if err != nil {
 			errorsDetected = append(errorsDetected, &MultisigError{
 				Addr:  m.Message.To.String(),
-				Error: xerrors.Errorf("failed to read signers: %w", err).Error(),
+				Error: fmt.Errorf("failed to read signers: %w", err).Error(),
 			})
 			continue
 		}
@@ -195,7 +195,7 @@ func (p *Task) getTransactionIfApplied(ctx context.Context, msg *types.Message,
 		var ret multisig.ProposeReturn
 		err := ret.UnmarshalCBOR(bytes.NewReader(rcpt.Return))
 		if err != nil {
-			return false, nil, xerrors.Errorf("failed to decode return value: %w", err)
+			return false, nil, fmt.Errorf("failed to decode return value: %w", err)
 		}
 
 		// Only interested in applied transactions
@@ -207,7 +207,7 @@ func (p *Task) getTransactionIfApplied(ctx context.Context, msg *types.Message,
 		var params multisig.ProposeParams
 		err = params.UnmarshalCBOR(bytes.NewReader(msg.Params))
 		if err != nil {
-			return false, nil, xerrors.Errorf("failed to decode message params: %w", err)
+			return false, nil, fmt.Errorf("failed to decode message params: %w", err)
 		}
 
 		return true, &transaction{
@@ -223,7 +223,7 @@ func (p *Task) getTransactionIfApplied(ctx context.Context, msg *types.Message,
 		var ret multisig.ApproveReturn
 		err := ret.UnmarshalCBOR(bytes.NewReader(rcpt.Return))
 		if err != nil {
-			return false, nil, xerrors.Errorf("failed to decode return value: %w", err)
+			return false, nil, fmt.Errorf("failed to decode return value: %w", err)
 		}
 
 		// Only interested in applied transactions
@@ -235,7 +235,7 @@ func (p *Task) getTransactionIfApplied(ctx context.Context, msg *types.Message,
 		var params multisig.TxnIDParams
 		err = params.UnmarshalCBOR(bytes.NewReader(msg.Params))
 		if err != nil {
-			return false, nil, xerrors.Errorf("failed to decode message params: %w", err)
+			return false, nil, fmt.Errorf("failed to decode message params: %w", err)
 		}
 
 		// Get state of actor before the message was applied
@@ -243,12 +243,12 @@ func (p *Task) getTransactionIfApplied(ctx context.Context, msg *types.Message,
 		// for that tipset
 		act, err := p.node.Actor(ctx, msg.To, pts.Parents())
 		if err != nil {
-			return false, nil, xerrors.Errorf("failed to load previous actor: %w", err)
+			return false, nil, fmt.Errorf("failed to load previous actor: %w", err)
 		}
 
 		prevActorState, err := multisig.Load(p.node.Store(), act)
 		if err != nil {
-			return false, nil, xerrors.Errorf("failed to load previous actor state: %w", err)
+			return false, nil, fmt.Errorf("failed to load previous actor state: %w", err)
 		}
 
 		var tx *transaction
@@ -263,11 +263,11 @@ func (p *Task) getTransactionIfApplied(ctx context.Context, msg *types.Message,
 			}
 			return nil
 		}); err != nil {
-			return false, nil, xerrors.Errorf("failed to read transaction details: %w", err)
+			return false, nil, fmt.Errorf("failed to read transaction details: %w", err)
 		}
 
 		if tx == nil {
-			return false, nil, xerrors.Errorf("pending transaction %d not found", params.ID)
+			return false, nil, fmt.Errorf("pending transaction %d not found", params.ID)
 		}
 
 		return true, tx, nil
diff --git a/tasks/survey/peeragents/peeragents.go b/tasks/survey/peeragents/peeragents.go
index 8fdfc8170..2c54ef25f 100644
--- a/tasks/survey/peeragents/peeragents.go
+++ b/tasks/survey/peeragents/peeragents.go
@@ -2,12 +2,12 @@ package peeragents
 
 import (
 	"context"
+	"fmt"
 	"regexp"
 	"time"
 
 	logging "github.com/ipfs/go-log/v2"
 	"github.com/libp2p/go-libp2p-core/peer"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/model"
 	"github.com/filecoin-project/lily/model/surveyed"
@@ -34,12 +34,12 @@ type Task struct {
 func (t *Task) Process(ctx context.Context) (model.Persistable, error) {
 	pid, err := t.api.ID(ctx)
 	if err != nil {
-		return nil, xerrors.Errorf("get peer id: %w", err)
+		return nil, fmt.Errorf("get peer id: %w", err)
 	}
 
 	peers, err := t.api.NetPeers(ctx)
 	if err != nil {
-		return nil, xerrors.Errorf("get peers: %w", err)
+		return nil, fmt.Errorf("get peers: %w", err)
 	}
 
 	start := time.Now()
diff --git a/tasks/views/chainvis.go b/tasks/views/chainvis.go
index 191bfc56b..d98ad1f6b 100644
--- a/tasks/views/chainvis.go
+++ b/tasks/views/chainvis.go
@@ -5,8 +5,6 @@ import (
 	"fmt"
 	"time"
 
-	"golang.org/x/xerrors"
-
 	"github.com/filecoin-project/lily/storage"
 	"github.com/filecoin-project/lily/wait"
 )
@@ -45,7 +43,7 @@ func (r *ChainVisRefresher) refreshView(ctx context.Context) (bool, error) {
 	for _, v := range chainVisViews {
 		_, err := r.db.ExecContext(ctx, fmt.Sprintf("REFRESH MATERIALIZED VIEW %s;", v))
 		if err != nil {
-			return true, xerrors.Errorf("refresh %s: %w", v, err)
+			return true, fmt.Errorf("refresh %s: %w", v, err)
 		}
 	}
 	return false, nil
diff --git a/testutil/db.go b/testutil/db.go
index 8e8f476db..3b1ce513e 100644
--- a/testutil/db.go
+++ b/testutil/db.go
@@ -2,13 +2,13 @@ package testutil
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"testing"
 	"time"
 
 	"github.com/go-pg/pg/v10"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/wait"
 )
@@ -37,7 +37,7 @@ func WaitForExclusiveDatabase(ctx context.Context, tb testing.TB) (*pg.DB, func(
 
 	// Check if connection credentials are valid and PostgreSQL is up and running.
 	if err := db.Ping(ctx); err != nil {
-		return nil, db.Close, xerrors.Errorf("ping database: %w", err)
+		return nil, db.Close, fmt.Errorf("ping database: %w", err)
 	}
 
 	release, err := WaitForExclusiveDatabaseLock(ctx, db)
@@ -72,10 +72,10 @@ func WaitForExclusiveDatabaseLock(ctx context.Context, db *pg.DB) (func() error,
 		var released bool
 		_, err := db.QueryOneContext(ctx, pg.Scan(&released), `SELECT pg_advisory_unlock(?);`, int64(testDatabaseLockID))
 		if err != nil {
-			return xerrors.Errorf("unlocking exclusive lock: %w", err)
+			return fmt.Errorf("unlocking exclusive lock: %w", err)
 		}
 		if !released {
-			return xerrors.Errorf("exclusive lock not released")
+			return fmt.Errorf("exclusive lock not released")
 		}
 		return nil
 	}
diff --git a/testutil/lens.go b/testutil/lens.go
index 7e0238390..45535d5c5 100644
--- a/testutil/lens.go
+++ b/testutil/lens.go
@@ -3,6 +3,7 @@ package testutil
 import (
 	"bytes"
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/lotus/api"
@@ -11,7 +12,6 @@ import (
 	"github.com/filecoin-project/specs-actors/actors/util/adt"
 	cid "github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/lens"
 )
@@ -38,34 +38,34 @@ func (aw *APIWrapper) Store() adt.Store {
 }
 
 func (aw *APIWrapper) GetExecutedAndBlockMessagesForTipset(ctx context.Context, ts, pts *types.TipSet) (*lens.TipSetMessages, error) {
-	return nil, xerrors.Errorf("ExecutedAndBlockMessages is not implemented")
+	return nil, fmt.Errorf("ExecutedAndBlockMessages is not implemented")
 }
 
 func (aw *APIWrapper) GetMessageExecutionsForTipSet(ctx context.Context, ts, pts *types.TipSet) ([]*lens.MessageExecution, error) {
-	return nil, xerrors.Errorf("MessageExecutions is not implemented")
+	return nil, fmt.Errorf("MessageExecutions is not implemented")
 }
 
 func (aw *APIWrapper) Get(ctx context.Context, c cid.Cid, out interface{}) error {
 	cu, ok := out.(cbg.CBORUnmarshaler)
 	if !ok {
-		return xerrors.Errorf("out parameter does not implement CBORUnmarshaler")
+		return fmt.Errorf("out parameter does not implement CBORUnmarshaler")
 	}
 
 	// miss :(
 	raw, err := aw.ChainReadObj(ctx, c)
 	if err != nil {
-		return xerrors.Errorf("read obj: %w", err)
+		return fmt.Errorf("read obj: %w", err)
 	}
 
 	if err := cu.UnmarshalCBOR(bytes.NewReader(raw)); err != nil {
-		return xerrors.Errorf("unmarshal obj: %w", err)
+		return fmt.Errorf("unmarshal obj: %w", err)
 	}
 
 	return nil
 }
 
 func (aw *APIWrapper) Put(ctx context.Context, v interface{}) (cid.Cid, error) {
-	return cid.Undef, xerrors.Errorf("put is not implemented")
+	return cid.Undef, fmt.Errorf("put is not implemented")
 }
 
 func (aw *APIWrapper) Context() context.Context {