[FAB-17691] Add BootstrappingSnapshotInfo to BlockchainInfo

When a block store is created from a snapshot, adding BootstrappingSnapshotInfo to BlockchainInfo.
If the store is created from a genesis block, this field is nil.

Signed-off-by: Wenjian Qiao <wenjianq@gmail.com>

common/ledger/blkstorage/blockfile_mgr.go

@@ -145,19 +145,19 @@ func newBlockfileMgr(id string, conf *Conf, indexConfig *IndexConfig, indexStore
 		bcInfo.Height = mgr.bootstrappingSnapshotInfo.LastBlockNum + 1
 		bcInfo.CurrentBlockHash = mgr.bootstrappingSnapshotInfo.LastBlockHash
 		bcInfo.PreviousBlockHash = mgr.bootstrappingSnapshotInfo.PreviousBlockHash
+		bcInfo.BootstrappingSnapshotInfo = &common.BootstrappingSnapshotInfo{}
+		bcInfo.BootstrappingSnapshotInfo.LastBlockInSnapshot = mgr.bootstrappingSnapshotInfo.LastBlockNum
 	}
 
 	if !blockfilesInfo.noBlockFiles {
 		lastBlockHeader, err := mgr.retrieveBlockHeaderByNumber(blockfilesInfo.lastPersistedBlock)
 		if err != nil {
 			panic(fmt.Sprintf("Could not retrieve header of the last block form file: %s", err))
 		}
-		lastBlockHash := protoutil.BlockHeaderHash(lastBlockHeader)
-		previousBlockHash := lastBlockHeader.PreviousHash
-		bcInfo = &common.BlockchainInfo{
-			Height:            blockfilesInfo.lastPersistedBlock + 1,
-			CurrentBlockHash:  lastBlockHash,
-			PreviousBlockHash: previousBlockHash}
+		// update bcInfo with lastPersistedBlock
+		bcInfo.Height = blockfilesInfo.lastPersistedBlock + 1
+		bcInfo.CurrentBlockHash = protoutil.BlockHeaderHash(lastBlockHeader)
+		bcInfo.PreviousBlockHash = lastBlockHeader.PreviousHash
 	}
 	mgr.bcInfo.Store(bcInfo)
 	return mgr, nil
@@ -490,9 +490,11 @@ func (mgr *blockfileMgr) updateBlockfilesInfo(blkfilesInfo *blockfilesInfo) {
 func (mgr *blockfileMgr) updateBlockchainInfo(latestBlockHash []byte, latestBlock *common.Block) {
 	currentBCInfo := mgr.getBlockchainInfo()
 	newBCInfo := &common.BlockchainInfo{
-		Height:            currentBCInfo.Height + 1,
-		CurrentBlockHash:  latestBlockHash,
-		PreviousBlockHash: latestBlock.Header.PreviousHash}
+		Height:                    currentBCInfo.Height + 1,
+		CurrentBlockHash:          latestBlockHash,
+		PreviousBlockHash:         latestBlock.Header.PreviousHash,
+		BootstrappingSnapshotInfo: currentBCInfo.BootstrappingSnapshotInfo,
+	}
 
 	mgr.bcInfo.Store(newBCInfo)
 }

common/ledger/blkstorage/snapshot_test.go

@@ -94,6 +94,18 @@ func TestImportFromSnapshot(t *testing.T) {
 			err := originalBlockStore.AddBlock(b)
 			require.NoError(t, err)
 		}
+
+		// verify blockchain info for original store (created by genesisblock)
+		lastBlock := blocksBeforeSnapshot[len(blocksBeforeSnapshot)-1]
+		prevBlock := blocksBeforeSnapshot[len(blocksBeforeSnapshot)-2]
+		bcInfo, err := originalBlockStore.GetBlockchainInfo()
+		require.NoError(t, err)
+		require.Equal(t, &common.BlockchainInfo{
+			Height:            uint64(len(blocksBeforeSnapshot)),
+			CurrentBlockHash:  protoutil.BlockHeaderHash(lastBlock.Header),
+			PreviousBlockHash: protoutil.BlockHeaderHash(prevBlock.Header),
+		}, bcInfo)
+
 		_, err = originalBlockStore.ExportTxIds(snapshotDir, testNewHashFunc)
 		require.NoError(t, err)
 		lastBlockInSnapshot := blocksBeforeSnapshot[len(blocksBeforeSnapshot)-1]
