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

Gas estimation: Refactor the special PayCh collect case

Browse Source
This commit is contained in:
Aayush Rajasekaran 2022-05-06 11:39:13 -04:00
parent 78899be05d
commit 26a780a198
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
node/impl/full/gas.go
View File

@ -295,31 +295,21 @@ func gasEstimateGasLimit(
return -1, xerrors.Errorf("message execution failed: exit %s, reason: %s", res.MsgRct.ExitCode, res.Error) return -1, xerrors.Errorf("message execution failed: exit %s, reason: %s", res.MsgRct.ExitCode, res.Error)
} }
ret := res.MsgRct.GasUsed
// Special case for PaymentChannel collect, which is deleting actor // Special case for PaymentChannel collect, which is deleting actor
// We ignore errors in this special case since they CAN occur,
// and we just want to detect existing payment channel actors
st, err := smgr.ParentState(ts) st, err := smgr.ParentState(ts)
if err != nil { if err == nil {
_ = err act, err := st.GetActor(msg.To)
// somewhat ignore it as it can happen and we just want to detect if err == nil && builtin.IsPaymentChannelActor(act.Code) && msgIn.Method == paych.Methods.Collect {
// an existing PaymentChannel actor // add the refunded gas for DestroyActor back into the gas used
return res.MsgRct.GasUsed, nil ret += 76e3
} }
act, err := st.GetActor(msg.To)
if err != nil {
_ = err
// somewhat ignore it as it can happen and we just want to detect
// an existing PaymentChannel actor
return res.MsgRct.GasUsed, nil
} }
if !builtin.IsPaymentChannelActor(act.Code) { return ret, nil
return res.MsgRct.GasUsed, nil
}
if msgIn.Method != paych.Methods.Collect {
return res.MsgRct.GasUsed, nil
}
// return GasUsed without the refund for DestoryActor
return res.MsgRct.GasUsed + 76e3, nil
} }
func (m *GasModule) GasEstimateMessageGas(ctx context.Context, msg *types.Message, spec *api.MessageSendSpec, _ types.TipSetKey) (*types.Message, error) { func (m *GasModule) GasEstimateMessageGas(ctx context.Context, msg *types.Message, spec *api.MessageSendSpec, _ types.TipSetKey) (*types.Message, error) {