Merge branch 'master' into debugWeb for other bug fixes

chain/sync.go

@@ -896,7 +896,7 @@ func (syncer *Syncer) syncFork(ctx context.Context, incoming *types.TipSet, know
 
 	if commonParent {
 		// known contains at least one of incoming's Parents => the common ancestor is known's Parents (incoming's Grandparents)
-		// in this case, we need to return {incoming, incoming.Parents()}
+		// in this case, we need to return {incoming.Parents()}
 		incomingParents, err := syncer.store.LoadTipSet(ctx, incomingParentsTsk)
 		if err != nil {
 			// fallback onto the network
@@ -912,7 +912,7 @@ func (syncer *Syncer) syncFork(ctx context.Context, incoming *types.TipSet, know
 			incomingParents = tips[0]
 		}
 
-		return []*types.TipSet{incoming, incomingParents}, nil
+		return []*types.TipSet{incomingParents}, nil
 	}
 
 	// TODO: Does this mean we always ask for ForkLengthThreshold blocks from the network, even if we just need, like, 2? Yes.

cmd/lotus-miner/sectors.go

@@ -2290,7 +2290,7 @@ var sectorsCompactPartitionsCmd = &cli.Command{
 		if len(parts) <= 0 {
 			return fmt.Errorf("must include at least one partition to compact")
 		}
-		fmt.Printf("compacting %d paritions\n", len(parts))
+		fmt.Printf("compacting %d partitions\n", len(parts))
 
 		var makeMsgForPartitions func(partitionsBf bitfield.BitField) ([]*types.Message, error)
 		makeMsgForPartitions = func(partitionsBf bitfield.BitField) ([]*types.Message, error) {

cmd/lotus-shed/miner.go

@@ -553,7 +553,7 @@ var sendInvalidWindowPoStCmd = &cli.Command{
 			return xerrors.Errorf("serializing params: %w", err)
 		}
 
-		fmt.Printf("submitting bad PoST for %d paritions\n", len(partitionIndices))
+		fmt.Printf("submitting bad PoST for %d partitions\n", len(partitionIndices))
 		smsg, err := api.MpoolPushMessage(ctx, &types.Message{
 			From:   minfo.Worker,
 			To:     maddr,