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

nit: put evm case in a block

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

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

@ -369,26 +369,28 @@ 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.
actor, err := a.StateManager.LoadActor(ctx, addr, ts) {
if 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)
}
if builtinactors.IsEvmActor(actor.Code) {
evmState, err := builtinevm.Load(a.Chain.ActorStore(ctx), actor)
if err != nil { if err != nil {
return 0, xerrors.Errorf("failed to load evm state: %w", err) if xerrors.Is(err, types.ErrActorNotFound) {
return 0, nil
}
return 0, xerrors.Errorf("failed to lookup contract %s: %w", sender, err)
} }
if alive, err := evmState.IsAlive(); err != nil {
return 0, err if builtinactors.IsEvmActor(actor.Code) {
} else if !alive { evmState, err := builtinevm.Load(a.Chain.ActorStore(ctx), actor)
return 0, nil if err != 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())