da: try fallback to blobdata else try calldata

celestiaorg · Jun 7, 2024 · c5c2684 · c5c2684
1 parent 5196308
commit c5c2684
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/op-batcher/batcher/driver.go b/op-batcher/batcher/driver.go
@@ -562,8 +562,14 @@ func (l *BatchSubmitter) calldataTxCandidate(data []byte) (*txmgr.TxCandidate, e
 		if l.DAClient.EthFallbackDisabled {
 			return nil, fmt.Errorf("celestia: blob submission failed; eth fallback disabled: %w", err)
 		}
-
-		l.Log.Info("celestia: blob submission failed; falling back to eth", "err", err)
+		// eth fallback: try using blobdata otherwise use calldata
+		// NOTE: the data already includes the version byte
+		candidate, err := l.blobTxCandidate(singleFrameTxData(frameData{data: data[1:]}))
+		if err == nil {
+			l.Log.Info("celestia: blob submission failed; falling back to eth blobdata", "err", err)
+			return candidate, nil
+		}
+		l.Log.Info("celestia: blob submission failed; falling back to eth calldata", "err", err)
 	}
 	return &txmgr.TxCandidate{
 		To:     &l.RollupConfig.BatchInboxAddress,