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

Merge branch 'master' into next

Browse Source
This commit is contained in:
Aayush Rajasekaran 2020-10-07 23:03:59 -04:00
commit 304d835739
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cmd/lotus-pcr/main.go
View File

@ -15,6 +15,7 @@ import (
"time" "time"
"github.com/filecoin-project/lotus/chain/actors/builtin" "github.com/filecoin-project/lotus/chain/actors/builtin"
builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
miner0 "github.com/filecoin-project/specs-actors/actors/builtin/miner" miner0 "github.com/filecoin-project/specs-actors/actors/builtin/miner"
@ -1028,9 +1029,9 @@ func (r *refunder) ProcessTipset(ctx context.Context, tipset *types.TipSet, refu
return nil, nil return nil, nil
} }
refundValue := types.NewInt(0)
tipsetRefunds := NewMinersRefund() tipsetRefunds := NewMinersRefund()
for i, msg := range msgs { for i, msg := range msgs {
refundValue := types.NewInt(0)
m := msg.Message m := msg.Message
a, err := r.api.StateGetActor(ctx, m.To, tipset.Key()) a, err := r.api.StateGetActor(ctx, m.To, tipset.Key())
@ -1040,27 +1041,22 @@ func (r *refunder) ProcessTipset(ctx context.Context, tipset *types.TipSet, refu
} }
var messageMethod string var messageMethod string
var processed bool
if m.To == market.Address { if m.To == market.Address {
var err error
var processed bool
processed, messageMethod, refundValue, err = r.processTipsetStorageMarketActor(ctx, tipset, msg, recps[i]) processed, messageMethod, refundValue, err = r.processTipsetStorageMarketActor(ctx, tipset, msg, recps[i])
if err != nil { }
continue
} if builtin.IsStorageMinerActor(a.Code) {
if !processed {
continue
}
} else if builtin.IsStorageMinerActor(a.Code) {
var err error
var processed bool
processed, messageMethod, refundValue, err = r.processTipsetStorageMinerActor(ctx, tipset, msg, recps[i]) processed, messageMethod, refundValue, err = r.processTipsetStorageMinerActor(ctx, tipset, msg, recps[i])
if err != nil { }
continue
} if err != nil {
if !processed { log.Errorw("error while processing message", "cid", msg.Cid)
continue continue
} }
if !processed {
continue
} }
log.Debugw( log.Debugw(