Merge pull request #3641 from OffchainLabs/retry_fast_confirm_backport

Make sure to retry fast confirmation on failure

Author: joshuacolvin0

bold/assertions/confirmation.go

@@ -51,13 +51,11 @@ func (m *Manager) keepTryingAssertionConfirmation(ctx context.Context, assertion
 		confirmed, err = m.chain.FastConfirmAssertion(ctx, creationInfo)
 		if err != nil {
 			log.Error("Could not fast confirm latest assertion", "err", err)
-			return
-		}
-		if confirmed {
+		} else if confirmed {
 			assertionConfirmedCounter.Inc(1)
 			log.Info("Fast Confirmed assertion", "assertionHash", creationInfo.AssertionHash)
+			return
 		}
-		return
 	}
 	prevCreationInfo, err := retry.UntilSucceeds(ctx, func() (*protocol.AssertionCreatedInfo, error) {
 		return m.chain.ReadAssertionCreationInfo(ctx, creationInfo.ParentAssertionHash)
@@ -75,6 +73,17 @@ func (m *Manager) keepTryingAssertionConfirmation(ctx context.Context, assertion
 		case <-ctx.Done():
 			return
 		case <-ticker.C:
+			if m.enableFastConfirmation {
+				var confirmed bool
+				confirmed, err = m.chain.FastConfirmAssertion(ctx, creationInfo)
+				if err != nil {
+					log.Error("Could not fast confirm latest assertion", "err", err)
+				} else if confirmed {
+					assertionConfirmedCounter.Inc(1)
+					log.Info("Fast Confirmed assertion", "assertionHash", creationInfo.AssertionHash)
+					return
+				}
+			}
 			opts := m.chain.GetCallOptsWithDesiredRpcHeadBlockNumber(&bind.CallOpts{Context: ctx})
 			parentAssertion, err := m.chain.GetAssertion(
 				ctx,