diff --git a/op-batcher/batcher/channel_config.go b/op-batcher/batcher/channel_config.go index 45dc1d4dcfa4..a23485873c60 100644 --- a/op-batcher/batcher/channel_config.go +++ b/op-batcher/batcher/channel_config.go @@ -49,6 +49,9 @@ type ChannelConfig struct { // UseBlobs indicates that this channel should be sent as a multi-blob // transaction with one blob per frame. UseBlobs bool + + // TODO(samlaf): temporary thing... just testing this out. Not sure if this is the right approach + UseAltDA bool } // ChannelConfig returns a copy of the receiver. @@ -93,7 +96,7 @@ func (cc *ChannelConfig) ReinitCompressorConfig() { } func (cc *ChannelConfig) MaxFramesPerTx() int { - if !cc.UseBlobs { + if !cc.UseBlobs && !cc.UseAltDA { return 1 } return cc.TargetNumFrames diff --git a/op-batcher/batcher/driver.go b/op-batcher/batcher/driver.go index 5ef870a1ebdb..ff7659e2fdac 100644 --- a/op-batcher/batcher/driver.go +++ b/op-batcher/batcher/driver.go @@ -592,10 +592,6 @@ func (l *BatchSubmitter) cancelBlockingTx(queue *txmgr.Queue[txRef], receiptsCh // publishToAltDAAndL1 posts the txdata to the DA Provider and then sends the commitment to L1. func (l *BatchSubmitter) publishToAltDAAndL1(txdata txData, queue *txmgr.Queue[txRef], receiptsCh chan txmgr.TxReceipt[txRef], daGroup *errgroup.Group) { - // sanity checks - if nf := len(txdata.frames); nf != 1 { - l.Log.Crit("Unexpected number of frames in calldata tx", "num_frames", nf) - } if txdata.asBlob { l.Log.Crit("Unexpected blob txdata with AltDA enabled") } diff --git a/op-batcher/batcher/service.go b/op-batcher/batcher/service.go index 5d97256fc9ac..1b28619eca31 100644 --- a/op-batcher/batcher/service.go +++ b/op-batcher/batcher/service.go @@ -207,6 +207,7 @@ func (bs *BatcherService) initChannelConfig(cfg *CLIConfig) error { TargetNumFrames: cfg.TargetNumFrames, SubSafetyMargin: cfg.SubSafetyMargin, BatchType: cfg.BatchType, + UseAltDA: bs.UseAltDA, } switch cfg.DataAvailabilityType {