Merge branch 'update-20250719221546' into develop

Author: nebojsa94

rollup/fees/rollup_fee.go

@@ -7,12 +7,9 @@ import (
 	"math/big"
 
 	"github.com/holiman/uint256"
-	"github.com/scroll-tech/da-codec/encoding"
-
 	"github.com/scroll-tech/go-ethereum/common"
 	"github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/scroll-tech/go-ethereum/crypto"
-	"github.com/scroll-tech/go-ethereum/log"
 	"github.com/scroll-tech/go-ethereum/params"
 	"github.com/scroll-tech/go-ethereum/rollup/rcfg"
 )
@@ -178,36 +175,36 @@ func readGPOStorageSlots(addr common.Address, state StateDB) gpoState {
 // compression_ratio(tx) = size(tx) * PRECISION / size(zstd(tx))
 func estimateTxCompressionRatio(data []byte, blockNumber uint64, blockTime uint64, config *params.ChainConfig) (*big.Int, error) {
 	// By definition, the compression ratio of empty data is infinity
-	if len(data) == 0 {
-		return U256MAX, nil
-	}
-
-	// Compress data using da-codec
-	compressed, err := encoding.CompressScrollBatchBytes(data, blockNumber, blockTime, config)
-	if err != nil {
-		log.Error("Batch compression failed, using 1.0 compression ratio", "error", err, "data size", len(data), "data", common.Bytes2Hex(data))
-		return nil, fmt.Errorf("batch compression failed: %w", err)
-	}
-
-	if len(compressed) == 0 {
-		log.Error("Compressed data is empty, using 1.0 compression ratio", "data size", len(data), "data", common.Bytes2Hex(data))
-		return nil, fmt.Errorf("compressed data is empty")
-	}
-
-	// Make sure compression ratio >= 1 by checking if compressed data is bigger or equal to original data
-	// This behavior is consistent with DA Batch compression in codecv7 and later versions
-	if len(compressed) >= len(data) {
-		return rcfg.Precision, nil
-	}
-
-	// compression_ratio = size(tx) * PRECISION / size(zstd(tx))
-	originalSize := new(big.Int).SetUint64(uint64(len(data)))
-	compressedSize := new(big.Int).SetUint64(uint64(len(compressed)))
-
-	ratio := new(big.Int).Mul(originalSize, rcfg.Precision)
-	ratio.Div(ratio, compressedSize)
-
-	return ratio, nil
+	//if len(data) == 0 {
+	return U256MAX, nil
+	//}
+
+	//// Compress data using da-codec
+	//compressed, err := encoding.CompressScrollBatchBytes(data, blockNumber, blockTime, config)
+	//if err != nil {
+	//	log.Error("Batch compression failed, using 1.0 compression ratio", "error", err, "data size", len(data), "data", common.Bytes2Hex(data))
+	//	return nil, fmt.Errorf("batch compression failed: %w", err)
+	//}
+	//
+	//if len(compressed) == 0 {
+	//	log.Error("Compressed data is empty, using 1.0 compression ratio", "data size", len(data), "data", common.Bytes2Hex(data))
+	//	return nil, fmt.Errorf("compressed data is empty")
+	//}
+	//
+	//// Make sure compression ratio >= 1 by checking if compressed data is bigger or equal to original data
+	//// This behavior is consistent with DA Batch compression in codecv7 and later versions
+	//if len(compressed) >= len(data) {
+	//	return rcfg.Precision, nil
+	//}
+	//
+	//// compression_ratio = size(tx) * PRECISION / size(zstd(tx))
+	//originalSize := new(big.Int).SetUint64(uint64(len(data)))
+	//compressedSize := new(big.Int).SetUint64(uint64(len(compressed)))
+	//
+	//ratio := new(big.Int).Mul(originalSize, rcfg.Precision)
+	//ratio.Div(ratio, compressedSize)
+	//
+	//return ratio, nil
 }
 
 // calculatePenalty computes the penalty multiplier based on compression ratio

rollup/l1/reader.go

@@ -6,8 +6,6 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/scroll-tech/da-codec/encoding"
-
 	"github.com/scroll-tech/go-ethereum"
 	"github.com/scroll-tech/go-ethereum/accounts/abi"
 	"github.com/scroll-tech/go-ethereum/common"
@@ -427,19 +425,19 @@ func (r *Reader) FetchCommitTxData(commitEvent *CommitBatchEvent) (*CommitBatchA
 
 		// in commitAndFinalizeBatch, the last batch hash is encoded in the finalize struct as this is the only batch we're
 		// committing when calling this function.
-		codec, err := encoding.CodecFromVersion(encoding.CodecVersion(commitAndFinalizeArgs.Version))
-		if err != nil {
-			return nil, fmt.Errorf("failed to get codec from version %d, err: %w", commitAndFinalizeArgs.Version, err)
-		}
-		daBatch, err := codec.NewDABatchFromBytes(commitAndFinalizeArgs.FinalizeStruct.BatchHeader)
-		if err != nil {
-			return nil, fmt.Errorf("failed to decode daBatch from bytes, err: %w", err)
-		}
+		//codec, err := encoding.CodecFromVersion(encoding.CodecVersion(commitAndFinalizeArgs.Version))
+		//if err != nil {
+		//	return nil, fmt.Errorf("failed to get codec from version %d, err: %w", commitAndFinalizeArgs.Version, err)
+		//}
+		//daBatch, err := codec.NewDABatchFromBytes(commitAndFinalizeArgs.FinalizeStruct.BatchHeader)
+		//if err != nil {
+		//	return nil, fmt.Errorf("failed to decode daBatch from bytes, err: %w", err)
+		//}
 
 		args = &CommitBatchArgs{
 			Version:         commitAndFinalizeArgs.Version,
 			ParentBatchHash: commitAndFinalizeArgs.ParentBatchHash,
-			LastBatchHash:   daBatch.Hash(),
+			//LastBatchHash:   daBatch.Hash(),
 		}
 	} else {
 		return nil, fmt.Errorf("unknown method name for commit transaction: %s", method.Name)