Merge pull request #3350 from filecoin-project/fix/some-fsm-issues

Fix some fsm issues
2020-08-29 02:16:59 +02:00
parent 84a632787c a62e44c4e5
commit 953effcc43
33 changed files with 866 additions and 221 deletions
@@ -153,8 +153,10 @@ func (sm *StorageMinerAPI) SectorsStatus(ctx context.Context, sid abi.SectorNumb
 			Value: info.SeedValue,
 			Epoch: info.SeedEpoch,
 		},
-		Retries:   info.InvalidProofs,
-		ToUpgrade: sm.Miner.IsMarkedForUpgrade(sid),
+		PreCommitMsg: info.PreCommitMessage,
+		CommitMsg:    info.CommitMessage,
+		Retries:      info.InvalidProofs,
+		ToUpgrade:    sm.Miner.IsMarkedForUpgrade(sid),

 		LastErr: info.LastErr,
 		Log:     log,
@@ -175,6 +177,9 @@ func (sm *StorageMinerAPI) SectorsStatus(ctx context.Context, sid abi.SectorNumb

 	onChainInfo, err := sm.Full.StateSectorGetInfo(ctx, sm.Miner.Address(), sid, types.EmptyTSK)
 	if err != nil {
+		return sInfo, err
+	}
+	if onChainInfo == nil {
 		return sInfo, nil
 	}
 	sInfo.SealProof = onChainInfo.SealProof