-
Notifications
You must be signed in to change notification settings - Fork 46
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(lens): Optimize StateGetActor calls. #214
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
7535638
feat(lens): Optimize StateGetActor calls.
hsanjuan e0f626e
feat(lens): Optimize StateGetActor calls.
hsanjuan 74f722b
PR #214: Address reviews
hsanjuan 98ca485
Merge branch 'master' into fix/196-state-get-actor-perf
hsanjuan 1b286c1
Make changes so that optimized path can be used by lotus API
hsanjuan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
package lens | ||
|
||
import ( | ||
"context" | ||
"errors" | ||
|
||
"github.com/filecoin-project/go-address" | ||
"github.com/filecoin-project/lotus/chain/state" | ||
"github.com/filecoin-project/lotus/chain/types" | ||
"github.com/filecoin-project/lotus/node/impl/full" | ||
cbor "github.com/ipfs/go-ipld-cbor" | ||
logging "github.com/ipfs/go-log/v2" | ||
"golang.org/x/xerrors" | ||
) | ||
|
||
var logger = logging.Logger("visor/lens/lotus") | ||
|
||
// OptimizedStateGetActorWithFallback is a helper to obtain an actor in the | ||
// state of the current tipset without recomputing the full tipset. It does | ||
// this by obtaining the child tipset (current height+1) and using the | ||
// pre-computed ParentState(). | ||
// | ||
// TODO: Remove. See: https://github.com/filecoin-project/sentinel-visor/issues/196 | ||
func OptimizedStateGetActorWithFallback(ctx context.Context, store cbor.IpldStore, chainAPI full.ChainModuleAPI, fallback full.StateModuleAPI, actor address.Address, tsk types.TipSetKey) (*types.Actor, error) { | ||
act, err := efficientStateGetActorFromChainStore(ctx, store, chainAPI, actor, tsk) | ||
if err != nil { | ||
logger.Warnf("Optimized StateGetActorError: %s. Falling back to default StateGetActor().", err) | ||
return fallback.StateGetActor(ctx, actor, tsk) | ||
} | ||
return act, nil | ||
} | ||
|
||
func efficientStateGetActorFromChainStore(ctx context.Context, store cbor.IpldStore, chainAPI full.ChainModuleAPI, actor address.Address, tsk types.TipSetKey) (*types.Actor, error) { | ||
ts, err := chainAPI.ChainGetTipSet(ctx, tsk) | ||
if err != nil { | ||
return nil, xerrors.Errorf("Failed to load tipset: %w", err) | ||
} | ||
|
||
// heaviest tipset means look on the main chain and false means return tipset following null round. | ||
head, err := chainAPI.ChainHead(ctx) | ||
if err != nil { | ||
return nil, xerrors.Errorf("Failed to get chain head: %w", err) | ||
} | ||
child, err := chainAPI.ChainGetTipSetByHeight(ctx, ts.Height()+1, head.Key()) | ||
if err != nil { | ||
return nil, xerrors.Errorf("load child tipset: %w", err) | ||
} | ||
|
||
if !types.CidArrsEqual(child.Parents().Cids(), ts.Cids()) { | ||
return nil, errors.New("child is not on the same chain") | ||
} | ||
|
||
st, err := state.LoadStateTree(store, child.ParentState()) | ||
if err != nil { | ||
return nil, xerrors.Errorf("load state tree: %w", err) | ||
} | ||
return st.GetActor(actor) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This could be simpler if
FullNodeAPI
actually implementedFullNode
but it doesn't: