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

Only charge for actor creation after making a meaningful state change

Browse Source
This commit is contained in:
Aayush Rajasekaran 2020-04-29 23:21:19 -04:00
parent d7d2b12a32
commit bd1ac4d91b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
chain/vm/mkactor.go
View File

@ -2,7 +2,6 @@ package vm
import ( import (
"context" "context"
"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"
@ -35,10 +34,6 @@ func TryCreateAccountActor(rt *Runtime, addr address.Address) (*types.Actor, aer
return nil, aerrors.Escalate(err, "registering actor address") return nil, aerrors.Escalate(err, "registering actor address")
} }
if err := rt.chargeGasSafe(PricelistByEpoch(rt.height).OnCreateActor()); err != nil {
return nil, err
}
act, aerr := makeActor(addr) act, aerr := makeActor(addr)
if aerr != nil { if aerr != nil {
return nil, aerr return nil, aerr
@ -55,6 +50,10 @@ func TryCreateAccountActor(rt *Runtime, addr address.Address) (*types.Actor, aer
} }
// call constructor on account // call constructor on account
if err := rt.chargeGasSafe(PricelistByEpoch(rt.height).OnCreateActor()); err != nil {
return nil, err
}
_, 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.Wrap(aerr, "failed to invoke account constructor") return nil, aerrors.Wrap(aerr, "failed to invoke account constructor")