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

Merge pull request #2684 from filecoin-project/asr/fundmgr

Browse Source 
Fundmanager shouldn't try to add zero
This commit is contained in:
Łukasz Magiera 2020-07-30 03:48:15 +02:00 committed by GitHub
commit 76440e703e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
chain/market/fundmgr.go
View File

@ -2,6 +2,7 @@ package market
import ( import (
"context" "context"
"github.com/filecoin-project/specs-actors/actors/abi/big"
"sync" "sync"
"github.com/filecoin-project/specs-actors/actors/builtin" "github.com/filecoin-project/specs-actors/actors/builtin"
@ -52,29 +53,33 @@ func (fm *FundMgr) EnsureAvailable(ctx context.Context, addr, wallet address.Add
if avail.LessThan(types.NewInt(0)) { if avail.LessThan(types.NewInt(0)) {
// TODO: some rules around adding more to avoid doing stuff on-chain // TODO: some rules around adding more to avoid doing stuff on-chain
// all the time // all the time
toAdd = types.BigSub(toAdd, avail) toAdd = avail.Neg()
avail = types.NewInt(0) avail = types.NewInt(0)
} }
fm.available[addr] = avail fm.available[addr] = avail
fm.lk.Unlock() fm.lk.Unlock()
var err error if toAdd.LessThanEqual(big.Zero()) {
params, err := actors.SerializeParams(&addr) return cid.Undef, nil
if err != nil { } else {
return cid.Undef, err var err error
} params, err := actors.SerializeParams(&addr)
if err != nil {
return cid.Undef, err
}
smsg, err := fm.mpool.MpoolPushMessage(ctx, &types.Message{ smsg, err := fm.mpool.MpoolPushMessage(ctx, &types.Message{
To: builtin.StorageMarketActorAddr, To: builtin.StorageMarketActorAddr,
From: wallet, From: wallet,
Value: toAdd, Value: toAdd,
Method: builtin.MethodsMarket.AddBalance, Method: builtin.MethodsMarket.AddBalance,
Params: params, Params: params,
}) })
if err != nil { if err != nil {
return cid.Undef, err return cid.Undef, err
} }
return smsg.Cid(), nil return smsg.Cid(), nil
}
} }