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

correctly account for message replacement in required funds tracking

Browse Source
This commit is contained in:
vyzo 2020-08-26 15:27:09 +03:00
parent c473d3c682
commit a2c0c10d2a
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
chain/messagepool/messagepool.go
View File

@ -174,6 +174,18 @@ func (ms *msgSet) rm(nonce uint64) {
} }
} }
func (ms *msgSet) getRequiredFunds(nonce uint64) types.BigInt {
m, has := ms.msgs[nonce]
if has {
requiredFunds := new(stdbig.Int).Set(ms.requiredFunds)
requiredFunds.Sub(requiredFunds, m.Message.RequiredFunds().Int)
requiredFunds.Sub(requiredFunds, m.Message.Value.Int)
return types.BigInt{Int: requiredFunds}
}
return types.BigInt{Int: new(stdbig.Int).Set(ms.requiredFunds)}
}
func New(api Provider, ds dtypes.MetadataDS, netName dtypes.NetworkName) (*MessagePool, error) { func New(api Provider, ds dtypes.MetadataDS, netName dtypes.NetworkName) (*MessagePool, error) {
cache, _ := lru.New2Q(build.BlsSignatureCacheSize) cache, _ := lru.New2Q(build.BlsSignatureCacheSize)
verifcache, _ := lru.New2Q(build.VerifSigCacheSize) verifcache, _ := lru.New2Q(build.VerifSigCacheSize)
@ -427,7 +439,7 @@ func (mp *MessagePool) checkBalance(m *types.SignedMessage, curTs *types.TipSet)
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, mset.getRequiredFunds(m.Message.Nonce))
} }
if balance.LessThan(requiredFunds) { if balance.LessThan(requiredFunds) {