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

dont use fatal errors in the vm

Browse Source
This commit is contained in:
Jeromy 2020-03-26 20:03:04 -07:00
parent 59e77ba6c8
commit 1b50be09af
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
chain/vm/mkactor.go
View File

@ -6,6 +6,7 @@ import (
"github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/specs-actors/actors/abi/big" "github.com/filecoin-project/specs-actors/actors/abi/big"
"github.com/filecoin-project/specs-actors/actors/builtin" "github.com/filecoin-project/specs-actors/actors/builtin"
"github.com/filecoin-project/specs-actors/actors/runtime/exitcode"
"github.com/ipfs/go-cid" "github.com/ipfs/go-cid"
cbor "github.com/ipfs/go-ipld-cbor" cbor "github.com/ipfs/go-ipld-cbor"
@ -32,7 +33,7 @@ var EmptyObjectCid cid.Cid
func TryCreateAccountActor(ctx context.Context, rt *Runtime, addr address.Address) (*types.Actor, aerrors.ActorError) { func TryCreateAccountActor(ctx context.Context, rt *Runtime, addr address.Address) (*types.Actor, aerrors.ActorError) {
addrID, err := rt.state.RegisterNewAddress(addr) addrID, err := rt.state.RegisterNewAddress(addr)
if err != nil { if err != nil {
return nil, aerrors.Escalate(err, "registering actor address") return nil, aerrors.Absorb(err, byte(exitcode.SysErrInternal), "registering actor address")
} }
if err := rt.chargeGasSafe(PricelistByEpoch(rt.height).OnCreateActor()); err != nil { if err := rt.chargeGasSafe(PricelistByEpoch(rt.height).OnCreateActor()); err != nil {
@ -45,24 +46,23 @@ func TryCreateAccountActor(ctx context.Context, rt *Runtime, addr address.Addres
} }
if err := rt.state.SetActor(addrID, act); err != nil { if err := rt.state.SetActor(addrID, act); err != nil {
return nil, aerrors.Escalate(err, "creating new actor failed") return nil, aerrors.Absorb(err, byte(exitcode.SysErrInternal), "creating new actor failed")
} }
p, err := actors.SerializeParams(&addr) p, err := actors.SerializeParams(&addr)
if err != nil { if err != nil {
return nil, aerrors.Escalate(err, "registering actor address") return nil, aerrors.Absorb(err, byte(exitcode.SysErrInternal), "registering actor address")
} }
// call constructor on account // call constructor on account
_, aerr = rt.internalSend(builtin.SystemActorAddr, addrID, builtin.MethodsAccount.Constructor, big.Zero(), p) _, aerr = rt.internalSend(builtin.SystemActorAddr, addrID, builtin.MethodsAccount.Constructor, big.Zero(), p)
if aerr != nil { if aerr != nil {
return nil, aerrors.Fatal("failed to invoke account constructor") return nil, aerrors.Wrap(aerr, "failed to invoke account constructor")
} }
act, err = rt.state.GetActor(addrID) act, err = rt.state.GetActor(addrID)
if err != nil { if err != nil {
return nil, aerrors.Escalate(err, "loading newly created actor failed") return nil, aerrors.Absorb(err, byte(exitcode.SysErrInternal), "loading newly created actor failed")
} }
return act, nil return act, nil
} }