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

include message Value only in soft validation failures

Browse Source
This commit is contained in:
vyzo 2020-08-26 15:13:50 +03:00
parent 78876947a4
commit 87e6c0973a
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
chain/messagepool/messagepool.go
View File

@ -417,19 +417,23 @@ func (mp *MessagePool) checkBalance(m *types.SignedMessage, curTs *types.TipSet)
return xerrors.Errorf("failed to check sender balance: %s: %w", err, ErrValidationFailure) return xerrors.Errorf("failed to check sender balance: %s: %w", err, ErrValidationFailure)
} }
requiredFunds := types.BigAdd(m.Message.RequiredFunds(), m.Message.Value) requiredFunds := m.Message.RequiredFunds()
if balance.LessThan(requiredFunds) { if balance.LessThan(requiredFunds) {
return xerrors.Errorf("not enough funds (required: %s, balance: %s): %w", types.FIL(requiredFunds), types.FIL(balance), ErrNotEnoughFunds) return xerrors.Errorf("not enough funds (required: %s, balance: %s): %w", types.FIL(requiredFunds), types.FIL(balance), ErrNotEnoughFunds)
} }
// add Value for soft failure check
requiredFunds = types.BigAdd(requiredFunds, m.Message.Value)
mset, ok := mp.pending[m.Message.From] mset, ok := mp.pending[m.Message.From]
if ok { if ok {
requiredFunds = types.BigAdd(requiredFunds, types.BigInt{Int: mset.requiredFunds}) requiredFunds = types.BigAdd(requiredFunds, types.BigInt{Int: mset.requiredFunds})
if balance.LessThan(requiredFunds) { }
// Note: we fail here for ErrValidationFailure to signal a soft failure because we might
// be out of sync. if balance.LessThan(requiredFunds) {
return xerrors.Errorf("not enough funds including pending messages (required: %s, balance: %s): %w", types.FIL(requiredFunds), types.FIL(balance), ErrValidationFailure) // Note: we fail here for ErrValidationFailure to signal a soft failure because we might
} // be out of sync.
return xerrors.Errorf("not enough funds including pending messages (required: %s, balance: %s): %w", types.FIL(requiredFunds), types.FIL(balance), ErrValidationFailure)
} }
return nil return nil