Remove merge commented code leftovers

Author: qdm12

plugin/evm/block.go

@@ -246,10 +246,6 @@ func (b *Block) verifyPredicates(predicateContext *precompileconfig.PredicateCon
 		return fmt.Errorf("failed to marshal predicate results: %w", err)
 	}
 	extraData := b.ethBlock.Extra()
-	// headerPredicateResultsBytes := predicate.GetPredicateResultBytes(extraData) // XXX
-	// if len(headerPredicateResultsBytes) == 0 {
-	// 	return fmt.Errorf("failed to find predicate results in extra data: %x", extraData)
-	// }
 	headerPredicateResultsBytes := header.PredicateBytesFromExtra(extraData)
 	if !bytes.Equal(headerPredicateResultsBytes, predicateResultsBytes) {
 		return fmt.Errorf("%w (remote: %x local: %x)", errInvalidHeaderPredicateResults, headerPredicateResultsBytes, predicateResultsBytes)

plugin/evm/block_verification.go

@@ -61,30 +61,6 @@ func (v blockValidator) SyntacticVerify(b *Block, rules params.Rules) error {
 		return fmt.Errorf("invalid mix digest: %v", ethHeader.MixDigest)
 	}
 
-	// // Check that the size of the header's Extra data field is correct for [rules]. // XXX
-	// headerExtraDataSize := len(ethHeader.Extra)
-	// switch {
-	// case rulesExtra.IsDurango:
-	// 	if headerExtraDataSize < params.DynamicFeeExtraDataSize {
-	// 		return fmt.Errorf(
-	// 			"expected header ExtraData to be len >= %d but got %d",
-	// 			params.DynamicFeeExtraDataSize, len(ethHeader.Extra),
-	// 		)
-	// 	}
-	// case rulesExtra.IsSubnetEVM:
-	// 	if headerExtraDataSize != params.DynamicFeeExtraDataSize {
-	// 		return fmt.Errorf(
-	// 			"expected header ExtraData to be len %d but got %d",
-	// 			params.DynamicFeeExtraDataSize, headerExtraDataSize,
-	// 		)
-	// 	}
-	// default:
-	// 	if uint64(headerExtraDataSize) > params.MaximumExtraDataSize {
-	// 		return fmt.Errorf(
-	// 			"expected header ExtraData to be <= %d but got %d",
-	// 			params.MaximumExtraDataSize, headerExtraDataSize,
-	// 		)
-	// 	}
 	// Verify the extra data is well-formed.
 	if err := header.VerifyExtra(rulesExtra.AvalancheRules, ethHeader.Extra); err != nil {
 		return err