Embed Compressor Logic directly to Span Channel Out

Author: axelKingsley

op-batcher/compressor/blind_compressor.go

@@ -33,6 +33,10 @@ func NewBlindCompressor(config Config) (derive.Compressor, error) {
 	return c, nil
 }
 
+func (t *BlindCompressor) TargetOutputSize() uint64 {
+	return t.config.TargetOutputSize
+}
+
 func (t *BlindCompressor) Write(p []byte) (int, error) {
 	if err := t.FullErr(); err != nil {
 		return 0, err

op-batcher/compressor/non_compressor.go

@@ -36,6 +36,10 @@ func NewNonCompressor(config Config) (derive.Compressor, error) {
 	return c, nil
 }
 
+func (t *NonCompressor) TargetOutputSize() uint64 {
+	return t.config.TargetOutputSize
+}
+
 func (t *NonCompressor) Write(p []byte) (int, error) {
 	if err := t.compress.Flush(); err != nil {
 		return 0, err

op-batcher/compressor/ratio_compressor.go

@@ -34,6 +34,10 @@ func NewRatioCompressor(config Config) (derive.Compressor, error) {
 	return c, nil
 }
 
+func (t *RatioCompressor) TargetOutputSize() uint64 {
+	return t.config.TargetOutputSize
+}
+
 func (t *RatioCompressor) Write(p []byte) (int, error) {
 	if err := t.FullErr(); err != nil {
 		return 0, err

op-batcher/compressor/shadow_compressor.go

@@ -58,6 +58,10 @@ func NewShadowCompressor(config Config) (derive.Compressor, error) {
 	return c, nil
 }
 
+func (t *ShadowCompressor) TargetOutputSize() uint64 {
+	return t.config.TargetOutputSize
+}
+
 func (t *ShadowCompressor) Write(p []byte) (int, error) {
 	if t.fullErr != nil {
 		return 0, t.fullErr

op-node/rollup/derive/channel_out.go

@@ -48,6 +48,8 @@ type Compressor interface {
 	// calls to Write will fail if an error is returned from this method, but calls to Write
 	// can still return ErrCompressorFull even if this does not.
 	FullErr() error
+	// TargetOutputSize returns the target size of the compressed output
+	TargetOutputSize() uint64
 }
 
 type ChannelOut interface {
@@ -68,7 +70,7 @@ func NewChannelOut(batchType uint, compress Compressor, spanBatch *SpanBatch) (C
 	case SingularBatchType:
 		return NewSingularChannelOut(compress)
 	case SpanBatchType:
-		return NewSpanChannelOut(compress, spanBatch)
+		return NewSpanChannelOut(spanBatch.GenesisTimestamp, spanBatch.ChainID, compress.TargetOutputSize())
 	default:
 		return nil, fmt.Errorf("unrecognized batch type: %d", batchType)
 	}

op-node/rollup/derive/channel_out_test.go

@@ -36,6 +36,10 @@ func (s *nonCompressor) FullErr() error {
 	return nil
 }
 
+func (t *nonCompressor) TargetOutputSize() uint64 {
+	return 0
+}
+
 func TestChannelOutAddBlock(t *testing.T) {
 	cout, err := NewChannelOut(SingularBatchType, &nonCompressor{}, nil)
 	require.NoError(t, err)