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

Merge pull request #4808 from filecoin-project/fix/fund-mgr-panic

Browse Source 
Fix panic in FundManager
This commit is contained in:
Aayush Rajasekaran 2020-11-11 16:43:13 -05:00 committed by GitHub
commit bc7eaee6d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chain/market/fundmanager.go
View File

@ -379,7 +379,7 @@ func (a *fundedAddress) processReservations(reservations []*fundRequest, release
// Work out the amount to add to the balance // Work out the amount to add to the balance
amtToAdd := abi.NewTokenAmount(0) amtToAdd := abi.NewTokenAmount(0)
if reserved.GreaterThan(abi.NewTokenAmount(0)) { if len(toAdd) > 0 && reserved.GreaterThan(abi.NewTokenAmount(0)) {
// Get available funds for address // Get available funds for address
avail, err := a.env.AvailableFunds(a.ctx, a.state.Addr) avail, err := a.env.AvailableFunds(a.ctx, a.state.Addr)
if err != nil { if err != nil {
@ -487,9 +487,9 @@ func (a *fundedAddress) processWithdrawals(withdrawals []*fundRequest) (msgCid c
// the rest // the rest
withdrawalAmt := abi.NewTokenAmount(0) withdrawalAmt := abi.NewTokenAmount(0)
allowedAmt := abi.NewTokenAmount(0) allowedAmt := abi.NewTokenAmount(0)
allowed := make([]*fundRequest, 0, len(a.withdrawals)) allowed := make([]*fundRequest, 0, len(withdrawals))
var batchWallet address.Address var batchWallet address.Address
for _, req := range a.withdrawals { for _, req := range withdrawals {
amt := req.Amount() amt := req.Amount()
if amt.IsZero() { if amt.IsZero() {
// If the context for the request was cancelled, bail out // If the context for the request was cancelled, bail out