Merge pull request #2907 from filecoin-project/misc/sync-times

Simplify sync logic around tipset expansions, ff and forking

chain/sync.go

@@ -1301,15 +1301,18 @@ loop:
 		at = blks[len(blks)-1].Parents()
 	}
 
-	// base is the tipset in the candidate chain at the height equal to our known tipset height.
-	if base := blockSet[len(blockSet)-1]; !types.CidArrsEqual(base.Parents().Cids(), known.Cids()) {
+	base := blockSet[len(blockSet)-1]
 	if base.Parents() == known.Parents() {
 		// common case: receiving a block thats potentially part of the same tipset as our best block
 		return blockSet, nil
 	}
 
-		// We have now ascertained that this is *not* a 'fast forward'
+	if types.CidArrsEqual(base.Parents().Cids(), known.Cids()) {
+		// common case: receiving blocks that are building on top of our best tipset
+		return blockSet, nil
+	}
 
+	// We have now ascertained that this is *not* a 'fast forward'
 	log.Warnf("(fork detected) synced header chain (%s - %d) does not link to our best block (%s - %d)", incoming.Cids(), incoming.Height(), known.Cids(), known.Height())
 	fork, err := syncer.syncFork(ctx, base, known)
 	if err != nil {
@@ -1324,7 +1327,6 @@ loop:
 	}
 
 	blockSet = append(blockSet, fork...)
-	}
 
 	return blockSet, nil
 }

journal/journal.go

@@ -100,12 +100,14 @@ func (fsj *fsJournal) putEntry(je *JournalEntry) error {
 	return nil
 }
 
+const RFC3339nocolon = "2006-01-02T150405Z0700"
+
 func (fsj *fsJournal) rollJournalFile() error {
 	if fsj.fi != nil {
 		fsj.fi.Close()
 	}
 
-	nfi, err := os.Create(filepath.Join(fsj.journalDir, fmt.Sprintf("lotus-journal-%s.ndjson", build.Clock.Now().Format(time.RFC3339))))
+	nfi, err := os.Create(filepath.Join(fsj.journalDir, fmt.Sprintf("lotus-journal-%s.ndjson", build.Clock.Now().Format(RFC3339nocolon))))
 	if err != nil {
 		return xerrors.Errorf("failed to open journal file: %w", err)
 	}

tools/stats/metrics.go

@@ -129,6 +129,12 @@ func RecordTipsetPoints(ctx context.Context, api api.FullNode, pl *PointList, ti
 	p = NewPoint("chain.blocktime", tsTime.Unix())
 	pl.AddPoint(p)
 
+	baseFeeBig := tipset.Blocks()[0].ParentBaseFee.Copy()
+	baseFeeRat := new(big.Rat).SetFrac(baseFeeBig.Int, new(big.Int).SetUint64(build.FilecoinPrecision))
+	baseFeeFloat, _ := baseFeeRat.Float64()
+	p = NewPoint("chain.basefee", baseFeeFloat)
+	pl.AddPoint(p)
+
 	for _, blockheader := range tipset.Blocks() {
 		bs, err := blockheader.Serialize()
 		if err != nil {