From 256d12773be0adc008a0aa4642c77d141126cecc Mon Sep 17 00:00:00 2001
From: frrist <forrest@protocol.ai>
Date: Wed, 28 Jul 2021 17:50:22 -0700
Subject: [PATCH] polish(errors): better state tree errors

---
 chain/state/statetree.go | 2 +-
 chain/stmgr/stmgr.go     | 6 +++---
 chain/store/messages.go  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/chain/state/statetree.go b/chain/state/statetree.go
index 8705aeff81b..8140cd4dbdf 100644
--- a/chain/state/statetree.go
+++ b/chain/state/statetree.go
@@ -273,7 +273,7 @@ func LoadStateTree(cst cbor.IpldStore, c cid.Cid) (*StateTree, error) {
 	}
 	if err != nil {
 		log.Errorf("failed to load state tree: %s", err)
-		return nil, xerrors.Errorf("failed to load state tree: %w", err)
+		return nil, xerrors.Errorf("failed to load state tree %s: %w", c, err)
 	}
 
 	s := &StateTree{
diff --git a/chain/stmgr/stmgr.go b/chain/stmgr/stmgr.go
index b76dd0faffb..1748c341e1d 100644
--- a/chain/stmgr/stmgr.go
+++ b/chain/stmgr/stmgr.go
@@ -221,7 +221,7 @@ func (sm *StateManager) ResolveToKeyAddress(ctx context.Context, addr address.Ad
 	// First try to resolve the actor in the parent state, so we don't have to compute anything.
 	tree, err := state.LoadStateTree(cst, ts.ParentState())
 	if err != nil {
-		return address.Undef, xerrors.Errorf("failed to load parent state tree: %w", err)
+		return address.Undef, xerrors.Errorf("failed to load parent state tree at tipset %s: %w", ts.Parents(), err)
 	}
 
 	resolved, err := vm.ResolveToKeyAddr(tree, cst, addr)
@@ -232,12 +232,12 @@ func (sm *StateManager) ResolveToKeyAddress(ctx context.Context, addr address.Ad
 	// If that fails, compute the tip-set and try again.
 	st, _, err := sm.TipSetState(ctx, ts)
 	if err != nil {
-		return address.Undef, xerrors.Errorf("resolve address failed to get tipset state: %w", err)
+		return address.Undef, xerrors.Errorf("resolve address failed to get tipset %s state: %w", ts, err)
 	}
 
 	tree, err = state.LoadStateTree(cst, st)
 	if err != nil {
-		return address.Undef, xerrors.Errorf("failed to load state tree")
+		return address.Undef, xerrors.Errorf("failed to load state tree at tipset %s: %w", ts, err)
 	}
 
 	return vm.ResolveToKeyAddr(tree, cst, addr)
diff --git a/chain/store/messages.go b/chain/store/messages.go
index 50cf0e6a249..9f5160559ac 100644
--- a/chain/store/messages.go
+++ b/chain/store/messages.go
@@ -110,7 +110,7 @@ func (cs *ChainStore) BlockMsgsForTipset(ts *types.TipSet) ([]BlockMessages, err
 	cst := cbor.NewCborStore(cs.stateBlockstore)
 	st, err := state.LoadStateTree(cst, ts.Blocks()[0].ParentStateRoot)
 	if err != nil {
-		return nil, xerrors.Errorf("failed to load state tree")
+		return nil, xerrors.Errorf("failed to load state tree at tipset %s: %w", ts, err)
 	}
 
 	selectMsg := func(m *types.Message) (bool, error) {