cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

nit: actually, don't use blocks

Browse Source
This commit is contained in:
Steven Allen 2023-02-17 11:18:51 -08:00
parent 49cd428c43
commit 6c0f4cbd74
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
node/impl/full/eth.go
View File

@ -369,28 +369,23 @@ func (a *EthModule) EthGetTransactionCount(ctx context.Context, sender ethtypes.
} }
// First, handle the case where the "sender" is an EVM actor. // First, handle the case where the "sender" is an EVM actor.
{ if actor, err := a.StateManager.LoadActor(ctx, addr, ts); err != nil {
actor, err := a.StateManager.LoadActor(ctx, addr, ts) if xerrors.Is(err, types.ErrActorNotFound) {
return 0, nil
}
return 0, xerrors.Errorf("failed to lookup contract %s: %w", sender, err)
} else if builtinactors.IsEvmActor(actor.Code) {
evmState, err := builtinevm.Load(a.Chain.ActorStore(ctx), actor)
if err != nil { if err != nil {
if xerrors.Is(err, types.ErrActorNotFound) { return 0, xerrors.Errorf("failed to load evm state: %w", err)
return 0, nil
}
return 0, xerrors.Errorf("failed to lookup contract %s: %w", sender, err)
} }
if alive, err := evmState.IsAlive(); err != nil {
if builtinactors.IsEvmActor(actor.Code) { return 0, err
evmState, err := builtinevm.Load(a.Chain.ActorStore(ctx), actor) } else if !alive {
if err != nil { return 0, nil
return 0, xerrors.Errorf("failed to load evm state: %w", err)
}
if alive, err := evmState.IsAlive(); err != nil {
return 0, err
} else if !alive {
return 0, nil
}
nonce, err := evmState.Nonce()
return ethtypes.EthUint64(nonce), err
} }
nonce, err := evmState.Nonce()
return ethtypes.EthUint64(nonce), err
} }
nonce, err := a.Mpool.GetNonce(ctx, addr, ts.Key()) nonce, err := a.Mpool.GetNonce(ctx, addr, ts.Key())