@@ -139,6 +151,9 @@ func TestImportFromSnapshot(t *testing.T) {
 				Height:            snapshotInfo.LastBlockNum + 1,
 				CurrentBlockHash:  snapshotInfo.LastBlockHash,
 				PreviousBlockHash: snapshotInfo.PreviousBlockHash,
+				BootstrappingSnapshotInfo: &common.BootstrappingSnapshotInfo{
+					LastBlockInSnapshot: uint64(snapshotInfo.LastBlockNum),
+				},
 			},
 			blocksDetailsBeforeSnapshot,
 			blocksBeforeSnapshot,
@@ -162,6 +177,9 @@ func TestImportFromSnapshot(t *testing.T) {
 			Height:            finalBlock.Header.Number + 1,
 			CurrentBlockHash:  protoutil.BlockHeaderHash(finalBlock.Header),
 			PreviousBlockHash: finalBlock.Header.PreviousHash,
+			BootstrappingSnapshotInfo: &common.BootstrappingSnapshotInfo{
+				LastBlockInSnapshot: uint64(snapshotInfo.LastBlockNum),
+			},
 		}
 		verifyQueriesOnBlocksPriorToSnapshot(t,
 			bootstrappedBlockStore,
@@ -189,6 +207,9 @@ func TestImportFromSnapshot(t *testing.T) {
 				Height:            snapshotInfo.LastBlockNum + 1,
 				CurrentBlockHash:  snapshotInfo.LastBlockHash,
 				PreviousBlockHash: snapshotInfo.PreviousBlockHash,
+				BootstrappingSnapshotInfo: &common.BootstrappingSnapshotInfo{
+					LastBlockInSnapshot: uint64(snapshotInfo.LastBlockNum),
+				},
 			},
 			blocksDetailsBeforeSnapshot,
 			blocksBeforeSnapshot,
@@ -204,6 +225,9 @@ func TestImportFromSnapshot(t *testing.T) {
 			Height:            finalBlock.Header.Number + 1,
 			CurrentBlockHash:  protoutil.BlockHeaderHash(finalBlock.Header),
 			PreviousBlockHash: finalBlock.Header.PreviousHash,
+			BootstrappingSnapshotInfo: &common.BootstrappingSnapshotInfo{
+				LastBlockInSnapshot: uint64(snapshotInfo.LastBlockNum),
+			},
 		}
 		verifyQueriesOnBlocksAddedAfterBootstrapping(t,
 			bootstrappedBlockStore,
@@ -275,6 +299,9 @@ func TestImportFromSnapshot(t *testing.T) {
 					Height:            finalBlock.Header.Number + 1,
 					CurrentBlockHash:  protoutil.BlockHeaderHash(finalBlock.Header),
 					PreviousBlockHash: finalBlock.Header.PreviousHash,
+					BootstrappingSnapshotInfo: &common.BootstrappingSnapshotInfo{
+						LastBlockInSnapshot: uint64(snapshotInfo.LastBlockNum),
+					},
 				},
 				blockDetails,
 				blocks,

core/ledger/kvledger/snapshot_test.go

@@ -838,6 +838,9 @@ func verifyCreatedLedger(t *testing.T,
 			Height:            e.lastBlockNumber + 1,
 			CurrentBlockHash:  e.lastBlockHash,
 			PreviousBlockHash: e.previousBlockHash,
+			BootstrappingSnapshotInfo: &common.BootstrappingSnapshotInfo{
+				LastBlockInSnapshot: e.lastBlockNumber,
+			},
 		},
 		destBCInfo,
 	)

core/ledger/ledgermgmt/ledger_mgmt_test.go

@@ -89,7 +89,12 @@ func TestCreateLedgerFromSnapshot(t *testing.T) {
 		require.NoError(t, err)
 		bcInfo, _ := l.GetBlockchainInfo()
 		require.Equal(t, &common.BlockchainInfo{
-			Height: 1, CurrentBlockHash: protoutil.BlockHeaderHash(gb.Header), PreviousBlockHash: nil,
+			Height:            1,
+			CurrentBlockHash:  protoutil.BlockHeaderHash(gb.Header),
+			PreviousBlockHash: nil,
+			BootstrappingSnapshotInfo: &common.BootstrappingSnapshotInfo{
+				LastBlockInSnapshot: 0,
+			},
 		}, bcInfo)
 	})