Fix: WarpSync

pkg/protocol/chain.go

@@ -341,7 +341,7 @@ func (c *Chain) addCommitment(newCommitment *Commitment) (shutdown func()) {
 
 	return lo.Batch(
 		newCommitment.IsAttested.OnTrigger(func() { c.LatestAttestedCommitment.Set(newCommitment) }),
-		newCommitment.IsVerified.OnTrigger(func() { c.LatestProducedCommitment.Set(newCommitment) }),
+		newCommitment.IsCommitted.OnTrigger(func() { c.LatestProducedCommitment.Set(newCommitment) }),
 	)
 }
 

pkg/protocol/commitment.go

@@ -56,9 +56,15 @@ type Commitment struct {
 	// IsAttested contains a flag indicating if we have received attestations for this Commitment.
 	IsAttested reactive.Event
 
-	// IsVerified contains a flag indicating if this Commitment is verified (we produced this Commitment ourselves by
-	// booking all the contained blocks and transactions).
-	IsVerified reactive.Event
+	// IsFullyBooked contains a flag indicating if we have received all blocks for this Commitment.
+	IsFullyBooked reactive.Event
+
+	// IsCommittable contains a flag indicating if this Commitment is committable (we have received all blocks and all attestations).
+	IsCommittable reactive.Event
+
+	// IsCommitted contains a flag indicating if we Commitment produced this Commitment ourselves by replaying all the
+	// blocks of the Commitment.
+	IsCommitted reactive.Event
 
 	// IsAboveLatestVerifiedCommitment contains a flag indicating if this Commitment is above the latest verified
 	// Commitment.
@@ -94,7 +100,9 @@ func newCommitment(commitments *Commitments, model *model.Commitment) *Commitmen
 		CumulativeAttestedWeight:        reactive.NewVariable[uint64](),
 		IsRoot:                          reactive.NewEvent(),
 		IsAttested:                      reactive.NewEvent(),
-		IsVerified:                      reactive.NewEvent(),
+		IsFullyBooked:                   reactive.NewEvent(),
+		IsCommittable:                   reactive.NewEvent(),
+		IsCommitted:                     reactive.NewEvent(),
 		IsAboveLatestVerifiedCommitment: reactive.NewVariable[bool](),
 		ReplayDroppedBlocks:             reactive.NewVariable[bool](),
 		IsEvicted:                       reactive.NewEvent(),
@@ -135,7 +143,9 @@ func (c *Commitment) initLogger() (shutdown func()) {
 		c.CumulativeAttestedWeight.LogUpdates(c, log.LevelTrace, "CumulativeAttestedWeight"),
 		c.IsRoot.LogUpdates(c, log.LevelTrace, "IsRoot"),
 		c.IsAttested.LogUpdates(c, log.LevelTrace, "IsAttested"),
-		c.IsVerified.LogUpdates(c, log.LevelTrace, "IsVerified"),
+		c.IsFullyBooked.LogUpdates(c, log.LevelTrace, "IsFullyBooked"),
+		c.IsCommittable.LogUpdates(c, log.LevelTrace, "IsCommittable"),
+		c.IsCommitted.LogUpdates(c, log.LevelTrace, "IsCommitted"),
 		c.ReplayDroppedBlocks.LogUpdates(c, log.LevelTrace, "ReplayDroppedBlocks"),
 		c.IsEvicted.LogUpdates(c, log.LevelTrace, "IsEvicted"),
 
@@ -147,10 +157,12 @@ func (c *Commitment) initLogger() (shutdown func()) {
 func (c *Commitment) initDerivedProperties() (shutdown func()) {
 	return lo.Batch(
 		// mark commitments that are marked as root as verified
-		c.IsVerified.InheritFrom(c.IsRoot),
+		c.IsCommitted.InheritFrom(c.IsRoot),
 
-		// mark commitments that are marked as verified as attested
-		c.IsAttested.InheritFrom(c.IsVerified),
+		// mark commitments that are marked as verified as attested, fully booked and committable
+		c.IsAttested.InheritFrom(c.IsCommitted),
+		c.IsFullyBooked.InheritFrom(c.IsCommitted),
+		c.IsCommittable.InheritFrom(c.IsCommitted),
 
 		c.Parent.WithNonEmptyValue(func(parent *Commitment) func() {
 			// the weight can be fixed as a one time operation (as it only relies on static information from the parent
@@ -245,9 +257,9 @@ func (c *Commitment) deriveCumulativeAttestedWeight(parent *Commitment) func() {
 // deriveIsAboveLatestVerifiedCommitment derives the IsAboveLatestVerifiedCommitment flag of this Commitment which is
 // true if the parent is already above the latest verified Commitment or if the parent is verified and we are not.
 func (c *Commitment) deriveIsAboveLatestVerifiedCommitment(parent *Commitment) func() {
-	return c.IsAboveLatestVerifiedCommitment.DeriveValueFrom(reactive.NewDerivedVariable3(func(_ bool, parentAboveLatestVerifiedCommitment bool, parentIsVerified bool, isVerified bool) bool {
-		return parentAboveLatestVerifiedCommitment || (parentIsVerified && !isVerified)
-	}, parent.IsAboveLatestVerifiedCommitment, parent.IsVerified, c.IsVerified))
+	return c.IsAboveLatestVerifiedCommitment.DeriveValueFrom(reactive.NewDerivedVariable3(func(_ bool, parentAboveLatestVerifiedCommitment bool, parentIsCommitted bool, isCommitted bool) bool {
+		return parentAboveLatestVerifiedCommitment || (parentIsCommitted && !isCommitted)
+	}, parent.IsAboveLatestVerifiedCommitment, parent.IsCommitted, c.IsCommitted))
 }
 
 // deriveRequestAttestations derives the RequestAttestations flag of this Commitment which is true if our Chain is
@@ -261,9 +273,9 @@ func (c *Commitment) deriveRequestAttestations(chain *Chain, parent *Commitment)
 // deriveWarpSyncBlocks derives the WarpSyncBlocks flag of this Commitment which is true if our Chain is requesting
 // warp sync, and we are the directly above the latest verified Commitment.
 func (c *Commitment) deriveWarpSyncBlocks(chain *Chain, parent *Commitment) func() {
-	return c.WarpSyncBlocks.DeriveValueFrom(reactive.NewDerivedVariable4(func(_ bool, engineInstance *engine.Engine, warpSync bool, parentIsVerified bool, isVerified bool) bool {
-		return engineInstance != nil && warpSync && parentIsVerified && !isVerified
-	}, chain.Engine, chain.WarpSyncMode, parent.IsVerified, c.IsVerified))
+	return c.WarpSyncBlocks.DeriveValueFrom(reactive.NewDerivedVariable4(func(_ bool, engineInstance *engine.Engine, warpSync bool, parentIsFullyBooked bool, isFullyBooked bool) bool {
+		return engineInstance != nil && warpSync && parentIsFullyBooked && !isFullyBooked
+	}, chain.Engine, chain.WarpSyncMode, parent.IsFullyBooked, c.IsFullyBooked))
 }
 
 // deriveReplayDroppedBlocks derives the ReplayDroppedBlocks flag of this Commitment which is true if our Chain has an

pkg/protocol/commitments.go

@@ -155,7 +155,7 @@ func (c *Commitments) publishEngineCommitments(chain *Chain, engine *engine.Engi
 			// mark it as produced by ourselves and force it to be on the right chain (in case our chain produced a
 			// different commitment than the one we erroneously expected it to be - we always trust our engine most).
 			publishedCommitment.AttestedWeight.Set(publishedCommitment.Weight.Get())
-			publishedCommitment.IsVerified.Set(true)
+			publishedCommitment.IsCommitted.Set(true)
 			publishedCommitment.forceChain(chain)
 		}
 	})

pkg/protocol/protocol_warp_sync.go

@@ -160,7 +160,8 @@ func (w *WarpSyncProtocol) ProcessResponse(commitmentID iotago.CommitmentID, blo
 			if targetEngine.Workers.WaitChildren(); targetEngine.Storage.Settings().LatestCommitment().ID().Slot() > commitmentID.Slot() {
 				return blocksToWarpSync
 			}
-			targetEngine.Reset()
+			// TODO: reset the engine only once at the very beginning of the warp-sync process
+			// targetEngine.Reset()
 
 			// Once all blocks are booked we
 			//   1. Mark all transactions as accepted
@@ -186,8 +187,19 @@ func (w *WarpSyncProtocol) ProcessResponse(commitmentID iotago.CommitmentID, blo
 				}
 			}
 
+			commitment.IsFullyBooked.OnUpdateOnce(func(_ bool, _ bool) {
+				minimumCommittableAge := w.protocol.APIForSlot(commitmentID.Slot()).ProtocolParameters().MinCommittableAge()
+				if committableCommitment, exists := chain.Commitment(commitmentID.Slot() - minimumCommittableAge + 1); exists {
+					committableCommitment.IsCommittable.Set(true)
+				}
+			})
+
+			commitment.IsCommittable.OnUpdateOnce(func(_ bool, _ bool) {
+				w.workerPool.Submit(forceCommitmentFunc)
+			})
+
 			if totalBlocks == 0 {
-				forceCommitmentFunc()
+				commitment.IsFullyBooked.Set(true)
 
 				return blocksToWarpSync
 			}
@@ -213,12 +225,9 @@ func (w *WarpSyncProtocol) ProcessResponse(commitmentID iotago.CommitmentID, blo
 						targetEngine.BlockGadget.SetAccepted(block)
 
 						block.Notarized().OnUpdate(func(_ bool, _ bool) {
-							// Wait for all blocks to be notarized before forcing the commitment of the slot.
-							if notarizedBlocks.Add(1) != totalBlocks {
-								return
+							if notarizedBlocks.Add(1) == totalBlocks {
+								commitment.IsFullyBooked.Set(true)
 							}
-
-							forceCommitmentFunc()
 						})
 					}
 				}