Merge-to-master orphaned conflicts instead of invalidating the block

iotaledger · Oct 4, 2023 · 5047a90 · 5047a90
1 parent ca796ce
commit 5047a90
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/pkg/protocol/engine/booker/inmemorybooker/booker.go b/pkg/protocol/engine/booker/inmemorybooker/booker.go
@@ -158,12 +158,9 @@ func (b *Booker) book(block *blocks.Block) error {
 			return ierrors.Errorf("failed to load transaction %s for block %s", conflictID.String(), block.ID())
 		}
 
-		if orphanedSlot, orphaned := txMetadata.IsOrphaned(); orphaned {
-			if orphanedSlot <= block.SlotCommitmentID().Slot() {
-				block.SetInvalid()
-
-				return nil
-			}
+		if orphanedSlot, orphaned := txMetadata.IsOrphaned(); orphaned && orphanedSlot <= block.SlotCommitmentID().Slot() {
+			// Merge-to-master orphaned conflicts.
+			conflictsToInherit.Delete(conflictID)
 		}
 	}