@@ -722,6 +722,8 @@ func (e *epochStartBootstrap) syncIntermediateBlocksIfNeeded(
722722 header data.HeaderHandler ,
723723 lastExecutedNonce uint64 ,
724724) error {
725+ shardID := header .GetShardID ()
726+
725727 hashToSync := header .GetPrevHash ()
726728 currNonce := header .GetNonce ()
727729
@@ -738,7 +740,7 @@ func (e *epochStartBootstrap) syncIntermediateBlocksIfNeeded(
738740 continue
739741 }
740742
741- header , err := e .syncOneHeader (hashToSync , core . MetachainShardId )
743+ header , err := e .syncOneHeader (hashToSync , shardID )
742744 if err != nil {
743745 return err
744746 }
@@ -766,7 +768,7 @@ func (e *epochStartBootstrap) syncEpochStartDataInfo(
766768 return nil
767769 }
768770
769- err = e .requestBlocksUpToLastExecuted (syncedHeaders , syncedHeader , epochStartData .GetShardID ())
771+ err = e .syncBlocksUpToLastExecuted (syncedHeaders , syncedHeader , epochStartData .GetShardID ())
770772 if err != nil {
771773 return err
772774 }
@@ -854,7 +856,7 @@ func (e *epochStartBootstrap) syncPrevShardHeaderHandler(
854856 header data.HeaderHandler ,
855857) (data.ShardHeaderHandler , error ) {
856858 prevHash := header .GetPrevHash ()
857- syncedHeader , err := e .syncOneHeader (prevHash , core . MetachainShardId )
859+ syncedHeader , err := e .syncOneHeader (prevHash , header . GetShardID () )
858860 if err != nil {
859861 return nil , err
860862 }
@@ -884,7 +886,7 @@ func (e *epochStartBootstrap) syncEpochStartMetaHeaders(
884886
885887 // sync meta header with intermediate blocks up to last executed (for supernova)
886888 syncedHeaders := make (map [string ]data.HeaderHandler )
887- err = e .requestBlocksUpToLastExecuted (syncedHeaders , meta , core .MetachainShardId )
889+ err = e .syncBlocksUpToLastExecuted (syncedHeaders , meta , core .MetachainShardId )
888890 if err != nil {
889891 return nil , err
890892 }
@@ -935,7 +937,7 @@ func (e *epochStartBootstrap) syncHeadersFrom(meta data.MetaHeaderHandler) (map[
935937 return syncedHeaders , nil
936938}
937939
938- func (e * epochStartBootstrap ) requestBlocksUpToLastExecuted (
940+ func (e * epochStartBootstrap ) syncBlocksUpToLastExecuted (
939941 syncedHeaders map [string ]data.HeaderHandler ,
940942 header data.HeaderHandler ,
941943 shardID uint32 ,
0 commit comments