feat(dot/sync): Resume full sync after warp sync is finished

dot/core/service.go

@@ -150,6 +150,10 @@ func (s *Service) StorageRoot() (common.Hash, error) {
 	return stateTrieVersion.Hash(ts.Trie())
 }
 
+func (s *Service) HandleDigests(header *types.Header) error {
+	return s.onBlockImport.HandleDigests(header)
+}
+
 // HandleBlockImport handles a block that was imported via the network
 func (s *Service) HandleBlockImport(block *types.Block, state *rtstorage.TrieState, announce bool) error {
 	parentHash := block.Header.ParentHash

dot/digest/digest_integration_test.go

@@ -67,7 +67,7 @@ func TestHandler_GrandpaScheduledChange(t *testing.T) {
 	// create 4 blocks and finalize only blocks 0, 1, 2
 	headers, _ := state.AddBlocksToState(t, handler.blockState.(*state.BlockState), 4, false)
 	for i, h := range headers[:3] {
-		err := handler.blockState.(*state.BlockState).SetFinalisedHash(h.Hash(), uint64(i), 0)
+		err := handler.blockState.(*state.BlockState).SetFinalisedHash(h.Hash(), uint64(i), 0, true)
 		require.NoError(t, err)
 	}
 
@@ -98,7 +98,7 @@ func TestHandler_GrandpaScheduledChange(t *testing.T) {
 	require.NoError(t, err)
 
 	// finalize block of number 3
-	err = handler.blockState.(*state.BlockState).SetFinalisedHash(headers[3].Hash(), 3, 0)
+	err = handler.blockState.(*state.BlockState).SetFinalisedHash(headers[3].Hash(), 3, 0, true)
 	require.NoError(t, err)
 
 	time.Sleep(time.Millisecond * 500)

dot/rpc/modules/chain_integration_test.go

@@ -328,7 +328,7 @@ func TestChainGetFinalizedHeadByRound(t *testing.T) {
 	require.NoError(t, err)
 
 	testhash := header.Hash()
-	err = state.Block.SetFinalisedHash(testhash, 77, 1)
+	err = state.Block.SetFinalisedHash(testhash, 77, 1, true)
 	require.NoError(t, err)
 
 	req = ChainFinalizedHeadRequest{77, 1}

dot/services.go

@@ -527,6 +527,7 @@ func (nodeBuilder) newSyncService(config *cfg.Config, st *state.Service, fg sync
 		sync.WithBlockState(st.Block),
 		sync.WithGrandpaState(st.Grandpa),
 		sync.WithStorageState(st.Storage),
+		sync.WithEpochState(st.Epoch),
 		sync.WithFinalityGadget(fg),
 		sync.WithBabeVerifier(verifier),
 		sync.WithBlockImportHandler(cs),

dot/state/block.go

@@ -153,7 +153,7 @@ func NewBlockStateFromGenesis(db database.Database, trs *Tries, header *types.He
 	}
 
 	// set the latest finalised head to the genesis header
-	if err := bs.SetFinalisedHash(bs.genesisHash, 0, 0); err != nil {
+	if err := bs.SetFinalisedHash(bs.genesisHash, 0, 0, true); err != nil {
 		return nil, err
 	}
 
@@ -481,7 +481,7 @@ func (bs *BlockState) SetBlockBody(hash common.Hash, body *types.Body) error {
 }
 
 // SetFirstNonOriginSlotNumber saves the first non-origin slot number into the DB
-func (bs *BlockState) setFirstNonOriginSlotNumber(slotNumber uint64) error {
+func (bs *BlockState) SetFirstNonOriginSlotNumber(slotNumber uint64) error {
 	buf := make([]byte, 8)
 	binary.LittleEndian.PutUint64(buf, slotNumber)
 	return bs.db.Put(firstSlotNumberKey, buf)
@@ -960,3 +960,10 @@ func (bs *BlockState) StoreRuntime(hash common.Hash, rt runtime.Instance) {
 func (bs *BlockState) GetNonFinalisedBlocks() []common.Hash {
 	return bs.bt.GetAllBlocks()
 }
+
+// SetBlockTree sets the blocktree for the block state
+// WARN: this should be used only when state sync finishes and we need to set the new state to resume the node using a
+// specific blocktree
+func (bs *BlockState) SetBlockTree(blocktree *blocktree.BlockTree) {
+	bs.bt = blocktree
+}

dot/state/block_finalisation.go

@@ -123,7 +123,7 @@ func (bs *BlockState) GetHighestFinalisedHeader() (*types.Header, error) {
 }
 
 // SetFinalisedHash sets the latest finalised block hash
-func (bs *BlockState) SetFinalisedHash(hash common.Hash, round, setID uint64) error {
+func (bs *BlockState) SetFinalisedHash(hash common.Hash, round, setID uint64, finalizeAncestors bool) error {
 	bs.lock.Lock()
 	defer bs.lock.Unlock()
 
@@ -139,8 +139,10 @@ func (bs *BlockState) SetFinalisedHash(hash common.Hash, round, setID uint64) er
 		return fmt.Errorf("cannot finalise unknown block %s", hash)
 	}
 
-	if err := bs.handleFinalisedBlock(hash); err != nil {
-		return fmt.Errorf("failed to set finalised subchain in db on finalisation: %w", err)
+	if finalizeAncestors {
+		if err := bs.handleFinalisedBlock(hash); err != nil {
+			return fmt.Errorf("failed to set finalised subchain in db on finalisation: %w", err)
+		}
 	}
 
 	if err := bs.db.Put(finalisedHashKey(round, setID), hash[:]); err != nil {
@@ -243,7 +245,7 @@ func (bs *BlockState) handleFinalisedBlock(currentFinalizedHash common.Hash) err
 				return err
 			}
 
-			if err = bs.setFirstNonOriginSlotNumber(slotNumber); err != nil {
+			if err = bs.SetFirstNonOriginSlotNumber(slotNumber); err != nil {
 				return err
 			}
 		}

dot/state/block_finalisation_test.go

@@ -99,7 +99,7 @@ func TestBlockState_SetFinalisedHash(t *testing.T) {
 	// set tries with some state root
 	bs.tries.softSet(someStateRoot, inmemory_trie.NewEmptyTrie())
 
-	err = bs.SetFinalisedHash(testhash, 1, 1)
+	err = bs.SetFinalisedHash(testhash, 1, 1, true)
 	require.NoError(t, err)
 
 	h, err = bs.GetFinalisedHash(1, 1)
@@ -148,7 +148,7 @@ func TestSetFinalisedHash_retrieveBlockNumber1SlotNumber(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	err = bs.SetFinalisedHash(header2.Hash(), 1, 1)
+	err = bs.SetFinalisedHash(header2.Hash(), 1, 1, true)
 	require.NoError(t, err)
 	require.Equal(t, header2.Hash(), bs.lastFinalised)
 

dot/state/block_notify_test.go

@@ -51,7 +51,7 @@ func TestFinalizedChannel(t *testing.T) {
 	chain, _ := AddBlocksToState(t, bs, 3, false)
 
 	for _, b := range chain {
-		bs.SetFinalisedHash(b.Hash(), 1, 0)
+		bs.SetFinalisedHash(b.Hash(), 1, 0, true)
 	}
 
 	for i := 0; i < 1; i++ {
@@ -124,7 +124,7 @@ func TestFinalizedChannel_Multi(t *testing.T) {
 	}
 
 	time.Sleep(time.Millisecond * 10)
-	bs.SetFinalisedHash(chain[0].Hash(), 1, 0)
+	bs.SetFinalisedHash(chain[0].Hash(), 1, 0, true)
 	wg.Wait()
 
 	for _, ch := range chs {

dot/state/block_test.go

@@ -304,7 +304,7 @@ func TestGetAllDescendants(t *testing.T) {
 	err = bs.AddBlockWithArrivalTime(block2, time.Now())
 	require.NoError(t, err)
 
-	err = bs.SetFinalisedHash(block2.Header.Hash(), 1, 1)
+	err = bs.SetFinalisedHash(block2.Header.Hash(), 1, 1, true)
 	require.NoError(t, err)
 
 	// can't fetch given block's descendants since the given block get removed from memory after
@@ -455,7 +455,7 @@ func TestFinalization_DeleteBlock(t *testing.T) {
 
 	// pick block to finalise
 	fin := leaves[len(leaves)-1]
-	err := bs.SetFinalisedHash(fin, 1, 1)
+	err := bs.SetFinalisedHash(fin, 1, 1, true)
 	require.NoError(t, err)
 
 	after := bs.bt.GetAllBlocks()
@@ -683,7 +683,7 @@ func TestNumberIsFinalised(t *testing.T) {
 		Body:   types.Body{},
 	})
 	require.NoError(t, err)
-	err = bs.SetFinalisedHash(header2.Hash(), 1, 1)
+	err = bs.SetFinalisedHash(header2.Hash(), 1, 1, true)
 	require.NoError(t, err)
 
 	fin, err = bs.NumberIsFinalised(0)
@@ -1023,7 +1023,7 @@ func TestRange(t *testing.T) {
 				hashIndexToSetAsFinalized := tt.blocksToPersistAtDisk - 1
 				selectedHash := hashesCreated[hashIndexToSetAsFinalized]
 
-				err := blockState.SetFinalisedHash(selectedHash, 0, 0)
+				err := blockState.SetFinalisedHash(selectedHash, 0, 0, true)
 				require.NoError(t, err)
 			}
 
@@ -1093,7 +1093,7 @@ func Test_GetRuntime_StoreRuntime(t *testing.T) {
 	}
 
 	lastElementOnChain := chain[len(chain)-1]
-	err = blockState.SetFinalisedHash(lastElementOnChain.Hash(), 1, 0)
+	err = blockState.SetFinalisedHash(lastElementOnChain.Hash(), 1, 0, true)
 	require.NoError(t, err)
 
 	sameRuntimeOnDiffHash, err := blockState.GetRuntime(lastElementOnChain.Hash())

dot/state/epoch.go

@@ -685,7 +685,7 @@ func (s *EpochState) HandleBABEDigest(header *types.Header, digest types.BabeCon
 		}
 
 		nextEpoch := currEpoch + 1
-		s.storeBABENextEpochData(nextEpoch, headerHash, val)
+		s.StoreBABENextEpochData(nextEpoch, headerHash, val)
 
 		if err = s.setBABENextEpochDataInDB(nextEpoch, headerHash, val); err != nil {
 			return fmt.Errorf("setting next epoch data in db: %w", err)
@@ -912,7 +912,7 @@ func (s *EpochState) SkipVerify(header *types.Header) (bool, error) {
 }
 
 // StoreBABENextEpochData stores the types.NextEpochData under epoch and hash keys
-func (s *EpochState) storeBABENextEpochData(epoch uint64, hash common.Hash, nextEpochData types.NextEpochData) {
+func (s *EpochState) StoreBABENextEpochData(epoch uint64, hash common.Hash, nextEpochData types.NextEpochData) {
 	s.nextEpochDataLock.Lock()
 	defer s.nextEpochDataLock.Unlock()
 
@@ -1001,7 +1001,7 @@ func (s *EpochState) FinalizeBABENextEpochData(finalizedHeader *types.Header) er
 
 	finalizedNextEpochData, err := findFinalizedHeaderForEpoch(s.nextEpochData, s, nextEpoch)
 	if err != nil {
-		return fmt.Errorf("cannot find next epoch data: %w", err)
+		return fmt.Errorf("cannot find next epoch data for epoch %d: %w", nextEpoch, err)
 	}
 
 	err = s.SetEpochDataRaw(nextEpoch, finalizedNextEpochData.ToEpochDataRaw())

dot/state/epoch_test.go

@@ -382,7 +382,7 @@ func TestStoreAndFinalizeBabeNextEpochData(t *testing.T) {
 
 			for _, e := range tt.inMemoryEpoch {
 				for i, hash := range e.hashes {
-					epochState.storeBABENextEpochData(e.epoch, hash, e.nextData[i])
+					epochState.StoreBABENextEpochData(e.epoch, hash, e.nextData[i])
 				}
 			}
 

dot/state/grandpa.go

@@ -66,7 +66,7 @@ func NewGrandpaStateFromGenesis(db database.Database, bs *BlockState,
 		return nil, fmt.Errorf("cannot set latest round: %w", err)
 	}
 
-	if err := s.setAuthorities(genesisSetID, genesisAuthorities); err != nil {
+	if err := s.SetAuthorities(genesisSetID, genesisAuthorities); err != nil {
 		return nil, fmt.Errorf("cannot set authorities: %w", err)
 	}
 
@@ -187,7 +187,7 @@ func (s *GrandpaState) ApplyScheduledChanges(finalizedHeader *types.Header) erro
 	}
 
 	grandpaVotersAuthorities := types.NewGrandpaVotersFromAuthorities(changeToApply.change.nextAuthorities)
-	err = s.setAuthorities(newSetID, grandpaVotersAuthorities)
+	err = s.SetAuthorities(newSetID, grandpaVotersAuthorities)
 	if err != nil {
 		return fmt.Errorf("cannot set authorities: %w", err)
 	}
@@ -259,7 +259,7 @@ func (s *GrandpaState) ApplyForcedChanges(importedBlockHeader *types.Header) err
 	}
 
 	grandpaVotersAuthorities := types.NewGrandpaVotersFromAuthorities(forcedChange.nextAuthorities)
-	err = s.setAuthorities(newSetID, grandpaVotersAuthorities)
+	err = s.SetAuthorities(newSetID, grandpaVotersAuthorities)
 	if err != nil {
 		return fmt.Errorf("cannot set authorities: %w", err)
 	}
@@ -334,8 +334,8 @@ func setIDChangeKey(setID uint64) []byte {
 	return append(setIDChangePrefix, buf...)
 }
 
-// setAuthorities sets the authorities for a given setID
-func (s *GrandpaState) setAuthorities(setID uint64, authorities []types.GrandpaVoter) error {
+// SetAuthorities sets the authorities for a given setID
+func (s *GrandpaState) SetAuthorities(setID uint64, authorities []types.GrandpaVoter) error {
 	enc, err := types.EncodeGrandpaVoters(authorities)
 	if err != nil {
 		return err
@@ -407,7 +407,7 @@ func (s *GrandpaState) SetNextChange(authorities []types.GrandpaVoter, number ui
 	}
 
 	nextSetID := currSetID + 1
-	err = s.setAuthorities(nextSetID, authorities)
+	err = s.SetAuthorities(nextSetID, authorities)
 	if err != nil {
 		return err
 	}

dot/state/service.go

@@ -214,7 +214,7 @@ func (s *Service) Rewind(toBlock uint) error {
 	// TODO: this is broken, it needs to set the latest finalised header after
 	// rewinding to some block number, but there is no reverse lookup function
 	// for block -> (round, setID) where it was finalised (#1859)
-	err = s.Block.SetFinalisedHash(header.Hash(), 0, 0)
+	err = s.Block.SetFinalisedHash(header.Hash(), 0, 0, true)
 	if err != nil {
 		return err
 	}