Merge pull request #5892 from filecoin-project/fix/miss-genesis-block

fix: Saving genesis blocks when importing snapshots

app/node/builder.go

@@ -84,8 +84,7 @@ func (b *Builder) build(ctx context.Context) (*Node, error) {
 		b.journal = journal.NewNoopJournal()
 	}
 
-	// fetch genesis block id
-	b.genBlk, err = readGenesisCid(ctx, b.repo.ChainDatastore(), b.repo.Datastore())
+	b.genBlk, err = chain2.GenesisBlock(ctx, b.repo.ChainDatastore(), b.repo.Datastore())
 	if err != nil {
 		return nil, err
 	}

cmd/import.go

@@ -105,6 +105,14 @@ func importChain(ctx context.Context, r repo.Repo, fname string) error {
 	}
 	logImport.Infof("accepting %s as new head", tip.Key().String())
 
+	genesis, err := chainStore.GetTipSetByHeight(ctx, tip, 0, false)
+	if err != nil {
+		return fmt.Errorf("got genesis failed: %v", err)
+	}
+	if err := chainStore.PersistGenesisCID(ctx, genesis.Blocks()[0]); err != nil {
+		return fmt.Errorf("persist genesis failed: %v", err)
+	}
+
 	err = chainStore.WriteCheckPoint(context.TODO(), tip.Key())
 	if err != nil {
 		logImport.Errorf("set check point error: %s", err.Error())

pkg/chain/store.go

@@ -3,6 +3,7 @@ package chain
 import (
 	"bytes"
 	"context"
+	"encoding/json"
 	"fmt"
 	"io"
 	"os"
@@ -413,6 +414,36 @@ func (store *Store) GetGenesisBlock(ctx context.Context) (*types.BlockHeader, er
 	return store.GetBlock(ctx, store.GenesisCid())
 }
 
+func (store *Store) PersistGenesisCID(ctx context.Context, blk *types.BlockHeader) error {
+	data, err := json.Marshal(blk.Cid())
+	if err != nil {
+		return fmt.Errorf("failed to marshal genesis cid: %v", err)
+	}
+
+	return store.ds.Put(ctx, GenesisKey, data)
+}
+
+func GenesisBlock(ctx context.Context, chainDs datastore.Datastore, bs blockstoreutil.Blockstore) (types.BlockHeader, error) {
+	bb, err := chainDs.Get(ctx, GenesisKey)
+	if err != nil {
+		return types.BlockHeader{}, fmt.Errorf("failed to read genesisKey: %v", err)
+	}
+
+	var c cid.Cid
+	err = json.Unmarshal(bb, &c)
+	if err != nil {
+		return types.BlockHeader{}, fmt.Errorf("failed to cast genesisCid: %v", err)
+	}
+
+	var blk types.BlockHeader
+	err = cbor.NewCborStore(bs).Get(ctx, c, &blk)
+	if err != nil {
+		return types.BlockHeader{}, fmt.Errorf("failed to read genesis block: %v", err)
+	}
+
+	return blk, nil
+}
+
 // GetTipSetStateRoot returns the aggregate state root CID of the tipset identified by `key`.
 func (store *Store) GetTipSetStateRoot(ctx context.Context, key *types.TipSet) (cid.Cid, error) {
 	return store.tipIndex.GetTipSetStateRoot(ctx, key)

pkg/genesis/init.go

@@ -2,7 +2,6 @@ package genesis
 
 import (
 	"context"
-	"encoding/json"
 
 	"github.com/filecoin-project/venus/pkg/chain"
 	"github.com/filecoin-project/venus/pkg/config"
@@ -44,13 +43,8 @@ func Init(ctx context.Context, r repo.Repo, bs blockstoreutil.Blockstore, cst cb
 	if err = chainStore.SetHead(ctx, genTipSet); err != nil {
 		return nil, errors.Wrap(err, "failed to persist genesis block in chain store")
 	}
-	// Persist the genesis cid to the repo.
-	val, err := json.Marshal(genesis.Cid())
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to marshal genesis cid")
-	}
 
-	if err = r.ChainDatastore().Put(ctx, chain.GenesisKey, val); err != nil {
+	if err := chainStore.PersistGenesisCID(ctx, genesis); err != nil {
 		return nil, errors.Wrap(err, "failed to persist genesis cid")
 	}