Merge pull request #938 from iotaledger/feat/fixed-snapshot-export

Do not export a newer finalized slot than the target slot of a snapshot

pkg/protocol/engine/blockdag/inmemoryblockdag/blockdag.go

@@ -213,7 +213,7 @@ func (b *BlockDAG) shouldAppend(modelBlock *model.Block) (shouldAppend bool, err
 func (b *BlockDAG) canAppendToParents(modelBlock *model.Block) (parentsValid bool, err error) {
 	for _, parent := range modelBlock.ProtocolBlock().ParentsWithType() {
 		if isBelowRange, isInRange := b.evictionState.BelowOrInActiveRootBlockRange(parent.ID); isBelowRange || isInRange && !b.evictionState.IsActiveRootBlock(parent.ID) {
-			return false, ierrors.Errorf("parent %s with type %s of block %s is too old", parent.ID, parent.Type, modelBlock.ID())
+			return false, ierrors.Errorf("parent %s with type %s of block %s is too old (isBelowRange: %t, isInRange: %t, isActiveRootBlock: %t)", parent.ID, parent.Type, modelBlock.ID(), isBelowRange, isInRange, b.evictionState.IsActiveRootBlock(parent.ID))
 		}
 	}
 

pkg/storage/permanent/settings.go

@@ -362,23 +362,22 @@ func (s *Settings) SetLatestIssuedValidationBlock(block *model.Block) (err error
 }
 
 func (s *Settings) Export(writer io.WriteSeeker, targetCommitment *iotago.Commitment) error {
-	var commitmentBytes []byte
-	var err error
-	if targetCommitment != nil {
-		// We always know the version of the target commitment, so there can be no error.
-		commitmentBytes, err = lo.PanicOnErr(s.apiProvider.APIForVersion(targetCommitment.ProtocolVersion)).Encode(targetCommitment)
-		if err != nil {
-			return ierrors.Wrap(err, "failed to encode target commitment")
-		}
-	} else {
-		commitmentBytes = s.LatestCommitment().Data()
+	// We always know the version of the target commitment, so there can be no error.
+	commitmentBytes, err := lo.PanicOnErr(s.apiProvider.APIForVersion(targetCommitment.ProtocolVersion)).Encode(targetCommitment)
+	if err != nil {
+		return ierrors.Wrap(err, "failed to encode target commitment")
 	}
 
 	if err := stream.WriteBytesWithSize(writer, commitmentBytes, serializer.SeriLengthPrefixTypeAsUint16); err != nil {
 		return ierrors.Wrap(err, "failed to write commitment")
 	}
 
-	if err := stream.Write(writer, s.LatestFinalizedSlot()); err != nil {
+	latestFinalizedSlot := s.LatestFinalizedSlot()
+	if latestFinalizedSlot > targetCommitment.Slot {
+		latestFinalizedSlot = targetCommitment.Slot
+	}
+
+	if err := stream.Write(writer, latestFinalizedSlot); err != nil {
 		return ierrors.Wrap(err, "failed to write latest finalized slot")
 	}