op-node: Ensure unit tests to handle Span batches with unprotected txs

op-node/rollup/derive/batch_test.go

@@ -30,15 +30,24 @@ func RandomRawSpanBatch(rng *rand.Rand, chainId *big.Int) *RawSpanBatch {
 	}
 	var blockTxCounts []uint64
 	totalblockTxCounts := uint64(0)
-	for i := 0; i < int(blockCount); i++ {
+
+	blockTxCounts = append(blockTxCounts, 4)
+	totalblockTxCounts += 4
+	for i := 1; i < int(blockCount); i++ {
 		blockTxCount := uint64(rng.Intn(16))
 		blockTxCounts = append(blockTxCounts, blockTxCount)
 		totalblockTxCounts += blockTxCount
 	}
-	signer := types.NewLondonSigner(chainId)
+	londonSigner := types.NewLondonSigner(chainId)
 	var txs [][]byte
 	for i := 0; i < int(totalblockTxCounts); i++ {
-		tx := testutils.RandomTx(rng, new(big.Int).SetUint64(rng.Uint64()), signer)
+		var tx *types.Transaction
+		// ensure unprotected txs are included
+		if i < 4 || testutils.RandomBool(rng) {
+			tx = testutils.RandomLegacyTxNotProtected(rng)
+		} else {
+			tx = testutils.RandomTx(rng, new(big.Int).SetUint64(rng.Uint64()), londonSigner)
+		}
 		rawTx, err := tx.MarshalBinary()
 		if err != nil {
 			panic("MarshalBinary:" + err.Error())

op-node/rollup/derive/span_batch_txs_test.go

@@ -301,19 +301,36 @@ func TestSpanBatchTxsRecoverV(t *testing.T) {
 	rng := rand.New(rand.NewSource(0x123))
 
 	chainID := big.NewInt(rng.Int63n(1000))
-	signer := types.NewLondonSigner(chainID)
-	totalblockTxCount := rng.Intn(100)
+	londonSigner := types.NewLondonSigner(chainID)
+	totalblockTxCount := 20 + rng.Intn(100)
 
 	var spanBatchTxs spanBatchTxs
 	var txTypes []int
 	var txSigs []spanBatchSignature
 	var originalVs []uint64
 	yParityBits := new(big.Int)
+	protectedBits := new(big.Int)
+	totalLegacyTxCount := 0
 	for idx := 0; idx < totalblockTxCount; idx++ {
-		tx := testutils.RandomTx(rng, new(big.Int).SetUint64(rng.Uint64()), signer)
-		txTypes = append(txTypes, int(tx.Type()))
+		var tx *types.Transaction
+		// ensure unprotected txs are included
+		if idx < 4 || testutils.RandomBool(rng) {
+			tx = testutils.RandomLegacyTxNotProtected(rng)
+		} else {
+			tx = testutils.RandomTx(rng, new(big.Int).SetUint64(rng.Uint64()), londonSigner)
+		}
+		txType := tx.Type()
+		txTypes = append(txTypes, int(txType))
 		var txSig spanBatchSignature
 		v, r, s := tx.RawSignatureValues()
+		if txType == types.LegacyTxType {
+			protectedBit := uint(0)
+			if tx.Protected() {
+				protectedBit = uint(1)
+			}
+			protectedBits.SetBit(protectedBits, int(totalLegacyTxCount), protectedBit)
+			totalLegacyTxCount++
+		}
 		// Do not fill in txSig.V
 		txSig.r, _ = uint256.FromBig(r)
 		txSig.s, _ = uint256.FromBig(s)

op-service/testutils/random.go

@@ -157,6 +157,10 @@ func RandomTx(rng *rand.Rand, baseFee *big.Int, signer types.Signer) *types.Tran
 	return tx
 }
 
+func RandomLegacyTxNotProtected(rng *rand.Rand) *types.Transaction {
+	return RandomLegacyTx(rng, types.HomesteadSigner{})
+}
+
 func RandomLegacyTx(rng *rand.Rand, signer types.Signer) *types.Transaction {
 	key := InsecureRandomKey(rng)
 	txData := &types.LegacyTx{